From acce8da7d849707d289b728239bf05e65cd6079a Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 16 Jun 2025 15:02:02 +0300 Subject: [PATCH] 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"