From 9eb6abe6e2e3d7377575a3908ea80594eed3a2e5 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 10 Dec 2025 14:39:00 +0300 Subject: [PATCH 01/13] nx version migration --- npm/ng-packs/apps/dev-app/project.json | 4 +- npm/ng-packs/apps/dev-app/src/main.server.ts | 4 +- npm/ng-packs/migrations.json | 123 ++++++++++++++---- npm/ng-packs/package.json | 74 +++++------ .../packages/account-core/project.json | 6 +- npm/ng-packs/packages/account/project.json | 6 +- npm/ng-packs/packages/components/project.json | 6 +- npm/ng-packs/packages/core/project.json | 4 +- .../packages/feature-management/project.json | 6 +- npm/ng-packs/packages/generators/project.json | 4 +- npm/ng-packs/packages/identity/project.json | 6 +- npm/ng-packs/packages/oauth/project.json | 6 +- .../permission-management/project.json | 6 +- npm/ng-packs/packages/schematics/project.json | 4 +- .../packages/setting-management/project.json | 6 +- .../packages/tenant-management/project.json | 6 +- .../packages/theme-basic/project.json | 6 +- .../packages/theme-shared/project.json | 6 +- 18 files changed, 177 insertions(+), 106 deletions(-) diff --git a/npm/ng-packs/apps/dev-app/project.json b/npm/ng-packs/apps/dev-app/project.json index 37f0502dde..bea3bf6612 100644 --- a/npm/ng-packs/apps/dev-app/project.json +++ b/npm/ng-packs/apps/dev-app/project.json @@ -176,9 +176,7 @@ }, "test": { "executor": "@nx/jest:jest", - "outputs": [ - "{workspaceRoot}/coverage/apps/dev-app" - ], + "outputs": ["{workspaceRoot}/coverage/apps/dev-app"], "options": { "jestConfig": "apps/dev-app/jest.config.ts" } diff --git a/npm/ng-packs/apps/dev-app/src/main.server.ts b/npm/ng-packs/apps/dev-app/src/main.server.ts index 4b9d4d1545..fbd3e9dbd7 100644 --- a/npm/ng-packs/apps/dev-app/src/main.server.ts +++ b/npm/ng-packs/apps/dev-app/src/main.server.ts @@ -1,7 +1,7 @@ -import { bootstrapApplication } from '@angular/platform-browser'; +import { bootstrapApplication, BootstrapContext } from '@angular/platform-browser'; import { AppComponent } from './app/app.component'; import { config } from './app/app.config.server'; -const bootstrap = () => bootstrapApplication(AppComponent, config); +const bootstrap = (context: BootstrapContext) => bootstrapApplication(AppComponent, config, context); export default bootstrap; diff --git a/npm/ng-packs/migrations.json b/npm/ng-packs/migrations.json index 49df20928b..3615f35e50 100644 --- a/npm/ng-packs/migrations.json +++ b/npm/ng-packs/migrations.json @@ -1,45 +1,118 @@ { "migrations": [ + { + "version": "22.0.0-beta.1", + "description": "Updates release version config based on the breaking changes in Nx v22", + "implementation": "./src/migrations/update-22-0-0/release-version-config-changes", + "package": "nx", + "name": "22-0-0-release-version-config-changes" + }, + { + "version": "22.0.0-beta.2", + "description": "Consolidates releaseTag* options into nested releaseTag object structure", + "implementation": "./src/migrations/update-22-0-0/consolidate-release-tag-config", + "package": "nx", + "name": "22-0-0-consolidate-release-tag-config" + }, { "cli": "nx", - "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", + "version": "22.1.0-beta.5", + "description": "Updates the nx wrapper.", + "implementation": "./src/migrations/update-22-1-0/update-nx-wrapper", + "package": "nx", + "name": "22-1-0-update-nx-wrapper" + }, + { + "version": "21.5.0-beta.2", + "description": "Migrate the legacy 'development' custom condition to a workspace-unique custom condition name.", + "factory": "./src/migrations/update-21-5-0/migrate-development-custom-condition", + "package": "@nx/js", + "name": "migrate-development-custom-condition" + }, + { + "version": "22.0.0-beta.0", + "description": "Remove the deprecated `external` and `externalBuildTargets` options from the `@nx/js:swc` and `@nx/js:tsc` executors.", + "factory": "./src/migrations/update-22-0-0/remove-external-options-from-js-executors", + "package": "@nx/js", + "name": "remove-external-options-from-js-executors" + }, + { + "version": "22.1.0-rc.1", + "description": "Removes redundant TypeScript project references from project's tsconfig.json files when runtime tsconfig files (e.g., tsconfig.lib.json, tsconfig.app.json) exist.", + "factory": "./src/migrations/update-22-1-0/remove-redundant-ts-project-references", + "package": "@nx/js", + "name": "remove-redundant-ts-project-references" + }, + { + "version": "21.3.0-beta.3", + "description": "Rename the CLI option `testPathPattern` to `testPathPatterns`.", + "implementation": "./src/migrations/update-21-3-0/rename-test-path-pattern", + "package": "@nx/jest", + "name": "rename-test-path-pattern" + }, + { + "version": "22.2.0-beta.2", + "description": "Convert jest.config.ts files from ESM to CJS syntax (export default -> module.exports, import -> require) for projects using CommonJS resolution to ensure correct loading under Node.js type-stripping.", + "implementation": "./src/migrations/update-22-2-0/convert-jest-config-to-cjs", + "package": "@nx/jest", + "name": "convert-jest-config-to-cjs" + }, + { + "cli": "nx", + "version": "21.3.0-beta.4", + "requires": { "@angular/core": ">=20.1.0" }, + "description": "Update the @angular/cli package version to ~20.1.0.", + "factory": "./src/migrations/update-21-3-0/update-angular-cli", "package": "@nx/angular", - "name": "update-angular-cli-version-20-0-0" + "name": "update-angular-cli-version-20-1-0" }, { - "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", + "version": "21.5.0-beta.0", + "description": "Set the 'tsConfig' option to build and test targets to help with Angular migration issues.", + "factory": "./src/migrations/update-21-5-0/set-tsconfig-option", "package": "@nx/angular", - "name": "migrate-provide-server-rendering-import" + "name": "set-tsconfig-option" }, { - "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", + "cli": "nx", + "version": "21.5.0-beta.2", + "requires": { "@angular/core": ">=20.2.0" }, + "description": "Update the @angular/cli package version to ~20.2.0.", + "factory": "./src/migrations/update-21-5-0/update-angular-cli", "package": "@nx/angular", - "name": "replace-provide-server-routing" + "name": "update-angular-cli-version-20-2-0" }, { - "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", + "version": "21.5.0-beta.2", + "requires": { "@angular/core": ">=20.2.0" }, + "description": "Remove any Karma configuration files that only contain the default content. The default configuration is automatically available without a specific project configurationfile.", + "factory": "./src/migrations/update-21-5-0/remove-default-karma-configuration-files", "package": "@nx/angular", - "name": "set-generator-defaults-for-previous-style-guide" + "name": "remove-default-karma-configuration-files" }, { - "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", + "cli": "nx", + "version": "21.6.1-beta.2", + "requires": { "@angular/core": ">=20.3.0" }, + "description": "Update the @angular/cli package version to ~20.3.0.", + "factory": "./src/migrations/update-21-6-1/update-angular-cli", "package": "@nx/angular", - "name": "update-module-resolution" + "name": "update-angular-cli-version-20-3-0" + }, + { + "version": "20.2.0", + "description": "Replaces usages of the deprecated Router.getCurrentNavigation method with the Router.currentNavigation signal", + "factory": "./bundles/router-current-navigation.cjs#migrate", + "optional": true, + "package": "@angular/core", + "name": "router-current-navigation" + }, + { + "version": "20.3.0", + "description": "Adds `BootstrapContext` to `bootstrapApplication` calls in `main.server.ts` to support server rendering.", + "factory": "./bundles/add-bootstrap-context-to-server-main.cjs#migrate", + "package": "@angular/core", + "name": "add-bootstrap-context-to-server-main" } ] } diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index f0019eb726..286ca75ae6 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -48,44 +48,44 @@ "devDependencies": { "@abp/ng.theme.lepton-x": "~5.0.1", "@abp/utils": "~10.0.1", - "@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.0", - "@angular/build": "~20.0.0", - "@angular/cli": "~20.0.0", - "@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/platform-server": "~20.0.0", - "@angular/router": "~20.0.0", - "@angular/ssr": "~20.0.0", + "@angular-devkit/build-angular": "~21.0.0", + "@angular-devkit/core": "~21.0.0", + "@angular-devkit/schematics": "~21.0.0", + "@angular-devkit/schematics-cli": "~21.0.0", + "@angular-eslint/eslint-plugin": "~21.0.0", + "@angular-eslint/eslint-plugin-template": "~21.0.0", + "@angular-eslint/template-parser": "~21.0.0", + "@angular/animations": "21.0.0", + "@angular/build": "~21.0.0", + "@angular/cli": "~21.0.0", + "@angular/common": "~21.0.0", + "@angular/compiler": "~21.0.0", + "@angular/compiler-cli": "~21.0.0", + "@angular/core": "~21.0.0", + "@angular/forms": "~21.0.0", + "@angular/language-service": "~21.0.0", + "@angular/localize": "~21.0.0", + "@angular/platform-browser": "~21.0.0", + "@angular/platform-browser-dynamic": "~21.0.0", + "@angular/platform-server": "~21.0.0", + "@angular/router": "~21.0.0", + "@angular/ssr": "21.0.0", "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~19.0.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/web": "~21.2.0", - "@nx/workspace": "~21.2.0", + "@nx/angular": "~22.2.0", + "@nx/cypress": "~22.2.0", + "@nx/devkit": "~22.2.0", + "@nx/eslint": "~22.2.0", + "@nx/eslint-plugin": "~22.2.0", + "@nx/jest": "~22.2.0", + "@nx/js": "~22.2.0", + "@nx/plugin": "~22.2.0", + "@nx/web": "~22.2.0", + "@nx/workspace": "~22.2.0", "@popperjs/core": "~2.11.0", - "@schematics/angular": "~20.0.0", + "@schematics/angular": "~21.0.0", "@swc-node/register": "1.9.2", "@swc/cli": "0.6.0", "@swc/core": "~1.5.0", @@ -120,9 +120,9 @@ "just-compare": "^2.0.0", "lerna": "^4.0.0", "lint-staged": "^13.0.0", - "ng-packagr": "~20.0.0", + "ng-packagr": "~21.0.0", "ng-zorro-antd": "~20.0.0", - "nx": "~21.2.0", + "nx": "~22.2.0", "postcss": "^8.0.0", "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", @@ -131,12 +131,12 @@ "protractor": "~7.0.0", "rxjs": "~7.8.0", "should-quote": "^1.0.0", - "ts-jest": "29.1.0", + "ts-jest": "29.4.6", "ts-node": "10.9.1", "ts-toolbelt": "^9.0.0", "tslib": "^2.3.0", "tslint": "~6.1.0", - "typescript": "~5.8.0", + "typescript": "~5.9.0", "zone.js": "~0.15.0" }, "lint-staged": { diff --git a/npm/ng-packs/packages/account-core/project.json b/npm/ng-packs/packages/account-core/project.json index 3e60410088..312bdd30e9 100644 --- a/npm/ng-packs/packages/account-core/project.json +++ b/npm/ng-packs/packages/account-core/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/account-core/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared"] + } } diff --git a/npm/ng-packs/packages/account/project.json b/npm/ng-packs/packages/account/project.json index 9514a59dc6..41c6597e2a 100644 --- a/npm/ng-packs/packages/account/project.json +++ b/npm/ng-packs/packages/account/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/account/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared", "account-core"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared", "account-core"] + } } diff --git a/npm/ng-packs/packages/components/project.json b/npm/ng-packs/packages/components/project.json index 4a61b72ab4..671fabe461 100644 --- a/npm/ng-packs/packages/components/project.json +++ b/npm/ng-packs/packages/components/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/components/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared"] + } } diff --git a/npm/ng-packs/packages/core/project.json b/npm/ng-packs/packages/core/project.json index 9efdfd9d83..a6b7789814 100644 --- a/npm/ng-packs/packages/core/project.json +++ b/npm/ng-packs/packages/core/project.json @@ -4,6 +4,7 @@ "projectType": "library", "sourceRoot": "packages/core/src", "prefix": "abp", + "tags": [], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,6 +33,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [] + } } diff --git a/npm/ng-packs/packages/feature-management/project.json b/npm/ng-packs/packages/feature-management/project.json index b2f0e61b08..7712d1b67b 100644 --- a/npm/ng-packs/packages/feature-management/project.json +++ b/npm/ng-packs/packages/feature-management/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/feature-management/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared"] + } } diff --git a/npm/ng-packs/packages/generators/project.json b/npm/ng-packs/packages/generators/project.json index 06244af3d0..5924f7caac 100644 --- a/npm/ng-packs/packages/generators/project.json +++ b/npm/ng-packs/packages/generators/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/generators/src", "projectType": "library", + "tags": [], "targets": { "build": { "executor": "@nx/js:tsc", @@ -51,6 +52,5 @@ "jestConfig": "packages/generators/jest.config.ts" } } - }, - "tags": [] + } } diff --git a/npm/ng-packs/packages/identity/project.json b/npm/ng-packs/packages/identity/project.json index d51409ac2a..e67a92ba2a 100644 --- a/npm/ng-packs/packages/identity/project.json +++ b/npm/ng-packs/packages/identity/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/identity/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared", "permission-management"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared", "permission-management"] + } } diff --git a/npm/ng-packs/packages/oauth/project.json b/npm/ng-packs/packages/oauth/project.json index 61662f4811..858ec5947c 100644 --- a/npm/ng-packs/packages/oauth/project.json +++ b/npm/ng-packs/packages/oauth/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/oauth/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core"], "targets": { "build": { "executor": "@nx/angular:package", @@ -31,7 +33,5 @@ "lint": { "executor": "@nx/eslint:lint" } - }, - "tags": [], - "implicitDependencies": ["core"] + } } diff --git a/npm/ng-packs/packages/permission-management/project.json b/npm/ng-packs/packages/permission-management/project.json index eb09ef6178..3e3287256d 100644 --- a/npm/ng-packs/packages/permission-management/project.json +++ b/npm/ng-packs/packages/permission-management/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/permission-management/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared"] + } } diff --git a/npm/ng-packs/packages/schematics/project.json b/npm/ng-packs/packages/schematics/project.json index 7e3f6a8fd3..74a01e9f03 100644 --- a/npm/ng-packs/packages/schematics/project.json +++ b/npm/ng-packs/packages/schematics/project.json @@ -4,6 +4,7 @@ "projectType": "library", "sourceRoot": "packages/schematics/src", "prefix": "abp", + "tags": [], "targets": { "test": { "executor": "@nx/jest:jest", @@ -16,6 +17,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [] + } } diff --git a/npm/ng-packs/packages/setting-management/project.json b/npm/ng-packs/packages/setting-management/project.json index 334e58be26..57f72234fb 100644 --- a/npm/ng-packs/packages/setting-management/project.json +++ b/npm/ng-packs/packages/setting-management/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/setting-management/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared", "components"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared", "components"] + } } diff --git a/npm/ng-packs/packages/tenant-management/project.json b/npm/ng-packs/packages/tenant-management/project.json index c2f4c3bc8c..2394793380 100644 --- a/npm/ng-packs/packages/tenant-management/project.json +++ b/npm/ng-packs/packages/tenant-management/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/tenant-management/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared", "feature-management"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared", "feature-management"] + } } diff --git a/npm/ng-packs/packages/theme-basic/project.json b/npm/ng-packs/packages/theme-basic/project.json index 5c2936576f..be0464cc18 100644 --- a/npm/ng-packs/packages/theme-basic/project.json +++ b/npm/ng-packs/packages/theme-basic/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/theme-basic/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "theme-shared", "account-core"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "theme-shared", "account-core"] + } } diff --git a/npm/ng-packs/packages/theme-shared/project.json b/npm/ng-packs/packages/theme-shared/project.json index 6ad2a9db6d..a77551187c 100644 --- a/npm/ng-packs/packages/theme-shared/project.json +++ b/npm/ng-packs/packages/theme-shared/project.json @@ -4,6 +4,8 @@ "projectType": "library", "sourceRoot": "packages/theme-shared/src", "prefix": "abp", + "tags": [], + "implicitDependencies": ["core", "oauth"], "targets": { "build": { "executor": "@nx/angular:package", @@ -32,7 +34,5 @@ "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] } - }, - "tags": [], - "implicitDependencies": ["core", "oauth"] + } } From cfd1d9ee85aa93bd497f660467c611d16eb4bf98 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 11 Dec 2025 11:13:45 +0300 Subject: [PATCH 02/13] templates version upgrade --- templates/app-nolayers/angular/package.json | 31 +++++++++-------- templates/app-nolayers/angular/tsconfig.json | 4 --- templates/app/angular/package.json | 31 +++++++++-------- templates/app/angular/tsconfig.json | 4 --- templates/module/angular/package.json | 33 +++++++++---------- .../my-project-name/tsconfig.lib.json | 6 +--- templates/module/angular/tsconfig.json | 1 + 7 files changed, 48 insertions(+), 62 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 420ad7b2cf..8e89acccff 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~10.0.1", "@abp/ng.theme.lepton-x": "~5.0.1", "@abp/ng.theme.shared": "~10.0.1", - "@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", + "@angular/animations": "~21.0.0", + "@angular/common": "~21.0.0", + "@angular/compiler": "~21.0.0", + "@angular/core": "~21.0.0", + "@angular/forms": "~21.0.0", + "@angular/localize": "~21.0.0", + "@angular/platform-browser": "~21.0.0", + "@angular/platform-browser-dynamic": "~21.0.0", + "@angular/router": "~21.0.0", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,27 +37,26 @@ }, "devDependencies": { "@abp/ng.schematics": "~10.0.1", - "@angular-devkit/build-angular": "~20.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", - "@angular/build": "~20.0.0", + "@angular/build": "~21.0.0", + "@angular/cli": "~21.0.3", + "@angular/compiler-cli": "~21.0.0", + "@angular/language-service": "~21.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", "jasmine-core": "~4.0.0", - "karma": "~6.3.0", + "karma": "~6.4.4", "karma-chrome-launcher": "~3.1.0", "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.8.0" + "typescript": "~5.9.3" } } diff --git a/templates/app-nolayers/angular/tsconfig.json b/templates/app-nolayers/angular/tsconfig.json index 0322d97e4d..79efe96be9 100644 --- a/templates/app-nolayers/angular/tsconfig.json +++ b/templates/app-nolayers/angular/tsconfig.json @@ -13,10 +13,6 @@ "module": "esnext", "skipLibCheck": true, "esModuleInterop": true, - "lib": [ - "es2020", - "dom" - ], "paths": { "@proxy": [ "src/app/proxy/index.ts" diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index ac7e253962..3130bdaffd 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -21,15 +21,15 @@ "@abp/ng.tenant-management": "~10.0.1", "@abp/ng.theme.lepton-x": "~5.0.1", "@abp/ng.theme.shared": "~10.0.1", - "@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", + "@angular/animations": "~21.0.0", + "@angular/common": "~21.0.0", + "@angular/compiler": "~21.0.0", + "@angular/core": "~21.0.0", + "@angular/forms": "~21.0.0", + "@angular/localize": "~21.0.0", + "@angular/platform-browser": "~21.0.0", + "@angular/platform-browser-dynamic": "~21.0.0", + "@angular/router": "~21.0.0", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -37,27 +37,26 @@ }, "devDependencies": { "@abp/ng.schematics": "~10.0.1", - "@angular-devkit/build-angular": "~20.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", - "@angular/build": "~20.0.0", + "@angular/build": "~21.0.0", + "@angular/cli": "~21.0.3", + "@angular/compiler-cli": "~21.0.0", + "@angular/language-service": "~21.0.0", "@types/jasmine": "~3.6.0", "@types/node": "~20.11.0", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", "jasmine-core": "~4.0.0", - "karma": "~6.3.0", + "karma": "~6.4.4", "karma-chrome-launcher": "~3.1.0", "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.8.0" + "typescript": "~5.9.3" } } diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index 0322d97e4d..79efe96be9 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -13,10 +13,6 @@ "module": "esnext", "skipLibCheck": true, "esModuleInterop": true, - "lib": [ - "es2020", - "dom" - ], "paths": { "@proxy": [ "src/app/proxy/index.ts" diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 5fc4ebe29e..be67b2d639 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -22,44 +22,43 @@ "@abp/ng.tenant-management": "~10.0.1", "@abp/ng.theme.basic": "~10.0.1", "@abp/ng.theme.shared": "~10.0.1", - "@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", + "@angular/animations": "~21.0.0", + "@angular/common": "~21.0.0", + "@angular/compiler": "~21.0.0", + "@angular/core": "~21.0.0", + "@angular/forms": "~21.0.0", + "@angular/localize": "~21.0.0", + "@angular/platform-browser": "~21.0.0", + "@angular/platform-browser-dynamic": "~21.0.0", + "@angular/router": "~21.0.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", "zone.js": "~0.15.0" }, "devDependencies": { "@abp/ng.schematics": "~10.0.1", - "@angular-devkit/build-angular": "~20.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", - "@angular/build": "~20.0.0", + "@angular/build": "~21.0.0", + "@angular/cli": "~21.0.0", + "@angular/compiler-cli": "~21.0.0", + "@angular/language-service": "~21.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", "jasmine-core": "~4.0.0", - "karma": "~6.3.0", + "karma": "~6.4.4", "karma-chrome-launcher": "~3.1.0", "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "ng-packagr": "~20.0.0", + "ng-packagr": "~21.0.0", "symlink": "^2.0.0", - "typescript": "~5.8.0" + "typescript": "~5.9.3" } } diff --git a/templates/module/angular/projects/my-project-name/tsconfig.lib.json b/templates/module/angular/projects/my-project-name/tsconfig.lib.json index 8246b3f0b1..6fea9ad884 100644 --- a/templates/module/angular/projects/my-project-name/tsconfig.lib.json +++ b/templates/module/angular/projects/my-project-name/tsconfig.lib.json @@ -6,11 +6,7 @@ "declaration": true, "declarationMap": true, "inlineSources": true, - "types": [], - "lib": [ - "dom", - "es2018" - ] + "types": [] }, "exclude": [ "src/test.ts", diff --git a/templates/module/angular/tsconfig.json b/templates/module/angular/tsconfig.json index 0cbe9a9de8..2e5e466bf0 100644 --- a/templates/module/angular/tsconfig.json +++ b/templates/module/angular/tsconfig.json @@ -2,6 +2,7 @@ "extends": "./tsconfig.prod.json", "compilerOptions": { "esModuleInterop": true, + "moduleResolution": "bundler", "skipLibCheck": true, "paths": { "@my-company-name/my-project-name": [ From 3389f496ff6cd5f9b4893dcd41f66978e4dcf5cc Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 11 Dec 2025 11:19:02 +0300 Subject: [PATCH 03/13] templates version upgrade --- templates/app-nolayers/angular/package.json | 10 +++++----- templates/app-nolayers/angular/src/main.ts | 3 ++- templates/app/angular/package.json | 10 +++++----- templates/app/angular/src/main.ts | 3 ++- templates/module/angular/package.json | 10 +++++----- templates/module/angular/projects/dev-app/src/main.ts | 3 ++- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 8e89acccff..8178491e71 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -37,11 +37,11 @@ }, "devDependencies": { "@abp/ng.schematics": "~10.0.1", - "@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-eslint/builder": "~21.0.0", + "@angular-eslint/eslint-plugin": "~21.0.0", + "@angular-eslint/eslint-plugin-template": "~21.0.0", + "@angular-eslint/schematics": "~21.0.0", + "@angular-eslint/template-parser": "~21.0.0", "@angular/build": "~21.0.0", "@angular/cli": "~21.0.3", "@angular/compiler-cli": "~21.0.0", diff --git a/templates/app-nolayers/angular/src/main.ts b/templates/app-nolayers/angular/src/main.ts index 7180ec1a32..b7ef9f0bc3 100644 --- a/templates/app-nolayers/angular/src/main.ts +++ b/templates/app-nolayers/angular/src/main.ts @@ -1,5 +1,6 @@ +import { provideZoneChangeDetection } from "@angular/core"; import { bootstrapApplication } from '@angular/platform-browser'; import { appConfig } from './app/app.config'; import { AppComponent } from './app/app.component'; -bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err)); +bootstrapApplication(AppComponent, {...appConfig, providers: [provideZoneChangeDetection(), ...appConfig.providers]}).catch(err => console.error(err)); diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 3130bdaffd..44677ccbb0 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -37,11 +37,11 @@ }, "devDependencies": { "@abp/ng.schematics": "~10.0.1", - "@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-eslint/builder": "~21.0.0", + "@angular-eslint/eslint-plugin": "~21.0.0", + "@angular-eslint/eslint-plugin-template": "~21.0.0", + "@angular-eslint/schematics": "~21.0.0", + "@angular-eslint/template-parser": "~21.0.0", "@angular/build": "~21.0.0", "@angular/cli": "~21.0.3", "@angular/compiler-cli": "~21.0.0", diff --git a/templates/app/angular/src/main.ts b/templates/app/angular/src/main.ts index 7180ec1a32..b7ef9f0bc3 100644 --- a/templates/app/angular/src/main.ts +++ b/templates/app/angular/src/main.ts @@ -1,5 +1,6 @@ +import { provideZoneChangeDetection } from "@angular/core"; import { bootstrapApplication } from '@angular/platform-browser'; import { appConfig } from './app/app.config'; import { AppComponent } from './app/app.component'; -bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err)); +bootstrapApplication(AppComponent, {...appConfig, providers: [provideZoneChangeDetection(), ...appConfig.providers]}).catch(err => console.error(err)); diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index be67b2d639..08efc9c651 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -37,11 +37,11 @@ }, "devDependencies": { "@abp/ng.schematics": "~10.0.1", - "@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-eslint/builder": "~21.0.0", + "@angular-eslint/eslint-plugin": "~21.0.0", + "@angular-eslint/eslint-plugin-template": "~21.0.0", + "@angular-eslint/schematics": "~21.0.0", + "@angular-eslint/template-parser": "~21.0.0", "@angular/build": "~21.0.0", "@angular/cli": "~21.0.0", "@angular/compiler-cli": "~21.0.0", diff --git a/templates/module/angular/projects/dev-app/src/main.ts b/templates/module/angular/projects/dev-app/src/main.ts index 7180ec1a32..b7ef9f0bc3 100644 --- a/templates/module/angular/projects/dev-app/src/main.ts +++ b/templates/module/angular/projects/dev-app/src/main.ts @@ -1,5 +1,6 @@ +import { provideZoneChangeDetection } from "@angular/core"; import { bootstrapApplication } from '@angular/platform-browser'; import { appConfig } from './app/app.config'; import { AppComponent } from './app/app.component'; -bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err)); +bootstrapApplication(AppComponent, {...appConfig, providers: [provideZoneChangeDetection(), ...appConfig.providers]}).catch(err => console.error(err)); From 62369ffc9fa28e0333c0eb075c42d9a4e7ea68c3 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 11 Dec 2025 11:50:52 +0300 Subject: [PATCH 04/13] update --- npm/ng-packs/package.json | 6 +++--- npm/ng-packs/packages/components/package.json | 2 +- npm/ng-packs/packages/schematics/package.json | 10 +++++----- npm/ng-packs/packages/theme-shared/package.json | 2 +- .../toast-container/toast-container.component.ts | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 286ca75ae6..d73864827d 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -69,7 +69,7 @@ "@angular/platform-browser-dynamic": "~21.0.0", "@angular/platform-server": "~21.0.0", "@angular/router": "~21.0.0", - "@angular/ssr": "21.0.0", + "@angular/ssr": "~21.0.0", "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~19.0.0", "@ngneat/spectator": "~19.6.2", @@ -90,7 +90,7 @@ "@swc/cli": "0.6.0", "@swc/core": "~1.5.0", "@swc/helpers": "~0.5.0", - "@swimlane/ngx-datatable": "~21.1.0", + "@swimlane/ngx-datatable": "~22.0.0", "@types/express": "~5.0.0", "@types/jest": "29.5.14", "@types/node": "~20.11.0", @@ -121,7 +121,7 @@ "lerna": "^4.0.0", "lint-staged": "^13.0.0", "ng-packagr": "~21.0.0", - "ng-zorro-antd": "~20.0.0", + "ng-zorro-antd": "~21.0.0-next.1", "nx": "~22.2.0", "postcss": "^8.0.0", "postcss-import": "14.1.0", diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index df305d27ae..1fb6de5e0c 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", + "ng-zorro-antd": "~21.0.0-next.1", "@ctrl/tinycolor": "^4.0.0", "tslib": "^2.0.0" }, diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index d878f17f3a..8a7836e8ba 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": "~20.0.0", - "@angular-devkit/schematics": "~20.0.0", - "@angular/cli": "~20.0.0", + "@angular-devkit/core": "~21.0.0", + "@angular-devkit/schematics": "~21.0.0", + "@angular/cli": "~21.0.0", "got": "^11.5.2", "jsonc-parser": "^2.3.0", "should-quote": "^1.0.0", - "typescript": "~5.8.0" + "typescript": "~5.9.0" }, "devDependencies": { - "@schematics/angular": "~20.0.0", + "@schematics/angular": "~21.0.0", "@types/jest": "29.4.4", "@types/node": "20.2.5", "jest": "29.4.3", diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index add2a3e0e1..53407ce647 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -12,7 +12,7 @@ "@ng-bootstrap/ng-bootstrap": "~19.0.0", "@ngx-validate/core": "^0.2.0", "@popperjs/core": "~2.11.0", - "@swimlane/ngx-datatable": "^21.0.0", + "@swimlane/ngx-datatable": "~22.0.0", "bootstrap": "^5.0.0", "tslib": "^2.0.0" }, diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts index aca2149f8b..9c884cb937 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts @@ -46,7 +46,7 @@ export class ToastContainerComponent implements OnInit { }); } - @HostListener('window:resize', ['$event']) + @HostListener('window:resize') onWindowResize() { this.setDefaultRight(); } From d0813b9147455aa2ce81b0498326203576af8de6 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 11 Dec 2025 21:54:41 +0300 Subject: [PATCH 05/13] update --- .../packages/account-core/tsconfig.lib.json | 3 ++- .../packages/account/tsconfig.lib.json | 3 ++- .../packages/components/tsconfig.lib.json | 20 ++++++++++++++----- npm/ng-packs/packages/core/tsconfig.lib.json | 3 ++- .../feature-management/tsconfig.lib.json | 3 ++- .../packages/identity/tsconfig.lib.json | 3 ++- npm/ng-packs/packages/oauth/tsconfig.lib.json | 3 ++- .../permission-management/tsconfig.lib.json | 3 ++- .../setting-management/tsconfig.lib.json | 3 ++- .../tenant-management/tsconfig.lib.json | 3 ++- .../packages/theme-basic/tsconfig.lib.json | 3 ++- .../packages/theme-shared/tsconfig.lib.json | 3 ++- 12 files changed, 37 insertions(+), 16 deletions(-) diff --git a/npm/ng-packs/packages/account-core/tsconfig.lib.json b/npm/ng-packs/packages/account-core/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/account-core/tsconfig.lib.json +++ b/npm/ng-packs/packages/account-core/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/account/tsconfig.lib.json b/npm/ng-packs/packages/account/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/account/tsconfig.lib.json +++ b/npm/ng-packs/packages/account/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/components/tsconfig.lib.json b/npm/ng-packs/packages/components/tsconfig.lib.json index 22d2695db8..c0bf976510 100644 --- a/npm/ng-packs/packages/components/tsconfig.lib.json +++ b/npm/ng-packs/packages/components/tsconfig.lib.json @@ -2,14 +2,24 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, "types": [], - "lib": ["dom", "es2020"], - "useDefineForClassFields": false + + // Tutarlı ES2022 + "target": "ES2022", + "module": "ES2022", + "lib": ["ES2022", "dom"], // ✅ Düzeltildi + + // Angular için + "moduleResolution": "bundler", + "useDefineForClassFields": false, }, - "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], - "include": ["**/*.ts"] + "exclude": [ + "src/test-setup.ts", + "src/**/*.spec.ts", // ✅ src/ prefix ekledim + "jest.config.ts" + ], + "include": ["src/**/*.ts"] // ✅ Düzeltildi } diff --git a/npm/ng-packs/packages/core/tsconfig.lib.json b/npm/ng-packs/packages/core/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/core/tsconfig.lib.json +++ b/npm/ng-packs/packages/core/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/feature-management/tsconfig.lib.json b/npm/ng-packs/packages/feature-management/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/feature-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/feature-management/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/identity/tsconfig.lib.json b/npm/ng-packs/packages/identity/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/identity/tsconfig.lib.json +++ b/npm/ng-packs/packages/identity/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/oauth/tsconfig.lib.json b/npm/ng-packs/packages/oauth/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/oauth/tsconfig.lib.json +++ b/npm/ng-packs/packages/oauth/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/permission-management/tsconfig.lib.json b/npm/ng-packs/packages/permission-management/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/permission-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/permission-management/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/setting-management/tsconfig.lib.json b/npm/ng-packs/packages/setting-management/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json index 22d2695db8..dcb1f459cb 100644 --- a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json @@ -8,7 +8,8 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false + "useDefineForClassFields": false, + "moduleResolution": "bundler" }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] From 1ffe86af1a3bcc1d8a91c0e41dc3eebd8bcfe1de Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Fri, 12 Dec 2025 10:57:16 +0300 Subject: [PATCH 06/13] update --- .../lib/directives/ngx-datatable-default.directive.ts | 4 ++-- npm/ng-packs/tsconfig.base.json | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-default.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-default.directive.ts index b4c0d419c3..951de1a6f2 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-default.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-default.directive.ts @@ -8,7 +8,7 @@ import { inject, PLATFORM_ID, } from '@angular/core'; -import { ColumnMode, DatatableComponent, ScrollerComponent } from '@swimlane/ngx-datatable'; +import { ColumnMode, DatatableComponent } from '@swimlane/ngx-datatable'; import { fromEvent, Subscription } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; @@ -41,7 +41,7 @@ export class NgxDatatableDefaultDirective implements AfterViewInit, OnDestroy { this.table.virtualization = false; } - private fixHorizontalGap(scroller: ScrollerComponent) { + private fixHorizontalGap(scroller: any) { const { body, documentElement } = this.document; if (isPlatformBrowser(this.platformId)) { if (documentElement.scrollHeight !== documentElement.clientHeight) { diff --git a/npm/ng-packs/tsconfig.base.json b/npm/ng-packs/tsconfig.base.json index f863f18520..1718cde898 100644 --- a/npm/ng-packs/tsconfig.base.json +++ b/npm/ng-packs/tsconfig.base.json @@ -47,7 +47,14 @@ "@abp/ng.theme.basic/testing": ["packages/theme-basic/testing/src/public-api.ts"], "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"], "@abp/ng.theme.shared/testing": ["packages/theme-shared/testing/src/public-api.ts"], - "@abp/nx.generators": ["packages/generators/src/index.ts"] + "@abp/nx.generators": ["packages/generators/src/index.ts"], + "@angular/*": ["node_modules/@angular/*"], + "ng-zorro-antd/core/no-animation": [ + "node_modules/ng-zorro-antd/core/no-animation" + ], + "ng-zorro-antd/*": [ + "node_modules/ng-zorro-antd/*" + ] } }, "exclude": ["node_modules", "tmp"] From fe3ae60c03849687470616bdcdf47a0034ac7216 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 15 Dec 2025 15:04:10 +0300 Subject: [PATCH 07/13] refactoring --- npm/ng-packs/packages/components/tsconfig.lib.json | 13 ++++--------- .../packages/components/tsconfig.lib.prod.json | 3 ++- npm/ng-packs/packages/core/tsconfig.lib.prod.json | 3 ++- npm/ng-packs/tsconfig.base.json | 4 ---- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/npm/ng-packs/packages/components/tsconfig.lib.json b/npm/ng-packs/packages/components/tsconfig.lib.json index c0bf976510..18989f0ef4 100644 --- a/npm/ng-packs/packages/components/tsconfig.lib.json +++ b/npm/ng-packs/packages/components/tsconfig.lib.json @@ -6,20 +6,15 @@ "declarationMap": true, "inlineSources": true, "types": [], - - // Tutarlı ES2022 "target": "ES2022", - "module": "ES2022", - "lib": ["ES2022", "dom"], // ✅ Düzeltildi - - // Angular için + "lib": ["ES2020", "dom"], "moduleResolution": "bundler", - "useDefineForClassFields": false, + "useDefineForClassFields": false }, "exclude": [ "src/test-setup.ts", - "src/**/*.spec.ts", // ✅ src/ prefix ekledim + "src/**/*.spec.ts", "jest.config.ts" ], - "include": ["src/**/*.ts"] // ✅ Düzeltildi + "include": ["src/**/*.ts"] } diff --git a/npm/ng-packs/packages/components/tsconfig.lib.prod.json b/npm/ng-packs/packages/components/tsconfig.lib.prod.json index 0e06848ce5..8bfa43c12b 100644 --- a/npm/ng-packs/packages/components/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/components/tsconfig.lib.prod.json @@ -3,7 +3,8 @@ "compilerOptions": { "declarationMap": false, "target": "ES2022", - "useDefineForClassFields": false + "useDefineForClassFields": false, + "skipLibCheck": true }, "angularCompilerOptions": { "compilationMode": "partial" diff --git a/npm/ng-packs/packages/core/tsconfig.lib.prod.json b/npm/ng-packs/packages/core/tsconfig.lib.prod.json index 0e06848ce5..8bfa43c12b 100644 --- a/npm/ng-packs/packages/core/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/core/tsconfig.lib.prod.json @@ -3,7 +3,8 @@ "compilerOptions": { "declarationMap": false, "target": "ES2022", - "useDefineForClassFields": false + "useDefineForClassFields": false, + "skipLibCheck": true }, "angularCompilerOptions": { "compilationMode": "partial" diff --git a/npm/ng-packs/tsconfig.base.json b/npm/ng-packs/tsconfig.base.json index 1718cde898..2be2509399 100644 --- a/npm/ng-packs/tsconfig.base.json +++ b/npm/ng-packs/tsconfig.base.json @@ -48,12 +48,8 @@ "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"], "@abp/ng.theme.shared/testing": ["packages/theme-shared/testing/src/public-api.ts"], "@abp/nx.generators": ["packages/generators/src/index.ts"], - "@angular/*": ["node_modules/@angular/*"], "ng-zorro-antd/core/no-animation": [ "node_modules/ng-zorro-antd/core/no-animation" - ], - "ng-zorro-antd/*": [ - "node_modules/ng-zorro-antd/*" ] } }, From 0b141d38d80593af48313b759f8314a813e28181 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 15 Dec 2025 16:00:38 +0300 Subject: [PATCH 08/13] refactoring --- npm/ng-packs/packages/account-core/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/account/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/components/tsconfig.lib.json | 1 - npm/ng-packs/packages/core/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/feature-management/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/generators/tsconfig.json | 3 ++- npm/ng-packs/packages/identity/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/oauth/tsconfig.lib.json | 3 +-- .../packages/permission-management/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/setting-management/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/tenant-management/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/theme-basic/tsconfig.lib.json | 3 +-- npm/ng-packs/packages/theme-shared/tsconfig.lib.json | 3 +-- npm/ng-packs/tsconfig.base.json | 6 +++--- 14 files changed, 16 insertions(+), 27 deletions(-) diff --git a/npm/ng-packs/packages/account-core/tsconfig.lib.json b/npm/ng-packs/packages/account-core/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/account-core/tsconfig.lib.json +++ b/npm/ng-packs/packages/account-core/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/account/tsconfig.lib.json b/npm/ng-packs/packages/account/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/account/tsconfig.lib.json +++ b/npm/ng-packs/packages/account/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/components/tsconfig.lib.json b/npm/ng-packs/packages/components/tsconfig.lib.json index 18989f0ef4..7dde5f04bf 100644 --- a/npm/ng-packs/packages/components/tsconfig.lib.json +++ b/npm/ng-packs/packages/components/tsconfig.lib.json @@ -8,7 +8,6 @@ "types": [], "target": "ES2022", "lib": ["ES2020", "dom"], - "moduleResolution": "bundler", "useDefineForClassFields": false }, "exclude": [ diff --git a/npm/ng-packs/packages/core/tsconfig.lib.json b/npm/ng-packs/packages/core/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/core/tsconfig.lib.json +++ b/npm/ng-packs/packages/core/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/feature-management/tsconfig.lib.json b/npm/ng-packs/packages/feature-management/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/feature-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/feature-management/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/generators/tsconfig.json b/npm/ng-packs/packages/generators/tsconfig.json index f765bc1b6a..8d1999ff05 100644 --- a/npm/ng-packs/packages/generators/tsconfig.json +++ b/npm/ng-packs/packages/generators/tsconfig.json @@ -2,7 +2,8 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "module": "commonjs", - "skipLibCheck": true + "skipLibCheck": true, + "moduleResolution": "node" }, "files": [], "include": [], diff --git a/npm/ng-packs/packages/identity/tsconfig.lib.json b/npm/ng-packs/packages/identity/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/identity/tsconfig.lib.json +++ b/npm/ng-packs/packages/identity/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/oauth/tsconfig.lib.json b/npm/ng-packs/packages/oauth/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/oauth/tsconfig.lib.json +++ b/npm/ng-packs/packages/oauth/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/permission-management/tsconfig.lib.json b/npm/ng-packs/packages/permission-management/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/permission-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/permission-management/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/setting-management/tsconfig.lib.json b/npm/ng-packs/packages/setting-management/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json index dcb1f459cb..22d2695db8 100644 --- a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json @@ -8,8 +8,7 @@ "inlineSources": true, "types": [], "lib": ["dom", "es2020"], - "useDefineForClassFields": false, - "moduleResolution": "bundler" + "useDefineForClassFields": false }, "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "include": ["**/*.ts"] diff --git a/npm/ng-packs/tsconfig.base.json b/npm/ng-packs/tsconfig.base.json index 2be2509399..810e0867eb 100644 --- a/npm/ng-packs/tsconfig.base.json +++ b/npm/ng-packs/tsconfig.base.json @@ -4,12 +4,12 @@ "strict": false, "sourceMap": true, "declaration": false, - "moduleResolution": "node", + "moduleResolution": "bundler", "emitDecoratorMetadata": true, "experimentalDecorators": true, "importHelpers": true, - "target": "es2020", - "module": "esnext", + "target": "ES2022", + "module": "ES2022", "lib": ["es2020", "dom"], "esModuleInterop": true, "baseUrl": "./", From 8b7a7b7d1a8043a8aa57ad40a41a728c47185a04 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 18 Dec 2025 14:00:18 +0300 Subject: [PATCH 09/13] ng-bootstrap version update --- npm/ng-packs/package.json | 2 +- npm/ng-packs/packages/account-core/tsconfig.lib.json | 2 +- npm/ng-packs/packages/account/tsconfig.lib.json | 2 +- npm/ng-packs/packages/components/tsconfig.lib.json | 2 +- npm/ng-packs/packages/core/tsconfig.lib.json | 2 +- npm/ng-packs/packages/feature-management/tsconfig.lib.json | 2 +- npm/ng-packs/packages/identity/tsconfig.lib.json | 2 +- npm/ng-packs/packages/oauth/tsconfig.lib.json | 2 +- npm/ng-packs/packages/permission-management/tsconfig.lib.json | 2 +- npm/ng-packs/packages/setting-management/tsconfig.lib.json | 2 +- npm/ng-packs/packages/tenant-management/tsconfig.lib.json | 2 +- npm/ng-packs/packages/theme-basic/tsconfig.lib.json | 2 +- npm/ng-packs/packages/theme-shared/package.json | 2 +- npm/ng-packs/packages/theme-shared/tsconfig.lib.json | 2 +- npm/ng-packs/tsconfig.base.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index d73864827d..80b1ea7f33 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -71,7 +71,7 @@ "@angular/router": "~21.0.0", "@angular/ssr": "~21.0.0", "@fortawesome/fontawesome-free": "^6.0.0", - "@ng-bootstrap/ng-bootstrap": "~19.0.0", + "@ng-bootstrap/ng-bootstrap": "~20.0.0", "@ngneat/spectator": "~19.6.2", "@ngx-validate/core": "^0.2.0", "@nx/angular": "~22.2.0", diff --git a/npm/ng-packs/packages/account-core/tsconfig.lib.json b/npm/ng-packs/packages/account-core/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/account-core/tsconfig.lib.json +++ b/npm/ng-packs/packages/account-core/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/account/tsconfig.lib.json b/npm/ng-packs/packages/account/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/account/tsconfig.lib.json +++ b/npm/ng-packs/packages/account/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/components/tsconfig.lib.json b/npm/ng-packs/packages/components/tsconfig.lib.json index 7dde5f04bf..9a376f87aa 100644 --- a/npm/ng-packs/packages/components/tsconfig.lib.json +++ b/npm/ng-packs/packages/components/tsconfig.lib.json @@ -6,7 +6,7 @@ "declarationMap": true, "inlineSources": true, "types": [], - "target": "ES2022", + "target": "ES2020", "lib": ["ES2020", "dom"], "useDefineForClassFields": false }, diff --git a/npm/ng-packs/packages/core/tsconfig.lib.json b/npm/ng-packs/packages/core/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/core/tsconfig.lib.json +++ b/npm/ng-packs/packages/core/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/feature-management/tsconfig.lib.json b/npm/ng-packs/packages/feature-management/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/feature-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/feature-management/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/identity/tsconfig.lib.json b/npm/ng-packs/packages/identity/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/identity/tsconfig.lib.json +++ b/npm/ng-packs/packages/identity/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/oauth/tsconfig.lib.json b/npm/ng-packs/packages/oauth/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/oauth/tsconfig.lib.json +++ b/npm/ng-packs/packages/oauth/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/permission-management/tsconfig.lib.json b/npm/ng-packs/packages/permission-management/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/permission-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/permission-management/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/setting-management/tsconfig.lib.json b/npm/ng-packs/packages/setting-management/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 53407ce647..8f4fe7888a 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": "~10.0.1", "@fortawesome/fontawesome-free": "^6.0.0", - "@ng-bootstrap/ng-bootstrap": "~19.0.0", + "@ng-bootstrap/ng-bootstrap": "~20.0.0", "@ngx-validate/core": "^0.2.0", "@popperjs/core": "~2.11.0", "@swimlane/ngx-datatable": "~22.0.0", diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json index 22d2695db8..6cbd6a5942 100644 --- a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2022", + "target": "ES2020", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/tsconfig.base.json b/npm/ng-packs/tsconfig.base.json index 810e0867eb..6469f5cae6 100644 --- a/npm/ng-packs/tsconfig.base.json +++ b/npm/ng-packs/tsconfig.base.json @@ -8,7 +8,7 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, "importHelpers": true, - "target": "ES2022", + "target": "ES2020", "module": "ES2022", "lib": ["es2020", "dom"], "esModuleInterop": true, From de848eb9bde2d319838a40646625e19920e8f57e Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 18 Dec 2025 14:10:16 +0300 Subject: [PATCH 10/13] ng-bootstrap version update --- templates/app-nolayers/angular/package.json | 2 +- templates/app-nolayers/angular/tsconfig.json | 4 ++-- templates/app/angular/tsconfig.json | 4 ++-- templates/module/angular/package.json | 2 +- templates/module/angular/tsconfig.prod.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 8178491e71..6c7e4488b0 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.9.3" + "typescript": "~5.9.0" } } diff --git a/templates/app-nolayers/angular/tsconfig.json b/templates/app-nolayers/angular/tsconfig.json index 79efe96be9..37722d9bf1 100644 --- a/templates/app-nolayers/angular/tsconfig.json +++ b/templates/app-nolayers/angular/tsconfig.json @@ -9,8 +9,8 @@ "experimentalDecorators": true, "moduleResolution": "bundler", "importHelpers": true, - "target": "ES2022", - "module": "esnext", + "target": "ES2020", + "module": "ES2022", "skipLibCheck": true, "esModuleInterop": true, "paths": { diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index 79efe96be9..37722d9bf1 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -9,8 +9,8 @@ "experimentalDecorators": true, "moduleResolution": "bundler", "importHelpers": true, - "target": "ES2022", - "module": "esnext", + "target": "ES2020", + "module": "ES2022", "skipLibCheck": true, "esModuleInterop": true, "paths": { diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 08efc9c651..6e66db9a0d 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -59,6 +59,6 @@ "karma-jasmine-html-reporter": "^1.7.0", "ng-packagr": "~21.0.0", "symlink": "^2.0.0", - "typescript": "~5.9.3" + "typescript": "~5.9.0" } } diff --git a/templates/module/angular/tsconfig.prod.json b/templates/module/angular/tsconfig.prod.json index 28b0a75f51..097ee37e41 100644 --- a/templates/module/angular/tsconfig.prod.json +++ b/templates/module/angular/tsconfig.prod.json @@ -7,10 +7,10 @@ "declaration": false, "downlevelIteration": true, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "es2020", - "module": "esnext", + "module": "ES2022", "esModuleInterop": true, "lib": [ "es2020", From 787def12f19799316a9dd58c1ffd79c0c81d2b00 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 18 Dec 2025 14:35:08 +0300 Subject: [PATCH 11/13] update --- npm/ng-packs/packages/account-core/tsconfig.lib.json | 2 +- npm/ng-packs/packages/account/tsconfig.lib.json | 2 +- npm/ng-packs/packages/components/tsconfig.lib.json | 2 +- npm/ng-packs/packages/core/tsconfig.lib.json | 2 +- npm/ng-packs/packages/feature-management/tsconfig.lib.json | 2 +- npm/ng-packs/packages/identity/tsconfig.lib.json | 2 +- npm/ng-packs/packages/oauth/tsconfig.lib.json | 2 +- npm/ng-packs/packages/permission-management/tsconfig.lib.json | 2 +- npm/ng-packs/packages/setting-management/tsconfig.lib.json | 2 +- npm/ng-packs/packages/tenant-management/tsconfig.lib.json | 2 +- npm/ng-packs/packages/theme-basic/tsconfig.lib.json | 2 +- npm/ng-packs/packages/theme-shared/tsconfig.lib.json | 2 +- templates/app-nolayers/angular/tsconfig.json | 2 +- templates/app/angular/tsconfig.json | 2 +- templates/module/angular/tsconfig.prod.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/npm/ng-packs/packages/account-core/tsconfig.lib.json b/npm/ng-packs/packages/account-core/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/account-core/tsconfig.lib.json +++ b/npm/ng-packs/packages/account-core/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/account/tsconfig.lib.json b/npm/ng-packs/packages/account/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/account/tsconfig.lib.json +++ b/npm/ng-packs/packages/account/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/components/tsconfig.lib.json b/npm/ng-packs/packages/components/tsconfig.lib.json index 9a376f87aa..7dde5f04bf 100644 --- a/npm/ng-packs/packages/components/tsconfig.lib.json +++ b/npm/ng-packs/packages/components/tsconfig.lib.json @@ -6,7 +6,7 @@ "declarationMap": true, "inlineSources": true, "types": [], - "target": "ES2020", + "target": "ES2022", "lib": ["ES2020", "dom"], "useDefineForClassFields": false }, diff --git a/npm/ng-packs/packages/core/tsconfig.lib.json b/npm/ng-packs/packages/core/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/core/tsconfig.lib.json +++ b/npm/ng-packs/packages/core/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/feature-management/tsconfig.lib.json b/npm/ng-packs/packages/feature-management/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/feature-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/feature-management/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/identity/tsconfig.lib.json b/npm/ng-packs/packages/identity/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/identity/tsconfig.lib.json +++ b/npm/ng-packs/packages/identity/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/oauth/tsconfig.lib.json b/npm/ng-packs/packages/oauth/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/oauth/tsconfig.lib.json +++ b/npm/ng-packs/packages/oauth/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/permission-management/tsconfig.lib.json b/npm/ng-packs/packages/permission-management/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/permission-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/permission-management/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/setting-management/tsconfig.lib.json b/npm/ng-packs/packages/setting-management/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json index 6cbd6a5942..22d2695db8 100644 --- a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "target": "ES2020", + "target": "ES2022", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/templates/app-nolayers/angular/tsconfig.json b/templates/app-nolayers/angular/tsconfig.json index 37722d9bf1..9a18adaf46 100644 --- a/templates/app-nolayers/angular/tsconfig.json +++ b/templates/app-nolayers/angular/tsconfig.json @@ -9,7 +9,7 @@ "experimentalDecorators": true, "moduleResolution": "bundler", "importHelpers": true, - "target": "ES2020", + "target": "ES2022", "module": "ES2022", "skipLibCheck": true, "esModuleInterop": true, diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index 37722d9bf1..9a18adaf46 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -9,7 +9,7 @@ "experimentalDecorators": true, "moduleResolution": "bundler", "importHelpers": true, - "target": "ES2020", + "target": "ES2022", "module": "ES2022", "skipLibCheck": true, "esModuleInterop": true, diff --git a/templates/module/angular/tsconfig.prod.json b/templates/module/angular/tsconfig.prod.json index 097ee37e41..2f4afb8ff7 100644 --- a/templates/module/angular/tsconfig.prod.json +++ b/templates/module/angular/tsconfig.prod.json @@ -9,7 +9,7 @@ "experimentalDecorators": true, "moduleResolution": "bundler", "importHelpers": true, - "target": "es2020", + "target": "es2022", "module": "ES2022", "esModuleInterop": true, "lib": [ From 4d506f9f868638fe1347d6caa7527c0e2b18b1af Mon Sep 17 00:00:00 2001 From: sumeyye Date: Fri, 26 Dec 2025 13:11:02 +0300 Subject: [PATCH 12/13] fix: tree import because of the depdency update --- .../components/tree/src/lib/components/tree.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts index 316200704b..5c320a539b 100644 --- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts +++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts @@ -29,7 +29,7 @@ import { DISABLE_TREE_STYLE_LOADING_TOKEN } from '../disable-tree-style-loading. import { TreeNodeTemplateDirective } from '../templates/tree-node-template.directive'; import { ExpandedIconTemplateDirective } from '../templates/expanded-icon-template.directive'; import { NgTemplateOutlet } from '@angular/common'; -import { NzNoAnimationDirective } from 'ng-zorro-antd/core/no-animation'; +import { NzNoAnimationDirective } from 'ng-zorro-antd/core/animation'; export type DropEvent = NzFormatEmitEvent & { pos: number }; From 69f8b199ff90a9ae40ef4b4b8edbfd57768d890a Mon Sep 17 00:00:00 2001 From: sumeyye Date: Fri, 26 Dec 2025 13:11:39 +0300 Subject: [PATCH 13/13] update: normalization for some packages --- templates/app-nolayers/angular/package.json | 2 +- templates/app/angular/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 6c7e4488b0..6a8c89da4e 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -43,7 +43,7 @@ "@angular-eslint/schematics": "~21.0.0", "@angular-eslint/template-parser": "~21.0.0", "@angular/build": "~21.0.0", - "@angular/cli": "~21.0.3", + "@angular/cli": "~21.0.0", "@angular/compiler-cli": "~21.0.0", "@angular/language-service": "~21.0.0", "@types/jasmine": "~3.6.0", diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 44677ccbb0..57e5e6d457 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -43,7 +43,7 @@ "@angular-eslint/schematics": "~21.0.0", "@angular-eslint/template-parser": "~21.0.0", "@angular/build": "~21.0.0", - "@angular/cli": "~21.0.3", + "@angular/cli": "~21.0.0", "@angular/compiler-cli": "~21.0.0", "@angular/language-service": "~21.0.0", "@types/jasmine": "~3.6.0",