From d82a2b13f15d52d35cdfb1506093cf11a5edcc0e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 26 Apr 2021 10:29:05 -0700 Subject: [PATCH 01/13] Upgrade to angular 11 --- .../Angular-CSharp/ClientApp/.browserslistrc | 17 +++ .../Angular-CSharp/ClientApp/.editorconfig | 3 + .../Angular-CSharp/ClientApp/.eslintrc.json | 51 +++++++ .../Angular-CSharp/ClientApp/angular.json | 33 +++-- .../Angular-CSharp/ClientApp/karma.conf.js | 44 ++++++ .../Angular-CSharp/ClientApp/package.json | 70 +++++----- .../app/fetch-data/fetch-data.component.ts | 2 +- .../Angular-CSharp/ClientApp/src/tslint.json | 17 --- .../ClientApp/tsconfig.app.json | 15 ++ .../ClientApp/tsconfig.spec.json | 18 +++ .../Angular-CSharp/ClientApp/tslint.json | 130 ------------------ 11 files changed, 209 insertions(+), 191 deletions(-) create mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.browserslistrc create mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.eslintrc.json create mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/karma.conf.js delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tslint.json create mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.app.json create mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.spec.json delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tslint.json diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.browserslistrc b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.browserslistrc new file mode 100644 index 000000000000..427441dc9308 --- /dev/null +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.browserslistrc @@ -0,0 +1,17 @@ +# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries + +# For the full list of supported browsers by the Angular framework, please see: +# https://angular.io/guide/browser-support + +# You can see what browsers were selected by your queries by running: +# npx browserslist + +last 1 Chrome version +last 1 Firefox version +last 2 Edge major versions +last 2 Safari major versions +last 2 iOS major versions +Firefox ESR +not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line. diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.editorconfig b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.editorconfig index 934f2fe8420e..5fc7188ff1b4 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.editorconfig +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.editorconfig @@ -8,6 +8,9 @@ indent_size = 2 insert_final_newline = true trim_trailing_whitespace = true +[*.ts] +quote_type = single + [*.md] max_line_length = off trim_trailing_whitespace = false diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.eslintrc.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.eslintrc.json new file mode 100644 index 000000000000..1e4624e68ae6 --- /dev/null +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.eslintrc.json @@ -0,0 +1,51 @@ +{ + "root": true, + "ignorePatterns": [ + "projects/**/*" + ], + "overrides": [ + { + "files": [ + "*.ts" + ], + "parserOptions": { + "project": [ + "tsconfig.json", + "e2e/tsconfig.json" + ], + "createDefaultProgram": true + }, + "extends": [ + "plugin:@angular-eslint/recommended", + "plugin:@angular-eslint/template/process-inline-templates" + ], + "rules": { + "@angular-eslint/component-selector": [ + "error", + { + "prefix": "app", + "style": "kebab-case", + "type": "element" + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + "prefix": "app", + "style": "camelCase", + "type": "attribute" + } + ] + } + }, + { + "files": [ + "*.html" + ], + "extends": [ + "plugin:@angular-eslint/template/recommended" + ], + "rules": {} + } + ] +} diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json index 3359b389ea77..168c53edc310 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json @@ -20,7 +20,9 @@ "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.app.json", - "assets": ["src/assets"], + "assets": [ + "src/assets" + ], "styles": [ "node_modules/bootstrap/dist/css/bootstrap.min.css", "src/styles.css" @@ -72,16 +74,22 @@ "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", - "styles": ["src/styles.css"], + "styles": [ + "src/styles.css" + ], "scripts": [], - "assets": ["src/assets"] + "assets": [ + "src/assets" + ] } }, "lint": { - "builder": "@angular-devkit/build-angular:tslint", + "builder": "@angular-eslint/builder:lint", "options": { - "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"], - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "src/**/*.ts", + "src/**/*.html" + ] } }, "server": { @@ -124,14 +132,19 @@ } }, "lint": { - "builder": "@angular-devkit/build-angular:tslint", + "builder": "@angular-eslint/builder:lint", "options": { - "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": ["**/node_modules/**"] + "lintFilePatterns": [ + "e2e//**/*.ts", + "e2e//**/*.html" + ] } } } } }, - "defaultProject": "Company.WebApplication1" + "defaultProject": "Company.WebApplication1", + "cli": { + "defaultCollection": "@angular-eslint/schematics" + } } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/karma.conf.js b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/karma.conf.js new file mode 100644 index 000000000000..95d59d9caa3b --- /dev/null +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/karma.conf.js @@ -0,0 +1,44 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + jasmine: { + // you can add configuration options for Jasmine here + // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html + // for example, you can disable the random execution with `random: false` + // or set a specific seed with `seed: 4321` + }, + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + jasmineHtmlReporter: { + suppressAll: true // removes the duplicated traces + }, + coverageReporter: { + dir: require('path').join(__dirname, './coverage/angularapp'), + subdir: '.', + reporters: [ + { type: 'html' }, + { type: 'text-summary' } + ] + }, + reporters: ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false, + restartOnFileChange: true + }); +}; diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json index f93f90cc0fb3..f747f8d0c618 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json @@ -12,56 +12,60 @@ "start": "ng serve --port 5002", //#endif "build": "ng build", - "build:ssr": "ng run Company.WebApplication1:server:dev", + "build:ssr": "ng run Company.Webapplication1:server:dev", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" }, "private": true, "dependencies": { - "@angular/animations": "8.2.14", - "@angular/common": "8.2.14", - "@angular/compiler": "8.2.14", - "@angular/core": "8.2.14", - "@angular/forms": "8.2.14", - "@angular/platform-browser": "8.2.14", - "@angular/platform-browser-dynamic": "8.2.14", - "@angular/platform-server": "8.2.14", - "@angular/router": "8.2.14", - "@nguniversal/module-map-ngfactory-loader": "8.1.1", + "@angular/animations": "~11.2.11", + "@angular/common": "~11.2.11", + "@angular/compiler": "~11.2.11", + "@angular/core": "~11.2.11", + "@angular/forms": "~11.2.11", + "@angular/platform-browser": "~11.2.11", + "@angular/platform-browser-dynamic": "~11.2.11", + "@angular/platform-server": "~11.2.11", + "@angular/router": "~11.2.11", + "@nguniversal/module-map-ngfactory-loader": "^8.2.6", "bootstrap": "^4.6.0", - "core-js": "^3.8.3", "jquery": "^3.5.1", "oidc-client": "^1.11.3", "popper.js": "^1.16.0", "run-script-os": "^1.1.6", - "rxjs": "^6.6.3", - "zone.js": "0.9.1" + "rxjs": "~6.6.0", + "tslib": "^2.0.0", + "zone.js": "~0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.803.29", - "@angular/cli": "^8.3.29", - "@angular/compiler-cli": "^8.2.14", - "@angular/language-service": "^8.2.14", - "@types/jasmine": "~3.4.4", + "@angular-devkit/build-angular": "~0.1102.10", + "@angular-eslint/builder": "4.0.0", + "@angular-eslint/eslint-plugin": "4.0.0", + "@angular-eslint/eslint-plugin-template": "4.0.0", + "@angular-eslint/schematics": "4.0.0", + "@angular-eslint/template-parser": "4.0.0", + "@angular/cli": "~11.2.10", + "@angular/compiler-cli": "~11.2.11", + "@types/jasmine": "^3.6.10", "@types/jasminewd2": "~2.0.8", - "@types/node": "~12.11.6", - "codelyzer": "^5.2.2", + "@types/node": "^12.11.1", + "@typescript-eslint/eslint-plugin": "4.16.1", + "@typescript-eslint/parser": "4.16.1", + "eslint": "^7.6.0", "ini": "^1.3.7", - "jasmine-core": "~3.5.0", - "jasmine-spec-reporter": "~4.2.1", - "karma": "^5.2.3", + "jasmine-core": "~3.6.0", + "jasmine-spec-reporter": "~5.0.0", + "karma": "~6.1.0", "karma-chrome-launcher": "~3.1.0", + "karma-coverage": "~2.0.3", "karma-coverage-istanbul-reporter": "~2.1.0", - "karma-jasmine": "~2.0.1", - "karma-jasmine-html-reporter": "^1.5.4", + "karma-jasmine": "~4.0.0", + "karma-jasmine-html-reporter": "^1.5.0", "karma-spec-reporter": "0.0.32", - "typescript": "3.5.3" - }, - "optionalDependencies": { - "node-sass": "^5.0.0", - "protractor": "~5.4.2", + "protractor": "~7.0.0", "ts-node": "~8.4.1", - "tslint": "~5.20.0" - } + "typescript": "~4.1.5" + }, + "optionalDependencies": {} } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.ts index 9b81e1beb482..a5b147774e04 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.ts @@ -6,7 +6,7 @@ import { HttpClient } from '@angular/common/http'; templateUrl: './fetch-data.component.html' }) export class FetchDataComponent { - public forecasts: WeatherForecast[]; + public forecasts: WeatherForecast[] = []; constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { http.get(baseUrl + 'weatherforecast').subscribe(result => { diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tslint.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tslint.json deleted file mode 100644 index 52e2c1a5a74c..000000000000 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tslint.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../tslint.json", - "rules": { - "directive-selector": [ - true, - "attribute", - "app", - "camelCase" - ], - "component-selector": [ - true, - "element", - "app", - "kebab-case" - ] - } -} diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.app.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.app.json new file mode 100644 index 000000000000..82d91dc4a4de --- /dev/null +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.app.json @@ -0,0 +1,15 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "files": [ + "src/main.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.d.ts" + ] +} diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.spec.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.spec.json new file mode 100644 index 000000000000..092345b02e80 --- /dev/null +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.spec.json @@ -0,0 +1,18 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/spec", + "types": [ + "jasmine" + ] + }, + "files": [ + "src/test.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] +} diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tslint.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tslint.json deleted file mode 100644 index f5f06e9e8e85..000000000000 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tslint.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "rulesDirectory": [ - "node_modules/codelyzer" - ], - "rules": { - "arrow-return-shorthand": true, - "callable-types": true, - "class-name": true, - "comment-format": [ - true, - "check-space" - ], - "curly": true, - "deprecation": { - "severity": "warn" - }, - "eofline": true, - "forin": true, - "import-blacklist": [ - true, - "rxjs/Rx" - ], - "import-spacing": true, - "indent": [ - true, - "spaces" - ], - "interface-over-type-literal": true, - "label-position": true, - "max-line-length": [ - true, - 140 - ], - "member-access": false, - "member-ordering": [ - true, - { - "order": [ - "static-field", - "instance-field", - "static-method", - "instance-method" - ] - } - ], - "no-arg": true, - "no-bitwise": true, - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-construct": true, - "no-debugger": true, - "no-duplicate-super": true, - "no-empty": false, - "no-empty-interface": true, - "no-eval": true, - "no-inferrable-types": [ - true, - "ignore-params" - ], - "no-misused-new": true, - "no-non-null-assertion": true, - "no-shadowed-variable": true, - "no-string-literal": false, - "no-string-throw": true, - "no-switch-case-fall-through": true, - "no-trailing-whitespace": true, - "no-unnecessary-initializer": true, - "no-unused-expression": true, - "no-use-before-declare": true, - "no-var-keyword": true, - "object-literal-sort-keys": false, - "one-line": [ - true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" - ], - "prefer-const": true, - "quotemark": [ - true, - "single" - ], - "radix": true, - "semicolon": [ - true, - "always" - ], - "triple-equals": [ - true, - "allow-null-check" - ], - "typedef-whitespace": [ - true, - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - } - ], - "unified-signatures": true, - "variable-name": false, - "whitespace": [ - true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ], - "no-output-on-prefix": true, - "no-inputs-metadata-property": true, - "no-outputs-metadata-property": true, - "no-host-metadata-property": true, - "no-input-rename": true, - "no-output-rename": true, - "use-lifecycle-interface": true, - "use-pipe-transform-interface": true, - "component-class-suffix": true, - "directive-class-suffix": true - } -} From 0fba977f90c554d8582f40502e433af937ab0e36 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 26 Apr 2021 10:53:14 -0700 Subject: [PATCH 02/13] Fix casing --- .../content/Angular-CSharp/ClientApp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json index f747f8d0c618..842ef409b66d 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json @@ -12,7 +12,7 @@ "start": "ng serve --port 5002", //#endif "build": "ng build", - "build:ssr": "ng run Company.Webapplication1:server:dev", + "build:ssr": "ng run Company.WebApplication1:server:dev", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" From 59d5017c534a86d3cb0bdaf481d19aadab041f60 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 26 Apr 2021 15:56:21 -0700 Subject: [PATCH 03/13] Fix lint warning --- .../src/api-authorization/login-menu/login-menu.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.html b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.html index 30fa656b36d7..7bab54e73707 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.html +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.html @@ -6,7 +6,7 @@ Logout -
    +
    • Register
      • From 462fae217c5d700a4ec3b3504057cb7a801b0e9d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 26 Apr 2021 18:42:20 -0700 Subject: [PATCH 04/13] Update angular template test baseline files --- src/ProjectTemplates/test/template-baselines.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index cae276951c67..896cc30d3fe4 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -1189,16 +1189,20 @@ "ClientApp/src/tsconfig.server.json", "ClientApp/src/tsconfig.spec.json", "ClientApp/src/tslint.json", + "ClientApp/.browserslistrc", "ClientApp/.editorconfig", + "ClientApp/.eslintrc.json", "ClientApp/.gitignore", "ClientApp/angular.json", "ClientApp/aspnetcore-https.js", + "ClientApp/karma.conf.js", "ClientApp/package-lock.json", "ClientApp/package.json", "ClientApp/proxy.conf.js", "ClientApp/README.md", "ClientApp/tsconfig.json", - "ClientApp/tslint.json", + "ClientApp/tsconfig.app.json", + "ClientApp/tsconfig.spec.json", "WeatherForecast.cs", "Controllers/WeatherForecastController.cs", "Pages/_ViewImports.cshtml", From 0275a7ffdd544606233b0593edd5288816db26b1 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 27 Apr 2021 09:25:50 -0700 Subject: [PATCH 05/13] Update template-baselines.json --- src/ProjectTemplates/test/template-baselines.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index 896cc30d3fe4..79dcf7ae21d9 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -1188,7 +1188,6 @@ "ClientApp/src/tsconfig.app.json", "ClientApp/src/tsconfig.server.json", "ClientApp/src/tsconfig.spec.json", - "ClientApp/src/tslint.json", "ClientApp/.browserslistrc", "ClientApp/.editorconfig", "ClientApp/.eslintrc.json", From b68bfcb5d137755345c4ef88824f35bf4c113aba Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 27 Apr 2021 10:04:08 -0700 Subject: [PATCH 06/13] Fix e2e --- .../ClientApp/e2e/protractor.conf.js | 27 ++++++++++++------- .../e2e/{tsconfig.e2e.json => tsconfig.json} | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) rename src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/{tsconfig.e2e.json => tsconfig.json} (88%) diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/protractor.conf.js b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/protractor.conf.js index d60eff064c43..3c07988707c6 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/protractor.conf.js +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/protractor.conf.js @@ -1,28 +1,35 @@ // Protractor configuration file, see link for more information // https://github.com/angular/protractor/blob/master/lib/config.ts -const { SpecReporter } = require("jasmine-spec-reporter"); +const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter'); +/** + * @type { import("protractor").Config } + */ exports.config = { allScriptsTimeout: 11000, - specs: ["./src/**/*.e2e-spec.ts"], + specs: [ + './src/**/*.e2e-spec.ts' + ], capabilities: { - browserName: "chrome" + browserName: 'chrome' }, directConnect: true, - baseUrl: "http://localhost:4200/", - framework: "jasmine", + baseUrl: 'http://localhost:4200/', + framework: 'jasmine', jasmineNodeOpts: { showColors: true, defaultTimeoutInterval: 30000, print: function() {} }, onPrepare() { - require("ts-node").register({ - project: require("path").join(__dirname, "./tsconfig.e2e.json") + require('ts-node').register({ + project: require('path').join(__dirname, './tsconfig.json') }); - jasmine - .getEnv() - .addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); + jasmine.getEnv().addReporter(new SpecReporter({ + spec: { + displayStacktrace: StacktraceOption.PRETTY + } + })); } }; diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/tsconfig.e2e.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/tsconfig.json similarity index 88% rename from src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/tsconfig.e2e.json rename to src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/tsconfig.json index a6dd62202824..db33721a1918 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/tsconfig.e2e.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/e2e/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "outDir": "../out-tsc/app", "module": "commonjs", - "target": "es5", + "target": "es2018", "types": [ "jasmine", "jasminewd2", From 9ac7d1324cfba2d4c44c6c6a6a65e83243193a15 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 27 Apr 2021 10:04:38 -0700 Subject: [PATCH 07/13] Update template-baselines.json --- src/ProjectTemplates/test/template-baselines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index 79dcf7ae21d9..7e696035e305 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -1160,7 +1160,7 @@ "ClientApp/e2e/src/app.e2e-spec.ts", "ClientApp/e2e/src/app.po.ts", "ClientApp/e2e/protractor.conf.js", - "ClientApp/e2e/tsconfig.e2e.json", + "ClientApp/e2e/tsconfig.json", "ClientApp/src/app/counter/counter.component.html", "ClientApp/src/app/counter/counter.component.spec.ts", "ClientApp/src/app/counter/counter.component.ts", From 6d806be2ac116b1c715d6c964c41dbaefafd76b3 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 27 Apr 2021 16:10:21 -0700 Subject: [PATCH 08/13] Remove depricated extractCss --- .../content/Angular-CSharp/ClientApp/angular.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json index 168c53edc310..88f266611b70 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json @@ -14,7 +14,6 @@ "builder": "@angular-devkit/build-angular:browser", "options": { "progress": false, - "extractCss": true, "outputPath": "dist", "index": "src/index.html", "main": "src/main.ts", From 0e23ae21bbe16b7d50b8b5a7796a68f700e449d7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 28 Apr 2021 09:12:26 -0700 Subject: [PATCH 09/13] Update login-menu.component.html --- .../src/api-authorization/login-menu/login-menu.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.html b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.html index 7bab54e73707..27f88793989e 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.html +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.html @@ -6,7 +6,7 @@ Logout
    -
      +
      • Register
        • From 1c6875fa1ea450994073f225f446980fcf243475 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 28 Apr 2021 10:51:02 -0700 Subject: [PATCH 10/13] Delete browserslist --- .../content/Angular-CSharp/ClientApp/browserslist | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/browserslist diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/browserslist b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/browserslist deleted file mode 100644 index 8e09ab492e26..000000000000 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/browserslist +++ /dev/null @@ -1,9 +0,0 @@ -# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers -# For additional information regarding the format and rule options, please see: -# https://github.com/browserslist/browserslist#queries -# For IE 9-11 support, please uncomment the last line of the file and adjust as needed -> 0.5% -last 2 versions -Firefox ESR -not dead -# IE 9-11 \ No newline at end of file From c43e0e2747915ce0d4f1b3ad1e57eff2091ba4ef Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 28 Apr 2021 10:52:15 -0700 Subject: [PATCH 11/13] Remove browserlist --- src/ProjectTemplates/test/template-baselines.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index 7e696035e305..65fbf3366152 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -1178,7 +1178,6 @@ "ClientApp/src/assets/.gitkeep", "ClientApp/src/environments/environment.prod.ts", "ClientApp/src/environments/environment.ts", - "ClientApp/browserslist", "ClientApp/src/index.html", "ClientApp/src/karma.conf.js", "ClientApp/src/main.ts", From 48cf0f99fddce2527a24ec5533ecd1384adb0674 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 May 2021 11:26:57 -0700 Subject: [PATCH 12/13] Apply fixes --- .../Angular-CSharp/ClientApp/angular.json | 8 ++--- .../authorize.interceptor.ts | 2 +- .../api-authorization/authorize.service.ts | 30 ++++++++--------- .../login-menu/login-menu.component.ts | 4 +-- .../login/login.component.ts | 2 +- .../logout/logout.component.ts | 2 +- .../ClientApp/src/karma.conf.js | 32 ------------------- .../Angular-CSharp/ClientApp/src/test.ts | 2 +- .../ClientApp/src/tsconfig.app.json | 11 ------- .../ClientApp/src/tsconfig.server.json | 9 ------ .../ClientApp/src/tsconfig.spec.json | 18 ----------- .../Angular-CSharp/ClientApp/tsconfig.json | 18 +++++++++-- .../ClientApp/tsconfig.spec.json | 3 +- 13 files changed, 42 insertions(+), 99 deletions(-) delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/karma.conf.js delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.app.json delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.server.json delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.spec.json diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json index 88f266611b70..53b1ab9be205 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json @@ -18,7 +18,7 @@ "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.app.json", + "tsConfig": "tsconfig.app.json", "assets": [ "src/assets" ], @@ -71,8 +71,8 @@ "options": { "main": "src/test.ts", "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.spec.json", - "karmaConfig": "src/karma.conf.js", + "tsConfig": "tsconfig.spec.json", + "karmaConfig": "karma.conf.js", "styles": [ "src/styles.css" ], @@ -96,7 +96,7 @@ "options": { "outputPath": "dist-server", "main": "src/main.ts", - "tsConfig": "src/tsconfig.server.json" + "tsConfig": "tsconfig.server.json" }, "configurations": { "dev": { diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.interceptor.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.interceptor.ts index dd4e1d65cca6..6e23db7b25b7 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.interceptor.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.interceptor.ts @@ -18,7 +18,7 @@ export class AuthorizeInterceptor implements HttpInterceptor { // Checks if there is an access_token available in the authorize service // and adds it to the request in case it's targeted at the same origin as the // single page application. - private processRequestWithToken(token: string, req: HttpRequest, next: HttpHandler) { + private processRequestWithToken(token: string | null, req: HttpRequest, next: HttpHandler) { if (!!token && this.isSameOriginUrl(req)) { req = req.clone({ setHeaders: { diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.service.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.service.ts index c1791c3b3525..34256e552961 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.service.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.service.ts @@ -41,8 +41,8 @@ export class AuthorizeService { // If you want to enable pop up authentication simply set this flag to false. private popUpDisabled = true; - private userManager: UserManager; - private userSubject: BehaviorSubject = new BehaviorSubject(null); + private userManager?: UserManager; + private userSubject: BehaviorSubject = new BehaviorSubject(null); public isAuthenticated(): Observable { return this.getUser().pipe(map(u => !!u)); @@ -55,9 +55,9 @@ export class AuthorizeService { this.userSubject.asObservable()); } - public getAccessToken(): Observable { + public getAccessToken(): Observable { return from(this.ensureUserManagerInitialized()) - .pipe(mergeMap(() => from(this.userManager.getUser())), + .pipe(mergeMap(() => from(this.userManager!.getUser())), map(user => user && user.access_token)); } @@ -71,9 +71,9 @@ export class AuthorizeService { // redirect flow. public async signIn(state: any): Promise { await this.ensureUserManagerInitialized(); - let user: User = null; + let user: User | null = null; try { - user = await this.userManager.signinSilent(this.createArguments()); + user = await this.userManager!.signinSilent(this.createArguments()); this.userSubject.next(user.profile); return this.success(state); } catch (silentError) { @@ -84,7 +84,7 @@ export class AuthorizeService { if (this.popUpDisabled) { throw new Error('Popup disabled. Change \'authorize.service.ts:AuthorizeService.popupDisabled\' to false to enable it.'); } - user = await this.userManager.signinPopup(this.createArguments()); + user = await this.userManager!.signinPopup(this.createArguments()); this.userSubject.next(user.profile); return this.success(state); } catch (popupError) { @@ -97,7 +97,7 @@ export class AuthorizeService { // PopUps might be blocked by the user, fallback to redirect try { - await this.userManager.signinRedirect(this.createArguments(state)); + await this.userManager!.signinRedirect(this.createArguments(state)); return this.redirect(); } catch (redirectError) { console.log('Redirect authentication error: ', redirectError); @@ -110,7 +110,7 @@ export class AuthorizeService { public async completeSignIn(url: string): Promise { try { await this.ensureUserManagerInitialized(); - const user = await this.userManager.signinCallback(url); + const user = await this.userManager!.signinCallback(url); this.userSubject.next(user && user.profile); return this.success(user && user.state); } catch (error) { @@ -126,13 +126,13 @@ export class AuthorizeService { } await this.ensureUserManagerInitialized(); - await this.userManager.signoutPopup(this.createArguments()); + await this.userManager!.signoutPopup(this.createArguments()); this.userSubject.next(null); return this.success(state); } catch (popupSignOutError) { console.log('Popup signout error: ', popupSignOutError); try { - await this.userManager.signoutRedirect(this.createArguments(state)); + await this.userManager!.signoutRedirect(this.createArguments(state)); return this.redirect(); } catch (redirectSignOutError) { console.log('Redirect signout error: ', redirectSignOutError); @@ -144,7 +144,7 @@ export class AuthorizeService { public async completeSignOut(url: string): Promise { await this.ensureUserManagerInitialized(); try { - const response = await this.userManager.signoutCallback(url); + const response = await this.userManager!.signoutCallback(url); this.userSubject.next(null); return this.success(response && response.state); } catch (error) { @@ -185,15 +185,15 @@ export class AuthorizeService { this.userManager = new UserManager(settings); this.userManager.events.addUserSignedOut(async () => { - await this.userManager.removeUser(); + await this.userManager!.removeUser(); this.userSubject.next(null); }); } - private getUserFromStorage(): Observable { + private getUserFromStorage(): Observable { return from(this.ensureUserManagerInitialized()) .pipe( - mergeMap(() => this.userManager.getUser()), + mergeMap(() => this.userManager!.getUser()), map(u => u && u.profile)); } } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.ts index 5853edff2442..946a5294d313 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login-menu/login-menu.component.ts @@ -9,8 +9,8 @@ import { map } from 'rxjs/operators'; styleUrls: ['./login-menu.component.css'] }) export class LoginMenuComponent implements OnInit { - public isAuthenticated: Observable; - public userName: Observable; + public isAuthenticated?: Observable; + public userName?: Observable; constructor(private authorizeService: AuthorizeService) { } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login/login.component.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login/login.component.ts index 02c55dc90a1a..3d520708f5b2 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login/login.component.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/login/login.component.ts @@ -14,7 +14,7 @@ import { LoginActions, QueryParameterNames, ApplicationPaths, ReturnUrlType } fr styleUrls: ['./login.component.css'] }) export class LoginComponent implements OnInit { - public message = new BehaviorSubject(null); + public message = new BehaviorSubject(null); constructor( private authorizeService: AuthorizeService, diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/logout/logout.component.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/logout/logout.component.ts index e99e88d19569..61455c8fc3e3 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/logout/logout.component.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/logout/logout.component.ts @@ -14,7 +14,7 @@ import { LogoutActions, ApplicationPaths, ReturnUrlType } from '../api-authoriza styleUrls: ['./logout.component.css'] }) export class LogoutComponent implements OnInit { - public message = new BehaviorSubject(null); + public message = new BehaviorSubject(null); constructor( private authorizeService: AuthorizeService, diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/karma.conf.js b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/karma.conf.js deleted file mode 100644 index 0643ba82a303..000000000000 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/karma.conf.js +++ /dev/null @@ -1,32 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-spec-reporter'), - require('karma-coverage-istanbul-reporter'), - require('@angular-devkit/build-angular/plugins/karma') - ], - client: { - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - coverageIstanbulReporter: { - dir: require('path').join(__dirname, '../coverage'), - reports: ['html', 'lcovonly'], - fixWebpackSourcePaths: true - }, - reporters: ['progress', 'kjhtml', 'spec'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false - }); -}; diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/test.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/test.ts index 88492582fb73..16317897b1c5 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/test.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/test.ts @@ -7,7 +7,7 @@ import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -declare const require; +declare const require: any; // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.app.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.app.json deleted file mode 100644 index 8ea061ea1b88..000000000000 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.app.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "types": [] - }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] -} diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.server.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.server.json deleted file mode 100644 index 3f183ef32f4f..000000000000 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "module": "commonjs" - }, - "angularCompilerOptions": { - "entryModule": "app/app.server.module#AppServerModule" - } -} diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.spec.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.spec.json deleted file mode 100644 index de7733630eb2..000000000000 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/tsconfig.spec.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/spec", - "types": [ - "jasmine", - "node" - ] - }, - "files": [ - "test.ts", - "polyfills.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] -} diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.json index b93cbfce94b6..45b04663fd7d 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.json @@ -4,18 +4,30 @@ "baseUrl": "./", "module": "esnext", "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, "sourceMap": true, "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, + "downlevelIteration": true, "experimentalDecorators": true, + "moduleResolution": "node", + "importHelpers": true, "target": "es2015", "typeRoots": [ "node_modules/@types" ], + "module": "es2020", "lib": [ - "es2017", + "es2018", "dom" ] + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true } } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.spec.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.spec.json index 092345b02e80..1762d06378d1 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.spec.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/tsconfig.spec.json @@ -4,7 +4,8 @@ "compilerOptions": { "outDir": "./out-tsc/spec", "types": [ - "jasmine" + "jasmine", + "node" ] }, "files": [ From 5784047efdd2b98a152d08f2a2ce04b5121ee9bd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 May 2021 14:45:50 -0700 Subject: [PATCH 13/13] Update template-baselines.json --- src/ProjectTemplates/test/template-baselines.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index 65fbf3366152..10ffc4747f83 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -1179,14 +1179,10 @@ "ClientApp/src/environments/environment.prod.ts", "ClientApp/src/environments/environment.ts", "ClientApp/src/index.html", - "ClientApp/src/karma.conf.js", "ClientApp/src/main.ts", "ClientApp/src/polyfills.ts", "ClientApp/src/styles.css", "ClientApp/src/test.ts", - "ClientApp/src/tsconfig.app.json", - "ClientApp/src/tsconfig.server.json", - "ClientApp/src/tsconfig.spec.json", "ClientApp/.browserslistrc", "ClientApp/.editorconfig", "ClientApp/.eslintrc.json",