tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #23363 from abpframework/issue-23242 

feat : Update Angular templates to Angular 20 new build system
pull/23459/head
Yağmur Çelik 1 year ago
committed by GitHub
parent
b00fae0767 3b808f3b00
commit
556bd6c321
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
24 changed files with 50 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      npm/ng-packs/apps/dev-app/project.json
  2. 2
      npm/ng-packs/packages/account-core/tsconfig.lib.json
  3. 2
      npm/ng-packs/packages/account/tsconfig.lib.json
  4. 2
      npm/ng-packs/packages/components/tsconfig.lib.json
  5. 2
      npm/ng-packs/packages/core/tsconfig.lib.json
  6. 2
      npm/ng-packs/packages/feature-management/tsconfig.lib.json
  7. 2
      npm/ng-packs/packages/identity/tsconfig.lib.json
  8. 2
      npm/ng-packs/packages/oauth/tsconfig.lib.json
  9. 2
      npm/ng-packs/packages/permission-management/tsconfig.lib.json
  10. 2
      npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.lib.json.template
  11. 2
      npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template
  12. 2
      npm/ng-packs/packages/schematics/tsconfig.json
  13. 2
      npm/ng-packs/packages/setting-management/tsconfig.lib.json
  14. 2
      npm/ng-packs/packages/tenant-management/tsconfig.lib.json
  15. 2
      npm/ng-packs/packages/theme-basic/tsconfig.lib.json
  16. 2
      npm/ng-packs/packages/theme-shared/tsconfig.lib.json
  17. 2
      npm/ng-packs/source-code-requirements/tsconfig.lib.json
  18. 3
      npm/ng-packs/tsconfig.base.json
  19. 15
      templates/app-nolayers/angular/angular.json
  20. 5
      templates/app-nolayers/angular/tsconfig.json
  21. 15
      templates/app/angular/angular.json
  22. 5
      templates/app/angular/tsconfig.json
  23. 15
      templates/module/angular/angular.json
  24. 7
      templates/module/angular/tsconfig.prod.json

11
npm/ng-packs/apps/dev-app/project.json
View File

