Skip to content

Merge branch dev with rel-10.3#25196

Merged
voloagent merged 1 commit intodevfrom
auto-merge/rel-10-3/4467
Apr 1, 2026
Merged

Merge branch dev with rel-10.3#25196
voloagent merged 1 commit intodevfrom
auto-merge/rel-10-3/4467

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Apr 1, 2026

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 1, 2026 08:18
Copilot AI review requested due to automatic review settings April 1, 2026 08:18
@voloagent voloagent merged commit 55c11eb into dev Apr 1, 2026
3 checks passed
@voloagent voloagent deleted the auto-merge/rel-10-3/4467 branch April 1, 2026 08:18
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Automated merge PR that aligns template and package manager metadata to the 10.3.0-rc.1 (and LeptonX 5.3.0-rc.1) release candidate versions across the repository’s npm/Yarn-based assets.

Changes:

  • Bumps ABP npm pack versions (and their internal dependencies) from 10.2.0 to 10.3.0-rc.1.
  • Updates Angular and ASP.NET Core template package.json files to reference 10.3.0-rc.1 packages (and LeptonX 5.3.0-rc.1).
  • Updates multiple Yarn lockfiles and Lerna version metadata to match the new RC versions.

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

npm/packs/aspnetcore.mvc.ui/package-lock.json:10

  • In this package-lock.json, the top-level "version" is 10.3.0-rc.1, but the entry under "packages" -> "" still declares "version": "8.1.0-rc.3". This makes the lockfile internally inconsistent and can break tooling that relies on the root package metadata. Please regenerate/update the lockfile so the "packages[''].version" matches the package version (and stays in sync going forward).

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