Skip to content

Merge branch dev with rel-10.4#25438

Merged
voloagent merged 1 commit into
devfrom
auto-merge/rel-10-4/4575
May 14, 2026
Merged

Merge branch dev with rel-10.4#25438
voloagent merged 1 commit into
devfrom
auto-merge/rel-10-4/4575

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

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.

@voloagent voloagent marked this pull request as ready for review May 14, 2026 10:11
Copilot AI review requested due to automatic review settings May 14, 2026 10:11
@voloagent voloagent merged commit 2b46e56 into dev May 14, 2026
1 check passed
@voloagent voloagent deleted the auto-merge/rel-10-4/4575 branch May 14, 2026 10:11

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This automatic merge updates ABP template, demo, and npm package metadata from 10.4 RC package versions to the stable 10.4.0 release line, with LeptonX packages updated to 5.4.0 where used.

Changes:

  • Replaces 10.4.0-rc.* ABP npm dependencies with 10.4.0.
  • Replaces LeptonX 5.4.0-rc.2 dependencies with 5.4.0.
  • Updates related package lockfiles and package version metadata.

Reviewed changes

Copilot reviewed 110 out of 136 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 Updates Basic theme dependency to stable 10.4.0.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json Updates Basic theme dependency to stable 10.4.0.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json Updates Basic theme and server Basic theme dependencies to stable 10.4.0.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json Updates Basic theme dependency to stable 10.4.0.
templates/module/angular/projects/my-project-name/package.json Updates ABP Angular peer dependencies to stable 10.4.0.
templates/module/angular/package.json Updates ABP Angular dependencies and schematics to stable 10.4.0.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json Updates LeptonX Lite MVC and server theme dependencies to stable 5.4.0.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json Updates LeptonX Lite MVC and server theme dependencies to stable 5.4.0.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json Updates LeptonX Lite MVC and server theme dependencies to stable 5.4.0.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json Updates LeptonX Lite MVC and server theme dependencies to stable 5.4.0.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app/angular/package.json Updates ABP Angular dependencies and LeptonX Angular theme to stable versions.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json Updates LeptonX Lite theme dependency to stable 5.4.0.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json Updates LeptonX Lite MVC and server theme dependencies to stable 5.4.0.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json Updates LeptonX Lite MVC and server theme dependencies to stable 5.4.0.
templates/app-nolayers/angular/package.json Updates ABP Angular dependencies and LeptonX Angular theme to stable versions.
nupkg/0 Updates numeric package helper marker content.
npm/packs/zxcvbn/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/vue/package.json Updates package version to 10.4.0.
npm/packs/virtual-file-explorer/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/vee-validate/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/utils/package.json Updates package version to 10.4.0.
npm/packs/uppy/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/tui-editor/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/toastr/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/timeago/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/sweetalert2/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/star-rating-svg/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/slugify/package.json Updates package version to 10.4.0.
npm/packs/signalr/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/select2/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/qrcode/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/prismjs/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/popper.js/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/owl.carousel/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/moment/package.json Updates package version to 10.4.0.
npm/packs/markdown-it/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/malihu-custom-scrollbar-plugin/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/luxon/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/lodash/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/jstree/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/jquery/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/jquery-validation/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/jquery-validation-unobtrusive/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/jquery-form/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/highlight.js/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/font-awesome/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/flag-icons/package.json Updates package version to 10.4.0.
npm/packs/flag-icon-css/package.json Updates package version to 10.4.0.
npm/packs/docs/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/datatables.net/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/datatables.net-bs5/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/datatables.net-bs4/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/cropperjs/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/core/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/codemirror/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/cms-kit/package.json Updates package and CMS Kit package dependency versions to 10.4.0.
npm/packs/cms-kit.public/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/cms-kit.admin/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/clipboard/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/chart.js/package.json Updates package version to 10.4.0.
npm/packs/bootstrap/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/bootstrap-daterangepicker/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/bootstrap-datepicker/package.json Updates package version to 10.4.0.
npm/packs/blogging/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/aspnetcore.mvc.ui/package.json Updates package version to 10.4.0.
npm/packs/aspnetcore.mvc.ui/package-lock.json Updates lockfile top-level package version.
npm/packs/aspnetcore.mvc.ui.theme.shared/package.json Updates package and shared theme dependency versions to 10.4.0.
npm/packs/aspnetcore.mvc.ui.theme.basic/package.json Updates package and shared theme dependency versions to 10.4.0.
npm/packs/aspnetcore.components.server.theming/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/packs/aspnetcore.components.server.basictheme/package.json Updates package and server theming dependency versions to 10.4.0.
npm/packs/anchor-js/package.json Updates package and internal ABP dependency versions to 10.4.0.
npm/ng-packs/packages/theme-shared/package.json Updates Angular package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/theme-basic/package.json Updates Angular package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/tenant-management/package.json Updates Angular package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/setting-management/package.json Updates Angular package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/schematics/package.json Updates Angular schematics package version to 10.4.0.
npm/ng-packs/packages/permission-management/package.json Updates Angular package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/oauth/package.json Updates Angular package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/identity/package.json Updates Angular package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/generators/package.json Updates Nx generators package version to 10.4.0.
npm/ng-packs/packages/feature-management/package.json Updates Angular package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/core/package.json Updates Angular core package and utility dependency versions to 10.4.0.
npm/ng-packs/packages/components/package.json Updates Angular components package and peer dependency lower bounds to 10.4.0.
npm/ng-packs/packages/cms-kit/package.json Updates Angular CMS Kit package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/account/package.json Updates Angular account package and internal dependency versions to 10.4.0.
npm/ng-packs/packages/account-core/package.json Updates Angular account core package and internal dependency versions to 10.4.0.
npm/ng-packs/package.json Updates Angular workspace dev ABP dependencies to stable versions.
npm/lerna.json Updates Lerna package version to 10.4.0.
modules/virtual-file-explorer/app/package.json Updates demo app dependencies to stable 10.4.0.
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock Updates resolved ABP packages to stable 10.4.0.
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json Updates demo app Basic theme dependency to stable 10.4.0.
modules/openiddict/app/OpenIddict.Demo.Server/package.json Updates demo server Basic theme dependency to stable 10.4.0.
modules/openiddict/app/angular/package.json Updates Angular demo ABP dependencies to stable versions.
modules/docs/app/VoloDocs.Web/package.json Updates docs app dependencies to stable 10.4.0.
modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json Updates CMS Kit host dependencies to stable 10.4.0.
modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock Updates resolved ABP packages to stable 10.4.0.
modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json Updates CMS Kit host Basic theme dependency to stable 10.4.0.
modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock Updates resolved ABP packages to stable 10.4.0.
modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json Updates CMS Kit IdentityServer Basic theme dependency to stable 10.4.0.
modules/cms-kit/angular/projects/cms-kit/package.json Updates Angular CMS Kit peer dependency lower bounds to 10.4.0.
modules/cms-kit/angular/package.json Updates CMS Kit Angular dev dependencies to stable 10.4.0.
modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock Updates resolved ABP packages to stable 10.4.0.
modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json Updates client simulation demo Basic theme dependency to stable 10.4.0.
modules/blogging/app/Volo.BloggingTestApp/package.json Updates blogging test app dependencies to stable 10.4.0.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock Updates resolved ABP packages to stable 10.4.0.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json Updates Basic theme demo dependencies to stable 10.4.0.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock Updates resolved ABP packages to stable 10.4.0.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json Updates Bootstrap demo dependencies to stable 10.4.0.
Files not reviewed (1)
  • npm/packs/aspnetcore.mvc.ui/package-lock.json: Language not supported

{
"name": "@abp/aspnetcore.mvc.ui",
"version": "10.4.0-rc.2",
"version": "10.4.0",
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.

2 participants