Merge branch dev with rel-10.7 - #26008
Merged
Merged
Conversation
voloagent
marked this pull request as ready for review
August 18, 2026 09:40
voloagent
approved these changes
Aug 18, 2026
voloagent
enabled auto-merge
August 18, 2026 09:40
Contributor
There was a problem hiding this comment.
Pull request overview
This automated merge PR primarily updates ABP JavaScript/Angular package versions across templates, npm packs, and demo apps to align dev with the rel-10.7 release line (moving from 10.7.0-rc.2 to 10.7.0-rc.3, and LeptonX theme packages from 5.7.0-rc.2 to 5.7.0-rc.3).
Changes:
- Bump ABP npm pack and Angular package versions to
10.7.0-rc.3(and LeptonX-related packages to5.7.0-rc.3). - Update template and demo app
package.jsonfiles to reference the new RC versions. - Refresh lockfiles (
yarn.lock,package-lock.json) and the monorepo version (npm/lerna.json) to match.
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 template MVC basic theme dependency to ~10.7.0-rc.3. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json | Bumps template MVC basic theme dependency to ~10.7.0-rc.3. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json | Bumps template MVC/Blazor basic theme deps to ~10.7.0-rc.3. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json | Bumps template MVC basic theme dependency to ~10.7.0-rc.3. |
| templates/module/angular/projects/my-project-name/package.json | Bumps ABP Angular peer deps to ~10.7.0-rc.3. |
| templates/module/angular/package.json | Bumps ABP Angular deps/schematics to ~10.7.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json | Bumps LeptonX Lite MVC/Blazor theme deps to ~5.7.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json | Bumps LeptonX Lite MVC/Blazor theme deps to ~5.7.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bumps LeptonX Lite MVC/Blazor theme deps to ~5.7.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json | Bumps LeptonX Lite MVC/Blazor theme deps to ~5.7.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app/angular/package.json | Bumps ABP Angular deps/schematics (and Lepton-X) to rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json | Bumps LeptonX Lite theme dependency to ~5.7.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bumps LeptonX Lite MVC/Blazor theme deps to ~5.7.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json | Bumps LeptonX Lite MVC/Blazor theme deps to ~5.7.0-rc.3. |
| templates/app-nolayers/angular/package.json | Bumps ABP Angular deps/schematics (and Lepton-X) to rc.3. |
| npm/packs/zxcvbn/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/vue/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/virtual-file-explorer/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/vee-validate/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/utils/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/uppy/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/tui-editor/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/toastr/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/timeago/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/sweetalert2/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/star-rating-svg/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/slugify/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/signalr/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/select2/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/qrcode/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/prismjs/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/popper.js/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/owl.carousel/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/moment/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/markdown-it/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/malihu-custom-scrollbar-plugin/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/luxon/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/lodash/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/jstree/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/jquery/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/jquery-validation/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/jquery-validation-unobtrusive/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/jquery-form/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/highlight.js/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/font-awesome/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/flag-icons/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/flag-icon-css/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/docs/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/datatables.net/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/datatables.net-bs5/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/datatables.net-bs4/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/cropperjs/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/core/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/codemirror/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/cms-kit/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/cms-kit.public/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/cms-kit.admin/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/clipboard/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/chart.js/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/bootstrap/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/bootstrap-daterangepicker/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/bootstrap-datepicker/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/blogging/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/aspnetcore.mvc.ui/package.json | Bumps pack version to 10.7.0-rc.3. |
| npm/packs/aspnetcore.mvc.ui/package-lock.json | Updates lockfile version field to 10.7.0-rc.3. |
| npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/aspnetcore.mvc.ui.theme.basic/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/aspnetcore.components.server.theming/package.json | Bumps pack version and internal ABP deps to 10.7.0-rc.3. |
| npm/packs/aspnetcore.components.server.basictheme/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/packs/anchor-js/package.json | Bumps pack version and internal ABP dependency to 10.7.0-rc.3. |
| npm/ng-packs/packages/theme-shared/package.json | Bumps Angular package version and internal ABP dependency to rc.3. |
| npm/ng-packs/packages/theme-basic/package.json | Bumps Angular package version and internal ABP deps to rc.3. |
| npm/ng-packs/packages/tenant-management/package.json | Bumps Angular package version and internal ABP deps to rc.3. |
| npm/ng-packs/packages/setting-management/package.json | Bumps Angular package version and internal ABP deps to rc.3. |
| npm/ng-packs/packages/schematics/package.json | Bumps schematics package version to rc.3. |
| npm/ng-packs/packages/permission-management/package.json | Bumps Angular package version and internal ABP dependency to rc.3. |
| npm/ng-packs/packages/oauth/package.json | Bumps Angular package version and internal ABP deps to rc.3. |
| npm/ng-packs/packages/identity/package.json | Bumps Angular package version and internal ABP deps to rc.3. |
| npm/ng-packs/packages/generators/package.json | Bumps generators package version to rc.3. |
| npm/ng-packs/packages/feature-management/package.json | Bumps Angular package version and internal ABP dependency to rc.3. |
| npm/ng-packs/packages/core/package.json | Bumps Angular core package version and internal ABP dependency to rc.3. |
| npm/ng-packs/packages/components/package.json | Bumps components package version and peer-dependency minimums to rc.3. |
| npm/ng-packs/packages/cms-kit/package.json | Bumps Angular CMS Kit package version and internal ABP deps to rc.3. |
| npm/ng-packs/packages/account/package.json | Bumps Angular account package version and internal ABP deps to rc.3. |
| npm/ng-packs/packages/account-core/package.json | Bumps Angular account-core package version and internal ABP deps to rc.3. |
| npm/ng-packs/package.json | Bumps devDependency versions (including Lepton-X) to rc.3. |
| npm/lerna.json | Bumps monorepo version to 10.7.0-rc.3. |
| modules/virtual-file-explorer/app/package.json | Bumps demo app dependencies to ~10.7.0-rc.3. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock | Updates lockfile entries to 10.7.0-rc.3. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json | Bumps demo app dependency to ~10.7.0-rc.3. |
| modules/openiddict/app/OpenIddict.Demo.Server/package.json | Bumps demo app dependency to ~10.7.0-rc.3. |
| modules/openiddict/app/angular/package.json | Bumps demo app ABP Angular deps/schematics (and Lepton-X) to rc.3. |
| modules/docs/app/VoloDocs.Web/package.json | Bumps docs test app dependencies to ~10.7.0-rc.3. |
| modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json | Bumps CMS Kit unified host dependencies to rc.3. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock | Updates lockfile entries to 10.7.0-rc.3. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json | Bumps CMS Kit host dependency to ~10.7.0-rc.3. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock | Updates lockfile entries to 10.7.0-rc.3. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json | Bumps IdentityServer host dependency to ~10.7.0-rc.3. |
| modules/cms-kit/angular/projects/cms-kit/package.json | Bumps ABP Angular peer-dependency minimums to rc.3. |
| modules/cms-kit/angular/package.json | Partially bumps ABP Angular dependencies to rc.3 (needs consistency fix). |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock | Updates lockfile entries to 10.7.0-rc.3. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json | Bumps demo app dependency to ~10.7.0-rc.3. |
| modules/blogging/app/Volo.BloggingTestApp/package.json | Bumps blogging test app dependencies to ~10.7.0-rc.3. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock | Updates lockfile entries to 10.7.0-rc.3. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json | Bumps demo app dependencies to ~10.7.0-rc.3. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock | Updates lockfile entries to 10.7.0-rc.3. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json | Bumps demo app dependencies to ~10.7.0-rc.3. |
Files not reviewed (1)
- npm/packs/aspnetcore.mvc.ui/package-lock.json: Generated file
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+6
to
8
| "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0-rc.3", | ||
| "@abp/cms-kit": "10.7.0-rc.3" | ||
| } |
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.7. Please review the changed files before merging to prevent any errors that may occur.