diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index 5eb44371628..717c9748d8d 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~10.7.0", - "@abp/prismjs": "~10.7.0", - "@abp/highlight.js": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "~10.6.2", + "@abp/prismjs": "~10.6.2", + "@abp/highlight.js": "~10.6.2" } } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index 1385034b6fe..90d93106512 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0", - "@abp/prismjs": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2", + "@abp/prismjs": "~10.6.2" }, "devDependencies": {} } diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index f8687ccd037..afe5bcf25a1 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0", - "@abp/blogging": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2", + "@abp/blogging": "~10.6.2" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index c15e8594f22..87402a9b8c9 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2" } } diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index dae22add1f2..8380ec7ed30 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.7.0", - "@abp/ng.identity": "~10.7.0", - "@abp/ng.setting-management": "~10.7.0", - "@abp/ng.tenant-management": "~10.7.0", - "@abp/ng.theme.basic": "~10.7.0", + "@abp/ng.account": "~10.6.2", + "@abp/ng.identity": "~10.6.2", + "@abp/ng.setting-management": "~10.6.2", + "@abp/ng.tenant-management": "~10.6.2", + "@abp/ng.theme.basic": "~10.6.2", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index af97d9d031c..fb8a3b0724d 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=10.7.0", - "@abp/ng.theme.shared": ">=10.7.0" + "@abp/ng.core": ">=10.6.2", + "@abp/ng.theme.shared": ">=10.6.2" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index 4f276233810..ac211fa6290 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index eb8ae933ecb..e1bed455a7a 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index 112578a1487..ea66b7600b1 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0", - "@abp/cms-kit": "10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2", + "@abp/cms-kit": "10.6.2" } } diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 64d75f01f0a..cc58a358d44 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0", - "@abp/docs": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2", + "@abp/docs": "~10.6.2" } } diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index eb8ae933ecb..e1bed455a7a 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index cc2610c2951..5dbe0af40c9 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.7.0", - "@abp/ng.components": "~10.7.0", - "@abp/ng.core": "~10.7.0", - "@abp/ng.oauth": "~10.7.0", - "@abp/ng.identity": "~10.7.0", - "@abp/ng.setting-management": "~10.7.0", - "@abp/ng.tenant-management": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.account": "~10.6.2", + "@abp/ng.components": "~10.6.2", + "@abp/ng.core": "~10.6.2", + "@abp/ng.oauth": "~10.6.2", + "@abp/ng.identity": "~10.6.2", + "@abp/ng.setting-management": "~10.6.2", + "@abp/ng.tenant-management": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "@abp/ng.theme.lepton-x": "~5.6.2", "@angular/animations": "^15.0.1", "@angular/common": "^15.0.1", @@ -36,7 +36,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~10.7.0", + "@abp/ng.schematics": "~10.6.2", "@angular-devkit/build-angular": "^15.0.1", "@angular-eslint/builder": "~15.1.0", "@angular-eslint/eslint-plugin": "~15.1.0", diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index e9f93091e50..2650ce02fed 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2" } } diff --git a/modules/virtual-file-explorer/app/package.json b/modules/virtual-file-explorer/app/package.json index e103b96ea82..8d0b7a00d72 100644 --- a/modules/virtual-file-explorer/app/package.json +++ b/modules/virtual-file-explorer/app/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0", - "@abp/virtual-file-explorer": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2", + "@abp/virtual-file-explorer": "~10.6.2" } } diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index d1df4be9cc1..656336e8840 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -49,8 +49,8 @@ "private": true, "devDependencies": { "@abp/ng.theme.lepton-x": "~5.6.2", - "@abp/ng.schematics": "~10.7.0", - "@abp/utils": "~10.7.0", + "@abp/ng.schematics": "~10.6.2", + "@abp/utils": "~10.6.2", "@angular-devkit/build-angular": "~22.0.0", "@angular-devkit/core": "~22.0.0", "@angular-devkit/schematics": "~22.0.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 7b9112a1244..9197609479b 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.core": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 0011184bdda..bb65550b445 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.account.core": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/cms-kit/package.json b/npm/ng-packs/packages/cms-kit/package.json index 3b2feabc629..ffffc36a792 100644 --- a/npm/ng-packs/packages/cms-kit/package.json +++ b/npm/ng-packs/packages/cms-kit/package.json @@ -7,9 +7,9 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~10.7.0", - "@abp/ng.setting-management": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.components": "~10.6.2", + "@abp/ng.setting-management": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "@toast-ui/editor": "~3.0.0", "codemirror": "~6.0.0", "tslib": "^2.0.0" diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 20c71a9c144..084aca5e244 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=10.7.0", - "@abp/ng.theme.shared": ">=10.7.0" + "@abp/ng.core": ">=10.6.2", + "@abp/ng.theme.shared": ">=10.6.2" }, "dependencies": { "chart.js": "^3.5.1", diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index 1f96094b854..fad284b6fd8 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~10.7.0", + "@abp/utils": "~10.6.2", "just-clone": "^6.0.0", "just-compare": "^2.0.0", "ts-toolbelt": "^9.0.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index d815ec1fa3b..f97f1fd1fd2 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.theme.shared": "~10.6.2", "tslib": "^2.0.0" }, "peerDependencies": { diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index 730ec66cad9..83610a6f4a6 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -7,9 +7,9 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~10.7.0", - "@abp/ng.permission-management": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.components": "~10.6.2", + "@abp/ng.permission-management": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/oauth/package.json b/npm/ng-packs/packages/oauth/package.json index 98309775d2d..ea21e20c1d9 100644 --- a/npm/ng-packs/packages/oauth/package.json +++ b/npm/ng-packs/packages/oauth/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~10.7.0", - "@abp/utils": "~10.7.0", + "@abp/ng.core": "~10.6.2", + "@abp/utils": "~10.6.2", "angular-oauth2-oidc": "^20.0.0", "just-clone": "^6.0.0", "just-compare": "^2.0.0", diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 4a56faa9635..0e72466a875 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.theme.shared": "~10.6.2", "tslib": "^2.0.0" }, "peerDependencies": { diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index 0266c596310..d43e74109b9 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.components": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "tslib": "^2.0.0" }, "peerDependencies": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 3a3d40f5869..6dac84c77c7 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.feature-management": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index df7286d6ef0..afaab10dfe5 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.account.core": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index c5bb900f74d..b9dbf44bffe 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~10.7.0", + "@abp/ng.core": "~10.6.2", "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~20.0.0", "@ngx-validate/core": "^0.2.0", diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index d85200ad2bb..f18ca3bc6e1 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "anchor-js": "^5.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 2dcd846e543..703eba1f05f 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~10.7.0" + "@abp/aspnetcore.components.server.theming": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index 72710ca41ec..c0c709cb22c 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -5,8 +5,8 @@ "access": "public" }, "dependencies": { - "@abp/bootstrap": "~10.7.0", - "@abp/font-awesome": "~10.7.0" + "@abp/bootstrap": "~10.6.2", + "@abp/font-awesome": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 9f70d489c99..e6f0c67c1f4 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 5fa0a1219ba..57a4b7f5b80 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -10,20 +10,20 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~10.7.0", - "@abp/bootstrap": "~10.7.0", - "@abp/bootstrap-datepicker": "~10.7.0", - "@abp/bootstrap-daterangepicker": "~10.7.0", - "@abp/datatables.net-bs5": "~10.7.0", - "@abp/font-awesome": "~10.7.0", - "@abp/jquery-validation-unobtrusive": "~10.7.0", - "@abp/lodash": "~10.7.0", - "@abp/luxon": "~10.7.0", - "@abp/malihu-custom-scrollbar-plugin": "~10.7.0", - "@abp/moment": "~10.7.0", - "@abp/select2": "~10.7.0", - "@abp/sweetalert2": "~10.7.0", - "@abp/timeago": "~10.7.0" + "@abp/aspnetcore.mvc.ui": "~10.6.2", + "@abp/bootstrap": "~10.6.2", + "@abp/bootstrap-datepicker": "~10.6.2", + "@abp/bootstrap-daterangepicker": "~10.6.2", + "@abp/datatables.net-bs5": "~10.6.2", + "@abp/font-awesome": "~10.6.2", + "@abp/jquery-validation-unobtrusive": "~10.6.2", + "@abp/lodash": "~10.6.2", + "@abp/luxon": "~10.6.2", + "@abp/malihu-custom-scrollbar-plugin": "~10.6.2", + "@abp/moment": "~10.6.2", + "@abp/select2": "~10.6.2", + "@abp/sweetalert2": "~10.6.2", + "@abp/timeago": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 82d810a2b12..4602f35631d 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -5,10 +5,10 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~10.7.0", - "@abp/owl.carousel": "~10.7.0", - "@abp/prismjs": "~10.7.0", - "@abp/tui-editor": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "~10.6.2", + "@abp/owl.carousel": "~10.6.2", + "@abp/prismjs": "~10.6.2", + "@abp/tui-editor": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/bootstrap-daterangepicker/package.json b/npm/packs/bootstrap-daterangepicker/package.json index c560e0520d1..cded5905112 100644 --- a/npm/packs/bootstrap-daterangepicker/package.json +++ b/npm/packs/bootstrap-daterangepicker/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/moment": "~10.7.0", + "@abp/moment": "~10.6.2", "bootstrap-daterangepicker": "^3.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 95b1fd13b84..c8d707a9790 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -10,8 +10,8 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", - "@abp/popper.js": "~10.7.0", + "@abp/core": "~10.6.2", + "@abp/popper.js": "~10.6.2", "bootstrap": "^5.3.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index 125748a93f9..1c248de0fd4 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "clipboard": "^2.0.11" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index 220bc8df578..699dbaeb39e 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -5,12 +5,12 @@ "access": "public" }, "dependencies": { - "@abp/codemirror": "~10.7.0", - "@abp/jstree": "~10.7.0", - "@abp/markdown-it": "~10.7.0", - "@abp/slugify": "~10.7.0", - "@abp/tui-editor": "~10.7.0", - "@abp/uppy": "~10.7.0" + "@abp/codemirror": "~10.6.2", + "@abp/jstree": "~10.6.2", + "@abp/markdown-it": "~10.6.2", + "@abp/slugify": "~10.6.2", + "@abp/tui-editor": "~10.6.2", + "@abp/uppy": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index f322040a050..8e93838bd08 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -5,8 +5,8 @@ "access": "public" }, "dependencies": { - "@abp/highlight.js": "~10.7.0", - "@abp/star-rating-svg": "~10.7.0" + "@abp/highlight.js": "~10.6.2", + "@abp/star-rating-svg": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index afd0821c2f2..734ab7ecd15 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -5,8 +5,8 @@ "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~10.7.0", - "@abp/cms-kit.public": "~10.7.0" + "@abp/cms-kit.admin": "~10.6.2", + "@abp/cms-kit.public": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 2d831fe92fd..66cae74cb02 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -8,7 +8,7 @@ "build": "node ./scripts/build.js" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/state": "^6.0.0", diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 41cfde5be43..d70b2c50dea 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~10.7.0" + "@abp/utils": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 652dfeee9af..52a7fbd95ef 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "cropperjs": "^1.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index 8e5b01c3fad..63bf66a0d85 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~10.7.0", + "@abp/datatables.net": "~10.6.2", "datatables.net-bs4": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index 1c962bb2e3b..9618be9a661 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~10.7.0", + "@abp/datatables.net": "~10.6.2", "datatables.net-bs5": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index a5ec7adbe47..1d659a825f6 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.7.0", + "@abp/jquery": "~10.6.2", "datatables.net": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index 24a2038b3af..48611041b96 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -5,11 +5,11 @@ "access": "public" }, "dependencies": { - "@abp/anchor-js": "~10.7.0", - "@abp/clipboard": "~10.7.0", - "@abp/malihu-custom-scrollbar-plugin": "~10.7.0", - "@abp/popper.js": "~10.7.0", - "@abp/prismjs": "~10.7.0" + "@abp/anchor-js": "~10.6.2", + "@abp/clipboard": "~10.6.2", + "@abp/malihu-custom-scrollbar-plugin": "~10.6.2", + "@abp/popper.js": "~10.6.2", + "@abp/prismjs": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 2a1caeb9ce3..3e63ef19540 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "@fortawesome/fontawesome-free": "^7.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index a3cd0512ec5..e6983672b70 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "@highlightjs/cdn-assets": "~11.11.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 87eb4d9faa3..3b7bccb4e20 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.7.0", + "@abp/jquery": "~10.6.2", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index ad613c544c8..af22a5e80d4 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~10.7.0", + "@abp/jquery-validation": "~10.6.2", "jquery-validation-unobtrusive": "^4.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 4b9b9ad3639..93f5efaecb3 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.7.0", + "@abp/jquery": "~10.6.2", "jquery-validation": "^1.21.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 3ab9fcea08a..6d93d75b8f9 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "jquery": "~3.7.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 08601a202a5..56531150819 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.7.0", + "@abp/jquery": "~10.6.2", "jstree": "^3.3.17" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 46777275e87..cd0cb81e800 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "lodash": "^4.18.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index f7f95d61ccb..82c6c623954 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "luxon": "^3.7.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 3685e48249a..ab0581c9d99 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index f217ab098c9..e83d02f65a4 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "markdown-it": "^14.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index e8aa326da08..18b07c1bf9d 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 9f806e81513..ee6094f6dba 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "@popperjs/core": "^2.11.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 8da860051a3..5f13bd6b1c2 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -5,8 +5,8 @@ "access": "public" }, "dependencies": { - "@abp/clipboard": "~10.7.0", - "@abp/core": "~10.7.0", + "@abp/clipboard": "~10.6.2", + "@abp/core": "~10.6.2", "prismjs": "^1.30.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/qrcode/package.json b/npm/packs/qrcode/package.json index 335a00100fb..efe914b82d2 100644 --- a/npm/packs/qrcode/package.json +++ b/npm/packs/qrcode/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0" + "@abp/core": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 5b537b9cdc6..89766afe2bb 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 10aa777c47b..928c5d5d1bb 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "@microsoft/signalr": "~9.0.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index afe0364731c..73dcdcc588e 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.7.0", + "@abp/jquery": "~10.6.2", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index e33b1239b6f..73674d45320 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "sweetalert2": "^11.23.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 604d048a39c..b6bcfcf143e 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.7.0", + "@abp/jquery": "~10.6.2", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index 4fcd2dc4843..6c95b410095 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.7.0", + "@abp/jquery": "~10.6.2", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 0169268c6b7..7a7a41e949e 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -5,8 +5,8 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.7.0", - "@abp/prismjs": "~10.7.0" + "@abp/jquery": "~10.6.2", + "@abp/prismjs": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index b71345721a2..f699d499956 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "uppy": "^5.1.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index 52d21844925..cdcea3a6568 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/vue": "~10.7.0", + "@abp/vue": "~10.6.2", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index 0810f2aeb73..2df7d3ff375 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -5,8 +5,8 @@ "access": "public" }, "dependencies": { - "@abp/clipboard": "~10.7.0", - "@abp/prismjs": "~10.7.0" + "@abp/clipboard": "~10.6.2", + "@abp/prismjs": "~10.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/zxcvbn/package.json b/npm/packs/zxcvbn/package.json index 998ce64df39..a62c98f33d2 100644 --- a/npm/packs/zxcvbn/package.json +++ b/npm/packs/zxcvbn/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0", + "@abp/core": "~10.6.2", "zxcvbn": "^4.4.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/publish-ng.ps1 b/npm/publish-ng.ps1 index dac52b44275..080a1cde5a2 100644 --- a/npm/publish-ng.ps1 +++ b/npm/publish-ng.ps1 @@ -19,7 +19,7 @@ if (-Not $Registry) { $UpdateNgPacksCommand = "yarn update-version $Version" $NgPacksPublishCommand = "npm run publish-packages -- --nextVersion $Version --skipGit --registry $Registry --skipVersionValidation" -$UpdateGulpCommand = "yarn update-gulp --registry $Registry" +$UpdateGulpCommand = "yarn update-gulp --registry $Registry --targetVersion $Version" $UpdateLeptonXCommand = "yarn update-lepton-x-versions -v $LeptonXVersion"; $IsPrerelease = $(node publish-utils.js --prerelease --customVersion $Version) -eq "true"; diff --git a/npm/update-gulp.js b/npm/update-gulp.js index 0788e5bb13c..25481ffde20 100644 --- a/npm/update-gulp.js +++ b/npm/update-gulp.js @@ -4,6 +4,8 @@ const childProcess = require('child_process'); const execa = require('execa'); const fse = require('fs-extra'); const { program } = require('commander'); +const semverLt = require('semver/functions/lt'); +const semverValid = require('semver/functions/valid'); program.version('0.0.1'); program.option('-pr, --prerelease', 'whether version is prerelease'); @@ -12,6 +14,10 @@ program.option( 'NPM server registry', 'https://registry.npmjs.org' ); +program.option( + '-tv, --targetVersion ', + 'version being published; an older patch line is not moved up to the latest tag' +); program.parse(process.argv); const gulp = (folderPath) => { @@ -31,13 +37,17 @@ const gulp = (folderPath) => { } }; +// ncu's default target is the "latest" dist-tag. Publishing 10.6.2 while +// 10.7.0 is already latest would rewrite ~10.6.2 to ~10.7.0. Stay on the +// same minor for that maintenance release. A release that is itself latest +// still follows the latest tag, so a minor bump can move 10.7.x to 10.8.0. +const ncuTargetFlag = resolveNcuTargetFlag(); + const updatePackages = (pkgJsonPath) => { try { const result = childProcess .execSync( - `ncu "/^@abp.*$/" --packageFile ${pkgJsonPath} -u${ - program.prerelease ? ' --target newest' : '' - } --registry ${program.registry}` + `ncu "/^@abp.*$/" --packageFile ${pkgJsonPath} -u${ncuTargetFlag} --registry ${program.registry}` ) .toString(); console.log('\x1b[0m', result); @@ -46,6 +56,53 @@ const updatePackages = (pkgJsonPath) => { } }; +function resolveNcuTargetFlag() { + if (program.prerelease) { + return ' --target newest'; + } + + const version = getReleaseVersion(); + if (!semverValid(version)) { + return ''; + } + + let latest = ''; + try { + latest = childProcess + .execFileSync( + 'npm', + ['view', '@abp/core', 'version', '--registry', program.registry], + { encoding: 'utf8', shell: true, stdio: ['ignore', 'pipe', 'ignore'] } + ) + .trim(); + } catch (e) { + return ''; + } + + if (semverValid(latest) && semverLt(version, latest)) { + return ' --target patch'; + } + + return ''; +} + +function getReleaseVersion() { + if (program.targetVersion) { + return program.targetVersion; + } + + try { + const commonProps = fse.readFileSync(path.join(__dirname, '../common.props')).toString(); + const versionTag = ''; + const versionEndTag = ''; + const first = commonProps.indexOf(versionTag) + versionTag.length; + const last = commonProps.indexOf(versionEndTag); + return commonProps.substring(first, last).trim(); + } catch (e) { + return ''; + } +} + (async () => { console.time(); let files = await glob('../**/package.json'); diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index c21d19ce4f9..58eebcf3967 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.7.0", - "@abp/ng.components": "~10.7.0", - "@abp/ng.core": "~10.7.0", - "@abp/ng.identity": "~10.7.0", - "@abp/ng.oauth": "~10.7.0", - "@abp/ng.setting-management": "~10.7.0", - "@abp/ng.tenant-management": "~10.7.0", + "@abp/ng.account": "~10.6.2", + "@abp/ng.components": "~10.6.2", + "@abp/ng.core": "~10.6.2", + "@abp/ng.identity": "~10.6.2", + "@abp/ng.oauth": "~10.6.2", + "@abp/ng.setting-management": "~10.6.2", + "@abp/ng.tenant-management": "~10.6.2", "@abp/ng.theme.lepton-x": "~5.6.2", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.theme.shared": "~10.6.2", "@angular/animations": "~22.0.1", "@angular/aria": "~22.0.0", "@angular/common": "~22.0.1", @@ -37,7 +37,7 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@abp/ng.schematics": "~10.7.0", + "@abp/ng.schematics": "~10.6.2", "@angular-eslint/builder": "~21.2.0", "@angular-eslint/eslint-plugin": "~21.2.0", "@angular-eslint/eslint-plugin-template": "~21.2.0", diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 4431b89497a..a249f121008 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.7.0", - "@abp/ng.components": "~10.7.0", - "@abp/ng.core": "~10.7.0", - "@abp/ng.identity": "~10.7.0", - "@abp/ng.oauth": "~10.7.0", - "@abp/ng.setting-management": "~10.7.0", - "@abp/ng.tenant-management": "~10.7.0", + "@abp/ng.account": "~10.6.2", + "@abp/ng.components": "~10.6.2", + "@abp/ng.core": "~10.6.2", + "@abp/ng.identity": "~10.6.2", + "@abp/ng.oauth": "~10.6.2", + "@abp/ng.setting-management": "~10.6.2", + "@abp/ng.tenant-management": "~10.6.2", "@abp/ng.theme.lepton-x": "~5.6.2", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.theme.shared": "~10.6.2", "@angular/animations": "~22.0.1", "@angular/aria": "~22.0.0", "@angular/common": "~22.0.1", @@ -37,7 +37,7 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@abp/ng.schematics": "~10.7.0", + "@abp/ng.schematics": "~10.6.2", "@angular-eslint/builder": "~21.2.0", "@angular-eslint/eslint-plugin": "~21.2.0", "@angular-eslint/eslint-plugin-template": "~21.2.0", diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index a433055b20c..16064a17af4 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -13,15 +13,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.7.0", - "@abp/ng.components": "~10.7.0", - "@abp/ng.core": "~10.7.0", - "@abp/ng.identity": "~10.7.0", - "@abp/ng.oauth": "~10.7.0", - "@abp/ng.setting-management": "~10.7.0", - "@abp/ng.tenant-management": "~10.7.0", - "@abp/ng.theme.basic": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0", + "@abp/ng.account": "~10.6.2", + "@abp/ng.components": "~10.6.2", + "@abp/ng.core": "~10.6.2", + "@abp/ng.identity": "~10.6.2", + "@abp/ng.oauth": "~10.6.2", + "@abp/ng.setting-management": "~10.6.2", + "@abp/ng.tenant-management": "~10.6.2", + "@abp/ng.theme.basic": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2", "@angular/animations": "~22.0.0", "@angular/aria": "~22.0.0", "@angular/common": "~22.0.0", @@ -37,7 +37,7 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@abp/ng.schematics": "~10.7.0", + "@abp/ng.schematics": "~10.6.2", "@angular-eslint/builder": "~21.2.0", "@angular-eslint/eslint-plugin": "~21.2.0", "@angular-eslint/eslint-plugin-template": "~21.2.0", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index 2a5c0e74476..5d8f3ae7014 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "~21.2.0", "@angular/core": "~21.2.0", - "@abp/ng.core": "~10.7.0", - "@abp/ng.theme.shared": "~10.7.0" + "@abp/ng.core": "~10.6.2", + "@abp/ng.theme.shared": "~10.6.2" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index ece3065d0f6..d519e8bdc6e 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index 498d62f60dc..e6562d0d217 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0", - "@abp/aspnetcore.components.server.basictheme": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2", + "@abp/aspnetcore.components.server.basictheme": "~10.6.2" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index c55275543dc..50d7c026113 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index c55275543dc..50d7c026113 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.7.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.6.2" } }