Merge branch dev with rel-10.5#25611
Merged
Merged
Conversation
voloagent
approved these changes
Jun 10, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This automated merge PR updates ABP template and npm package manifests to align with the rel-10.5 release candidate 10.5.0-rc.2 (and related 5.5.0-rc.2 theme packages), keeping template outputs and published frontend packages in sync for the rel-10.5 branch.
Changes:
- Bump ABP npm package versions/references from
10.5.0-rc.1to10.5.0-rc.2across templates, module demo apps, and npm pack manifests. - Update lockfiles (
yarn.lock,package-lock.json) to match the new resolved package versions. - Update monorepo version metadata (
npm/lerna.json) to10.5.0-rc.2.
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 | Bumps Basic MVC theme dependency to ~10.5.0-rc.2. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json | Bumps Basic MVC theme dependency to ~10.5.0-rc.2. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json | Bumps Basic MVC + Blazor BasicTheme deps to ~10.5.0-rc.2. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json | Bumps Basic MVC theme dependency to ~10.5.0-rc.2. |
| templates/module/angular/projects/my-project-name/package.json | Bumps Angular peer deps on @abp/ng.* to ~10.5.0-rc.2. |
| templates/module/angular/package.json | Bumps Angular template @abp/ng.* deps/schematics to ~10.5.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json | Bumps LeptonX Lite MVC + Blazor LeptonX Lite theme deps to ~5.5.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json | Bumps LeptonX Lite MVC + Blazor LeptonX Lite theme deps to ~5.5.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bumps LeptonX Lite MVC + Blazor LeptonX Lite theme deps to ~5.5.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json | Bumps LeptonX Lite MVC + Blazor LeptonX Lite theme deps to ~5.5.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app/angular/package.json | Bumps Angular app template @abp/ng.* deps/schematics to ~10.5.0-rc.2 (and Lepton-X to ~5.5.0-rc.2). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json | Bumps LeptonX Lite MVC theme to ~5.5.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bumps LeptonX Lite MVC + Blazor LeptonX Lite theme deps to ~5.5.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json | Bumps LeptonX Lite MVC + Blazor LeptonX Lite theme deps to ~5.5.0-rc.2. |
| templates/app-nolayers/angular/package.json | Bumps Angular no-layers template @abp/ng.* deps/schematics to ~10.5.0-rc.2 (and Lepton-X to ~5.5.0-rc.2). |
| npm/packs/zxcvbn/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/vue/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/virtual-file-explorer/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/vee-validate/package.json | Bumps pack version and @abp/vue dependency to ~10.5.0-rc.2. |
| npm/packs/utils/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/uppy/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/tui-editor/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/toastr/package.json | Bumps pack version and @abp/jquery dependency to ~10.5.0-rc.2. |
| npm/packs/timeago/package.json | Bumps pack version and @abp/jquery dependency to ~10.5.0-rc.2. |
| npm/packs/sweetalert2/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/star-rating-svg/package.json | Bumps pack version and @abp/jquery dependency to ~10.5.0-rc.2. |
| npm/packs/slugify/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/signalr/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/select2/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/qrcode/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/prismjs/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/popper.js/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/owl.carousel/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/moment/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/markdown-it/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/malihu-custom-scrollbar-plugin/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/luxon/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/lodash/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/jstree/package.json | Bumps pack version and @abp/jquery dependency to ~10.5.0-rc.2. |
| npm/packs/jquery/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/jquery-validation/package.json | Bumps pack version and @abp/jquery dependency to ~10.5.0-rc.2. |
| npm/packs/jquery-validation-unobtrusive/package.json | Bumps pack version and @abp/jquery-validation dependency to ~10.5.0-rc.2. |
| npm/packs/jquery-form/package.json | Bumps pack version and @abp/jquery dependency to ~10.5.0-rc.2. |
| npm/packs/highlight.js/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/font-awesome/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/flag-icons/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/flag-icon-css/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/docs/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/datatables.net/package.json | Bumps pack version and @abp/jquery dependency to ~10.5.0-rc.2. |
| npm/packs/datatables.net-bs5/package.json | Bumps pack version and @abp/datatables.net dependency to ~10.5.0-rc.2. |
| npm/packs/datatables.net-bs4/package.json | Bumps pack version and @abp/datatables.net dependency to ~10.5.0-rc.2. |
| npm/packs/cropperjs/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/core/package.json | Bumps pack version and @abp/utils dependency to ~10.5.0-rc.2. |
| npm/packs/codemirror/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/cms-kit/package.json | Bumps pack version and internal cms-kit deps to ~10.5.0-rc.2. |
| npm/packs/cms-kit.public/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/cms-kit.admin/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/clipboard/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/packs/chart.js/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/bootstrap/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/bootstrap-daterangepicker/package.json | Bumps pack version and @abp/moment dependency to ~10.5.0-rc.2. |
| npm/packs/bootstrap-datepicker/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/blogging/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/aspnetcore.mvc.ui/package.json | Bumps pack version to 10.5.0-rc.2. |
| npm/packs/aspnetcore.mvc.ui/package-lock.json | Updates lockfile version metadata to 10.5.0-rc.2. |
| npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/aspnetcore.mvc.ui.theme.basic/package.json | Bumps pack version and theme.shared dependency to ~10.5.0-rc.2. |
| npm/packs/aspnetcore.components.server.theming/package.json | Bumps pack version and internal deps to ~10.5.0-rc.2. |
| npm/packs/aspnetcore.components.server.basictheme/package.json | Bumps pack version and theming dependency to ~10.5.0-rc.2. |
| npm/packs/anchor-js/package.json | Bumps pack version and @abp/core dependency to ~10.5.0-rc.2. |
| npm/ng-packs/packages/theme-shared/package.json | Bumps ng pack version and @abp/ng.core dependency to ~10.5.0-rc.2. |
| npm/ng-packs/packages/theme-basic/package.json | Bumps ng pack version and internal deps to ~10.5.0-rc.2. |
| npm/ng-packs/packages/tenant-management/package.json | Bumps ng pack version and internal deps to ~10.5.0-rc.2. |
| npm/ng-packs/packages/setting-management/package.json | Bumps ng pack version and internal deps to ~10.5.0-rc.2. |
| npm/ng-packs/packages/schematics/package.json | Bumps ng schematics version to 10.5.0-rc.2. |
| npm/ng-packs/packages/permission-management/package.json | Bumps ng pack version and theme.shared dependency to ~10.5.0-rc.2. |
| npm/ng-packs/packages/oauth/package.json | Bumps ng pack version and internal deps to ~10.5.0-rc.2. |
| npm/ng-packs/packages/identity/package.json | Bumps ng pack version and internal deps to ~10.5.0-rc.2. |
| npm/ng-packs/packages/generators/package.json | Bumps nx generators version to 10.5.0-rc.2. |
| npm/ng-packs/packages/feature-management/package.json | Bumps ng pack version and theme.shared dependency to ~10.5.0-rc.2. |
| npm/ng-packs/packages/core/package.json | Bumps ng.core version and @abp/utils dependency to ~10.5.0-rc.2. |
| npm/ng-packs/packages/components/package.json | Bumps ng.components version and peer dependency minimums to >=10.5.0-rc.2. |
| npm/ng-packs/packages/cms-kit/package.json | Bumps ng cms-kit version and internal deps to ~10.5.0-rc.2. |
| npm/ng-packs/packages/account/package.json | Bumps ng account version and internal deps to ~10.5.0-rc.2. |
| npm/ng-packs/packages/account-core/package.json | Bumps ng account-core version and internal deps to ~10.5.0-rc.2. |
| npm/ng-packs/package.json | Bumps devDependency versions to ~10.5.0-rc.2 / ~5.5.0-rc.2. |
| npm/lerna.json | Bumps lerna monorepo version to 10.5.0-rc.2. |
| modules/virtual-file-explorer/app/package.json | Bumps module app deps to ~10.5.0-rc.2. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock | Updates resolved ABP package tarballs to 10.5.0-rc.2. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json | Bumps Basic MVC theme dependency to ~10.5.0-rc.2. |
| modules/openiddict/app/OpenIddict.Demo.Server/package.json | Bumps Basic MVC theme dependency to ~10.5.0-rc.2. |
| modules/openiddict/app/angular/package.json | Bumps Angular demo @abp/ng.* deps/schematics to ~10.5.0-rc.2 (and Lepton-X to ~5.5.0-rc.2). |
| modules/docs/app/VoloDocs.Web/package.json | Bumps Basic MVC theme + docs package deps to ~10.5.0-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json | Bumps host deps to 10.5.0-rc.2 / ~10.5.0-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock | Updates resolved ABP package tarballs to 10.5.0-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json | Bumps Basic MVC theme dependency to ~10.5.0-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock | Updates resolved ABP package tarballs to 10.5.0-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json | Bumps Basic MVC theme dependency to ~10.5.0-rc.2. |
| modules/cms-kit/angular/projects/cms-kit/package.json | Bumps peer dependency minimums to >=10.5.0-rc.2. |
| modules/cms-kit/angular/package.json | Bumps several @abp/ng.* dependencies (note: currently mixed rc.1/rc.2). |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock | Updates resolved ABP package tarballs to 10.5.0-rc.2. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json | Bumps Basic MVC theme dependency to ~10.5.0-rc.2. |
| modules/blogging/app/Volo.BloggingTestApp/package.json | Bumps Basic MVC theme + blogging package deps to ~10.5.0-rc.2. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock | Updates resolved ABP package tarballs to 10.5.0-rc.2. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json | Bumps Basic theme + prismjs deps to ~10.5.0-rc.2. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock | Updates resolved ABP package tarballs to 10.5.0-rc.2. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json | Bumps theme.shared + prismjs + highlight.js deps to ~10.5.0-rc.2. |
Files not reviewed (1)
- npm/packs/aspnetcore.mvc.ui/package-lock.json: Language not supported
Comment on lines
21
to
22
| "@abp/ng.tenant-management": "~10.5.0-rc.1", | ||
| "@abp/ng.theme.basic": "~10.5.0-rc.1", |
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.5. Please review the changed files before merging to prevent any errors that may occur.