Repository navigation
Merge branch dev with rel-10.4 - #25389
Merged
Merged
Conversation
…requency and enhance error handling for 4xx responses by parsing retry-after values.
Implement rate limiting in NuGet package push script to manage push f…
voloagent
marked this pull request as ready for review
May 7, 2026 12:15
voloagent
approved these changes
May 7, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Automated merge PR to align rel-10.4 with dev, primarily updating template/npm package references from 10.4.0-rc.1 to 10.4.0-rc.2 (and 5.4.0-rc.1 → 5.4.0-rc.2 for LeptonX-related packages), plus a change to NuGet push automation.
Changes:
- Bump ABP npm/template package versions from
*-rc.1to*-rc.2across templates, demo apps, and npm pack manifests. - Update
nupkg/push_packages.ps1to add a sliding-window rate limiter and smarter quota-retry delays (parsing “retry after”). - Remove committed
.abpstudio/state.jsonfiles from several modules and update yarn lockfiles accordingly.
Reviewed changes
Copilot reviewed 115 out of 141 changed files in this pull request and generated 3 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.4.0-rc.2. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json | Bump basic theme dependency to 10.4.0-rc.2. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json | Bump basic/blazor theme dependencies to 10.4.0-rc.2. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json | Bump basic theme dependency to 10.4.0-rc.2. |
| templates/module/angular/projects/my-project-name/package.json | Bump Angular peer deps for ABP Angular packages to 10.4.0-rc.2. |
| templates/module/angular/package.json | Bump ABP Angular dependencies/schematics to 10.4.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json | Bump LeptonXLite + Blazor theme dependencies to 5.4.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json | Bump LeptonXLite + Blazor theme dependencies to 5.4.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bump LeptonXLite + Blazor theme dependencies to 5.4.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json | Bump LeptonXLite + Blazor theme dependencies to 5.4.0-rc.2. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app/angular/package.json | Bump ABP Angular dependencies/schematics and lepton-x theme to *-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json | Bump LeptonXLite theme dependency to 5.4.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json | Bump LeptonXLite + Blazor theme dependencies to 5.4.0-rc.2. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json | Bump LeptonXLite + Blazor theme dependencies to 5.4.0-rc.2. |
| templates/app-nolayers/angular/package.json | Bump ABP Angular dependencies/schematics and lepton-x theme to *-rc.2. |
| nupkg/push_packages.ps1 | Add rate-limiting and retry-after parsing for NuGet pushes. |
| nupkg/0 | Updates a single numeric value (appears unrelated to merge). |
| npm/packs/zxcvbn/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/vue/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/virtual-file-explorer/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/vee-validate/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/utils/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/uppy/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/tui-editor/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/timeago/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/toastr/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/sweetalert2/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/star-rating-svg/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/slugify/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/signalr/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/select2/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/qrcode/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/prismjs/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/popper.js/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/owl.carousel/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/moment/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/markdown-it/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/malihu-custom-scrollbar-plugin/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/luxon/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/lodash/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/jstree/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/jquery/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/jquery-validation/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/jquery-validation-unobtrusive/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/jquery-form/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/highlight.js/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/font-awesome/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/flag-icons/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/flag-icon-css/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/docs/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/datatables.net/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/datatables.net-bs5/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/datatables.net-bs4/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/cropperjs/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/core/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/codemirror/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/cms-kit/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/cms-kit.public/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/cms-kit.admin/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/clipboard/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/chart.js/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/bootstrap/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/bootstrap-daterangepicker/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/bootstrap-datepicker/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/blogging/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/aspnetcore.mvc.ui/package.json | Bump pack version to 10.4.0-rc.2. |
| npm/packs/aspnetcore.mvc.ui/package-lock.json | Bump lockfile version metadata to 10.4.0-rc.2. |
| npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/aspnetcore.mvc.ui.theme.basic/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/aspnetcore.components.server.theming/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/aspnetcore.components.server.basictheme/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/packs/anchor-js/package.json | Bump pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/theme-shared/package.json | Bump Angular pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/theme-basic/package.json | Bump Angular pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/tenant-management/package.json | Bump Angular pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/setting-management/package.json | Bump Angular pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/schematics/package.json | Bump schematics version to 10.4.0-rc.2. |
| npm/ng-packs/packages/permission-management/package.json | Bump Angular pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/oauth/package.json | Bump Angular pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/identity/package.json | Bump Angular pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/generators/package.json | Bump Nx generators version to 10.4.0-rc.2. |
| npm/ng-packs/packages/feature-management/package.json | Bump Angular pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/core/package.json | Bump Angular core pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/components/package.json | Bump Angular components pack version/peer deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/cms-kit/package.json | Bump Angular CMS Kit pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/account/package.json | Bump Angular account pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/packages/account-core/package.json | Bump Angular account-core pack version and internal deps to 10.4.0-rc.2. |
| npm/ng-packs/package.json | Bump devDependencies for ng-packs build to *-rc.2. |
| npm/lerna.json | Bump lerna version to 10.4.0-rc.2. |
| modules/virtual-file-explorer/app/package.json | Bump module app dependencies to 10.4.0-rc.2. |
| modules/virtual-file-explorer/.abpstudio/state.json | Remove ABP Studio state file from repo. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock | Update lockfile entries to 10.4.0-rc.2. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json | Bump demo app dependency to 10.4.0-rc.2. |
| modules/openiddict/app/OpenIddict.Demo.Server/package.json | Bump demo app dependency to 10.4.0-rc.2. |
| modules/openiddict/app/angular/package.json | Bump Angular demo app ABP deps to *-rc.2. |
| modules/identity/.abpstudio/state.json | Remove ABP Studio state file from repo. |
| modules/docs/app/VoloDocs.Web/package.json | Bump docs app dependencies to 10.4.0-rc.2. |
| modules/docs/.abpstudio/state.json | Remove ABP Studio state file from repo. |
| modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json | Bump CMS Kit host app dependencies to *-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock | Update lockfile entries to 10.4.0-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json | Bump host app dependency to 10.4.0-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock | Update lockfile entries to 10.4.0-rc.2. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json | Bump identity server app dependency to 10.4.0-rc.2. |
| modules/cms-kit/angular/projects/cms-kit/package.json | Bump peer deps minimums to >=10.4.0-rc.2. |
| modules/cms-kit/angular/package.json | Update CMS Kit Angular app dependencies (currently mixed rc.1/rc.2). |
| modules/cms-kit/.abpstudio/state.json | Remove ABP Studio state file from repo. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock | Update lockfile entries to 10.4.0-rc.2. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json | Bump demo app dependency to 10.4.0-rc.2. |
| modules/blogging/app/Volo.BloggingTestApp/package.json | Bump blogging test app dependencies to 10.4.0-rc.2. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock | Update lockfile entries to 10.4.0-rc.2. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json | Bump demo dependencies to 10.4.0-rc.2. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock | Update lockfile entries to 10.4.0-rc.2. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json | Bump demo dependencies to 10.4.0-rc.2. |
Files not reviewed (1)
- npm/packs/aspnetcore.mvc.ui/package-lock.json: Language not supported
Comment on lines
+37
to
+41
| $windowStart = (Get-Date).AddHours(-1) | ||
| $recentPushes = $pushTimestamps | Where-Object { $_ -gt $windowStart } | ||
| $pushTimestamps = [System.Collections.Generic.List[datetime]]$recentPushes | ||
|
|
||
| if ($pushTimestamps.Count -ge $maxPushesPerHour) |
Comment on lines
+19
to
+22
| "@abp/ng.identity": "~10.4.0-rc.1", | ||
| "@abp/ng.setting-management": "~10.4.0-rc.2", | ||
| "@abp/ng.tenant-management": "~10.4.0-rc.2", | ||
| "@abp/ng.theme.basic": "~10.4.0-rc.1", |
| @@ -1 +1 @@ | |||
| 2 | |||
| 9 | |||
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.4. Please review the changed files before merging to prevent any errors that may occur.