Merge branch dev with rel-10.4#25516
Merged
Merged
Conversation
voloagent
approved these changes
Jun 1, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Automated merge PR syncing dev into rel-10.4, primarily updating template and package metadata to the 10.4.1 patch level (and related theme packages to 5.4.1) across the repository’s npm/yarn-managed assets.
Changes:
- Bump ABP npm package versions/references from
10.4.0to10.4.1across templates, packs, and module demo apps. - Bump LeptonX theme package references from
5.4.0to5.4.1where applicable. - Refresh affected
yarn.lock/package-lock.jsonentries to match the new resolved versions.
Reviewed changes
Copilot reviewed 109 out of 135 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json | Bumps Basic theme dependency to ~10.4.1. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json | Bumps Basic theme dependency to ~10.4.1. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json | Bumps Basic theme + Blazor basic theme packages to ~10.4.1. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json | Bumps Basic theme dependency to ~10.4.1. |
| templates/module/angular/projects/my-project-name/package.json | Updates Angular peer deps for @abp/ng.* to ~10.4.1. |
| templates/module/angular/package.json | Updates Angular template deps/devDeps (@abp/ng.*) to ~10.4.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json | Bumps LeptonX Lite MVC + Blazor server theme packages to ~5.4.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json | Bumps LeptonX Lite MVC + Blazor server theme packages to ~5.4.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bumps LeptonX Lite MVC + Blazor server theme packages to ~5.4.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json | Bumps LeptonX Lite MVC + Blazor server theme packages to ~5.4.1. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app/angular/package.json | Updates Angular app template deps/devDeps (@abp/ng.*) to ~10.4.1 and lepton-x to ~5.4.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json | Bumps LeptonX Lite MVC theme to ~5.4.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bumps LeptonX Lite MVC + Blazor server theme packages to ~5.4.1. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json | Bumps LeptonX Lite MVC + Blazor server theme packages to ~5.4.1. |
| templates/app-nolayers/angular/package.json | Updates no-layers Angular app template deps/devDeps (@abp/ng.*) to ~10.4.1 and lepton-x to ~5.4.1. |
| npm/packs/zxcvbn/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/vue/package.json | Bumps pack version to 10.4.1. |
| npm/packs/virtual-file-explorer/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/vee-validate/package.json | Bumps pack version to 10.4.1 and aligns @abp/vue dependency. |
| npm/packs/utils/package.json | Bumps pack version to 10.4.1. |
| npm/packs/uppy/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/tui-editor/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/toastr/package.json | Bumps pack version to 10.4.1 and aligns @abp/jquery dependency. |
| npm/packs/timeago/package.json | Bumps pack version to 10.4.1 and aligns @abp/jquery dependency. |
| npm/packs/sweetalert2/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/star-rating-svg/package.json | Bumps pack version to 10.4.1 and aligns @abp/jquery dependency. |
| npm/packs/slugify/package.json | Bumps pack version to 10.4.1. |
| npm/packs/signalr/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/select2/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/qrcode/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/prismjs/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/popper.js/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/owl.carousel/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/moment/package.json | Bumps pack version to 10.4.1. |
| npm/packs/markdown-it/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/malihu-custom-scrollbar-plugin/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/luxon/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/lodash/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/jstree/package.json | Bumps pack version to 10.4.1 and aligns @abp/jquery dependency. |
| npm/packs/jquery/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/jquery-validation/package.json | Bumps pack version to 10.4.1 and aligns @abp/jquery dependency. |
| npm/packs/jquery-validation-unobtrusive/package.json | Bumps pack version to 10.4.1 and aligns @abp/jquery-validation dependency. |
| npm/packs/jquery-form/package.json | Bumps pack version to 10.4.1 and aligns @abp/jquery dependency. |
| npm/packs/highlight.js/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/font-awesome/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/flag-icons/package.json | Bumps pack version to 10.4.1. |
| npm/packs/flag-icon-css/package.json | Bumps pack version to 10.4.1. |
| npm/packs/docs/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/datatables.net/package.json | Bumps pack version to 10.4.1 and aligns @abp/jquery dependency. |
| npm/packs/datatables.net-bs5/package.json | Bumps pack version to 10.4.1 and aligns @abp/datatables.net dependency. |
| npm/packs/datatables.net-bs4/package.json | Bumps pack version to 10.4.1 and aligns @abp/datatables.net dependency. |
| npm/packs/cropperjs/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/core/package.json | Bumps pack version to 10.4.1 and aligns @abp/utils dependency. |
| npm/packs/codemirror/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/cms-kit/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/cms-kit.public/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/cms-kit.admin/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/clipboard/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/packs/chart.js/package.json | Bumps pack version to 10.4.1. |
| npm/packs/bootstrap/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/bootstrap-daterangepicker/package.json | Bumps pack version to 10.4.1 and aligns @abp/moment dependency. |
| npm/packs/bootstrap-datepicker/package.json | Bumps pack version to 10.4.1. |
| npm/packs/blogging/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/aspnetcore.mvc.ui/package.json | Bumps pack version to 10.4.1. |
| npm/packs/aspnetcore.mvc.ui/package-lock.json | Updates lockfile version field to 10.4.1. |
| npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/aspnetcore.mvc.ui.theme.basic/package.json | Bumps pack version to 10.4.1 and aligns dependency on theme.shared. |
| npm/packs/aspnetcore.components.server.theming/package.json | Bumps pack version to 10.4.1 and aligns internal dependencies. |
| npm/packs/aspnetcore.components.server.basictheme/package.json | Bumps pack version to 10.4.1 and aligns dependency on server.theming. |
| npm/packs/anchor-js/package.json | Bumps pack version to 10.4.1 and aligns @abp/core dependency. |
| npm/ng-packs/packages/theme-shared/package.json | Bumps package version to 10.4.1 and aligns dependency on @abp/ng.core. |
| npm/ng-packs/packages/theme-basic/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/tenant-management/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/setting-management/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/schematics/package.json | Bumps package version to 10.4.1. |
| npm/ng-packs/packages/permission-management/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/oauth/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/identity/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/generators/package.json | Bumps package version to 10.4.1. |
| npm/ng-packs/packages/feature-management/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/core/package.json | Bumps package version to 10.4.1 and aligns dependency on @abp/utils. |
| npm/ng-packs/packages/components/package.json | Bumps package version to 10.4.1 and raises peer minimums. |
| npm/ng-packs/packages/cms-kit/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/account/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/packages/account-core/package.json | Bumps package version to 10.4.1 and aligns dependencies. |
| npm/ng-packs/package.json | Updates devDependency versions for ng-packs workspace tooling deps. |
| npm/lerna.json | Bumps Lerna monorepo version to 10.4.1. |
| modules/virtual-file-explorer/app/package.json | Bumps app dependencies to ~10.4.1. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock | Updates resolved ABP package entries to 10.4.1. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json | Bumps Basic theme dependency to ~10.4.1. |
| modules/openiddict/app/OpenIddict.Demo.Server/package.json | Bumps Basic theme dependency to ~10.4.1. |
| modules/openiddict/app/angular/package.json | Bumps Angular demo deps/devDeps to ~10.4.1 (and lepton-x to ~5.4.1). |
| modules/docs/app/VoloDocs.Web/yarn.lock | Updates resolved ABP package entries to 10.4.1. |
| modules/docs/app/VoloDocs.Web/package.json | Bumps Basic theme + docs package to ~10.4.1. |
| modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json | Bumps Basic theme to ~10.4.1 and cms-kit to 10.4.1 (see note in comments). |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock | Updates resolved ABP package entries to 10.4.1. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json | Bumps Basic theme dependency to ~10.4.1. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock | Updates resolved ABP package entries to 10.4.1. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json | Bumps Basic theme dependency to ~10.4.1. |
| modules/cms-kit/angular/projects/cms-kit/package.json | Raises peer minimums to >=10.4.1. |
| modules/cms-kit/angular/package.json | Partially bumps ABP Angular deps (see comment about remaining ~10.4.0 entries). |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock | Updates resolved ABP package entries to 10.4.1. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json | Bumps Basic theme dependency to ~10.4.1. |
| modules/blogging/app/Volo.BloggingTestApp/package.json | Bumps Basic theme + blogging package to ~10.4.1. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock | Updates resolved ABP package entries to 10.4.1. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json | Bumps Basic theme + prismjs packages to ~10.4.1. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock | Updates resolved ABP package entries to 10.4.1. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json | Bumps theme.shared + prismjs + highlight.js packages to ~10.4.1. |
Files not reviewed (1)
- npm/packs/aspnetcore.mvc.ui/package-lock.json: Language not supported
Comment on lines
18
to
+22
| "@abp/ng.account": "~10.4.0", | ||
| "@abp/ng.identity": "~10.4.0", | ||
| "@abp/ng.setting-management": "~10.4.0", | ||
| "@abp/ng.setting-management": "~10.4.1", | ||
| "@abp/ng.tenant-management": "~10.4.0", | ||
| "@abp/ng.theme.basic": "~10.4.0", | ||
| "@abp/ng.theme.basic": "~10.4.1", |
Comment on lines
+6
to
+7
| "@abp/aspnetcore.mvc.ui.theme.basic": "~10.4.1", | ||
| "@abp/cms-kit": "10.4.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.4. Please review the changed files before merging to prevent any errors that may occur.