From b47065d85b17a7a6fcf385777e4c1e0e0e45897f Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 11 Jun 2025 14:49:17 +0300 Subject: [PATCH 01/26] ng version upgrade to v20 --- npm/ng-packs/migrations.json | 36 +++++++++++++++++++++++++----------- npm/ng-packs/package.json | 22 +++++++++++----------- 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/npm/ng-packs/migrations.json b/npm/ng-packs/migrations.json index e89bc86d78..3f9be45779 100644 --- a/npm/ng-packs/migrations.json +++ b/npm/ng-packs/migrations.json @@ -1,19 +1,33 @@ { "migrations": [ { - "version": "20.3.0-beta.1", - "description": "Update ESLint flat config to include .cjs, .mjs, .cts, and .mts files in overrides (if needed)", - "implementation": "./src/migrations/update-20-3-0/add-file-extensions-to-overrides", - "package": "@nx/eslint", - "name": "add-file-extensions-to-overrides" + "version": "20.0.0", + "description": "Replaces usages of the deprecated InjectFlags enum", + "factory": "./bundles/inject-flags.cjs#migrate", + "package": "@angular/core", + "name": "inject-flags" }, { - "cli": "nx", - "version": "20.3.0-beta.2", - "description": "If workspace includes Module Federation projects, ensure the new @nx/module-federation package is installed.", - "factory": "./src/migrations/update-20-3-0/ensure-nx-module-federation-package", - "package": "@nx/angular", - "name": "ensure-nx-module-federation-package" + "version": "20.0.0", + "description": "Replaces usages of the deprecated TestBed.get method with TestBed.inject", + "factory": "./bundles/test-bed-get.cjs#migrate", + "package": "@angular/core", + "name": "test-bed-get" + }, + { + "version": "20.0.0", + "description": "Converts the entire application to block control flow syntax", + "factory": "./bundles/control-flow-migration.cjs#migrate", + "optional": true, + "package": "@angular/core", + "name": "control-flow-migration" + }, + { + "version": "20.0.0", + "description": "Moves imports of `DOCUMENT` from `@angular/common` to `@angular/core`", + "factory": "./bundles/document-core.cjs#migrate", + "package": "@angular/core", + "name": "document-core" } ] } diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 92326eadb4..1f6dc87885 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -53,18 +53,18 @@ "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/animations": "~19.1.0", + "@angular/animations": "20.0.2", "@angular/cli": "~19.1.0", - "@angular/common": "~19.1.0", - "@angular/compiler": "~19.1.0", - "@angular/compiler-cli": "~19.1.0", - "@angular/core": "~19.1.0", - "@angular/forms": "~19.1.0", - "@angular/language-service": "~19.1.0", - "@angular/localize": "~19.1.0", - "@angular/platform-browser": "~19.1.0", - "@angular/platform-browser-dynamic": "~19.1.0", - "@angular/router": "~19.1.0", + "@angular/common": "20.0.2", + "@angular/compiler": "20.0.2", + "@angular/compiler-cli": "20.0.2", + "@angular/core": "20.0.2", + "@angular/forms": "20.0.2", + "@angular/language-service": "20.0.2", + "@angular/localize": "20.0.2", + "@angular/platform-browser": "20.0.2", + "@angular/platform-browser-dynamic": "20.0.2", + "@angular/router": "20.0.2", "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~18.0.0", "@ngneat/spectator": "~19.1.0", From b6ad57cab350b0c501be67d0a1bba6c8e251446d Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 11 Jun 2025 15:11:18 +0300 Subject: [PATCH 02/26] ng version upgrade to v20 --- npm/ng-packs/migrations.json | 96 ++++++++++++++++++++++++++++-------- npm/ng-packs/package.json | 26 +++++----- 2 files changed, 88 insertions(+), 34 deletions(-) diff --git a/npm/ng-packs/migrations.json b/npm/ng-packs/migrations.json index 3f9be45779..354b89738e 100644 --- a/npm/ng-packs/migrations.json +++ b/npm/ng-packs/migrations.json @@ -1,33 +1,87 @@ { "migrations": [ { - "version": "20.0.0", - "description": "Replaces usages of the deprecated InjectFlags enum", - "factory": "./bundles/inject-flags.cjs#migrate", - "package": "@angular/core", - "name": "inject-flags" + "version": "21.0.0-beta.8", + "description": "Removes the legacy cache configuration from nx.json", + "implementation": "./src/migrations/update-21-0-0/remove-legacy-cache", + "package": "nx", + "name": "remove-legacy-cache" }, { - "version": "20.0.0", - "description": "Replaces usages of the deprecated TestBed.get method with TestBed.inject", - "factory": "./bundles/test-bed-get.cjs#migrate", - "package": "@angular/core", - "name": "test-bed-get" + "version": "21.0.0-beta.8", + "description": "Removes the legacy cache configuration from nx.json", + "implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner", + "package": "nx", + "name": "remove-custom-tasks-runner" }, { - "version": "20.0.0", - "description": "Converts the entire application to block control flow syntax", - "factory": "./bundles/control-flow-migration.cjs#migrate", - "optional": true, - "package": "@angular/core", - "name": "control-flow-migration" + "version": "21.0.0-beta.11", + "description": "Updates release version config based on the breaking changes in Nx v21", + "implementation": "./src/migrations/update-21-0-0/release-version-config-changes", + "package": "nx", + "name": "release-version-config-changes" }, { - "version": "20.0.0", - "description": "Moves imports of `DOCUMENT` from `@angular/common` to `@angular/core`", - "factory": "./bundles/document-core.cjs#migrate", - "package": "@angular/core", - "name": "document-core" + "version": "21.0.0-beta.11", + "description": "Updates release changelog config based on the breaking changes in Nx v21", + "implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes", + "package": "nx", + "name": "release-changelog-config-changes" + }, + { + "version": "21.1.0-beta.2", + "description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present", + "implementation": "./src/migrations/update-21-1-0/add-gitignore-entry", + "package": "nx", + "name": "21-1-0-add-ignore-entries-for-nx-rule-files" + }, + { + "version": "21.0.0-beta.10", + "description": "Removes the `tsConfig` and `copyFiles` options from the `@nx/cypress:cypress` executor.", + "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor", + "package": "@nx/cypress", + "name": "remove-tsconfig-and-copy-files-options-from-cypress-executor" + }, + { + "cli": "nx", + "version": "21.0.0-beta.9", + "description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.", + "implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync", + "package": "@nx/jest", + "name": "replace-getJestProjects-with-getJestProjectsAsync-v21" + }, + { + "version": "21.0.0-beta.10", + "description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.", + "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor", + "package": "@nx/jest", + "name": "remove-tsconfig-option-from-jest-executor" + }, + { + "cli": "nx", + "version": "20.4.0-beta.1", + "requires": { "@angular/core": ">=19.1.0" }, + "description": "Update the @angular/cli package version to ~19.1.0.", + "factory": "./src/migrations/update-20-4-0/update-angular-cli", + "package": "@nx/angular", + "name": "update-angular-cli-version-19-1-0" + }, + { + "cli": "nx", + "version": "20.5.0-beta.5", + "requires": { "@angular/core": ">=19.2.0" }, + "description": "Update the @angular/cli package version to ~19.2.0.", + "factory": "./src/migrations/update-20-5-0/update-angular-cli", + "package": "@nx/angular", + "name": "update-angular-cli-version-19-2-0" + }, + { + "cli": "nx", + "version": "21.0.0-beta.3", + "description": "Set the `continuous` option to `true` for continuous tasks.", + "factory": "./src/migrations/update-21-0-0/set-continuous-option", + "package": "@nx/angular", + "name": "set-continuous-option" } ] } diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 1f6dc87885..5c15bfdcb4 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -69,19 +69,19 @@ "@ng-bootstrap/ng-bootstrap": "~18.0.0", "@ngneat/spectator": "~19.1.0", "@ngx-validate/core": "^0.2.0", - "@nx/angular": "~20.3.0", - "@nx/cypress": "~20.3.0", - "@nx/devkit": "~20.3.0", - "@nx/eslint": "~20.3.0", - "@nx/eslint-plugin": "~20.3.0", - "@nx/jest": "~20.3.0", - "@nx/js": "~20.3.0", - "@nx/plugin": "~20.3.0", - "@nx/workspace": "~20.3.0", + "@nx/angular": "~21.1.3", + "@nx/cypress": "~21.1.3", + "@nx/devkit": "~21.1.3", + "@nx/eslint": "~21.1.3", + "@nx/eslint-plugin": "~21.1.3", + "@nx/jest": "~21.1.3", + "@nx/js": "~21.1.3", + "@nx/plugin": "~21.1.3", + "@nx/workspace": "~21.1.3", "@popperjs/core": "~2.11.0", "@schematics/angular": "~19.0.0", "@swc-node/register": "1.9.2", - "@swc/cli": "0.3.12", + "@swc/cli": "0.6.0", "@swc/core": "~1.5.0", "@swc/helpers": "~0.5.0", "@swimlane/ngx-datatable": "^20.0.0", @@ -98,7 +98,7 @@ "cypress": "^7.0.0", "dotenv": "10.0.0", "eslint": "^8.0.0", - "eslint-config-prettier": "9.0.0", + "eslint-config-prettier": "10.0.0", "eslint-plugin-cypress": "^2.10.3", "got": "^11.0.0", "jest": "^29.0.0", @@ -113,7 +113,7 @@ "lint-staged": "^13.0.0", "ng-packagr": "~19.1.0", "ng-zorro-antd": "~19.0.0", - "nx": "~20.3.0", + "nx": "~21.1.3", "postcss": "^8.0.0", "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", @@ -127,7 +127,7 @@ "ts-toolbelt": "^9.0.0", "tslib": "^2.0.0", "tslint": "~6.1.0", - "typescript": "~5.6.0", + "typescript": "~5.7.3", "zone.js": "~0.15.0" }, "lint-staged": { From 7b61edc70f7625730e9863775cb0237120e55344 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 11 Jun 2025 16:53:36 +0300 Subject: [PATCH 03/26] ng version upgrade to v20 --- npm/ng-packs/package.json | 32 +++++++++---------- .../extensible/src/lib/models/actions.ts | 4 +-- .../extensible/src/lib/models/entity-props.ts | 4 +-- .../extensible/src/lib/models/props.ts | 4 +-- .../src/lib/pipes/create-injector.pipe.ts | 12 ++----- .../packages/core/src/lib/pipes/sort.pipe.ts | 2 +- .../core/src/lib/services/list.service.ts | 6 ++-- .../core/src/lib/tests/utils/common.utils.ts | 6 ++-- 8 files changed, 31 insertions(+), 39 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 5c15bfdcb4..0d5af004d4 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -46,15 +46,15 @@ "devDependencies": { "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/utils": "~9.2.0", - "@angular-devkit/build-angular": "~19.1.0", - "@angular-devkit/core": "~19.1.0", - "@angular-devkit/schematics": "~19.1.0", - "@angular-devkit/schematics-cli": "~19.1.0", - "@angular-eslint/eslint-plugin": "~19.0.0", - "@angular-eslint/eslint-plugin-template": "~19.0.0", - "@angular-eslint/template-parser": "~19.0.0", + "@angular-devkit/build-angular": "~20.0.0", + "@angular-devkit/core": "~20.0.0", + "@angular-devkit/schematics": "~20.0.0", + "@angular-devkit/schematics-cli": "~20.0.0", + "@angular-eslint/eslint-plugin": "~20.0.0", + "@angular-eslint/eslint-plugin-template": "~20.0.0", + "@angular-eslint/template-parser": "~20.0.0", "@angular/animations": "20.0.2", - "@angular/cli": "~19.1.0", + "@angular/cli": "~20.0.1", "@angular/common": "20.0.2", "@angular/compiler": "20.0.2", "@angular/compiler-cli": "20.0.2", @@ -66,8 +66,8 @@ "@angular/platform-browser-dynamic": "20.0.2", "@angular/router": "20.0.2", "@fortawesome/fontawesome-free": "^6.0.0", - "@ng-bootstrap/ng-bootstrap": "~18.0.0", - "@ngneat/spectator": "~19.1.0", + "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", + "@ngneat/spectator": "~19.6.2", "@ngx-validate/core": "^0.2.0", "@nx/angular": "~21.1.3", "@nx/cypress": "~21.1.3", @@ -84,14 +84,14 @@ "@swc/cli": "0.6.0", "@swc/core": "~1.5.0", "@swc/helpers": "~0.5.0", - "@swimlane/ngx-datatable": "^20.0.0", + "@swimlane/ngx-datatable": "^21.0.0", "@types/jest": "29.5.14", "@types/node": "^20.0.0", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "@typescript-eslint/utils": "^7.16.0", - "angular-oauth2-oidc": "^19.0.0", - "autoprefixer": "^10.0.0", + "angular-oauth2-oidc": "^20.0.0", + "autoprefixer": "^10.4.21", "bootstrap": "^5.0.0", "bootstrap-icons": "^1.0.0", "chart.js": "^4.0.0", @@ -111,8 +111,8 @@ "just-compare": "^2.0.0", "lerna": "^4.0.0", "lint-staged": "^13.0.0", - "ng-packagr": "~19.1.0", - "ng-zorro-antd": "~19.0.0", + "ng-packagr": "~20.0.0", + "ng-zorro-antd": "~19.3.1", "nx": "~21.1.3", "postcss": "^8.0.0", "postcss-import": "14.1.0", @@ -127,7 +127,7 @@ "ts-toolbelt": "^9.0.0", "tslib": "^2.0.0", "tslint": "~6.1.0", - "typescript": "~5.7.3", + "typescript": "~5.8.3", "zone.js": "~0.15.0" }, "lint-staged": { diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts index 57a8e26bf0..269923669f 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts @@ -1,5 +1,5 @@ import { LinkedList } from '@abp/utils'; -import { InjectFlags, InjectionToken, InjectOptions, Type } from '@angular/core'; +import { InjectionToken, InjectOptions, Type } from '@angular/core'; export abstract class ActionList> extends LinkedList {} @@ -7,7 +7,7 @@ export abstract class ActionData { abstract getInjected: ( token: Type | InjectionToken, notFoundValue?: T, - flags?: InjectOptions | InjectFlags, + flags?: InjectOptions | { optional: true; host: true; skipSelf: true }, ) => T; index?: number; abstract record: R; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts index 8964bd9090..261a8a6afb 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts @@ -1,5 +1,5 @@ import { ABP, escapeHtmlChars } from '@abp/ng.core'; -import { InjectFlags, InjectOptions, InjectionToken, Type } from '@angular/core'; +import { InjectOptions, InjectionToken, Type } from '@angular/core'; import { Observable, of } from 'rxjs'; import { ActionCallback } from './actions'; import { @@ -93,6 +93,6 @@ export type ColumnPredicate = (getInjected: GetInjected, auxData?: any) => boole export type GetInjected = ( token: Type | InjectionToken, notFoundValue?: T, - options?: InjectOptions | InjectFlags, + options?: InjectOptions | { optional: true; host: true; skipSelf: true }, ) => T; type PropDataObject = { [key: string]: any }; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts index 7b1e2b7949..600785e7fc 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts @@ -1,5 +1,5 @@ import { LinkedList } from '@abp/utils'; -import { InjectFlags, InjectionToken, InjectOptions, Type } from '@angular/core'; +import { InjectionToken, InjectOptions, Type } from '@angular/core'; import { ePropType } from '../enums/props.enum'; import { FormPropTooltip } from './form-props'; @@ -9,7 +9,7 @@ export abstract class PropData { abstract getInjected: ( token: Type | InjectionToken, notFoundValue?: T, - options?: InjectOptions | InjectFlags, + options?: InjectOptions | { optional: true; host: true; skipSelf: true }, ) => T; index?: number; abstract record: R; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts b/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts index 3536fa4dad..35b5ece415 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts @@ -1,12 +1,4 @@ -import { - InjectFlags, - InjectionToken, - InjectOptions, - Injector, - Pipe, - PipeTransform, - Type, -} from '@angular/core'; +import { InjectionToken, InjectOptions, Injector, Pipe, PipeTransform, Type } from '@angular/core'; import { HasCreateInjectorPipe, ToolbarComponent } from '../models/toolbar-actions'; import { EXTENSIONS_ACTION_CALLBACK, EXTENSIONS_ACTION_DATA } from '../tokens/extensions.token'; @@ -22,7 +14,7 @@ export class CreateInjectorPipe implements PipeTransform { const get = ( token: Type | InjectionToken, notFoundValue?: T, - options?: InjectOptions | InjectFlags, + options?: InjectOptions | { optional: true; host: true; skipSelf: true }, ) => { const componentData = context.getData(); const componentDataCallback = (data: any) => { diff --git a/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts b/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts index 8b6c8b432e..2cc66b3f04 100644 --- a/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts +++ b/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts @@ -6,7 +6,7 @@ export type SortOrder = 'asc' | 'desc'; name: 'abpSort', }) export class SortPipe implements PipeTransform { - transform(value: any[], sortOrder: SortOrder | string = 'asc', sortKey?: string): any { + transform(value: any[], sortOrder: SortOrder | string = 'asc', sortKey?: string | number): any { sortOrder = sortOrder && (sortOrder.toLowerCase() as any); if (!value || (sortOrder !== 'asc' && sortOrder !== 'desc')) return value; diff --git a/npm/ng-packs/packages/core/src/lib/services/list.service.ts b/npm/ng-packs/packages/core/src/lib/services/list.service.ts index 027624ef88..204833a66d 100644 --- a/npm/ng-packs/packages/core/src/lib/services/list.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/list.service.ts @@ -65,12 +65,12 @@ export class ListService implements return this._totalCount; } - private _sortKey = ''; - set sortKey(value: string) { + private _sortKey: string | number = ''; + set sortKey(value: string | number) { this._sortKey = value; this.get(); } - get sortKey(): string { + get sortKey(): string | number { return this._sortKey; } diff --git a/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts b/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts index 01612a987e..7023a56e05 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts @@ -1,4 +1,4 @@ -import { AbstractType, InjectFlags, InjectionToken, Injector, Type } from '@angular/core'; +import { AbstractType, InjectionToken, Injector, Type } from '@angular/core'; import { Subject } from 'rxjs'; export const mockActions = new Subject(); @@ -10,10 +10,10 @@ export class DummyInjector extends Injector { get( token: Type | InjectionToken | AbstractType, notFoundValue?: T, - flags?: InjectFlags, + flags?: { optional: true; host: true; skipSelf: true }, ): T; get(token: any, notFoundValue?: any): any; - get(token, notFoundValue?, flags?: InjectFlags): any { + get(token, notFoundValue?, flags?: { optional: true; host: true; skipSelf: true }): any { return this.payload[token.name || token._desc || token]; } } From 3ec5e0a5eba21a3200cbcc822b420bccea7eb121 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 11 Jun 2025 17:19:01 +0300 Subject: [PATCH 04/26] app template version update --- npm/ng-packs/package.json | 22 ++++++------- templates/app/angular/angular.json | 48 +++++++++++++++++++++++------ templates/app/angular/karma.conf.js | 2 +- templates/app/angular/package.json | 30 +++++++++--------- templates/app/angular/tsconfig.json | 4 +-- 5 files changed, 67 insertions(+), 39 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 0d5af004d4..a99649f0b4 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -53,18 +53,18 @@ "@angular-eslint/eslint-plugin": "~20.0.0", "@angular-eslint/eslint-plugin-template": "~20.0.0", "@angular-eslint/template-parser": "~20.0.0", - "@angular/animations": "20.0.2", + "@angular/animations": "20.0.3", "@angular/cli": "~20.0.1", - "@angular/common": "20.0.2", - "@angular/compiler": "20.0.2", - "@angular/compiler-cli": "20.0.2", - "@angular/core": "20.0.2", - "@angular/forms": "20.0.2", - "@angular/language-service": "20.0.2", - "@angular/localize": "20.0.2", - "@angular/platform-browser": "20.0.2", - "@angular/platform-browser-dynamic": "20.0.2", - "@angular/router": "20.0.2", + "@angular/common": "20.0.3", + "@angular/compiler": "20.0.3", + "@angular/compiler-cli": "20.0.3", + "@angular/core": "20.0.3", + "@angular/forms": "20.0.3", + "@angular/language-service": "20.0.3", + "@angular/localize": "20.0.3", + "@angular/platform-browser": "20.0.3", + "@angular/platform-browser-dynamic": "20.0.3", + "@angular/router": "20.0.3", "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngneat/spectator": "~19.6.2", diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index 7a6c2413d3..b67ff8045e 100644 --- a/templates/app/angular/angular.json +++ b/templates/app/angular/angular.json @@ -19,12 +19,15 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular-devkit/build-angular:browser", + "builder": "@angular/build:application", "options": { - "outputPath": "dist/MyProjectName", + "outputPath": { + "base": "dist/MyProjectName" + }, "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", + "polyfills": [ + "src/polyfills.ts" + ], "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", "allowedCommonJsDependencies": ["chart.js", "js-sha256"], @@ -112,7 +115,8 @@ }, "src/styles.scss" ], - "scripts": [] + "scripts": [], + "browser": "src/main.ts" }, "configurations": { "production": { @@ -137,9 +141,7 @@ "outputHashing": "all" }, "development": { - "buildOptimizer": false, "optimization": false, - "vendorChunk": true, "extractLicenses": false, "sourceMap": true, "namedChunks": true @@ -148,7 +150,7 @@ "defaultConfiguration": "production" }, "serve": { - "builder": "@angular-devkit/build-angular:dev-server", + "builder": "@angular/build:dev-server", "configurations": { "production": { "buildTarget": "MyProjectName:build:production" @@ -160,13 +162,13 @@ "defaultConfiguration": "development" }, "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", + "builder": "@angular/build:extract-i18n", "options": { "buildTarget": "MyProjectName:build" } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular/build:karma", "options": { "main": "src/test.ts", "polyfills": "src/polyfills.ts", @@ -186,5 +188,31 @@ } } } + }, + "schematics": { + "@schematics/angular:component": { + "type": "component" + }, + "@schematics/angular:directive": { + "type": "directive" + }, + "@schematics/angular:service": { + "type": "service" + }, + "@schematics/angular:guard": { + "typeSeparator": "." + }, + "@schematics/angular:interceptor": { + "typeSeparator": "." + }, + "@schematics/angular:module": { + "typeSeparator": "." + }, + "@schematics/angular:pipe": { + "typeSeparator": "." + }, + "@schematics/angular:resolver": { + "typeSeparator": "." + } } } diff --git a/templates/app/angular/karma.conf.js b/templates/app/angular/karma.conf.js index b2fd9c40e8..b06ddef227 100644 --- a/templates/app/angular/karma.conf.js +++ b/templates/app/angular/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') + ], client: { jasmine: { diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index d67c0bc549..6571823f55 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~19.1.0", - "@angular/common": "~19.1.0", - "@angular/compiler": "~19.1.0", - "@angular/core": "~19.1.0", - "@angular/forms": "~19.1.0", - "@angular/localize": "~19.1.0", - "@angular/platform-browser": "~19.1.0", - "@angular/platform-browser-dynamic": "~19.1.0", - "@angular/router": "~19.1.0", + "@angular/animations": "~20.0.3", + "@angular/common": "~20.0.3", + "@angular/compiler": "~20.0.3", + "@angular/core": "~20.0.3", + "@angular/forms": "~20.0.3", + "@angular/localize": "~20.0.3", + "@angular/platform-browser": "~20.0.3", + "@angular/platform-browser-dynamic": "~20.0.3", + "@angular/router": "~20.0.3", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,15 +37,15 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~19.1.0", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~19.1.0", - "@angular/compiler-cli": "~19.1.0", - "@angular/language-service": "~19.1.0", + "@angular/build": "^20.0.1", + "@angular/cli": "~20.0.1", + "@angular/compiler-cli": "~20.0.3", + "@angular/language-service": "~20.0.3", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.6.0" + "typescript": "~5.8.3" } -} +} \ No newline at end of file diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index 9395506033..ac49d470a6 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -5,10 +5,10 @@ "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, + "esModuleInterop": true, "declaration": false, - "downlevelIteration": true, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "es2020", From 10a2a63e88124565a5b17ee43aad39a2fa2f1285 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 11 Jun 2025 17:50:03 +0300 Subject: [PATCH 05/26] refactoring --- npm/ng-packs/packages/theme-shared/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 9f3d76a9c6..bfcee41cc7 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -9,7 +9,7 @@ "dependencies": { "@abp/ng.core": "~9.2.0", "@fortawesome/fontawesome-free": "^5.0.0", - "@ng-bootstrap/ng-bootstrap": "~18.0.0", + "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngx-validate/core": "^0.2.0", "@popperjs/core": "~2.11.0", "@swimlane/ngx-datatable": "^20.0.0", From 8b025ef81fb333330d6d2e9c5d07144b87b3a9dc Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 12 Jun 2025 10:59:02 +0300 Subject: [PATCH 06/26] refactoring --- templates/app-nolayers/angular/angular.json | 48 +++++++++++++---- templates/app-nolayers/angular/karma.conf.js | 2 +- templates/app-nolayers/angular/package.json | 30 +++++------ templates/app-nolayers/angular/tsconfig.json | 4 +- templates/module/angular/angular.json | 52 ++++++++++++++----- templates/module/angular/package.json | 32 ++++++------ .../angular/projects/dev-app/karma.conf.js | 2 +- .../projects/my-project-name/karma.conf.js | 2 +- templates/module/angular/tsconfig.json | 1 + 9 files changed, 115 insertions(+), 58 deletions(-) diff --git a/templates/app-nolayers/angular/angular.json b/templates/app-nolayers/angular/angular.json index 7a6c2413d3..b67ff8045e 100644 --- a/templates/app-nolayers/angular/angular.json +++ b/templates/app-nolayers/angular/angular.json @@ -19,12 +19,15 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular-devkit/build-angular:browser", + "builder": "@angular/build:application", "options": { - "outputPath": "dist/MyProjectName", + "outputPath": { + "base": "dist/MyProjectName" + }, "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", + "polyfills": [ + "src/polyfills.ts" + ], "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", "allowedCommonJsDependencies": ["chart.js", "js-sha256"], @@ -112,7 +115,8 @@ }, "src/styles.scss" ], - "scripts": [] + "scripts": [], + "browser": "src/main.ts" }, "configurations": { "production": { @@ -137,9 +141,7 @@ "outputHashing": "all" }, "development": { - "buildOptimizer": false, "optimization": false, - "vendorChunk": true, "extractLicenses": false, "sourceMap": true, "namedChunks": true @@ -148,7 +150,7 @@ "defaultConfiguration": "production" }, "serve": { - "builder": "@angular-devkit/build-angular:dev-server", + "builder": "@angular/build:dev-server", "configurations": { "production": { "buildTarget": "MyProjectName:build:production" @@ -160,13 +162,13 @@ "defaultConfiguration": "development" }, "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", + "builder": "@angular/build:extract-i18n", "options": { "buildTarget": "MyProjectName:build" } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular/build:karma", "options": { "main": "src/test.ts", "polyfills": "src/polyfills.ts", @@ -186,5 +188,31 @@ } } } + }, + "schematics": { + "@schematics/angular:component": { + "type": "component" + }, + "@schematics/angular:directive": { + "type": "directive" + }, + "@schematics/angular:service": { + "type": "service" + }, + "@schematics/angular:guard": { + "typeSeparator": "." + }, + "@schematics/angular:interceptor": { + "typeSeparator": "." + }, + "@schematics/angular:module": { + "typeSeparator": "." + }, + "@schematics/angular:pipe": { + "typeSeparator": "." + }, + "@schematics/angular:resolver": { + "typeSeparator": "." + } } } diff --git a/templates/app-nolayers/angular/karma.conf.js b/templates/app-nolayers/angular/karma.conf.js index b2fd9c40e8..b06ddef227 100644 --- a/templates/app-nolayers/angular/karma.conf.js +++ b/templates/app-nolayers/angular/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') + ], client: { jasmine: { diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index d67c0bc549..6571823f55 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~19.1.0", - "@angular/common": "~19.1.0", - "@angular/compiler": "~19.1.0", - "@angular/core": "~19.1.0", - "@angular/forms": "~19.1.0", - "@angular/localize": "~19.1.0", - "@angular/platform-browser": "~19.1.0", - "@angular/platform-browser-dynamic": "~19.1.0", - "@angular/router": "~19.1.0", + "@angular/animations": "~20.0.3", + "@angular/common": "~20.0.3", + "@angular/compiler": "~20.0.3", + "@angular/core": "~20.0.3", + "@angular/forms": "~20.0.3", + "@angular/localize": "~20.0.3", + "@angular/platform-browser": "~20.0.3", + "@angular/platform-browser-dynamic": "~20.0.3", + "@angular/router": "~20.0.3", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,15 +37,15 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~19.1.0", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~19.1.0", - "@angular/compiler-cli": "~19.1.0", - "@angular/language-service": "~19.1.0", + "@angular/build": "^20.0.1", + "@angular/cli": "~20.0.1", + "@angular/compiler-cli": "~20.0.3", + "@angular/language-service": "~20.0.3", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.6.0" + "typescript": "~5.8.3" } -} +} \ No newline at end of file diff --git a/templates/app-nolayers/angular/tsconfig.json b/templates/app-nolayers/angular/tsconfig.json index 9395506033..ac49d470a6 100644 --- a/templates/app-nolayers/angular/tsconfig.json +++ b/templates/app-nolayers/angular/tsconfig.json @@ -5,10 +5,10 @@ "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, + "esModuleInterop": true, "declaration": false, - "downlevelIteration": true, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "es2020", diff --git a/templates/module/angular/angular.json b/templates/module/angular/angular.json index 9547009278..0bb60d9607 100644 --- a/templates/module/angular/angular.json +++ b/templates/module/angular/angular.json @@ -13,7 +13,7 @@ "prefix": "lib", "architect": { "build": { - "builder": "@angular-devkit/build-angular:ng-packagr", + "builder": "@angular/build:ng-packagr", "options": { "project": "projects/my-project-name/ng-package.json" }, @@ -28,7 +28,7 @@ "defaultConfiguration": "production" }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular/build:karma", "options": { "main": "projects/my-project-name/src/test.ts", "tsConfig": "projects/my-project-name/tsconfig.spec.json", @@ -58,12 +58,15 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular-devkit/build-angular:browser", + "builder": "@angular/build:application", "options": { - "outputPath": "dist/dev-app", + "outputPath": { + "base": "dist/dev-app" + }, "index": "projects/dev-app/src/index.html", - "main": "projects/dev-app/src/main.ts", - "polyfills": "projects/dev-app/src/polyfills.ts", + "polyfills": [ + "projects/dev-app/src/polyfills.ts" + ], "tsConfig": "projects/dev-app/tsconfig.app.json", "inlineStyleLanguage": "scss", "allowedCommonJsDependencies": ["chart.js", "js-sha256"], @@ -106,7 +109,8 @@ }, "projects/dev-app/src/styles.scss" ], - "scripts": [] + "scripts": [], + "browser": "projects/dev-app/src/main.ts" }, "configurations": { "production": { @@ -131,9 +135,7 @@ "outputHashing": "all" }, "development": { - "buildOptimizer": false, "optimization": false, - "vendorChunk": true, "extractLicenses": false, "sourceMap": true, "namedChunks": true @@ -142,7 +144,7 @@ "defaultConfiguration": "production" }, "serve": { - "builder": "@angular-devkit/build-angular:dev-server", + "builder": "@angular/build:dev-server", "configurations": { "production": { "buildTarget": "dev-app:build:production" @@ -154,13 +156,13 @@ "defaultConfiguration": "development" }, "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", + "builder": "@angular/build:extract-i18n", "options": { "buildTarget": "dev-app:build" } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular/build:karma", "options": { "main": "projects/dev-app/src/test.ts", "polyfills": "projects/dev-app/src/polyfills.ts", @@ -188,5 +190,31 @@ } } } + }, + "schematics": { + "@schematics/angular:component": { + "type": "component" + }, + "@schematics/angular:directive": { + "type": "directive" + }, + "@schematics/angular:service": { + "type": "service" + }, + "@schematics/angular:guard": { + "typeSeparator": "." + }, + "@schematics/angular:interceptor": { + "typeSeparator": "." + }, + "@schematics/angular:module": { + "typeSeparator": "." + }, + "@schematics/angular:pipe": { + "typeSeparator": "." + }, + "@schematics/angular:resolver": { + "typeSeparator": "." + } } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index d6da43f306..9502bd1cdf 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -22,30 +22,30 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.basic": "~9.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~19.1.0", - "@angular/common": "~19.1.0", - "@angular/compiler": "~19.1.0", - "@angular/core": "~19.1.0", - "@angular/forms": "~19.1.0", - "@angular/localize": "~19.1.0", - "@angular/platform-browser": "~19.1.0", - "@angular/platform-browser-dynamic": "~19.1.0", - "@angular/router": "~19.1.0", + "@angular/animations": "~20.0.3", + "@angular/common": "~20.0.3", + "@angular/compiler": "~20.0.3", + "@angular/core": "~20.0.3", + "@angular/forms": "~20.0.3", + "@angular/localize": "~20.0.3", + "@angular/platform-browser": "~20.0.3", + "@angular/platform-browser-dynamic": "~20.0.3", + "@angular/router": "~20.0.3", "rxjs": "~7.8.0", "tslib": "^2.0.0", "zone.js": "~0.15.0" }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~19.1.0", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~19.1.0", - "@angular/compiler-cli": "~19.1.0", - "@angular/language-service": "~19.1.0", + "@angular/build": "^20.0.1", + "@angular/cli": "~20.0.1", + "@angular/compiler-cli": "~20.0.3", + "@angular/language-service": "~20.0.3", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,8 +57,8 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "ng-packagr": "~19.1.0", + "ng-packagr": "~20.0.0", "symlink": "^2.0.0", - "typescript": "~5.6.0" + "typescript": "~5.8.3" } -} +} \ No newline at end of file diff --git a/templates/module/angular/projects/dev-app/karma.conf.js b/templates/module/angular/projects/dev-app/karma.conf.js index d693269c53..eee6000f3a 100644 --- a/templates/module/angular/projects/dev-app/karma.conf.js +++ b/templates/module/angular/projects/dev-app/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') + ], client: { jasmine: { diff --git a/templates/module/angular/projects/my-project-name/karma.conf.js b/templates/module/angular/projects/my-project-name/karma.conf.js index a56984ac5b..4fa9d617e5 100644 --- a/templates/module/angular/projects/my-project-name/karma.conf.js +++ b/templates/module/angular/projects/my-project-name/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') + ], client: { jasmine: { diff --git a/templates/module/angular/tsconfig.json b/templates/module/angular/tsconfig.json index 5879bfbc59..e06230d571 100644 --- a/templates/module/angular/tsconfig.json +++ b/templates/module/angular/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "./tsconfig.prod.json", "compilerOptions": { + "esModuleInterop": true, "paths": { "@my-company-name/my-project-name": [ "projects/my-project-name/src/public-api.ts" From 4854bd4fd9d2ba2dc18eb8454a05503d803b21c1 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 12 Jun 2025 14:43:53 +0300 Subject: [PATCH 07/26] refactoring --- npm/ng-packs/package.json | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index a99649f0b4..6de4af3fec 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -53,31 +53,31 @@ "@angular-eslint/eslint-plugin": "~20.0.0", "@angular-eslint/eslint-plugin-template": "~20.0.0", "@angular-eslint/template-parser": "~20.0.0", - "@angular/animations": "20.0.3", + "@angular/animations": "~20.0.3", "@angular/cli": "~20.0.1", - "@angular/common": "20.0.3", - "@angular/compiler": "20.0.3", - "@angular/compiler-cli": "20.0.3", - "@angular/core": "20.0.3", - "@angular/forms": "20.0.3", - "@angular/language-service": "20.0.3", - "@angular/localize": "20.0.3", - "@angular/platform-browser": "20.0.3", - "@angular/platform-browser-dynamic": "20.0.3", - "@angular/router": "20.0.3", + "@angular/common": "~20.0.3", + "@angular/compiler": "~20.0.3", + "@angular/compiler-cli": "~20.0.3", + "@angular/core": "~20.0.3", + "@angular/forms": "~20.0.3", + "@angular/language-service": "~20.0.3", + "@angular/localize": "~20.0.3", + "@angular/platform-browser": "~20.0.3", + "@angular/platform-browser-dynamic": "~20.0.3", + "@angular/router": "~20.0.3", "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngneat/spectator": "~19.6.2", "@ngx-validate/core": "^0.2.0", - "@nx/angular": "~21.1.3", - "@nx/cypress": "~21.1.3", - "@nx/devkit": "~21.1.3", - "@nx/eslint": "~21.1.3", - "@nx/eslint-plugin": "~21.1.3", - "@nx/jest": "~21.1.3", - "@nx/js": "~21.1.3", - "@nx/plugin": "~21.1.3", - "@nx/workspace": "~21.1.3", + "@nx/angular": "21.1.3", + "@nx/cypress": "21.1.3", + "@nx/devkit": "21.1.3", + "@nx/eslint": "21.1.3", + "@nx/eslint-plugin": "21.1.3", + "@nx/jest": "21.1.3", + "@nx/js": "21.1.3", + "@nx/plugin": "21.1.3", + "@nx/workspace": "21.1.3", "@popperjs/core": "~2.11.0", "@schematics/angular": "~19.0.0", "@swc-node/register": "1.9.2", @@ -113,7 +113,7 @@ "lint-staged": "^13.0.0", "ng-packagr": "~20.0.0", "ng-zorro-antd": "~19.3.1", - "nx": "~21.1.3", + "nx": "21.1.3", "postcss": "^8.0.0", "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", From 54791c78adfe97b6b950da035c4c84841c4752f3 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Fri, 13 Jun 2025 15:08:10 +0300 Subject: [PATCH 08/26] refactoring --- npm/ng-packs/packages/components/package.json | 2 +- npm/ng-packs/packages/oauth/package.json | 2 +- npm/ng-packs/packages/theme-shared/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 5c20f29f33..534bdc9c52 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "chart.js": "^3.5.1", - "ng-zorro-antd": "~19.0.0", + "ng-zorro-antd": "~19.3.1", "@ctrl/tinycolor": "^4.0.0", "tslib": "^2.0.0" }, diff --git a/npm/ng-packs/packages/oauth/package.json b/npm/ng-packs/packages/oauth/package.json index f11802ceff..c2488dd56b 100644 --- a/npm/ng-packs/packages/oauth/package.json +++ b/npm/ng-packs/packages/oauth/package.json @@ -9,7 +9,7 @@ "dependencies": { "@abp/ng.core": "~9.2.0", "@abp/utils": "~9.2.0", - "angular-oauth2-oidc": "^17.0.0", + "angular-oauth2-oidc": "^20.0.0", "just-clone": "^6.0.0", "just-compare": "^2.0.0", "tslib": "^2.0.0" diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index bfcee41cc7..bd24a97073 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -8,11 +8,11 @@ }, "dependencies": { "@abp/ng.core": "~9.2.0", - "@fortawesome/fontawesome-free": "^5.0.0", + "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngx-validate/core": "^0.2.0", "@popperjs/core": "~2.11.0", - "@swimlane/ngx-datatable": "^20.0.0", + "@swimlane/ngx-datatable": "^21.0.0", "bootstrap": "^5.0.0", "tslib": "^2.0.0" }, From bc5ee1c76d2cf08d2f11e9e4e10c6f2bc769083f Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Fri, 13 Jun 2025 17:46:30 +0300 Subject: [PATCH 09/26] devDependencies version update --- templates/app-nolayers/angular/package.json | 12 ++++++------ templates/app/angular/package.json | 12 ++++++------ templates/module/angular/package.json | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 6571823f55..8def9f5974 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -37,11 +37,11 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-eslint/builder": "~19.0.0", - "@angular-eslint/eslint-plugin": "~19.0.0", - "@angular-eslint/eslint-plugin-template": "~19.0.0", - "@angular-eslint/schematics": "~19.0.0", - "@angular-eslint/template-parser": "~19.0.0", + "@angular-eslint/builder": "~20.0.0", + "@angular-eslint/eslint-plugin": "~20.0.0", + "@angular-eslint/eslint-plugin-template": "~20.0.0", + "@angular-eslint/schematics": "~20.0.0", + "@angular-eslint/template-parser": "~20.0.0", "@angular/build": "^20.0.1", "@angular/cli": "~20.0.1", "@angular/compiler-cli": "~20.0.3", @@ -59,4 +59,4 @@ "karma-jasmine-html-reporter": "^1.7.0", "typescript": "~5.8.3" } -} \ No newline at end of file +} diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 6571823f55..8def9f5974 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -37,11 +37,11 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-eslint/builder": "~19.0.0", - "@angular-eslint/eslint-plugin": "~19.0.0", - "@angular-eslint/eslint-plugin-template": "~19.0.0", - "@angular-eslint/schematics": "~19.0.0", - "@angular-eslint/template-parser": "~19.0.0", + "@angular-eslint/builder": "~20.0.0", + "@angular-eslint/eslint-plugin": "~20.0.0", + "@angular-eslint/eslint-plugin-template": "~20.0.0", + "@angular-eslint/schematics": "~20.0.0", + "@angular-eslint/template-parser": "~20.0.0", "@angular/build": "^20.0.1", "@angular/cli": "~20.0.1", "@angular/compiler-cli": "~20.0.3", @@ -59,4 +59,4 @@ "karma-jasmine-html-reporter": "^1.7.0", "typescript": "~5.8.3" } -} \ No newline at end of file +} diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 9502bd1cdf..276a51dd63 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -37,11 +37,11 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-eslint/builder": "~19.0.0", - "@angular-eslint/eslint-plugin": "~19.0.0", - "@angular-eslint/eslint-plugin-template": "~19.0.0", - "@angular-eslint/schematics": "~19.0.0", - "@angular-eslint/template-parser": "~19.0.0", + "@angular-eslint/builder": "~20.0.0", + "@angular-eslint/eslint-plugin": "~20.0.0", + "@angular-eslint/eslint-plugin-template": "~20.0.0", + "@angular-eslint/schematics": "~20.0.0", + "@angular-eslint/template-parser": "~20.0.0", "@angular/build": "^20.0.1", "@angular/cli": "~20.0.1", "@angular/compiler-cli": "~20.0.3", @@ -61,4 +61,4 @@ "symlink": "^2.0.0", "typescript": "~5.8.3" } -} \ No newline at end of file +} From a06a754ba222cdd70b543e87adfbac502784456e Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 16 Jun 2025 11:19:01 +0300 Subject: [PATCH 10/26] packages version updates --- npm/ng-packs/migrations.json | 96 ++++++++++-------------------------- npm/ng-packs/nx.json | 54 +++++++++++++++++++- npm/ng-packs/package.json | 24 ++++----- 3 files changed, 92 insertions(+), 82 deletions(-) diff --git a/npm/ng-packs/migrations.json b/npm/ng-packs/migrations.json index 354b89738e..49df20928b 100644 --- a/npm/ng-packs/migrations.json +++ b/npm/ng-packs/migrations.json @@ -1,87 +1,45 @@ { "migrations": [ - { - "version": "21.0.0-beta.8", - "description": "Removes the legacy cache configuration from nx.json", - "implementation": "./src/migrations/update-21-0-0/remove-legacy-cache", - "package": "nx", - "name": "remove-legacy-cache" - }, - { - "version": "21.0.0-beta.8", - "description": "Removes the legacy cache configuration from nx.json", - "implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner", - "package": "nx", - "name": "remove-custom-tasks-runner" - }, - { - "version": "21.0.0-beta.11", - "description": "Updates release version config based on the breaking changes in Nx v21", - "implementation": "./src/migrations/update-21-0-0/release-version-config-changes", - "package": "nx", - "name": "release-version-config-changes" - }, - { - "version": "21.0.0-beta.11", - "description": "Updates release changelog config based on the breaking changes in Nx v21", - "implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes", - "package": "nx", - "name": "release-changelog-config-changes" - }, - { - "version": "21.1.0-beta.2", - "description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present", - "implementation": "./src/migrations/update-21-1-0/add-gitignore-entry", - "package": "nx", - "name": "21-1-0-add-ignore-entries-for-nx-rule-files" - }, - { - "version": "21.0.0-beta.10", - "description": "Removes the `tsConfig` and `copyFiles` options from the `@nx/cypress:cypress` executor.", - "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor", - "package": "@nx/cypress", - "name": "remove-tsconfig-and-copy-files-options-from-cypress-executor" - }, { "cli": "nx", - "version": "21.0.0-beta.9", - "description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.", - "implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync", - "package": "@nx/jest", - "name": "replace-getJestProjects-with-getJestProjectsAsync-v21" + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Update the @angular/cli package version to ~20.0.0.", + "factory": "./src/migrations/update-21-2-0/update-angular-cli", + "package": "@nx/angular", + "name": "update-angular-cli-version-20-0-0" }, { - "version": "21.0.0-beta.10", - "description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.", - "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor", - "package": "@nx/jest", - "name": "remove-tsconfig-option-from-jest-executor" + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Migrate imports of `provideServerRendering` from `@angular/platform-server` to `@angular/ssr`.", + "factory": "./src/migrations/update-21-2-0/migrate-provide-server-rendering-import", + "package": "@nx/angular", + "name": "migrate-provide-server-rendering-import" }, { - "cli": "nx", - "version": "20.4.0-beta.1", - "requires": { "@angular/core": ">=19.1.0" }, - "description": "Update the @angular/cli package version to ~19.1.0.", - "factory": "./src/migrations/update-20-4-0/update-angular-cli", + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Replace `provideServerRouting` and `provideServerRoutesConfig` with `provideServerRendering` using `withRoutes`.", + "factory": "./src/migrations/update-21-2-0/replace-provide-server-routing", "package": "@nx/angular", - "name": "update-angular-cli-version-19-1-0" + "name": "replace-provide-server-routing" }, { - "cli": "nx", - "version": "20.5.0-beta.5", - "requires": { "@angular/core": ">=19.2.0" }, - "description": "Update the @angular/cli package version to ~19.2.0.", - "factory": "./src/migrations/update-20-5-0/update-angular-cli", + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Update the generator defaults to maintain the previous style guide behavior.", + "factory": "./src/migrations/update-21-2-0/set-generator-defaults-for-previous-style-guide", "package": "@nx/angular", - "name": "update-angular-cli-version-19-2-0" + "name": "set-generator-defaults-for-previous-style-guide" }, { - "cli": "nx", - "version": "21.0.0-beta.3", - "description": "Set the `continuous` option to `true` for continuous tasks.", - "factory": "./src/migrations/update-21-0-0/set-continuous-option", + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Update 'moduleResolution' to 'bundler' in TypeScript configurations. You can read more about this here: https://www.typescriptlang.org/tsconfig/#moduleResolution.", + "factory": "./src/migrations/update-21-2-0/update-module-resolution", "package": "@nx/angular", - "name": "set-continuous-option" + "name": "update-module-resolution" } ] } diff --git a/npm/ng-packs/nx.json b/npm/ng-packs/nx.json index c4603659b0..0c52ac4bfe 100644 --- a/npm/ng-packs/nx.json +++ b/npm/ng-packs/nx.json @@ -20,7 +20,8 @@ "strict": false }, "@nx/angular:component": { - "style": "scss" + "style": "scss", + "type": "component" }, "@nx/angular": { "application": { @@ -31,7 +32,58 @@ }, "storybook-configuration": { "linter": "eslint" + }, + "directive": { + "type": "directive" + }, + "service": { + "type": "service" + }, + "scam": { + "type": "component" + }, + "scam-directive": { + "type": "directive" + }, + "guard": { + "typeSeparator": "." + }, + "interceptor": { + "typeSeparator": "." + }, + "module": { + "typeSeparator": "." + }, + "pipe": { + "typeSeparator": "." + }, + "resolver": { + "typeSeparator": "." } + }, + "@schematics/angular:component": { + "type": "component" + }, + "@schematics/angular:directive": { + "type": "directive" + }, + "@schematics/angular:service": { + "type": "service" + }, + "@schematics/angular:guard": { + "typeSeparator": "." + }, + "@schematics/angular:interceptor": { + "typeSeparator": "." + }, + "@schematics/angular:module": { + "typeSeparator": "." + }, + "@schematics/angular:pipe": { + "typeSeparator": "." + }, + "@schematics/angular:resolver": { + "typeSeparator": "." } }, "$schema": "./node_modules/nx/schemas/nx-schema.json", diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 6de4af3fec..a2a3de4965 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -69,17 +69,17 @@ "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngneat/spectator": "~19.6.2", "@ngx-validate/core": "^0.2.0", - "@nx/angular": "21.1.3", - "@nx/cypress": "21.1.3", - "@nx/devkit": "21.1.3", - "@nx/eslint": "21.1.3", - "@nx/eslint-plugin": "21.1.3", - "@nx/jest": "21.1.3", - "@nx/js": "21.1.3", - "@nx/plugin": "21.1.3", - "@nx/workspace": "21.1.3", + "@nx/angular": "21.2.0", + "@nx/cypress": "21.2.0", + "@nx/devkit": "21.2.0", + "@nx/eslint": "21.2.0", + "@nx/eslint-plugin": "21.2.0", + "@nx/jest": "21.2.0", + "@nx/js": "21.2.0", + "@nx/plugin": "21.2.0", + "@nx/workspace": "21.2.0", "@popperjs/core": "~2.11.0", - "@schematics/angular": "~19.0.0", + "@schematics/angular": "~20.0.2", "@swc-node/register": "1.9.2", "@swc/cli": "0.6.0", "@swc/core": "~1.5.0", @@ -104,7 +104,7 @@ "jest": "^29.0.0", "jest-canvas-mock": "^2.0.0", "jest-environment-jsdom": "^29.0.0", - "jest-preset-angular": "14.4.2", + "jest-preset-angular": "14.6.0", "jsonc-eslint-parser": "^2.0.0", "jsonc-parser": "^2.0.0", "just-clone": "^6.0.0", @@ -113,7 +113,7 @@ "lint-staged": "^13.0.0", "ng-packagr": "~20.0.0", "ng-zorro-antd": "~19.3.1", - "nx": "21.1.3", + "nx": "21.2.0", "postcss": "^8.0.0", "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", From 2858dc53a8c5b648001a1f9aa5385502bf5aee61 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 16 Jun 2025 11:48:05 +0300 Subject: [PATCH 11/26] packages version updates --- npm/ng-packs/migrations.json | 96 ++++++++++-------------------------- npm/ng-packs/nx.json | 54 +++++++++++++++++++- npm/ng-packs/package.json | 24 ++++----- 3 files changed, 92 insertions(+), 82 deletions(-) diff --git a/npm/ng-packs/migrations.json b/npm/ng-packs/migrations.json index 354b89738e..49df20928b 100644 --- a/npm/ng-packs/migrations.json +++ b/npm/ng-packs/migrations.json @@ -1,87 +1,45 @@ { "migrations": [ - { - "version": "21.0.0-beta.8", - "description": "Removes the legacy cache configuration from nx.json", - "implementation": "./src/migrations/update-21-0-0/remove-legacy-cache", - "package": "nx", - "name": "remove-legacy-cache" - }, - { - "version": "21.0.0-beta.8", - "description": "Removes the legacy cache configuration from nx.json", - "implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner", - "package": "nx", - "name": "remove-custom-tasks-runner" - }, - { - "version": "21.0.0-beta.11", - "description": "Updates release version config based on the breaking changes in Nx v21", - "implementation": "./src/migrations/update-21-0-0/release-version-config-changes", - "package": "nx", - "name": "release-version-config-changes" - }, - { - "version": "21.0.0-beta.11", - "description": "Updates release changelog config based on the breaking changes in Nx v21", - "implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes", - "package": "nx", - "name": "release-changelog-config-changes" - }, - { - "version": "21.1.0-beta.2", - "description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present", - "implementation": "./src/migrations/update-21-1-0/add-gitignore-entry", - "package": "nx", - "name": "21-1-0-add-ignore-entries-for-nx-rule-files" - }, - { - "version": "21.0.0-beta.10", - "description": "Removes the `tsConfig` and `copyFiles` options from the `@nx/cypress:cypress` executor.", - "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor", - "package": "@nx/cypress", - "name": "remove-tsconfig-and-copy-files-options-from-cypress-executor" - }, { "cli": "nx", - "version": "21.0.0-beta.9", - "description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.", - "implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync", - "package": "@nx/jest", - "name": "replace-getJestProjects-with-getJestProjectsAsync-v21" + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Update the @angular/cli package version to ~20.0.0.", + "factory": "./src/migrations/update-21-2-0/update-angular-cli", + "package": "@nx/angular", + "name": "update-angular-cli-version-20-0-0" }, { - "version": "21.0.0-beta.10", - "description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.", - "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor", - "package": "@nx/jest", - "name": "remove-tsconfig-option-from-jest-executor" + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Migrate imports of `provideServerRendering` from `@angular/platform-server` to `@angular/ssr`.", + "factory": "./src/migrations/update-21-2-0/migrate-provide-server-rendering-import", + "package": "@nx/angular", + "name": "migrate-provide-server-rendering-import" }, { - "cli": "nx", - "version": "20.4.0-beta.1", - "requires": { "@angular/core": ">=19.1.0" }, - "description": "Update the @angular/cli package version to ~19.1.0.", - "factory": "./src/migrations/update-20-4-0/update-angular-cli", + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Replace `provideServerRouting` and `provideServerRoutesConfig` with `provideServerRendering` using `withRoutes`.", + "factory": "./src/migrations/update-21-2-0/replace-provide-server-routing", "package": "@nx/angular", - "name": "update-angular-cli-version-19-1-0" + "name": "replace-provide-server-routing" }, { - "cli": "nx", - "version": "20.5.0-beta.5", - "requires": { "@angular/core": ">=19.2.0" }, - "description": "Update the @angular/cli package version to ~19.2.0.", - "factory": "./src/migrations/update-20-5-0/update-angular-cli", + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Update the generator defaults to maintain the previous style guide behavior.", + "factory": "./src/migrations/update-21-2-0/set-generator-defaults-for-previous-style-guide", "package": "@nx/angular", - "name": "update-angular-cli-version-19-2-0" + "name": "set-generator-defaults-for-previous-style-guide" }, { - "cli": "nx", - "version": "21.0.0-beta.3", - "description": "Set the `continuous` option to `true` for continuous tasks.", - "factory": "./src/migrations/update-21-0-0/set-continuous-option", + "version": "21.2.0-beta.3", + "requires": { "@angular/core": ">=20.0.0" }, + "description": "Update 'moduleResolution' to 'bundler' in TypeScript configurations. You can read more about this here: https://www.typescriptlang.org/tsconfig/#moduleResolution.", + "factory": "./src/migrations/update-21-2-0/update-module-resolution", "package": "@nx/angular", - "name": "set-continuous-option" + "name": "update-module-resolution" } ] } diff --git a/npm/ng-packs/nx.json b/npm/ng-packs/nx.json index c4603659b0..0c52ac4bfe 100644 --- a/npm/ng-packs/nx.json +++ b/npm/ng-packs/nx.json @@ -20,7 +20,8 @@ "strict": false }, "@nx/angular:component": { - "style": "scss" + "style": "scss", + "type": "component" }, "@nx/angular": { "application": { @@ -31,7 +32,58 @@ }, "storybook-configuration": { "linter": "eslint" + }, + "directive": { + "type": "directive" + }, + "service": { + "type": "service" + }, + "scam": { + "type": "component" + }, + "scam-directive": { + "type": "directive" + }, + "guard": { + "typeSeparator": "." + }, + "interceptor": { + "typeSeparator": "." + }, + "module": { + "typeSeparator": "." + }, + "pipe": { + "typeSeparator": "." + }, + "resolver": { + "typeSeparator": "." } + }, + "@schematics/angular:component": { + "type": "component" + }, + "@schematics/angular:directive": { + "type": "directive" + }, + "@schematics/angular:service": { + "type": "service" + }, + "@schematics/angular:guard": { + "typeSeparator": "." + }, + "@schematics/angular:interceptor": { + "typeSeparator": "." + }, + "@schematics/angular:module": { + "typeSeparator": "." + }, + "@schematics/angular:pipe": { + "typeSeparator": "." + }, + "@schematics/angular:resolver": { + "typeSeparator": "." } }, "$schema": "./node_modules/nx/schemas/nx-schema.json", diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 6de4af3fec..a2a3de4965 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -69,17 +69,17 @@ "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngneat/spectator": "~19.6.2", "@ngx-validate/core": "^0.2.0", - "@nx/angular": "21.1.3", - "@nx/cypress": "21.1.3", - "@nx/devkit": "21.1.3", - "@nx/eslint": "21.1.3", - "@nx/eslint-plugin": "21.1.3", - "@nx/jest": "21.1.3", - "@nx/js": "21.1.3", - "@nx/plugin": "21.1.3", - "@nx/workspace": "21.1.3", + "@nx/angular": "21.2.0", + "@nx/cypress": "21.2.0", + "@nx/devkit": "21.2.0", + "@nx/eslint": "21.2.0", + "@nx/eslint-plugin": "21.2.0", + "@nx/jest": "21.2.0", + "@nx/js": "21.2.0", + "@nx/plugin": "21.2.0", + "@nx/workspace": "21.2.0", "@popperjs/core": "~2.11.0", - "@schematics/angular": "~19.0.0", + "@schematics/angular": "~20.0.2", "@swc-node/register": "1.9.2", "@swc/cli": "0.6.0", "@swc/core": "~1.5.0", @@ -104,7 +104,7 @@ "jest": "^29.0.0", "jest-canvas-mock": "^2.0.0", "jest-environment-jsdom": "^29.0.0", - "jest-preset-angular": "14.4.2", + "jest-preset-angular": "14.6.0", "jsonc-eslint-parser": "^2.0.0", "jsonc-parser": "^2.0.0", "just-clone": "^6.0.0", @@ -113,7 +113,7 @@ "lint-staged": "^13.0.0", "ng-packagr": "~20.0.0", "ng-zorro-antd": "~19.3.1", - "nx": "21.1.3", + "nx": "21.2.0", "postcss": "^8.0.0", "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", From acce8da7d849707d289b728239bf05e65cd6079a Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 16 Jun 2025 15:02:02 +0300 Subject: [PATCH 12/26] revert template config --- templates/app-nolayers/angular/angular.json | 48 ++++------------- templates/app-nolayers/angular/karma.conf.js | 2 +- templates/app-nolayers/angular/package.json | 38 +++++++------- templates/app-nolayers/angular/tsconfig.json | 4 +- templates/app/angular/angular.json | 48 ++++------------- templates/app/angular/karma.conf.js | 2 +- templates/app/angular/package.json | 38 +++++++------- templates/app/angular/tsconfig.json | 4 +- templates/module/angular/angular.json | 52 +++++-------------- templates/module/angular/package.json | 40 +++++++------- .../angular/projects/dev-app/karma.conf.js | 2 +- .../projects/my-project-name/karma.conf.js | 2 +- templates/module/angular/tsconfig.json | 1 - 13 files changed, 98 insertions(+), 183 deletions(-) diff --git a/templates/app-nolayers/angular/angular.json b/templates/app-nolayers/angular/angular.json index b67ff8045e..7a6c2413d3 100644 --- a/templates/app-nolayers/angular/angular.json +++ b/templates/app-nolayers/angular/angular.json @@ -19,15 +19,12 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular/build:application", + "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": { - "base": "dist/MyProjectName" - }, + "outputPath": "dist/MyProjectName", "index": "src/index.html", - "polyfills": [ - "src/polyfills.ts" - ], + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", "allowedCommonJsDependencies": ["chart.js", "js-sha256"], @@ -115,8 +112,7 @@ }, "src/styles.scss" ], - "scripts": [], - "browser": "src/main.ts" + "scripts": [] }, "configurations": { "production": { @@ -141,7 +137,9 @@ "outputHashing": "all" }, "development": { + "buildOptimizer": false, "optimization": false, + "vendorChunk": true, "extractLicenses": false, "sourceMap": true, "namedChunks": true @@ -150,7 +148,7 @@ "defaultConfiguration": "production" }, "serve": { - "builder": "@angular/build:dev-server", + "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { "buildTarget": "MyProjectName:build:production" @@ -162,13 +160,13 @@ "defaultConfiguration": "development" }, "extract-i18n": { - "builder": "@angular/build:extract-i18n", + "builder": "@angular-devkit/build-angular:extract-i18n", "options": { "buildTarget": "MyProjectName:build" } }, "test": { - "builder": "@angular/build:karma", + "builder": "@angular-devkit/build-angular:karma", "options": { "main": "src/test.ts", "polyfills": "src/polyfills.ts", @@ -188,31 +186,5 @@ } } } - }, - "schematics": { - "@schematics/angular:component": { - "type": "component" - }, - "@schematics/angular:directive": { - "type": "directive" - }, - "@schematics/angular:service": { - "type": "service" - }, - "@schematics/angular:guard": { - "typeSeparator": "." - }, - "@schematics/angular:interceptor": { - "typeSeparator": "." - }, - "@schematics/angular:module": { - "typeSeparator": "." - }, - "@schematics/angular:pipe": { - "typeSeparator": "." - }, - "@schematics/angular:resolver": { - "typeSeparator": "." - } } } diff --git a/templates/app-nolayers/angular/karma.conf.js b/templates/app-nolayers/angular/karma.conf.js index b06ddef227..b2fd9c40e8 100644 --- a/templates/app-nolayers/angular/karma.conf.js +++ b/templates/app-nolayers/angular/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - + require('@angular-devkit/build-angular/plugins/karma') ], client: { jasmine: { diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 8def9f5974..d67c0bc549 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~20.0.3", - "@angular/common": "~20.0.3", - "@angular/compiler": "~20.0.3", - "@angular/core": "~20.0.3", - "@angular/forms": "~20.0.3", - "@angular/localize": "~20.0.3", - "@angular/platform-browser": "~20.0.3", - "@angular/platform-browser-dynamic": "~20.0.3", - "@angular/router": "~20.0.3", + "@angular/animations": "~19.1.0", + "@angular/common": "~19.1.0", + "@angular/compiler": "~19.1.0", + "@angular/core": "~19.1.0", + "@angular/forms": "~19.1.0", + "@angular/localize": "~19.1.0", + "@angular/platform-browser": "~19.1.0", + "@angular/platform-browser-dynamic": "~19.1.0", + "@angular/router": "~19.1.0", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,15 +37,15 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-eslint/builder": "~20.0.0", - "@angular-eslint/eslint-plugin": "~20.0.0", - "@angular-eslint/eslint-plugin-template": "~20.0.0", - "@angular-eslint/schematics": "~20.0.0", - "@angular-eslint/template-parser": "~20.0.0", - "@angular/build": "^20.0.1", - "@angular/cli": "~20.0.1", - "@angular/compiler-cli": "~20.0.3", - "@angular/language-service": "~20.0.3", + "@angular-devkit/build-angular": "~19.1.0", + "@angular-eslint/builder": "~19.0.0", + "@angular-eslint/eslint-plugin": "~19.0.0", + "@angular-eslint/eslint-plugin-template": "~19.0.0", + "@angular-eslint/schematics": "~19.0.0", + "@angular-eslint/template-parser": "~19.0.0", + "@angular/cli": "~19.1.0", + "@angular/compiler-cli": "~19.1.0", + "@angular/language-service": "~19.1.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.8.3" + "typescript": "~5.6.0" } } diff --git a/templates/app-nolayers/angular/tsconfig.json b/templates/app-nolayers/angular/tsconfig.json index ac49d470a6..9395506033 100644 --- a/templates/app-nolayers/angular/tsconfig.json +++ b/templates/app-nolayers/angular/tsconfig.json @@ -5,10 +5,10 @@ "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, - "esModuleInterop": true, "declaration": false, + "downlevelIteration": true, "experimentalDecorators": true, - "moduleResolution": "bundler", + "moduleResolution": "node", "importHelpers": true, "target": "ES2022", "module": "es2020", diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index b67ff8045e..7a6c2413d3 100644 --- a/templates/app/angular/angular.json +++ b/templates/app/angular/angular.json @@ -19,15 +19,12 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular/build:application", + "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": { - "base": "dist/MyProjectName" - }, + "outputPath": "dist/MyProjectName", "index": "src/index.html", - "polyfills": [ - "src/polyfills.ts" - ], + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", "allowedCommonJsDependencies": ["chart.js", "js-sha256"], @@ -115,8 +112,7 @@ }, "src/styles.scss" ], - "scripts": [], - "browser": "src/main.ts" + "scripts": [] }, "configurations": { "production": { @@ -141,7 +137,9 @@ "outputHashing": "all" }, "development": { + "buildOptimizer": false, "optimization": false, + "vendorChunk": true, "extractLicenses": false, "sourceMap": true, "namedChunks": true @@ -150,7 +148,7 @@ "defaultConfiguration": "production" }, "serve": { - "builder": "@angular/build:dev-server", + "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { "buildTarget": "MyProjectName:build:production" @@ -162,13 +160,13 @@ "defaultConfiguration": "development" }, "extract-i18n": { - "builder": "@angular/build:extract-i18n", + "builder": "@angular-devkit/build-angular:extract-i18n", "options": { "buildTarget": "MyProjectName:build" } }, "test": { - "builder": "@angular/build:karma", + "builder": "@angular-devkit/build-angular:karma", "options": { "main": "src/test.ts", "polyfills": "src/polyfills.ts", @@ -188,31 +186,5 @@ } } } - }, - "schematics": { - "@schematics/angular:component": { - "type": "component" - }, - "@schematics/angular:directive": { - "type": "directive" - }, - "@schematics/angular:service": { - "type": "service" - }, - "@schematics/angular:guard": { - "typeSeparator": "." - }, - "@schematics/angular:interceptor": { - "typeSeparator": "." - }, - "@schematics/angular:module": { - "typeSeparator": "." - }, - "@schematics/angular:pipe": { - "typeSeparator": "." - }, - "@schematics/angular:resolver": { - "typeSeparator": "." - } } } diff --git a/templates/app/angular/karma.conf.js b/templates/app/angular/karma.conf.js index b06ddef227..b2fd9c40e8 100644 --- a/templates/app/angular/karma.conf.js +++ b/templates/app/angular/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - + require('@angular-devkit/build-angular/plugins/karma') ], client: { jasmine: { diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 8def9f5974..d67c0bc549 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~20.0.3", - "@angular/common": "~20.0.3", - "@angular/compiler": "~20.0.3", - "@angular/core": "~20.0.3", - "@angular/forms": "~20.0.3", - "@angular/localize": "~20.0.3", - "@angular/platform-browser": "~20.0.3", - "@angular/platform-browser-dynamic": "~20.0.3", - "@angular/router": "~20.0.3", + "@angular/animations": "~19.1.0", + "@angular/common": "~19.1.0", + "@angular/compiler": "~19.1.0", + "@angular/core": "~19.1.0", + "@angular/forms": "~19.1.0", + "@angular/localize": "~19.1.0", + "@angular/platform-browser": "~19.1.0", + "@angular/platform-browser-dynamic": "~19.1.0", + "@angular/router": "~19.1.0", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,15 +37,15 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-eslint/builder": "~20.0.0", - "@angular-eslint/eslint-plugin": "~20.0.0", - "@angular-eslint/eslint-plugin-template": "~20.0.0", - "@angular-eslint/schematics": "~20.0.0", - "@angular-eslint/template-parser": "~20.0.0", - "@angular/build": "^20.0.1", - "@angular/cli": "~20.0.1", - "@angular/compiler-cli": "~20.0.3", - "@angular/language-service": "~20.0.3", + "@angular-devkit/build-angular": "~19.1.0", + "@angular-eslint/builder": "~19.0.0", + "@angular-eslint/eslint-plugin": "~19.0.0", + "@angular-eslint/eslint-plugin-template": "~19.0.0", + "@angular-eslint/schematics": "~19.0.0", + "@angular-eslint/template-parser": "~19.0.0", + "@angular/cli": "~19.1.0", + "@angular/compiler-cli": "~19.1.0", + "@angular/language-service": "~19.1.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.8.3" + "typescript": "~5.6.0" } } diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index ac49d470a6..9395506033 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -5,10 +5,10 @@ "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, - "esModuleInterop": true, "declaration": false, + "downlevelIteration": true, "experimentalDecorators": true, - "moduleResolution": "bundler", + "moduleResolution": "node", "importHelpers": true, "target": "ES2022", "module": "es2020", diff --git a/templates/module/angular/angular.json b/templates/module/angular/angular.json index 0bb60d9607..9547009278 100644 --- a/templates/module/angular/angular.json +++ b/templates/module/angular/angular.json @@ -13,7 +13,7 @@ "prefix": "lib", "architect": { "build": { - "builder": "@angular/build:ng-packagr", + "builder": "@angular-devkit/build-angular:ng-packagr", "options": { "project": "projects/my-project-name/ng-package.json" }, @@ -28,7 +28,7 @@ "defaultConfiguration": "production" }, "test": { - "builder": "@angular/build:karma", + "builder": "@angular-devkit/build-angular:karma", "options": { "main": "projects/my-project-name/src/test.ts", "tsConfig": "projects/my-project-name/tsconfig.spec.json", @@ -58,15 +58,12 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular/build:application", + "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": { - "base": "dist/dev-app" - }, + "outputPath": "dist/dev-app", "index": "projects/dev-app/src/index.html", - "polyfills": [ - "projects/dev-app/src/polyfills.ts" - ], + "main": "projects/dev-app/src/main.ts", + "polyfills": "projects/dev-app/src/polyfills.ts", "tsConfig": "projects/dev-app/tsconfig.app.json", "inlineStyleLanguage": "scss", "allowedCommonJsDependencies": ["chart.js", "js-sha256"], @@ -109,8 +106,7 @@ }, "projects/dev-app/src/styles.scss" ], - "scripts": [], - "browser": "projects/dev-app/src/main.ts" + "scripts": [] }, "configurations": { "production": { @@ -135,7 +131,9 @@ "outputHashing": "all" }, "development": { + "buildOptimizer": false, "optimization": false, + "vendorChunk": true, "extractLicenses": false, "sourceMap": true, "namedChunks": true @@ -144,7 +142,7 @@ "defaultConfiguration": "production" }, "serve": { - "builder": "@angular/build:dev-server", + "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { "buildTarget": "dev-app:build:production" @@ -156,13 +154,13 @@ "defaultConfiguration": "development" }, "extract-i18n": { - "builder": "@angular/build:extract-i18n", + "builder": "@angular-devkit/build-angular:extract-i18n", "options": { "buildTarget": "dev-app:build" } }, "test": { - "builder": "@angular/build:karma", + "builder": "@angular-devkit/build-angular:karma", "options": { "main": "projects/dev-app/src/test.ts", "polyfills": "projects/dev-app/src/polyfills.ts", @@ -190,31 +188,5 @@ } } } - }, - "schematics": { - "@schematics/angular:component": { - "type": "component" - }, - "@schematics/angular:directive": { - "type": "directive" - }, - "@schematics/angular:service": { - "type": "service" - }, - "@schematics/angular:guard": { - "typeSeparator": "." - }, - "@schematics/angular:interceptor": { - "typeSeparator": "." - }, - "@schematics/angular:module": { - "typeSeparator": "." - }, - "@schematics/angular:pipe": { - "typeSeparator": "." - }, - "@schematics/angular:resolver": { - "typeSeparator": "." - } } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 276a51dd63..d6da43f306 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -22,30 +22,30 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.basic": "~9.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~20.0.3", - "@angular/common": "~20.0.3", - "@angular/compiler": "~20.0.3", - "@angular/core": "~20.0.3", - "@angular/forms": "~20.0.3", - "@angular/localize": "~20.0.3", - "@angular/platform-browser": "~20.0.3", - "@angular/platform-browser-dynamic": "~20.0.3", - "@angular/router": "~20.0.3", + "@angular/animations": "~19.1.0", + "@angular/common": "~19.1.0", + "@angular/compiler": "~19.1.0", + "@angular/core": "~19.1.0", + "@angular/forms": "~19.1.0", + "@angular/localize": "~19.1.0", + "@angular/platform-browser": "~19.1.0", + "@angular/platform-browser-dynamic": "~19.1.0", + "@angular/router": "~19.1.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", "zone.js": "~0.15.0" }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-eslint/builder": "~20.0.0", - "@angular-eslint/eslint-plugin": "~20.0.0", - "@angular-eslint/eslint-plugin-template": "~20.0.0", - "@angular-eslint/schematics": "~20.0.0", - "@angular-eslint/template-parser": "~20.0.0", - "@angular/build": "^20.0.1", - "@angular/cli": "~20.0.1", - "@angular/compiler-cli": "~20.0.3", - "@angular/language-service": "~20.0.3", + "@angular-devkit/build-angular": "~19.1.0", + "@angular-eslint/builder": "~19.0.0", + "@angular-eslint/eslint-plugin": "~19.0.0", + "@angular-eslint/eslint-plugin-template": "~19.0.0", + "@angular-eslint/schematics": "~19.0.0", + "@angular-eslint/template-parser": "~19.0.0", + "@angular/cli": "~19.1.0", + "@angular/compiler-cli": "~19.1.0", + "@angular/language-service": "~19.1.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,8 +57,8 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "ng-packagr": "~20.0.0", + "ng-packagr": "~19.1.0", "symlink": "^2.0.0", - "typescript": "~5.8.3" + "typescript": "~5.6.0" } } diff --git a/templates/module/angular/projects/dev-app/karma.conf.js b/templates/module/angular/projects/dev-app/karma.conf.js index eee6000f3a..d693269c53 100644 --- a/templates/module/angular/projects/dev-app/karma.conf.js +++ b/templates/module/angular/projects/dev-app/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - + require('@angular-devkit/build-angular/plugins/karma') ], client: { jasmine: { diff --git a/templates/module/angular/projects/my-project-name/karma.conf.js b/templates/module/angular/projects/my-project-name/karma.conf.js index 4fa9d617e5..a56984ac5b 100644 --- a/templates/module/angular/projects/my-project-name/karma.conf.js +++ b/templates/module/angular/projects/my-project-name/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - + require('@angular-devkit/build-angular/plugins/karma') ], client: { jasmine: { diff --git a/templates/module/angular/tsconfig.json b/templates/module/angular/tsconfig.json index e06230d571..5879bfbc59 100644 --- a/templates/module/angular/tsconfig.json +++ b/templates/module/angular/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.prod.json", "compilerOptions": { - "esModuleInterop": true, "paths": { "@my-company-name/my-project-name": [ "projects/my-project-name/src/public-api.ts" From 30d34d5ae22d627035ee2f2a905bf72a83ab1646 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 16 Jun 2025 15:30:57 +0300 Subject: [PATCH 13/26] revert template config --- templates/app-nolayers/angular/angular.json | 26 +++++++++++++++++ templates/app-nolayers/angular/package.json | 28 +++++++++--------- templates/app-nolayers/angular/tsconfig.json | 3 +- templates/app/angular/angular.json | 26 +++++++++++++++++ templates/app/angular/package.json | 28 +++++++++--------- templates/app/angular/tsconfig.json | 3 +- templates/module/angular/angular.json | 26 +++++++++++++++++ templates/module/angular/package.json | 30 ++++++++++---------- templates/module/angular/tsconfig.json | 1 + 9 files changed, 126 insertions(+), 45 deletions(-) diff --git a/templates/app-nolayers/angular/angular.json b/templates/app-nolayers/angular/angular.json index 7a6c2413d3..bfdb10c374 100644 --- a/templates/app-nolayers/angular/angular.json +++ b/templates/app-nolayers/angular/angular.json @@ -186,5 +186,31 @@ } } } + }, + "schematics": { + "@schematics/angular:component": { + "type": "component" + }, + "@schematics/angular:directive": { + "type": "directive" + }, + "@schematics/angular:service": { + "type": "service" + }, + "@schematics/angular:guard": { + "typeSeparator": "." + }, + "@schematics/angular:interceptor": { + "typeSeparator": "." + }, + "@schematics/angular:module": { + "typeSeparator": "." + }, + "@schematics/angular:pipe": { + "typeSeparator": "." + }, + "@schematics/angular:resolver": { + "typeSeparator": "." + } } } diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index d67c0bc549..b80fac32dc 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~19.1.0", - "@angular/common": "~19.1.0", - "@angular/compiler": "~19.1.0", - "@angular/core": "~19.1.0", - "@angular/forms": "~19.1.0", - "@angular/localize": "~19.1.0", - "@angular/platform-browser": "~19.1.0", - "@angular/platform-browser-dynamic": "~19.1.0", - "@angular/router": "~19.1.0", + "@angular/animations": "~20.0.3", + "@angular/common": "~20.0.3", + "@angular/compiler": "~20.0.3", + "@angular/core": "~20.0.3", + "@angular/forms": "~20.0.3", + "@angular/localize": "~20.0.3", + "@angular/platform-browser": "~20.0.3", + "@angular/platform-browser-dynamic": "~20.0.3", + "@angular/router": "~20.0.3", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,15 +37,15 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~19.1.0", + "@angular-devkit/build-angular": "~20.0.2", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~19.1.0", - "@angular/compiler-cli": "~19.1.0", - "@angular/language-service": "~19.1.0", + "@angular/cli": "~20.0.2", + "@angular/compiler-cli": "~20.0.3", + "@angular/language-service": "~20.0.3", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.6.0" + "typescript": "~5.8.3" } } diff --git a/templates/app-nolayers/angular/tsconfig.json b/templates/app-nolayers/angular/tsconfig.json index 9395506033..29df0877f5 100644 --- a/templates/app-nolayers/angular/tsconfig.json +++ b/templates/app-nolayers/angular/tsconfig.json @@ -8,10 +8,11 @@ "declaration": false, "downlevelIteration": true, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "es2020", + "skipLibCheck": true, "lib": [ "es2018", "dom" diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index 7a6c2413d3..bfdb10c374 100644 --- a/templates/app/angular/angular.json +++ b/templates/app/angular/angular.json @@ -186,5 +186,31 @@ } } } + }, + "schematics": { + "@schematics/angular:component": { + "type": "component" + }, + "@schematics/angular:directive": { + "type": "directive" + }, + "@schematics/angular:service": { + "type": "service" + }, + "@schematics/angular:guard": { + "typeSeparator": "." + }, + "@schematics/angular:interceptor": { + "typeSeparator": "." + }, + "@schematics/angular:module": { + "typeSeparator": "." + }, + "@schematics/angular:pipe": { + "typeSeparator": "." + }, + "@schematics/angular:resolver": { + "typeSeparator": "." + } } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index d67c0bc549..b80fac32dc 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~19.1.0", - "@angular/common": "~19.1.0", - "@angular/compiler": "~19.1.0", - "@angular/core": "~19.1.0", - "@angular/forms": "~19.1.0", - "@angular/localize": "~19.1.0", - "@angular/platform-browser": "~19.1.0", - "@angular/platform-browser-dynamic": "~19.1.0", - "@angular/router": "~19.1.0", + "@angular/animations": "~20.0.3", + "@angular/common": "~20.0.3", + "@angular/compiler": "~20.0.3", + "@angular/core": "~20.0.3", + "@angular/forms": "~20.0.3", + "@angular/localize": "~20.0.3", + "@angular/platform-browser": "~20.0.3", + "@angular/platform-browser-dynamic": "~20.0.3", + "@angular/router": "~20.0.3", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,15 +37,15 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~19.1.0", + "@angular-devkit/build-angular": "~20.0.2", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~19.1.0", - "@angular/compiler-cli": "~19.1.0", - "@angular/language-service": "~19.1.0", + "@angular/cli": "~20.0.2", + "@angular/compiler-cli": "~20.0.3", + "@angular/language-service": "~20.0.3", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.6.0" + "typescript": "~5.8.3" } } diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index 9395506033..29df0877f5 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -8,10 +8,11 @@ "declaration": false, "downlevelIteration": true, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "es2020", + "skipLibCheck": true, "lib": [ "es2018", "dom" diff --git a/templates/module/angular/angular.json b/templates/module/angular/angular.json index 9547009278..b6145d12f1 100644 --- a/templates/module/angular/angular.json +++ b/templates/module/angular/angular.json @@ -188,5 +188,31 @@ } } } + }, + "schematics": { + "@schematics/angular:component": { + "type": "component" + }, + "@schematics/angular:directive": { + "type": "directive" + }, + "@schematics/angular:service": { + "type": "service" + }, + "@schematics/angular:guard": { + "typeSeparator": "." + }, + "@schematics/angular:interceptor": { + "typeSeparator": "." + }, + "@schematics/angular:module": { + "typeSeparator": "." + }, + "@schematics/angular:pipe": { + "typeSeparator": "." + }, + "@schematics/angular:resolver": { + "typeSeparator": "." + } } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index d6da43f306..fec7ee197e 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -22,30 +22,30 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.basic": "~9.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~19.1.0", - "@angular/common": "~19.1.0", - "@angular/compiler": "~19.1.0", - "@angular/core": "~19.1.0", - "@angular/forms": "~19.1.0", - "@angular/localize": "~19.1.0", - "@angular/platform-browser": "~19.1.0", - "@angular/platform-browser-dynamic": "~19.1.0", - "@angular/router": "~19.1.0", + "@angular/animations": "~20.0.3", + "@angular/common": "~20.0.3", + "@angular/compiler": "~20.0.3", + "@angular/core": "~20.0.3", + "@angular/forms": "~20.0.3", + "@angular/localize": "~20.0.3", + "@angular/platform-browser": "~20.0.3", + "@angular/platform-browser-dynamic": "~20.0.3", + "@angular/router": "~20.0.3", "rxjs": "~7.8.0", "tslib": "^2.0.0", "zone.js": "~0.15.0" }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~19.1.0", + "@angular-devkit/build-angular": "~20.0.2", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~19.1.0", - "@angular/compiler-cli": "~19.1.0", - "@angular/language-service": "~19.1.0", + "@angular/cli": "~20.0.2", + "@angular/compiler-cli": "~20.0.3", + "@angular/language-service": "~20.0.3", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,8 +57,8 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "ng-packagr": "~19.1.0", + "ng-packagr": "~20.0.0", "symlink": "^2.0.0", - "typescript": "~5.6.0" + "typescript": "~5.8.3" } } diff --git a/templates/module/angular/tsconfig.json b/templates/module/angular/tsconfig.json index 5879bfbc59..92d2f24875 100644 --- a/templates/module/angular/tsconfig.json +++ b/templates/module/angular/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "./tsconfig.prod.json", "compilerOptions": { + "skipLibCheck": true, "paths": { "@my-company-name/my-project-name": [ "projects/my-project-name/src/public-api.ts" From 7cc2096210c45ca225a9d0c1eb351654d7fb50ae Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 16 Jun 2025 15:51:14 +0300 Subject: [PATCH 14/26] refactoring --- .../packages/components/extensible/src/lib/models/actions.ts | 2 +- .../components/extensible/src/lib/models/entity-props.ts | 2 +- .../packages/components/extensible/src/lib/models/props.ts | 2 +- .../components/extensible/src/lib/pipes/create-injector.pipe.ts | 2 +- npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts index 269923669f..a8a093f8de 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts @@ -7,7 +7,7 @@ export abstract class ActionData { abstract getInjected: ( token: Type | InjectionToken, notFoundValue?: T, - flags?: InjectOptions | { optional: true; host: true; skipSelf: true }, + flags?: InjectOptions, ) => T; index?: number; abstract record: R; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts index 261a8a6afb..20620ef1c6 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts @@ -93,6 +93,6 @@ export type ColumnPredicate = (getInjected: GetInjected, auxData?: any) => boole export type GetInjected = ( token: Type | InjectionToken, notFoundValue?: T, - options?: InjectOptions | { optional: true; host: true; skipSelf: true }, + options?: InjectOptions, ) => T; type PropDataObject = { [key: string]: any }; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts index 600785e7fc..4161eaaea7 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts @@ -9,7 +9,7 @@ export abstract class PropData { abstract getInjected: ( token: Type | InjectionToken, notFoundValue?: T, - options?: InjectOptions | { optional: true; host: true; skipSelf: true }, + options?: InjectOptions, ) => T; index?: number; abstract record: R; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts b/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts index 35b5ece415..a61802283a 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts @@ -14,7 +14,7 @@ export class CreateInjectorPipe implements PipeTransform { const get = ( token: Type | InjectionToken, notFoundValue?: T, - options?: InjectOptions | { optional: true; host: true; skipSelf: true }, + options?: InjectOptions, ) => { const componentData = context.getData(); const componentDataCallback = (data: any) => { diff --git a/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts b/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts index 7023a56e05..f3b17082b9 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts @@ -10,7 +10,7 @@ export class DummyInjector extends Injector { get( token: Type | InjectionToken | AbstractType, notFoundValue?: T, - flags?: { optional: true; host: true; skipSelf: true }, + flags?: { optional: true; host: true; skipSelf: true; self: true }, ): T; get(token: any, notFoundValue?: any): any; get(token, notFoundValue?, flags?: { optional: true; host: true; skipSelf: true }): any { From 88f820fa77d78c4c542e4bb1e86a537da0b555d5 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 16 Jun 2025 17:07:07 +0300 Subject: [PATCH 15/26] fix --- .../src/lib/directives/ngx-datatable-list.directive.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts index 5715a4f40b..87ac4b9ce1 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts @@ -111,8 +111,9 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck { const spinnerRef = this.viewContainerRef.createComponent(SpinnerComponent); const spinnerElement = spinnerRef.location.nativeElement; - - this.renderer.insertBefore(parent, spinnerElement, placeholder); + if (placeholder?.parentNode === parent) { + this.renderer.insertBefore(parent, spinnerElement, placeholder); + } this.renderer.removeChild(parent, placeholder); } From 8cb433603fd3a21e844c7f1f71ad04cb97a79dee Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Tue, 17 Jun 2025 08:40:16 +0300 Subject: [PATCH 16/26] refactoring --- npm/ng-packs/package.json | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index a2a3de4965..d43651590a 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -53,31 +53,31 @@ "@angular-eslint/eslint-plugin": "~20.0.0", "@angular-eslint/eslint-plugin-template": "~20.0.0", "@angular-eslint/template-parser": "~20.0.0", - "@angular/animations": "~20.0.3", + "@angular/animations": "~20.0.0", "@angular/cli": "~20.0.1", - "@angular/common": "~20.0.3", - "@angular/compiler": "~20.0.3", - "@angular/compiler-cli": "~20.0.3", - "@angular/core": "~20.0.3", - "@angular/forms": "~20.0.3", - "@angular/language-service": "~20.0.3", - "@angular/localize": "~20.0.3", - "@angular/platform-browser": "~20.0.3", - "@angular/platform-browser-dynamic": "~20.0.3", - "@angular/router": "~20.0.3", + "@angular/common": "~20.0.0", + "@angular/compiler": "~20.0.0", + "@angular/compiler-cli": "~20.0.0", + "@angular/core": "~20.0.0", + "@angular/forms": "~20.0.0", + "@angular/language-service": "~20.0.0", + "@angular/localize": "~20.0.0", + "@angular/platform-browser": "~20.0.0", + "@angular/platform-browser-dynamic": "~20.0.0", + "@angular/router": "~20.0.0", "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngneat/spectator": "~19.6.2", "@ngx-validate/core": "^0.2.0", - "@nx/angular": "21.2.0", - "@nx/cypress": "21.2.0", - "@nx/devkit": "21.2.0", - "@nx/eslint": "21.2.0", - "@nx/eslint-plugin": "21.2.0", - "@nx/jest": "21.2.0", - "@nx/js": "21.2.0", - "@nx/plugin": "21.2.0", - "@nx/workspace": "21.2.0", + "@nx/angular": "~21.2.0", + "@nx/cypress": "~21.2.0", + "@nx/devkit": "~21.2.0", + "@nx/eslint": "~21.2.0", + "@nx/eslint-plugin": "~21.2.0", + "@nx/jest": "~21.2.0", + "@nx/js": "~21.2.0", + "@nx/plugin": "~21.2.0", + "@nx/workspace": "~21.2.0", "@popperjs/core": "~2.11.0", "@schematics/angular": "~20.0.2", "@swc-node/register": "1.9.2", @@ -127,7 +127,7 @@ "ts-toolbelt": "^9.0.0", "tslib": "^2.0.0", "tslint": "~6.1.0", - "typescript": "~5.8.3", + "typescript": "~5.8.0", "zone.js": "~0.15.0" }, "lint-staged": { From 34ed04e188d4fa91cc0ef2fff5a3d41bbdf3658f Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 18 Jun 2025 13:25:07 +0300 Subject: [PATCH 17/26] ng.schematics version update --- npm/ng-packs/package.json | 2 +- npm/ng-packs/packages/schematics/package.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index d43651590a..92f870b668 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -112,7 +112,7 @@ "lerna": "^4.0.0", "lint-staged": "^13.0.0", "ng-packagr": "~20.0.0", - "ng-zorro-antd": "~19.3.1", + "ng-zorro-antd": "~19.3.0", "nx": "21.2.0", "postcss": "^8.0.0", "postcss-import": "14.1.0", diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 2d89aed5f2..4c33ec9746 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -4,16 +4,16 @@ "author": "", "schematics": "./collection.json", "dependencies": { - "@angular-devkit/core": "~19.1.0", - "@angular-devkit/schematics": "~19.1.0", - "@angular/cli": "~19.1.0", + "@angular-devkit/core": "~20.0.0", + "@angular-devkit/schematics": "~20.0.0", + "@angular/cli": "~20.0.0", "got": "^11.5.2", "jsonc-parser": "^2.3.0", "should-quote": "^1.0.0", - "typescript": "~5.6.0" + "typescript": "~5.8.0" }, "devDependencies": { - "@schematics/angular": "~19.1.0", + "@schematics/angular": "~20.0.0", "@types/jest": "29.4.4", "@types/node": "20.2.5", "jest": "29.4.3", From 8ad2bcad5ac9f26d7e5b1843fcaa8e2badd5bf34 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 23 Jun 2025 16:42:02 +0300 Subject: [PATCH 18/26] version update --- npm/ng-packs/packages/components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 534bdc9c52..6fd11bf395 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "chart.js": "^3.5.1", - "ng-zorro-antd": "~19.3.1", + "ng-zorro-antd": "~20.0.0-next.0", "@ctrl/tinycolor": "^4.0.0", "tslib": "^2.0.0" }, From 6a49863cc49aa3a973ab231828e5ea2ac3816726 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 23 Jun 2025 17:35:25 +0300 Subject: [PATCH 19/26] version update --- npm/ng-packs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 92f870b668..3d80dd1295 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -112,7 +112,7 @@ "lerna": "^4.0.0", "lint-staged": "^13.0.0", "ng-packagr": "~20.0.0", - "ng-zorro-antd": "~19.3.0", + "ng-zorro-antd": "~20.0.0-next.0", "nx": "21.2.0", "postcss": "^8.0.0", "postcss-import": "14.1.0", From b5600e4ef375711c4be8e76df860787a377e83f9 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Tue, 24 Jun 2025 09:41:03 +0300 Subject: [PATCH 20/26] version update --- npm/ng-packs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 3d80dd1295..e81bb8f4cd 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -84,7 +84,7 @@ "@swc/cli": "0.6.0", "@swc/core": "~1.5.0", "@swc/helpers": "~0.5.0", - "@swimlane/ngx-datatable": "^21.0.0", + "@swimlane/ngx-datatable": "~21.1.0", "@types/jest": "29.5.14", "@types/node": "^20.0.0", "@typescript-eslint/eslint-plugin": "7.16.0", From 18b88a29f7838b76b5d94c1f6ec4351f844209e6 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Fri, 27 Jun 2025 11:33:44 +0300 Subject: [PATCH 21/26] version normalized --- npm/ng-packs/package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index e81bb8f4cd..dedfa30746 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -69,17 +69,17 @@ "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngneat/spectator": "~19.6.2", "@ngx-validate/core": "^0.2.0", - "@nx/angular": "~21.2.0", - "@nx/cypress": "~21.2.0", - "@nx/devkit": "~21.2.0", - "@nx/eslint": "~21.2.0", - "@nx/eslint-plugin": "~21.2.0", - "@nx/jest": "~21.2.0", - "@nx/js": "~21.2.0", - "@nx/plugin": "~21.2.0", - "@nx/workspace": "~21.2.0", + "@nx/angular": "~21.0.0", + "@nx/cypress": "~21.0.0", + "@nx/devkit": "~21.0.0", + "@nx/eslint": "~21.0.0", + "@nx/eslint-plugin": "~21.0.0", + "@nx/jest": "~21.0.0", + "@nx/js": "~21.0.0", + "@nx/plugin": "~21.0.0", + "@nx/workspace": "~21.0.0", "@popperjs/core": "~2.11.0", - "@schematics/angular": "~20.0.2", + "@schematics/angular": "~20.0.0", "@swc-node/register": "1.9.2", "@swc/cli": "0.6.0", "@swc/core": "~1.5.0", From 3f372f36474846926eb428fcc3a7a812591e04cc Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Fri, 27 Jun 2025 13:49:43 +0300 Subject: [PATCH 22/26] version updates --- npm/ng-packs/package.json | 11 ++++++++ templates/app-nolayers/angular/package.json | 28 ++++++++++----------- templates/app/angular/package.json | 28 ++++++++++----------- templates/module/angular/package.json | 28 ++++++++++----------- 4 files changed, 53 insertions(+), 42 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index dedfa30746..cf5e76e95b 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -69,6 +69,15 @@ "@ng-bootstrap/ng-bootstrap": "~19.0.0-rc.0", "@ngneat/spectator": "~19.6.2", "@ngx-validate/core": "^0.2.0", + "@nx/angular": "~21.2.0", + "@nx/cypress": "~21.2.0", + "@nx/devkit": "~21.2.0", + "@nx/eslint": "~21.2.0", + "@nx/eslint-plugin": "~21.2.0", + "@nx/jest": "~21.2.0", + "@nx/js": "~21.2.0", + "@nx/plugin": "~21.2.0", + "@nx/workspace": "~21.2.0", "@nx/angular": "~21.0.0", "@nx/cypress": "~21.0.0", "@nx/devkit": "~21.0.0", @@ -79,6 +88,7 @@ "@nx/plugin": "~21.0.0", "@nx/workspace": "~21.0.0", "@popperjs/core": "~2.11.0", + "@schematics/angular": "~20.0.2", "@schematics/angular": "~20.0.0", "@swc-node/register": "1.9.2", "@swc/cli": "0.6.0", @@ -137,3 +147,4 @@ }, "dependencies": {} } + diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index b80fac32dc..0a8b90ea73 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~20.0.3", - "@angular/common": "~20.0.3", - "@angular/compiler": "~20.0.3", - "@angular/core": "~20.0.3", - "@angular/forms": "~20.0.3", - "@angular/localize": "~20.0.3", - "@angular/platform-browser": "~20.0.3", - "@angular/platform-browser-dynamic": "~20.0.3", - "@angular/router": "~20.0.3", + "@angular/animations": "~20.0.0", + "@angular/common": "~20.0.0", + "@angular/compiler": "~20.0.0", + "@angular/core": "~20.0.0", + "@angular/forms": "~20.0.0", + "@angular/localize": "~20.0.0", + "@angular/platform-browser": "~20.0.0", + "@angular/platform-browser-dynamic": "~20.0.0", + "@angular/router": "~20.0.0", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,15 +37,15 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~20.0.2", + "@angular-devkit/build-angular": "~20.0.0", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~20.0.2", - "@angular/compiler-cli": "~20.0.3", - "@angular/language-service": "~20.0.3", + "@angular/cli": "~20.0.0", + "@angular/compiler-cli": "~20.0.0", + "@angular/language-service": "~20.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.8.3" + "typescript": "~5.8.0" } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index b80fac32dc..0a8b90ea73 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.lepton-x": "~4.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~20.0.3", - "@angular/common": "~20.0.3", - "@angular/compiler": "~20.0.3", - "@angular/core": "~20.0.3", - "@angular/forms": "~20.0.3", - "@angular/localize": "~20.0.3", - "@angular/platform-browser": "~20.0.3", - "@angular/platform-browser-dynamic": "~20.0.3", - "@angular/router": "~20.0.3", + "@angular/animations": "~20.0.0", + "@angular/common": "~20.0.0", + "@angular/compiler": "~20.0.0", + "@angular/core": "~20.0.0", + "@angular/forms": "~20.0.0", + "@angular/localize": "~20.0.0", + "@angular/platform-browser": "~20.0.0", + "@angular/platform-browser-dynamic": "~20.0.0", + "@angular/router": "~20.0.0", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,15 +37,15 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~20.0.2", + "@angular-devkit/build-angular": "~20.0.0", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~20.0.2", - "@angular/compiler-cli": "~20.0.3", - "@angular/language-service": "~20.0.3", + "@angular/cli": "~20.0.0", + "@angular/compiler-cli": "~20.0.0", + "@angular/language-service": "~20.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.8.3" + "typescript": "~5.8.0" } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index fec7ee197e..74f58d102d 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -22,30 +22,30 @@ "@abp/ng.tenant-management": "~9.2.0", "@abp/ng.theme.basic": "~9.2.0", "@abp/ng.theme.shared": "~9.2.0", - "@angular/animations": "~20.0.3", - "@angular/common": "~20.0.3", - "@angular/compiler": "~20.0.3", - "@angular/core": "~20.0.3", - "@angular/forms": "~20.0.3", - "@angular/localize": "~20.0.3", - "@angular/platform-browser": "~20.0.3", - "@angular/platform-browser-dynamic": "~20.0.3", - "@angular/router": "~20.0.3", + "@angular/animations": "~20.0.0", + "@angular/common": "~20.0.0", + "@angular/compiler": "~20.0.0", + "@angular/core": "~20.0.0", + "@angular/forms": "~20.0.0", + "@angular/localize": "~20.0.0", + "@angular/platform-browser": "~20.0.0", + "@angular/platform-browser-dynamic": "~20.0.0", + "@angular/router": "~20.0.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", "zone.js": "~0.15.0" }, "devDependencies": { "@abp/ng.schematics": "~9.2.0", - "@angular-devkit/build-angular": "~20.0.2", + "@angular-devkit/build-angular": "~20.0.0", "@angular-eslint/builder": "~19.0.0", "@angular-eslint/eslint-plugin": "~19.0.0", "@angular-eslint/eslint-plugin-template": "~19.0.0", "@angular-eslint/schematics": "~19.0.0", "@angular-eslint/template-parser": "~19.0.0", - "@angular/cli": "~20.0.2", - "@angular/compiler-cli": "~20.0.3", - "@angular/language-service": "~20.0.3", + "@angular/cli": "~20.0.0", + "@angular/compiler-cli": "~20.0.0", + "@angular/language-service": "~20.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", @@ -59,6 +59,6 @@ "karma-jasmine-html-reporter": "^1.7.0", "ng-packagr": "~20.0.0", "symlink": "^2.0.0", - "typescript": "~5.8.3" + "typescript": "~5.8.0" } } From eb8d890532f6425f511ed45a70b30419809ce358 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Tue, 1 Jul 2025 16:03:02 +0300 Subject: [PATCH 23/26] refactoring --- npm/ng-packs/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index cf5e76e95b..0098f097e1 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -122,8 +122,8 @@ "lerna": "^4.0.0", "lint-staged": "^13.0.0", "ng-packagr": "~20.0.0", - "ng-zorro-antd": "~20.0.0-next.0", - "nx": "21.2.0", + "ng-zorro-antd": "~20.0.0", + "nx": "~21.2.0", "postcss": "^8.0.0", "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", From 7047b90b77259a1932e6ad6605dbbb4c0e27b55f Mon Sep 17 00:00:00 2001 From: sumeyye Date: Wed, 2 Jul 2025 16:49:41 +0300 Subject: [PATCH 24/26] update: use version 20.0.x for `ng-zorro-antd` package --- npm/ng-packs/packages/components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index adbe6da370..a5cb97e8ae 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "chart.js": "^3.5.1", - "ng-zorro-antd": "~20.0.0-next.0", + "ng-zorro-antd": "~20.0.0", "@ctrl/tinycolor": "^4.0.0", "tslib": "^2.0.0" }, From 57c6ab69904f3b2235655fd4acfd03407866dbf4 Mon Sep 17 00:00:00 2001 From: sumeyye Date: Wed, 2 Jul 2025 16:50:10 +0300 Subject: [PATCH 25/26] remove: duplicate packages for ng-packs dependencies --- npm/ng-packs/package.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index cb66dafc84..9e218f2fab 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -78,17 +78,7 @@ "@nx/js": "~21.2.0", "@nx/plugin": "~21.2.0", "@nx/workspace": "~21.2.0", - "@nx/angular": "~21.0.0", - "@nx/cypress": "~21.0.0", - "@nx/devkit": "~21.0.0", - "@nx/eslint": "~21.0.0", - "@nx/eslint-plugin": "~21.0.0", - "@nx/jest": "~21.0.0", - "@nx/js": "~21.0.0", - "@nx/plugin": "~21.0.0", - "@nx/workspace": "~21.0.0", "@popperjs/core": "~2.11.0", - "@schematics/angular": "~20.0.2", "@schematics/angular": "~20.0.0", "@swc-node/register": "1.9.2", "@swc/cli": "0.6.0", @@ -147,4 +137,3 @@ }, "dependencies": {} } - From a8a49fde9eac0dc1e597ae189e5d8c3858f2813d Mon Sep 17 00:00:00 2001 From: sumeyye Date: Wed, 2 Jul 2025 16:50:44 +0300 Subject: [PATCH 26/26] update: versions for `@angular-eslint/x` packages in templates --- templates/app-nolayers/angular/package.json | 10 +++++----- templates/app/angular/package.json | 10 +++++----- templates/module/angular/package.json | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 8cef4e4a78..dad6781521 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -38,11 +38,11 @@ "devDependencies": { "@abp/ng.schematics": "~9.3.0-rc.2", "@angular-devkit/build-angular": "~20.0.0", - "@angular-eslint/builder": "~19.0.0", - "@angular-eslint/eslint-plugin": "~19.0.0", - "@angular-eslint/eslint-plugin-template": "~19.0.0", - "@angular-eslint/schematics": "~19.0.0", - "@angular-eslint/template-parser": "~19.0.0", + "@angular-eslint/builder": "~20.0.0", + "@angular-eslint/eslint-plugin": "~20.0.0", + "@angular-eslint/eslint-plugin-template": "~20.0.0", + "@angular-eslint/schematics": "~20.0.0", + "@angular-eslint/template-parser": "~20.0.0", "@angular/cli": "~20.0.0", "@angular/compiler-cli": "~20.0.0", "@angular/language-service": "~20.0.0", diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 8cef4e4a78..dad6781521 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -38,11 +38,11 @@ "devDependencies": { "@abp/ng.schematics": "~9.3.0-rc.2", "@angular-devkit/build-angular": "~20.0.0", - "@angular-eslint/builder": "~19.0.0", - "@angular-eslint/eslint-plugin": "~19.0.0", - "@angular-eslint/eslint-plugin-template": "~19.0.0", - "@angular-eslint/schematics": "~19.0.0", - "@angular-eslint/template-parser": "~19.0.0", + "@angular-eslint/builder": "~20.0.0", + "@angular-eslint/eslint-plugin": "~20.0.0", + "@angular-eslint/eslint-plugin-template": "~20.0.0", + "@angular-eslint/schematics": "~20.0.0", + "@angular-eslint/template-parser": "~20.0.0", "@angular/cli": "~20.0.0", "@angular/compiler-cli": "~20.0.0", "@angular/language-service": "~20.0.0", diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index b367bd856d..90cd54f25c 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -38,11 +38,11 @@ "devDependencies": { "@abp/ng.schematics": "~9.3.0-rc.2", "@angular-devkit/build-angular": "~20.0.0", - "@angular-eslint/builder": "~19.0.0", - "@angular-eslint/eslint-plugin": "~19.0.0", - "@angular-eslint/eslint-plugin-template": "~19.0.0", - "@angular-eslint/schematics": "~19.0.0", - "@angular-eslint/template-parser": "~19.0.0", + "@angular-eslint/builder": "~20.0.0", + "@angular-eslint/eslint-plugin": "~20.0.0", + "@angular-eslint/eslint-plugin-template": "~20.0.0", + "@angular-eslint/schematics": "~20.0.0", + "@angular-eslint/template-parser": "~20.0.0", "@angular/cli": "~20.0.0", "@angular/compiler-cli": "~20.0.0", "@angular/language-service": "~20.0.0",