Merge branch dev with rel-10.6 - #25768
Merged
Merged
Conversation
voloagent
marked this pull request as ready for review
July 7, 2026 11:55
voloagent
approved these changes
Jul 7, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This auto-generated merge PR primarily updates ABP-related NPM package versions across application/module templates, NPM packs, and demo apps to align with the 10.6.0-rc.1 (and LeptonX 5.6.0-rc.1) release line.
Changes:
- Bump ABP NPM package versions in templates and demo apps from
10.5.0to10.6.0-rc.1(and LeptonX packages from5.5.0to5.6.0-rc.1). - Update NPM pack versions and internal pack dependencies to
10.6.0-rc.1(includingnpm/lerna.json). - Refresh Yarn lockfiles in affected demo/test apps to point to the
10.6.0-rc.1tarballs.
Reviewed changes
Copilot reviewed 109 out of 135 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json | Bump Basic theme dependency to ~10.6.0-rc.1. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json | Bump Basic theme dependency to ~10.6.0-rc.1. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json | Bump MVC/Blazor Basic theme dependencies to ~10.6.0-rc.1. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json | Bump Basic theme dependency to ~10.6.0-rc.1. |
| templates/module/angular/projects/my-project-name/package.json | Bump ABP Angular peer deps to ~10.6.0-rc.1. |
| templates/module/angular/package.json | Bump ABP Angular deps/devDeps to ~10.6.0-rc.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json | Bump LeptonX Lite MVC/Blazor theme packages to ~5.6.0-rc.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json | Bump LeptonX Lite MVC/Blazor theme packages to ~5.6.0-rc.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bump LeptonX Lite MVC/Blazor theme packages to ~5.6.0-rc.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json | Bump LeptonX Lite MVC/Blazor theme packages to ~5.6.0-rc.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app/angular/package.json | Bump ABP Angular deps/devDeps to ~10.6.0-rc.1 and LeptonX to ~5.6.0-rc.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json | Bump LeptonX Lite theme to ~5.6.0-rc.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bump LeptonX Lite MVC/Blazor theme packages to ~5.6.0-rc.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json | Bump LeptonX Lite MVC/Blazor theme packages to ~5.6.0-rc.1. |
| templates/app-nolayers/angular/package.json | Bump ABP Angular deps/devDeps to ~10.6.0-rc.1 and LeptonX to ~5.6.0-rc.1. |
| npm/packs/zxcvbn/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/vue/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/virtual-file-explorer/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/vee-validate/package.json | Bump pack version and @abp/vue dependency to 10.6.0-rc.1. |
| npm/packs/utils/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/uppy/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/tui-editor/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/toastr/package.json | Bump pack version and @abp/jquery dependency to 10.6.0-rc.1. |
| npm/packs/timeago/package.json | Bump pack version and @abp/jquery dependency to 10.6.0-rc.1. |
| npm/packs/sweetalert2/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/star-rating-svg/package.json | Bump pack version and @abp/jquery dependency to 10.6.0-rc.1. |
| npm/packs/slugify/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/signalr/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/select2/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/qrcode/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/prismjs/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/popper.js/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/owl.carousel/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/moment/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/markdown-it/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/malihu-custom-scrollbar-plugin/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/luxon/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/lodash/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/jstree/package.json | Bump pack version and @abp/jquery dependency to 10.6.0-rc.1. |
| npm/packs/jquery/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/jquery-validation/package.json | Bump pack version and @abp/jquery dependency to 10.6.0-rc.1. |
| npm/packs/jquery-validation-unobtrusive/package.json | Bump pack version and @abp/jquery-validation dependency to 10.6.0-rc.1. |
| npm/packs/jquery-form/package.json | Bump pack version and @abp/jquery dependency to 10.6.0-rc.1. |
| npm/packs/highlight.js/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/font-awesome/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/flag-icons/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/flag-icon-css/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/docs/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/datatables.net/package.json | Bump pack version and @abp/jquery dependency to 10.6.0-rc.1. |
| npm/packs/datatables.net-bs5/package.json | Bump pack version and @abp/datatables.net dependency to 10.6.0-rc.1. |
| npm/packs/datatables.net-bs4/package.json | Bump pack version and @abp/datatables.net dependency to 10.6.0-rc.1. |
| npm/packs/cropperjs/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/core/package.json | Bump pack version and @abp/utils dependency to 10.6.0-rc.1. |
| npm/packs/codemirror/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/cms-kit/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/cms-kit.public/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/cms-kit.admin/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/clipboard/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/packs/chart.js/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/bootstrap/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/bootstrap-daterangepicker/package.json | Bump pack version and @abp/moment dependency to 10.6.0-rc.1. |
| npm/packs/bootstrap-datepicker/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/blogging/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/aspnetcore.mvc.ui/package.json | Bump pack version to 10.6.0-rc.1. |
| npm/packs/aspnetcore.mvc.ui/package-lock.json | Update lockfile package version to 10.6.0-rc.1. |
| npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/aspnetcore.mvc.ui.theme.basic/package.json | Bump pack version and dependency to 10.6.0-rc.1. |
| npm/packs/aspnetcore.components.server.theming/package.json | Bump pack version and dependencies to 10.6.0-rc.1. |
| npm/packs/aspnetcore.components.server.basictheme/package.json | Bump pack version and dependency to 10.6.0-rc.1. |
| npm/packs/anchor-js/package.json | Bump pack version and @abp/core dependency to 10.6.0-rc.1. |
| npm/ng-packs/packages/theme-shared/package.json | Bump Angular pack version and dependency to 10.6.0-rc.1. |
| npm/ng-packs/packages/theme-basic/package.json | Bump Angular pack version and dependencies to 10.6.0-rc.1. |
| npm/ng-packs/packages/tenant-management/package.json | Bump Angular pack version and dependencies to 10.6.0-rc.1. |
| npm/ng-packs/packages/setting-management/package.json | Bump Angular pack version and dependencies to 10.6.0-rc.1. |
| npm/ng-packs/packages/schematics/package.json | Bump schematics pack version to 10.6.0-rc.1. |
| npm/ng-packs/packages/permission-management/package.json | Bump Angular pack version and dependency to 10.6.0-rc.1. |
| npm/ng-packs/packages/oauth/package.json | Bump Angular pack version and dependencies to 10.6.0-rc.1. |
| npm/ng-packs/packages/identity/package.json | Bump Angular pack version and dependencies to 10.6.0-rc.1. |
| npm/ng-packs/packages/generators/package.json | Bump generators pack version to 10.6.0-rc.1. |
| npm/ng-packs/packages/feature-management/package.json | Bump Angular pack version and dependency to 10.6.0-rc.1. |
| npm/ng-packs/packages/core/package.json | Bump Angular core pack version and dependency to 10.6.0-rc.1. |
| npm/ng-packs/packages/components/package.json | Bump Angular components pack version and peer deps floor to >=10.6.0-rc.1. |
| npm/ng-packs/packages/cms-kit/package.json | Bump Angular CMS Kit pack version and dependencies to 10.6.0-rc.1. |
| npm/ng-packs/packages/account/package.json | Bump Angular account pack version and dependencies to 10.6.0-rc.1. |
| npm/ng-packs/packages/account-core/package.json | Bump Angular account-core pack version and dependencies to 10.6.0-rc.1. |
| npm/ng-packs/package.json | Bump devDependencies to 10.6.0-rc.1 / 5.6.0-rc.1. |
| npm/lerna.json | Bump monorepo version to 10.6.0-rc.1. |
| modules/virtual-file-explorer/app/package.json | Bump demo app dependencies to ~10.6.0-rc.1. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock | Update lockfile to 10.6.0-rc.1 ABP tarballs. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json | Bump Basic theme dependency to ~10.6.0-rc.1. |
| modules/openiddict/app/OpenIddict.Demo.Server/package.json | Bump Basic theme dependency to ~10.6.0-rc.1. |
| modules/openiddict/app/angular/package.json | Bump ABP Angular dependencies to ~10.6.0-rc.1 and LeptonX to ~5.6.0-rc.1. |
| modules/docs/app/VoloDocs.Web/package.json | Bump Basic theme + docs pack dependencies to ~10.6.0-rc.1. |
| modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json | Bump Basic theme + cms-kit pack dependencies to 10.6.0-rc.1. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock | Update lockfile to 10.6.0-rc.1 ABP tarballs. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json | Bump Basic theme dependency to ~10.6.0-rc.1. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock | Update lockfile to 10.6.0-rc.1 ABP tarballs. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json | Bump Basic theme dependency to ~10.6.0-rc.1. |
| modules/cms-kit/angular/projects/cms-kit/package.json | Bump ABP Angular peer deps floor to >=10.6.0-rc.1. |
| modules/cms-kit/angular/package.json | Bump ABP Angular dependencies (but one is still ~10.5.0). |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock | Update lockfile to 10.6.0-rc.1 ABP tarballs. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json | Bump Basic theme dependency to ~10.6.0-rc.1. |
| modules/blogging/app/Volo.BloggingTestApp/package.json | Bump Basic theme + blogging pack dependencies to ~10.6.0-rc.1. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock | Update lockfile to 10.6.0-rc.1 ABP tarballs. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json | Bump Basic theme + prismjs pack dependencies to ~10.6.0-rc.1. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock | Update lockfile to 10.6.0-rc.1 ABP tarballs. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json | Bump shared theme + prismjs + highlight.js dependencies to ~10.6.0-rc.1. |
Files not reviewed (1)
- npm/packs/aspnetcore.mvc.ui/package-lock.json: Generated file
| @@ -16,10 +16,10 @@ | |||
| "private": true, | |||
| "dependencies": { | |||
| "@abp/ng.account": "~10.5.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.