Skip to content

Merge dev into v4-dev and migrate the split workspace to Heft - #2170

Merged
AJIXuMuK merged 470 commits into
v4-devfrom
aterentiev-microsoft-v4-dev-integration
Oct 9, 2026
Merged

AJIXuMuK merged 470 commits into
v4-devfrom
aterentiev-microsoft-v4-dev-integration

Conversation

@AJIXuMuK

@AJIXuMuK AJIXuMuK commented Oct 9, 2026

Copy link
Copy Markdown
Collaborator
Q A
Bug fix? [x]
New feature? [x]
New sample? [x]
Related issues? N/A — integration of the existing dev branch

What's in this Pull Request?

Merge dev at 6ee720f into v4-dev at
0361654, preserving both histories in
merge commit 9b36396.

  • Preserve the Rush-managed controls library and private test web part/customizer app, component identities, library 4.0.0 version line, SPFx peer-dependency boundaries, and workspace:* linking.
  • Integrate dev fixes, improvements, new controls, public exports, localization, documentation, and samples into the split layout. The upstream file audit checked 1,378 source/test/script/typing/documentation files with no missing mapped files.
  • Migrate both projects to Heft, SPFx 1.23.2, TypeScript 5.8.3, ESLint 9, and Node 22.14.0+ within the Node 22 release line. Consumers require SPFx 1.23.2+ below 2.0.0 and React 17.
  • Preserve discovery of colocated tests and the separate library test directory; update legacy fixtures and the React 17 adapter without disabling diagnostics or tests.
  • Replace Gulp-dependent fast-serve with native Heft serving, retaining the independent Sonar Gulp task. Nonfatal lint warnings remain visible; compiler, test, and packaging errors still fail builds.
  • Update CI/release workflows and development documentation for the split workspace.
  • Respect user-configured npm registries and generate a registry-neutral lockfile with integrity hashes retained.
  • Exclude test/build infrastructure from the npm package while shipping public entrypoints, declarations, and localization assets.
  • Add Rush change metadata without incrementing the v4 version line.

Validation used Node 22.22.0:

Command Result
fnm exec --using=22.22.0 node common/scripts/install-run-rush.js install Passed with the regenerated frozen lockfile.
fnm exec --using=22.22.0 node common/scripts/install-run-rush.js rebuild Passed: 185 library tests, 1 app test, production bundles, and both .sppkg files. Lint warnings remain visible.
fnm exec --using=22.22.0 node --test common/tests/pnpmfile.test.cjs Passed: 4 registry-portability tests. No mirror-specific URLs remain in the lockfile.
fnm exec --using=22.22.0 node common/scripts/install-run-rush.js change --verify --no-fetch --target-branch origin/v4-dev Passed after committing the generated change file.
fnm exec --using=22.22.0 npm pack --dry-run --json in libraries/spfx-controls-react Passed: required entrypoints, declarations, and localization present; test/build infrastructure excluded.
fnm exec --using=22.22.0 node_modules/.bin/heft start --nobrowser in apps/controls-tests Passed: webpack compiled and /temp/build/manifests.js returned HTTP 200 with the app manifest. Server stopped afterward.

Both pinned branch tips are ancestors of the merge commit. No packages were
published and neither remote dev nor v4-dev was directly updated.
SharePoint-hosted interactive behavior and deployment still require tenant
validation. Rush 5.135.0 emits its Node 22 compatibility notice, and legacy
dependency/lint warnings remain.

Guidance

  • You can delete this section when you are submitting the pull request.
  • Please update this PR information accordingly. We'll use this as part of our release notes in monthly communications.
  • Please target your PR to dev branch.
  • This integration explicitly targets v4-dev at the user's request, rather than the template's general dev target.

Ateina and others added 30 commits December 13, 2025 00:59
…e-render-options

Add render options for ListItemAttachments. Closes #249
fixed #2078 to show multiline comment properly in ListItemComments control
Issue 2074 - Pass through ImageProps to TreeItem's Icon
- New ListToolbar control with Fluent UI 9 components
- Supports item grouping, far items, dividers, tooltips
- Automatic overflow menu for responsive layouts
- Far item labels auto-hide on small screens (≤768px)
- Dynamic responsive gap between left and right sections
- SharePoint & Teams theme support via context/theme props
- Custom item rendering via onRender
- Total count badge display
- Loading state support
- Full documentation and test webpart sample
joelfmrodrigues and others added 28 commits September 18, 2026 00:04
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Disable ESLint rule for ReactDOM rendering.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Added ESLint disable comment for ReactDOM render.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Add eslint disable comment for atomic updates.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Updated eslint-disable comments for clarity.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Fix simple lint warnings found by build
Co-authored-by: joelfmrodrigues <19577724+joelfmrodrigues@users.noreply.github.com>
Co-authored-by: joelfmrodrigues <19577724+joelfmrodrigues@users.noreply.github.com>
Co-authored-by: joelfmrodrigues <19577724+joelfmrodrigues@users.noreply.github.com>
hotfix for #2156 (DynamicForm hide/show formula doesn't work issue)
…nt-warnings

Fix simple lint warnings in test controls and DetailsList row
Preserve the Rush library/test-app architecture and v4 identities while integrating dev controls, fixes, localization, and documentation. Upgrade both projects to SPFx 1.23.2 and Node 22, retain full test discovery, and make dependency installation registry-portable.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@AJIXuMuK
AJIXuMuK merged commit 2e98f34 into v4-dev Oct 9, 2026
2 checks passed
@AJIXuMuK
AJIXuMuK deleted the aterentiev-microsoft-v4-dev-integration branch October 9, 2026 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.