Skip to content

Merge branch dev with rel-10.3 - #25230

Merged
voloagent merged 1 commit into
devfrom
auto-merge/rel-10-3/4480
Apr 10, 2026
Merged

voloagent merged 1 commit into
devfrom
auto-merge/rel-10-3/4480

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This PR generated automatically to merge dev with rel-10.3. Please review the changed files before merging to prevent any errors that may occur.

@voloagent
voloagent marked this pull request as ready for review April 10, 2026 05:23
Copilot AI review requested due to automatic review settings April 10, 2026 05:23
@voloagent
voloagent merged commit 1c8536b into dev Apr 10, 2026
5 checks passed
@voloagent
voloagent deleted the auto-merge/rel-10-3/4480 branch April 10, 2026 05:23

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 PR is an automated merge from dev into rel-10.3 that aligns template and ABP npm package versions for the 10.3.0-rc.2 release candidate.

Changes:

  • Bump ABP npm package versions from 10.3.0-rc.1 to 10.3.0-rc.2 across npm/packs and npm/ng-packs.
  • Update template package.json files (ASP.NET Core + Angular) to consume the -rc.2 packages (including LeptonX Lite 5.3.0-rc.2 where applicable).
  • Refresh related lockfiles (yarn.lock, package-lock.json) and monorepo version (npm/lerna.json) to match -rc.2.

Reviewed changes

Copilot reviewed 109 out of 135 changed files in this pull request and generated no comments.