@ -6,13 +6,13 @@
"prefix": "app", "prefix": "app",
"targets": { "targets": {
"build": { "build": {
"executor": "@angular-devkit/build-angular:browser", "executor": "@angular-devkit/build-angular:application",
"outputs": ["{options.outputPath}"], "outputs": ["{options.outputPath}"],
"options": { "options": {
"outputPath": "dist/apps/dev-app", "outputPath": "dist/apps/dev-app",
"index": "apps/dev-app/src/index.html", "index": "apps/dev-app/src/index.html",
"main": "apps/dev-app/src/main.ts", "browser": "apps/dev-app/src/main.ts",
"polyfills": "apps/dev-app/src/polyfills.ts", "polyfills": ["apps/dev-app/src/polyfills.ts"],
"tsConfig": "apps/dev-app/tsconfig.app.json", "tsConfig": "apps/dev-app/tsconfig.app.json",
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",
"allowedCommonJsDependencies": ["chart.js", "js-sha256"], "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
@ -141,12 +141,9 @@
"outputHashing": "all" "outputHashing": "all"
}, },
"development": { "development": {
"buildOptimizer": false,
"optimization": false, "optimization": false,
"vendorChunk": true,
"extractLicenses": false, "extractLicenses": false,
"sourceMap": true, "sourceMap": true
"namedChunks": true
} }
}, },
"defaultConfiguration": "production" "defaultConfiguration": "production"

2
npm/ng-packs/packages/account-core/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/account/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/components/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/core/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/feature-management/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/identity/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/oauth/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/permission-management/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.lib.json.template
View File

@ -10,7 +10,7 @@
"types": [], "types": [],
"lib": [ "lib": [
"dom", "dom",
"es2018" "es2020"
] ]
}, },
"exclude": [ "exclude": [

2
npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template
View File

@ -10,7 +10,7 @@
"types": [], "types": [],
"lib": [ "lib": [
"dom", "dom",
"es2018" "es2020"
] ]
}, },
"exclude": [ "exclude": [

2
npm/ng-packs/packages/schematics/tsconfig.json
View File

@ -1,7 +1,7 @@
{ {
"compilerOptions": { "compilerOptions": {
"baseUrl": "tsconfig", "baseUrl": "tsconfig",
"lib": ["es2019", "dom"], "lib": ["es2020", "dom"],
"declaration": true, "declaration": true,
"module": "commonjs", "module": "commonjs",
"moduleResolution": "node", "moduleResolution": "node",

2
npm/ng-packs/packages/setting-management/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/tenant-management/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/theme-basic/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/packages/theme-shared/tsconfig.lib.json
View File

@ -7,7 +7,7 @@
"declarationMap": true, "declarationMap": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"], "lib": ["dom", "es2020"],
"useDefineForClassFields": false "useDefineForClassFields": false
}, },
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"], "exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],

2
npm/ng-packs/source-code-requirements/tsconfig.lib.json
View File

@ -6,7 +6,7 @@
"declaration": true, "declaration": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],
"lib": ["dom", "es2018"] "lib": ["dom", "es2020"]
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"enableIvy": true, "enableIvy": true,

3
npm/ng-packs/tsconfig.base.json
View File

@ -10,7 +10,8 @@
"importHelpers": true, "importHelpers": true,
"target": "es2020", "target": "es2020",
"module": "esnext", "module": "esnext",
"lib": ["es2017", "dom"], "lib": ["es2020", "dom"],
"esModuleInterop": true,
"baseUrl": "./", "baseUrl": "./",
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"paths": { "paths": {

15
templates/app-nolayers/angular/angular.json
View File

@ -19,12 +19,12 @@
"prefix": "app", "prefix": "app",
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:application",
"options": { "options": {
"outputPath": "dist/MyProjectName", "outputPath": "dist/MyProjectName",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "browser": "src/main.ts",
"polyfills": "src/polyfills.ts", "polyfills": ["src/polyfills.ts"],
"tsConfig": "tsconfig.app.json", "tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",
"allowedCommonJsDependencies": ["chart.js", "js-sha256"], "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
@ -137,12 +137,9 @@
"outputHashing": "all" "outputHashing": "all"
}, },
"development": { "development": {
"buildOptimizer": false,
"optimization": false, "optimization": false,
"vendorChunk": true,
"extractLicenses": false, "extractLicenses": false,
"sourceMap": true, "sourceMap": true
"namedChunks": true
} }
}, },
"defaultConfiguration": "production" "defaultConfiguration": "production"
@ -168,8 +165,8 @@
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular-devkit/build-angular:karma",
"options": { "options": {
"main": "src/test.ts", "browser": "src/test.ts",
"polyfills": "src/polyfills.ts", "polyfills": ["src/polyfills.ts"],
"tsConfig": "tsconfig.spec.json", "tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js", "karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",

5
templates/app-nolayers/angular/tsconfig.json
View File

@ -11,10 +11,11 @@
"moduleResolution": "bundler", "moduleResolution": "bundler",
"importHelpers": true, "importHelpers": true,
"target": "ES2022", "target": "ES2022",
"module": "es2020", "module": "esnext",
"skipLibCheck": true, "skipLibCheck": true,
"esModuleInterop": true,
"lib": [ "lib": [
"es2018", "es2020",
"dom" "dom"
], ],
"paths": { "paths": {

15
templates/app/angular/angular.json
View File

@ -19,12 +19,12 @@
"prefix": "app", "prefix": "app",
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:application",
"options": { "options": {
"outputPath": "dist/MyProjectName", "outputPath": "dist/MyProjectName",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "browser": "src/main.ts",
"polyfills": "src/polyfills.ts", "polyfills": ["src/polyfills.ts"],
"tsConfig": "tsconfig.app.json", "tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",
"allowedCommonJsDependencies": ["chart.js", "js-sha256"], "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
@ -137,12 +137,9 @@
"outputHashing": "all" "outputHashing": "all"
}, },
"development": { "development": {
"buildOptimizer": false,
"optimization": false, "optimization": false,
"vendorChunk": true,
"extractLicenses": false, "extractLicenses": false,
"sourceMap": true, "sourceMap": true
"namedChunks": true
} }
}, },
"defaultConfiguration": "production" "defaultConfiguration": "production"
@ -168,8 +165,8 @@
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular-devkit/build-angular:karma",
"options": { "options": {
"main": "src/test.ts", "browser": "src/test.ts",
"polyfills": "src/polyfills.ts", "polyfills": ["src/polyfills.ts"],
"tsConfig": "tsconfig.spec.json", "tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js", "karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",

5
templates/app/angular/tsconfig.json
View File

@ -11,10 +11,11 @@
"moduleResolution": "bundler", "moduleResolution": "bundler",
"importHelpers": true, "importHelpers": true,
"target": "ES2022", "target": "ES2022",
"module": "es2020", "module": "esnext",
"skipLibCheck": true, "skipLibCheck": true,
"esModuleInterop": true,
"lib": [ "lib": [
"es2018", "es2020",
"dom" "dom"
], ],
"paths": { "paths": {

15
templates/module/angular/angular.json
View File

@ -58,12 +58,12 @@
"prefix": "app", "prefix": "app",
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:application",
"options": { "options": {
"outputPath": "dist/dev-app", "outputPath": "dist/dev-app",
"index": "projects/dev-app/src/index.html", "index": "projects/dev-app/src/index.html",
"main": "projects/dev-app/src/main.ts", "browser": "projects/dev-app/src/main.ts",
"polyfills": "projects/dev-app/src/polyfills.ts", "polyfills": ["projects/dev-app/src/polyfills.ts"],
"tsConfig": "projects/dev-app/tsconfig.app.json", "tsConfig": "projects/dev-app/tsconfig.app.json",
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",
"allowedCommonJsDependencies": ["chart.js", "js-sha256"], "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
@ -131,12 +131,9 @@
"outputHashing": "all" "outputHashing": "all"
}, },
"development": { "development": {
"buildOptimizer": false,
"optimization": false, "optimization": false,
"vendorChunk": true,
"extractLicenses": false, "extractLicenses": false,
"sourceMap": true, "sourceMap": true
"namedChunks": true
} }
}, },
"defaultConfiguration": "production" "defaultConfiguration": "production"
@ -162,8 +159,8 @@
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular-devkit/build-angular:karma",
"options": { "options": {
"main": "projects/dev-app/src/test.ts", "browser": "projects/dev-app/src/test.ts",
"polyfills": "projects/dev-app/src/polyfills.ts", "polyfills": ["projects/dev-app/src/polyfills.ts"],
"tsConfig": "projects/dev-app/tsconfig.spec.json", "tsConfig": "projects/dev-app/tsconfig.spec.json",
"karmaConfig": "projects/dev-app/karma.conf.js", "karmaConfig": "projects/dev-app/karma.conf.js",
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",

7
templates/module/angular/tsconfig.prod.json
View File

@ -9,10 +9,11 @@
"experimentalDecorators": true, "experimentalDecorators": true,
"moduleResolution": "node", "moduleResolution": "node",
"importHelpers": true, "importHelpers": true,
"target": "es2017", "target": "es2020",
"module": "es2020", "module": "esnext",
"esModuleInterop": true,
"lib": [ "lib": [
"es2018", "es2020",
"dom" "dom"
], ],
}, },

Write Preview
Loading…
Cancel
Save