Merge branch dev with rel-10.6 - #25875
Merged
Merged
Conversation
voloagent
marked this pull request as ready for review
July 27, 2026 08:16
voloagent
approved these changes
Jul 27, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This automated merge PR primarily aligns JavaScript/NPM package versions across ABP templates, demo apps, and published npm packs, moving from 10.6.0-rc.3 to the stable 10.6.0 (and 5.6.0-rc.3 → 5.6.0 for LeptonX-related packages).
Changes:
- Updated template and demo app
package.jsondependencies from release-candidate versions to stable10.6.0/5.6.0. - Bumped ABP npm pack versions (and their internal dependencies) to
10.6.0, includingnpm/lerna.json. - Updated multiple
yarn.lockfiles to resolve against the stable packages.
Reviewed changes
Copilot reviewed 109 out of 135 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json | Template dependency rc → stable (@abp/aspnetcore.mvc.ui.theme.basic). |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json | Template dependency rc → stable (@abp/aspnetcore.mvc.ui.theme.basic). |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json | Template dependencies rc → stable (MVC theme + Blazor basic theme). |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json | Template dependency rc → stable (@abp/aspnetcore.mvc.ui.theme.basic). |
| templates/module/angular/projects/my-project-name/package.json | Peer deps rc → stable (@abp/ng.*). |
| templates/module/angular/package.json | Updated many ABP Angular deps to stable 10.6.0. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json | LeptonX Lite + Blazor theme rc → stable (5.6.0). |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json | LeptonX Lite + Blazor theme rc → stable (5.6.0). |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json | LeptonX Lite + Blazor theme rc → stable (5.6.0). |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json | LeptonX Lite + Blazor theme rc → stable (5.6.0). |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app/angular/package.json | Updated many ABP Angular deps to stable 10.6.0 (and Lepton-X 5.6.0). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json | LeptonX Lite theme rc → stable (5.6.0). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json | LeptonX Lite + Blazor theme rc → stable (5.6.0). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json | LeptonX Lite + Blazor theme rc → stable (5.6.0). |
| templates/app-nolayers/angular/package.json | Updated many ABP Angular deps to stable 10.6.0 (and Lepton-X 5.6.0). |
| npm/packs/zxcvbn/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/vue/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/virtual-file-explorer/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/vee-validate/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/utils/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/uppy/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/tui-editor/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/toastr/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/timeago/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/sweetalert2/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/star-rating-svg/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/slugify/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/signalr/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/select2/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/qrcode/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/prismjs/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/popper.js/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/owl.carousel/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/moment/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/markdown-it/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/malihu-custom-scrollbar-plugin/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/luxon/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/lodash/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/jstree/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/jquery/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/jquery-validation/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/jquery-validation-unobtrusive/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/jquery-form/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/highlight.js/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/font-awesome/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/flag-icons/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/flag-icon-css/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/docs/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/datatables.net/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/datatables.net-bs5/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/datatables.net-bs4/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/cropperjs/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/core/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/codemirror/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/cms-kit/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/cms-kit.public/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/cms-kit.admin/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/clipboard/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/chart.js/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/bootstrap/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/bootstrap-daterangepicker/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/bootstrap-datepicker/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/blogging/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/aspnetcore.mvc.ui/package.json | Pack version rc → stable 10.6.0. |
| npm/packs/aspnetcore.mvc.ui/package-lock.json | Lockfile version updated (needs nested root version alignment). |
| npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/aspnetcore.mvc.ui.theme.basic/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/aspnetcore.components.server.theming/package.json | Pack version/dependencies rc → stable 10.6.0. |
| npm/packs/aspnetcore.components.server.basictheme/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/packs/anchor-js/package.json | Pack version/dependency rc → stable 10.6.0. |
| npm/ng-packs/packages/theme-shared/package.json | Angular pack version/dependency rc → stable 10.6.0. |
| npm/ng-packs/packages/theme-basic/package.json | Angular pack version/dependencies rc → stable 10.6.0. |
| npm/ng-packs/packages/tenant-management/package.json | Angular pack version/dependencies rc → stable 10.6.0. |
| npm/ng-packs/packages/setting-management/package.json | Angular pack version/dependencies rc → stable 10.6.0. |
| npm/ng-packs/packages/schematics/package.json | Angular pack version rc → stable 10.6.0. |
| npm/ng-packs/packages/permission-management/package.json | Angular pack version/dependency rc → stable 10.6.0. |
| npm/ng-packs/packages/oauth/package.json | Angular pack version/dependencies rc → stable 10.6.0. |
| npm/ng-packs/packages/identity/package.json | Angular pack version/dependencies rc → stable 10.6.0. |
| npm/ng-packs/packages/generators/package.json | Angular pack version rc → stable 10.6.0. |
| npm/ng-packs/packages/feature-management/package.json | Angular pack version/dependency rc → stable 10.6.0. |
| npm/ng-packs/packages/core/package.json | Angular pack version/dependency rc → stable 10.6.0. |
| npm/ng-packs/packages/components/package.json | Angular pack version + peer deps rc → stable 10.6.0. |
| npm/ng-packs/packages/cms-kit/package.json | Angular pack version/dependencies rc → stable 10.6.0. |
| npm/ng-packs/packages/account/package.json | Angular pack version/dependencies rc → stable 10.6.0. |
| npm/ng-packs/packages/account-core/package.json | Angular pack version/dependencies rc → stable 10.6.0. |
| npm/ng-packs/package.json | Tooling/devDeps rc → stable (10.6.0 / 5.6.0). |
| npm/lerna.json | Monorepo version rc → stable 10.6.0. |
| modules/virtual-file-explorer/app/package.json | Demo app deps rc → stable 10.6.0. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock | Lockfile updated for stable 10.6.0 packages. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json | Demo app dep rc → stable 10.6.0. |
| modules/openiddict/app/OpenIddict.Demo.Server/package.json | Demo app dep rc → stable 10.6.0. |
| modules/openiddict/app/angular/package.json | Demo app deps rc → stable (10.6.0 / 5.6.0). |
| modules/docs/app/VoloDocs.Web/package.json | Demo app deps rc → stable 10.6.0. |
| modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json | Host deps rc → stable 10.6.0. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock | Lockfile updated for stable 10.6.0 packages. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json | Host dep rc → stable 10.6.0. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock | Lockfile updated for stable 10.6.0 packages. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json | Host dep rc → stable 10.6.0. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock | Lockfile updated for stable 10.6.0 packages. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json | Demo app dep rc → stable 10.6.0. |
| modules/blogging/app/Volo.BloggingTestApp/package.json | Demo app deps rc → stable 10.6.0. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock | Lockfile updated for stable 10.6.0 packages. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json | Demo app deps rc → stable 10.6.0. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock | Lockfile updated for stable 10.6.0 packages. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json | Demo app deps rc → stable 10.6.0. |
| modules/cms-kit/angular/projects/cms-kit/package.json | Peer deps rc → stable (>=10.6.0). |
| modules/cms-kit/angular/package.json | Module app deps largely rc → stable 10.6.0. |
Files not reviewed (1)
- npm/packs/aspnetcore.mvc.ui/package-lock.json: Generated file
| "@abp/ng.account": "~10.6.0", | ||
| "@abp/ng.components": "~10.6.0", | ||
| "@abp/ng.core": "~10.6.0", | ||
| "@abp/ng.identity": "~10.6.0-rc.3", |
| "@abp/ng.account": "~10.6.0", | ||
| "@abp/ng.components": "~10.6.0", | ||
| "@abp/ng.core": "~10.6.0", | ||
| "@abp/ng.identity": "~10.6.0-rc.3", |
| "@abp/ng.account": "~10.6.0", | ||
| "@abp/ng.components": "~10.6.0", | ||
| "@abp/ng.core": "~10.6.0", | ||
| "@abp/ng.identity": "~10.6.0-rc.3", |
| "dependencies": { | ||
| "@abp/ng.account": "~10.6.0-rc.3", | ||
| "@abp/ng.account": "~10.6.0", | ||
| "@abp/ng.identity": "~10.6.0-rc.3", |
| { | ||
| "name": "@abp/aspnetcore.mvc.ui", | ||
| "version": "10.6.0-rc.3", | ||
| "version": "10.6.0", |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR generated automatically to merge dev with rel-10.6. Please review the changed files before merging to prevent any errors that may occur.