Merge pull request #23363 from abpframework/issue-23242

feat : Update Angular templates to Angular 20 new build system
6 months ago · 556bd6c321
24 changed files with 50 additions and 58 deletions
--- a/npm/ng-packs/apps/dev-app/project.json
+++ b/npm/ng-packs/apps/dev-app/project.json
@ -6,13 +6,13 @@
  "prefix": "app",
  "targets": {
    "build": {
-      "executor": "@angular-devkit/build-angular:browser",
+      "executor": "@angular-devkit/build-angular:application",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/apps/dev-app",
        "index": "apps/dev-app/src/index.html",
-        "main": "apps/dev-app/src/main.ts",
-        "polyfills": "apps/dev-app/src/polyfills.ts",
+        "browser": "apps/dev-app/src/main.ts",
+        "polyfills": ["apps/dev-app/src/polyfills.ts"],
        "tsConfig": "apps/dev-app/tsconfig.app.json",
        "inlineStyleLanguage": "scss",
        "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
@ -141,12 +141,9 @@
          "outputHashing": "all"
        },
        "development": {
-          "buildOptimizer": false,
          "optimization": false,
-          "vendorChunk": true,
          "extractLicenses": false,
-          "sourceMap": true,
-          "namedChunks": true
+          "sourceMap": true
        }
      },
      "defaultConfiguration": "production"