Show a summary per file
File Description
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json Update basic theme dependency to 10.3.0-rc.2.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json Update basic theme dependency to 10.3.0-rc.2.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json Update basic theme + Blazor basic theme dependencies to 10.3.0-rc.2.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json Update basic theme dependency to 10.3.0-rc.2.
templates/module/angular/projects/my-project-name/package.json Update Angular peer deps to @abp/* 10.3.0-rc.2.
templates/module/angular/package.json Update Angular template ABP deps/schematics to 10.3.0-rc.2.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json Update LeptonX Lite MVC + Blazor theme deps to 5.3.0-rc.2.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json Update LeptonX Lite MVC + Blazor theme deps to 5.3.0-rc.2.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json Update LeptonX Lite MVC + Blazor theme deps to 5.3.0-rc.2.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json Update LeptonX Lite MVC + Blazor theme deps to 5.3.0-rc.2.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app/angular/package.json Update Angular app template ABP deps/schematics to 10.3.0-rc.2 (and Lepton-X to 5.3.0-rc.2).
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json Update LeptonX Lite theme dependency to 5.3.0-rc.2.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json Update LeptonX Lite MVC + Blazor theme deps to 5.3.0-rc.2.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json Update LeptonX Lite MVC + Blazor theme deps to 5.3.0-rc.2.
templates/app-nolayers/angular/package.json Update Angular no-layers template ABP deps/schematics to 10.3.0-rc.2 (and Lepton-X to 5.3.0-rc.2).
npm/packs/zxcvbn/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/vue/package.json Bump package version to 10.3.0-rc.2.
npm/packs/virtual-file-explorer/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/vee-validate/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/utils/package.json Bump package version to 10.3.0-rc.2.
npm/packs/uppy/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/tui-editor/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/toastr/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/timeago/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/sweetalert2/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/star-rating-svg/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/slugify/package.json Bump package version to 10.3.0-rc.2.
npm/packs/signalr/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/select2/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/qrcode/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/prismjs/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/popper.js/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/owl.carousel/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/moment/package.json Bump package version to 10.3.0-rc.2.
npm/packs/markdown-it/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/malihu-custom-scrollbar-plugin/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/luxon/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/lodash/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/jstree/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/jquery/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/jquery-validation/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/jquery-validation-unobtrusive/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/jquery-form/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/highlight.js/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/font-awesome/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/flag-icons/package.json Bump package version to 10.3.0-rc.2.
npm/packs/flag-icon-css/package.json Bump package version to 10.3.0-rc.2.
npm/packs/docs/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/datatables.net/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/datatables.net-bs5/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/datatables.net-bs4/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/cropperjs/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/core/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/codemirror/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/cms-kit/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/cms-kit.public/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/cms-kit.admin/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/clipboard/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/chart.js/package.json Bump package version to 10.3.0-rc.2.
npm/packs/bootstrap/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/bootstrap-daterangepicker/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/bootstrap-datepicker/package.json Bump package version to 10.3.0-rc.2.
npm/packs/blogging/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/aspnetcore.mvc.ui/package.json Bump package version to 10.3.0-rc.2.
npm/packs/aspnetcore.mvc.ui/package-lock.json Bump lockfile package version to 10.3.0-rc.2.
npm/packs/aspnetcore.mvc.ui.theme.shared/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/aspnetcore.mvc.ui.theme.basic/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/aspnetcore.components.server.theming/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/aspnetcore.components.server.basictheme/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/packs/anchor-js/package.json Bump package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/theme-shared/package.json Bump Angular package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/theme-basic/package.json Bump Angular package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/tenant-management/package.json Bump Angular package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/setting-management/package.json Bump Angular package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/schematics/package.json Bump Angular schematics package version to 10.3.0-rc.2.
npm/ng-packs/packages/permission-management/package.json Bump Angular package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/oauth/package.json Bump Angular package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/identity/package.json Bump Angular package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/generators/package.json Bump Nx generators package version to 10.3.0-rc.2.
npm/ng-packs/packages/feature-management/package.json Bump Angular package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/core/package.json Bump Angular core package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/components/package.json Bump Angular components package version and peer range to rc.2.
npm/ng-packs/packages/cms-kit/package.json Bump Angular CMS Kit package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/account/package.json Bump Angular account package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/packages/account-core/package.json Bump Angular account-core package + internal dependency versions to 10.3.0-rc.2.
npm/ng-packs/package.json Update devDependencies to consume 10.3.0-rc.2 packages.
npm/lerna.json Bump monorepo version to 10.3.0-rc.2.
modules/virtual-file-explorer/app/package.json Update demo app dependencies to 10.3.0-rc.2.
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock Refresh lockfile entries to 10.3.0-rc.2.
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json Update demo app dependency to 10.3.0-rc.2.
modules/openiddict/app/OpenIddict.Demo.Server/package.json Update demo app dependency to 10.3.0-rc.2.
modules/openiddict/app/angular/package.json Update Angular demo app deps/schematics to 10.3.0-rc.2 (and Lepton-X to 5.3.0-rc.2).
modules/docs/app/VoloDocs.Web/package.json Update docs app dependencies to 10.3.0-rc.2.
modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json Update CMS Kit host dependencies to 10.3.0-rc.2.
modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock Refresh lockfile entries to 10.3.0-rc.2.
modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json Update host dependency to 10.3.0-rc.2.
modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock Refresh lockfile entries to 10.3.0-rc.2.
modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json Update identity server host dependency to 10.3.0-rc.2.
modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock Refresh lockfile entries to 10.3.0-rc.2.
modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json Update demo app dependency to 10.3.0-rc.2.
modules/blogging/app/Volo.BloggingTestApp/package.json Update blogging test app dependencies to 10.3.0-rc.2.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock Refresh lockfile entries to 10.3.0-rc.2.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json Update demo dependencies to 10.3.0-rc.2.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock Refresh lockfile entries to 10.3.0-rc.2.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json Update demo dependencies to 10.3.0-rc.2.
modules/cms-kit/angular/projects/cms-kit/package.json Update CMS Kit Angular peer ranges to >=10.3.0-rc.2.
modules/cms-kit/angular/package.json Update CMS Kit Angular host deps to 10.3.0-rc.2.
Files not reviewed (1)
  • npm/packs/aspnetcore.mvc.ui/package-lock.json: Language not supported

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