From a467f3511a7b95e0b950a12e4313da584eeda051 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 22 Sep 2020 13:20:25 +0300 Subject: [PATCH] feat: upgrade module template angular version to the latest #5389 --- templates/module/angular/package.json | 36 +++++++++---------- .../projects/dev-app/e2e/tsconfig.json | 2 +- .../projects/dev-app/tsconfig.app.json | 2 +- .../projects/dev-app/tsconfig.spec.json | 2 +- .../my-project-name/tsconfig.spec.json | 2 +- templates/module/angular/tsconfig.base.json | 15 -------- templates/module/angular/tsconfig.json | 34 +++++++----------- 7 files changed, 35 insertions(+), 58 deletions(-) delete mode 100644 templates/module/angular/tsconfig.base.json diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 0de3f194b7..a4240fc61b 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -20,40 +20,40 @@ "@abp/ng.setting-management": "~3.2.0-rc.2", "@abp/ng.tenant-management": "~3.2.0-rc.2", "@abp/ng.theme.basic": "~3.2.0-rc.2", - "@angular/animations": "~10.0.0", - "@angular/common": "~10.0.0", - "@angular/compiler": "~10.0.0", - "@angular/core": "~10.0.0", - "@angular/forms": "~10.0.0", - "@angular/platform-browser": "~10.0.0", - "@angular/platform-browser-dynamic": "~10.0.0", - "@angular/router": "~10.0.0", - "rxjs": "~6.5.4", + "@angular/animations": "~10.1.2", + "@angular/common": "~10.1.2", + "@angular/compiler": "~10.1.2", + "@angular/core": "~10.1.2", + "@angular/forms": "~10.1.2", + "@angular/platform-browser": "~10.1.2", + "@angular/platform-browser-dynamic": "~10.1.2", + "@angular/router": "~10.1.2", + "rxjs": "~6.6.3", "tslib": "^2.0.0", "zone.js": "~0.10.2" }, "devDependencies": { "@abp/ng.schematics": "~3.2.0-rc.2", - "@angular-devkit/build-angular": "~0.1000.0", - "@angular-devkit/build-ng-packagr": "~0.1000.0", - "@angular/cli": "~10.0.0", - "@angular/compiler-cli": "~10.0.0", + "@angular-devkit/build-angular": "~0.1001.2", + "@angular-devkit/build-ng-packagr": "~0.1001.2", + "@angular/cli": "~10.1.2", + "@angular/compiler-cli": "~10.1.2", "@types/jasmine": "~3.5.0", "@types/jasminewd2": "~2.0.3", "@types/node": "^12.11.1", - "codelyzer": "^5.1.2", - "jasmine-core": "~3.5.0", + "codelyzer": "^6.0.0", + "jasmine-core": "~3.6.0", "jasmine-spec-reporter": "~5.0.0", "karma": "~5.0.0", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", - "karma-jasmine": "~3.3.0", + "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.5.0", "ng-packagr": "^10.0.0", "protractor": "~7.0.0", "symlink-manager": "^1.5.0", "ts-node": "~8.3.0", "tslint": "~6.1.0", - "typescript": "~3.9.5" + "typescript": "~4.0.3" } -} +} \ No newline at end of file diff --git a/templates/module/angular/projects/dev-app/e2e/tsconfig.json b/templates/module/angular/projects/dev-app/e2e/tsconfig.json index 746a242801..3d809e80f6 100644 --- a/templates/module/angular/projects/dev-app/e2e/tsconfig.json +++ b/templates/module/angular/projects/dev-app/e2e/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.json", "compilerOptions": { "outDir": "../../../out-tsc/e2e", "module": "commonjs", diff --git a/templates/module/angular/projects/dev-app/tsconfig.app.json b/templates/module/angular/projects/dev-app/tsconfig.app.json index 406dd61a4a..809c09ca71 100644 --- a/templates/module/angular/projects/dev-app/tsconfig.app.json +++ b/templates/module/angular/projects/dev-app/tsconfig.app.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/app", "types": [] diff --git a/templates/module/angular/projects/dev-app/tsconfig.spec.json b/templates/module/angular/projects/dev-app/tsconfig.spec.json index ed5461c09c..a8ce1d396b 100644 --- a/templates/module/angular/projects/dev-app/tsconfig.spec.json +++ b/templates/module/angular/projects/dev-app/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/spec", "types": [ diff --git a/templates/module/angular/projects/my-project-name/tsconfig.spec.json b/templates/module/angular/projects/my-project-name/tsconfig.spec.json index a9ea5ea114..16da33db07 100644 --- a/templates/module/angular/projects/my-project-name/tsconfig.spec.json +++ b/templates/module/angular/projects/my-project-name/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/spec", "types": [ diff --git a/templates/module/angular/tsconfig.base.json b/templates/module/angular/tsconfig.base.json deleted file mode 100644 index 5879bfbc59..0000000000 --- a/templates/module/angular/tsconfig.base.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "./tsconfig.prod.json", - "compilerOptions": { - "paths": { - "@my-company-name/my-project-name": [ - "projects/my-project-name/src/public-api.ts" - ], - "@my-company-name/my-project-name/config": [ - "projects/my-project-name/config/src/public-api.ts" - ], - "@proxy": ["projects/my-project-name/src/lib/proxy/index.ts"], - "@proxy/*": ["projects/my-project-name/src/lib/proxy/*"] - } - } -} diff --git a/templates/module/angular/tsconfig.json b/templates/module/angular/tsconfig.json index 35742b66e3..5879bfbc59 100644 --- a/templates/module/angular/tsconfig.json +++ b/templates/module/angular/tsconfig.json @@ -1,23 +1,15 @@ -/* - This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience. - It is not intended to be used to perform a compilation. - - To learn more about this file see: https://angular.io/config/solution-tsconfig. -*/ { - "files": [], - "references": [ - { - "path": "./projects/my-project-name/tsconfig.lib.json" - }, - { - "path": "./projects/my-project-name/tsconfig.spec.json" - }, - { - "path": "./projects/dev-app/tsconfig.app.json" - }, - { - "path": "./projects/dev-app/tsconfig.spec.json" + "extends": "./tsconfig.prod.json", + "compilerOptions": { + "paths": { + "@my-company-name/my-project-name": [ + "projects/my-project-name/src/public-api.ts" + ], + "@my-company-name/my-project-name/config": [ + "projects/my-project-name/config/src/public-api.ts" + ], + "@proxy": ["projects/my-project-name/src/lib/proxy/index.ts"], + "@proxy/*": ["projects/my-project-name/src/lib/proxy/*"] } - ] -} \ No newline at end of file + } +}