--- a/npm/ng-packs/packages/account-core/tsconfig.lib.json
+++ b/npm/ng-packs/packages/account-core/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/account/tsconfig.lib.json
+++ b/npm/ng-packs/packages/account/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/components/tsconfig.lib.json
+++ b/npm/ng-packs/packages/components/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/core/tsconfig.lib.json
+++ b/npm/ng-packs/packages/core/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/feature-management/tsconfig.lib.json
+++ b/npm/ng-packs/packages/feature-management/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/identity/tsconfig.lib.json
+++ b/npm/ng-packs/packages/identity/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/oauth/tsconfig.lib.json
+++ b/npm/ng-packs/packages/oauth/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/permission-management/tsconfig.lib.json
+++ b/npm/ng-packs/packages/permission-management/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/libraryName@kebab/tsconfig.lib.json.template
+++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/libraryName@kebab/tsconfig.lib.json.template
@ -10,7 +10,7 @@
    "types": [],
    "lib": [
      "dom",
-      "es2018"
+      "es2020"
    ]
  },
  "exclude": [
--- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/libraryName@kebab/tsconfig.lib.json.template
+++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/libraryName@kebab/tsconfig.lib.json.template
@ -10,7 +10,7 @@
    "types": [],
    "lib": [
      "dom",
-      "es2018"
+      "es2020"
    ]
  },
  "exclude": [
--- a/npm/ng-packs/packages/schematics/tsconfig.json
+++ b/npm/ng-packs/packages/schematics/tsconfig.json
@ -1,7 +1,7 @@
 {
  "compilerOptions": {
    "baseUrl": "tsconfig",
-    "lib": ["es2019", "dom"],
+    "lib": ["es2020", "dom"],
    "declaration": true,
    "module": "commonjs",
    "moduleResolution": "node",
--- a/npm/ng-packs/packages/setting-management/tsconfig.lib.json
+++ b/npm/ng-packs/packages/setting-management/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json
+++ b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json
+++ b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json
+++ b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json
@ -7,7 +7,7 @@
    "declarationMap": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"],
+    "lib": ["dom", "es2020"],
    "useDefineForClassFields": false
  },
  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
--- a/npm/ng-packs/source-code-requirements/tsconfig.lib.json
+++ b/npm/ng-packs/source-code-requirements/tsconfig.lib.json
@ -6,7 +6,7 @@
    "declaration": true,
    "inlineSources": true,
    "types": [],
-    "lib": ["dom", "es2018"]
+    "lib": ["dom", "es2020"]
  },
  "angularCompilerOptions": {
    "enableIvy": true,
--- a/npm/ng-packs/tsconfig.base.json
+++ b/npm/ng-packs/tsconfig.base.json
@ -10,7 +10,8 @@
    "importHelpers": true,
    "target": "es2020",
    "module": "esnext",
-    "lib": ["es2017", "dom"],
+    "lib": ["es2020", "dom"],
+    "esModuleInterop": true,
    "baseUrl": "./",
    "allowSyntheticDefaultImports": true,
    "paths": {
--- a/templates/app-nolayers/angular/angular.json
+++ b/templates/app-nolayers/angular/angular.json
@ -19,12 +19,12 @@
      "prefix": "app",
      "architect": {
        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
          "options": {
            "outputPath": "dist/MyProjectName",
            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "browser": "src/main.ts",
+            "polyfills": ["src/polyfills.ts"],
            "tsConfig": "tsconfig.app.json",
            "inlineStyleLanguage": "scss",
            "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
@ -137,12 +137,9 @@
              "outputHashing": "all"
            },
            "development": {
-              "buildOptimizer": false,
              "optimization": false,
-              "vendorChunk": true,
              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
+              "sourceMap": true
            }
          },
          "defaultConfiguration": "production"
@ -168,8 +165,8 @@
        "test": {
          "builder": "@angular-devkit/build-angular:karma",
          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "browser": "src/test.ts",
+            "polyfills": ["src/polyfills.ts"],
            "tsConfig": "tsconfig.spec.json",
            "karmaConfig": "karma.conf.js",
            "inlineStyleLanguage": "scss",
--- a/templates/app-nolayers/angular/tsconfig.json
+++ b/templates/app-nolayers/angular/tsconfig.json
@ -11,10 +11,11 @@
    "moduleResolution": "bundler",
    "importHelpers": true,
    "target": "ES2022",
-    "module": "es2020",
+    "module": "esnext",
    "skipLibCheck": true,
+    "esModuleInterop": true,
    "lib": [
-      "es2018",
+      "es2020",
      "dom"
    ],
    "paths": {
--- a/templates/app/angular/angular.json
+++ b/templates/app/angular/angular.json
@ -19,12 +19,12 @@
      "prefix": "app",
      "architect": {
        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
          "options": {
            "outputPath": "dist/MyProjectName",
            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "browser": "src/main.ts",
+            "polyfills": ["src/polyfills.ts"],
            "tsConfig": "tsconfig.app.json",
            "inlineStyleLanguage": "scss",
            "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
@ -137,12 +137,9 @@
              "outputHashing": "all"
            },
            "development": {
-              "buildOptimizer": false,
              "optimization": false,
-              "vendorChunk": true,
              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
+              "sourceMap": true
            }
          },
          "defaultConfiguration": "production"
@ -168,8 +165,8 @@
        "test": {
          "builder": "@angular-devkit/build-angular:karma",
          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "browser": "src/test.ts",
+            "polyfills": ["src/polyfills.ts"],
            "tsConfig": "tsconfig.spec.json",
            "karmaConfig": "karma.conf.js",
            "inlineStyleLanguage": "scss",
--- a/templates/app/angular/tsconfig.json
+++ b/templates/app/angular/tsconfig.json
@ -11,10 +11,11 @@
    "moduleResolution": "bundler",
    "importHelpers": true,
    "target": "ES2022",
-    "module": "es2020",
+    "module": "esnext",
    "skipLibCheck": true,
+    "esModuleInterop": true,
    "lib": [
-      "es2018",
+      "es2020",
      "dom"
    ],
    "paths": {
--- a/templates/module/angular/angular.json
+++ b/templates/module/angular/angular.json
@ -58,12 +58,12 @@
      "prefix": "app",
      "architect": {
        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
          "options": {
            "outputPath": "dist/dev-app",
            "index": "projects/dev-app/src/index.html",
-            "main": "projects/dev-app/src/main.ts",
-            "polyfills": "projects/dev-app/src/polyfills.ts",
+            "browser": "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"],
@ -131,12 +131,9 @@
              "outputHashing": "all"
            },
            "development": {
-              "buildOptimizer": false,
              "optimization": false,
-              "vendorChunk": true,
              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
+              "sourceMap": true
            }
          },
          "defaultConfiguration": "production"
@ -162,8 +159,8 @@
        "test": {
          "builder": "@angular-devkit/build-angular:karma",
          "options": {
-            "main": "projects/dev-app/src/test.ts",
-            "polyfills": "projects/dev-app/src/polyfills.ts",
+            "browser": "projects/dev-app/src/test.ts",
+            "polyfills": ["projects/dev-app/src/polyfills.ts"],
            "tsConfig": "projects/dev-app/tsconfig.spec.json",
            "karmaConfig": "projects/dev-app/karma.conf.js",
            "inlineStyleLanguage": "scss",
--- a/templates/module/angular/tsconfig.prod.json
+++ b/templates/module/angular/tsconfig.prod.json
@ -9,10 +9,11 @@
    "experimentalDecorators": true,
    "moduleResolution": "node",
    "importHelpers": true,
-    "target": "es2017",
-    "module": "es2020",
+    "target": "es2020",
+    "module": "esnext",
+    "esModuleInterop": true,
    "lib": [
-      "es2018",
+      "es2020",
      "dom"
    ],
  },