From 6cf03b34dc6051c2a5e960b910c6fdae44dc8215 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 1 Sep 2025 11:38:28 +0300 Subject: [PATCH] templates builders updated to application builder --- templates/app-nolayers/angular/package.json | 6 +----- templates/app-nolayers/angular/tsconfig.json | 1 - templates/module/angular/angular.json | 12 ++++++------ templates/module/angular/package.json | 4 ++-- .../module/angular/projects/dev-app/karma.conf.js | 2 +- .../angular/projects/my-project-name/karma.conf.js | 2 +- templates/module/angular/tsconfig.json | 1 + 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index b73e309176..9791e46fa1 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -8,11 +8,7 @@ "build:prod": "ng build --configuration production", "watch": "ng build --watch --configuration development", "test": "ng test", - "lint": "ng lint", - "dev:ssr": "ng run MyProjectName:serve-ssr", - "serve:ssr": "node dist/MyProjectName/server/main.js", - "build:ssr": "ng build && ng run MyProjectName:server", - "prerender": "ng run MyProjectName:prerender" + "lint": "ng lint" }, "private": true, "dependencies": { diff --git a/templates/app-nolayers/angular/tsconfig.json b/templates/app-nolayers/angular/tsconfig.json index eeb0e33782..0322d97e4d 100644 --- a/templates/app-nolayers/angular/tsconfig.json +++ b/templates/app-nolayers/angular/tsconfig.json @@ -6,7 +6,6 @@ "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, - "downlevelIteration": true, "experimentalDecorators": true, "moduleResolution": "bundler", "importHelpers": true, diff --git a/templates/module/angular/angular.json b/templates/module/angular/angular.json index 02fd552ffe..8c1b576257 100644 --- a/templates/module/angular/angular.json +++ b/templates/module/angular/angular.json @@ -13,7 +13,7 @@ "prefix": "lib", "architect": { "build": { - "builder": "@angular-devkit/build-angular:ng-packagr", + "builder": "@angular/build:ng-packagr", "options": { "project": "projects/my-project-name/ng-package.json" }, @@ -28,7 +28,7 @@ "defaultConfiguration": "production" }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular/build:karma", "options": { "main": "projects/my-project-name/src/test.ts", "tsConfig": "projects/my-project-name/tsconfig.spec.json", @@ -58,7 +58,7 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular-devkit/build-angular:application", + "builder": "@angular/build:application", "options": { "outputPath": "dist/dev-app", "index": "projects/dev-app/src/index.html", @@ -139,7 +139,7 @@ "defaultConfiguration": "production" }, "serve": { - "builder": "@angular-devkit/build-angular:dev-server", + "builder": "@angular/build:dev-server", "configurations": { "production": { "buildTarget": "dev-app:build:production" @@ -151,13 +151,13 @@ "defaultConfiguration": "development" }, "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", + "builder": "@angular/build:extract-i18n", "options": { "buildTarget": "dev-app:build" } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular/build:karma", "options": { "browser": "projects/dev-app/src/test.ts", "polyfills": ["projects/dev-app/src/polyfills.ts"], diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 22211293c8..f085cd9f8b 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -38,12 +38,12 @@ }, "devDependencies": { "@abp/ng.schematics": "~9.3.2", - "@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/build": "^20.2.1", "@angular/cli": "~20.0.0", "@angular/compiler-cli": "~20.0.0", "@angular/language-service": "~20.0.0", @@ -62,4 +62,4 @@ "symlink": "^2.0.0", "typescript": "~5.8.0" } -} +} \ No newline at end of file diff --git a/templates/module/angular/projects/dev-app/karma.conf.js b/templates/module/angular/projects/dev-app/karma.conf.js index d693269c53..eee6000f3a 100644 --- a/templates/module/angular/projects/dev-app/karma.conf.js +++ b/templates/module/angular/projects/dev-app/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') + ], client: { jasmine: { diff --git a/templates/module/angular/projects/my-project-name/karma.conf.js b/templates/module/angular/projects/my-project-name/karma.conf.js index a56984ac5b..4fa9d617e5 100644 --- a/templates/module/angular/projects/my-project-name/karma.conf.js +++ b/templates/module/angular/projects/my-project-name/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') + ], client: { jasmine: { diff --git a/templates/module/angular/tsconfig.json b/templates/module/angular/tsconfig.json index 92d2f24875..0cbe9a9de8 100644 --- a/templates/module/angular/tsconfig.json +++ b/templates/module/angular/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "./tsconfig.prod.json", "compilerOptions": { + "esModuleInterop": true, "skipLibCheck": true, "paths": { "@my-company-name/my-project-name": [