Skip to content

Merge branch dev with rel-10.2#25169

Merged
voloagent merged 2 commits intodevfrom
auto-merge/rel-10-2/4459
Mar 27, 2026
Merged

Merge branch dev with rel-10.2#25169
voloagent merged 2 commits intodevfrom
auto-merge/rel-10-2/4459

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

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

@voloagent voloagent marked this pull request as ready for review March 26, 2026 08:39
Copilot AI review requested due to automatic review settings March 26, 2026 08:39
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 updating ABP front-end package references from 10.2.0-rc.3 to 10.2.0-rc.4 (and LeptonX Lite 5.2.0-rc.35.2.0-rc.4) across templates, npm packs, Angular ng-packs, and demo apps to align dev with rel-10.2.

Changes:

  • Bump ABP npm/ng package versions to 10.2.0-rc.4 across templates and published pack manifests.
  • Update demo/template app dependencies and Yarn lockfiles to match the new RC versions.
  • Update npm/lerna.json version to 10.2.0-rc.4.

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 basic theme dependency to 10.2.0-rc.4.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json Bump basic theme dependency to 10.2.0-rc.4.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json Bump MVC + Blazor basic theme dependencies to 10.2.0-rc.4.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json Bump basic theme dependency to 10.2.0-rc.4.
templates/module/angular/projects/my-project-name/package.json Bump ABP Angular peer deps to 10.2.0-rc.4.
templates/module/angular/package.json Bump ABP Angular dependencies/schematics to 10.2.0-rc.4.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json Bump MVC + Blazor LeptonX Lite theme dependencies to 5.2.0-rc.4.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json Bump MVC + Blazor LeptonX Lite theme dependencies to 5.2.0-rc.4.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json Bump MVC + Blazor LeptonX Lite theme dependencies to 5.2.0-rc.4.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json Bump MVC + Blazor LeptonX Lite theme dependencies to 5.2.0-rc.4.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app/angular/package.json Bump ABP Angular deps/schematics + Lepton-X to RC.4.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json Bump LeptonX Lite theme dependency to 5.2.0-rc.4.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json Bump MVC + Blazor LeptonX Lite theme dependencies to 5.2.0-rc.4.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json Bump MVC + Blazor LeptonX Lite theme dependencies to 5.2.0-rc.4.
templates/app-nolayers/angular/package.json Bump ABP Angular deps/schematics + Lepton-X to RC.4.
npm/packs/zxcvbn/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/vue/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/virtual-file-explorer/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/vee-validate/package.json Bump pack + @abp/vue dependency to 10.2.0-rc.4.
npm/packs/utils/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/uppy/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/tui-editor/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/toastr/package.json Bump pack + @abp/jquery dependency to 10.2.0-rc.4.
npm/packs/timeago/package.json Bump pack + @abp/jquery dependency to 10.2.0-rc.4.
npm/packs/sweetalert2/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/star-rating-svg/package.json Bump pack + @abp/jquery dependency to 10.2.0-rc.4.
npm/packs/slugify/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/signalr/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/select2/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/qrcode/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/prismjs/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/popper.js/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/owl.carousel/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/moment/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/markdown-it/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/malihu-custom-scrollbar-plugin/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/luxon/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/lodash/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/jstree/package.json Bump pack + @abp/jquery dependency to 10.2.0-rc.4.
npm/packs/jquery/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/jquery-validation/package.json Bump pack + @abp/jquery dependency to 10.2.0-rc.4.
npm/packs/jquery-validation-unobtrusive/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/jquery-form/package.json Bump pack + @abp/jquery dependency to 10.2.0-rc.4.
npm/packs/highlight.js/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/font-awesome/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/flag-icons/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/flag-icon-css/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/docs/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/datatables.net/package.json Bump pack + @abp/jquery dependency to 10.2.0-rc.4.
npm/packs/datatables.net-bs5/package.json Bump pack + @abp/datatables.net dependency to 10.2.0-rc.4.
npm/packs/datatables.net-bs4/package.json Bump pack + @abp/datatables.net dependency to 10.2.0-rc.4.
npm/packs/cropperjs/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/core/package.json Bump pack + @abp/utils dependency to 10.2.0-rc.4.
npm/packs/codemirror/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/cms-kit/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/cms-kit.public/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/cms-kit.admin/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/clipboard/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/packs/chart.js/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/bootstrap/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/bootstrap-daterangepicker/package.json Bump pack + @abp/moment dependency to 10.2.0-rc.4.
npm/packs/bootstrap-datepicker/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/blogging/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/aspnetcore.mvc.ui/package.json Bump pack version to 10.2.0-rc.4.
npm/packs/aspnetcore.mvc.ui/package-lock.json Bump lockfile root version to 10.2.0-rc.4.
npm/packs/aspnetcore.mvc.ui.theme.shared/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/aspnetcore.mvc.ui.theme.basic/package.json Bump pack + theme.shared dependency to 10.2.0-rc.4.
npm/packs/aspnetcore.components.server.theming/package.json Bump pack + internal deps to 10.2.0-rc.4.
npm/packs/aspnetcore.components.server.basictheme/package.json Bump pack + theming dependency to 10.2.0-rc.4.
npm/packs/anchor-js/package.json Bump pack + @abp/core dependency to 10.2.0-rc.4.
npm/ng-packs/packages/theme-shared/package.json Bump ng-pack + @abp/ng.core dependency to 10.2.0-rc.4.
npm/ng-packs/packages/theme-basic/package.json Bump ng-pack + internal deps to 10.2.0-rc.4.
npm/ng-packs/packages/tenant-management/package.json Bump ng-pack + internal deps to 10.2.0-rc.4.
npm/ng-packs/packages/setting-management/package.json Bump ng-pack + internal deps to 10.2.0-rc.4.
npm/ng-packs/packages/schematics/package.json Bump schematics ng-pack version to 10.2.0-rc.4.
npm/ng-packs/packages/permission-management/package.json Bump ng-pack + theme.shared dependency to 10.2.0-rc.4.
npm/ng-packs/packages/oauth/package.json Bump ng-pack + internal deps to 10.2.0-rc.4.
npm/ng-packs/packages/identity/package.json Bump ng-pack + internal deps to 10.2.0-rc.4.
npm/ng-packs/packages/generators/package.json Bump nx.generators ng-pack version to 10.2.0-rc.4.
npm/ng-packs/packages/feature-management/package.json Bump ng-pack + theme.shared dependency to 10.2.0-rc.4.
npm/ng-packs/packages/core/package.json Bump ng-pack + @abp/utils dependency to 10.2.0-rc.4.
npm/ng-packs/packages/components/package.json Bump ng-pack version + peer deps minimum to RC.4.
npm/ng-packs/packages/cms-kit/package.json Bump ng-pack + internal deps to 10.2.0-rc.4.
npm/ng-packs/packages/account/package.json Bump ng-pack + internal deps to 10.2.0-rc.4.
npm/ng-packs/packages/account-core/package.json Bump ng-pack + internal deps to 10.2.0-rc.4.
npm/ng-packs/package.json Bump ng-packs workspace dev deps to RC.4.
npm/lerna.json Bump lerna monorepo version to 10.2.0-rc.4.
modules/virtual-file-explorer/app/package.json Bump module demo app deps to 10.2.0-rc.4.
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock Update lock entries to RC.4 tarballs.
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json Bump demo app theme dependency to 10.2.0-rc.4.
modules/openiddict/app/angular/package.json Bump OpenIddict demo Angular deps/schematics + Lepton-X to RC.4.
modules/openiddict/app/OpenIddict.Demo.Server/package.json Bump demo server theme dependency to 10.2.0-rc.4.
modules/docs/app/VoloDocs.Web/package.json Bump docs test app deps to 10.2.0-rc.4.
modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json Bump CMS Kit host deps to 10.2.0-rc.4.
modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock Update lock entries to RC.4 tarballs.
modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json Bump host theme dependency to 10.2.0-rc.4.
modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock Update lock entries to RC.4 tarballs.
modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json Bump identityserver host theme dependency to 10.2.0-rc.4.
modules/cms-kit/angular/projects/cms-kit/package.json Bump CMS Kit Angular peer dep minimums to RC.4.
modules/cms-kit/angular/package.json Bump CMS Kit Angular app dependencies to RC.4.
modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock Update lock entries to RC.4 tarballs.
modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json Bump client-simulation demo theme dependency to 10.2.0-rc.4.
modules/blogging/app/Volo.BloggingTestApp/package.json Bump blogging test app deps to 10.2.0-rc.4.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock Update lock entries to RC.4 tarballs.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json Bump basic theme demo deps to 10.2.0-rc.4.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock Update lock entries to RC.4 tarballs.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json Bump bootstrap demo deps to 10.2.0-rc.4.
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

  • package-lock.json has inconsistent package version metadata: the root version is 10.2.0-rc.4, but packages[""].version still shows 8.1.0-rc.3. This should be updated to match (ideally by regenerating the lockfile) to avoid stale/incorrect lock metadata.

@voloagent voloagent merged commit 0cd6b7b into dev Mar 27, 2026
3 checks passed
@voloagent voloagent deleted the auto-merge/rel-10-2/4459 branch March 27, 2026 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants