Merge pull request #5567 from abpframework/feat/5389

Upgraded the Angular packages of the templates to the v10.1.2

npm/ng-packs/apps/dev-app/tsconfig.dev.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

npm/ng-packs/apps/dev-app/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": ["node", "jest"]

npm/ng-packs/package.json

@@ -21,7 +21,7 @@
     "ci:test": "ng test --coverage=false --silent",
     "ci:build": "cd scripts && yarn install && yarn build:prod",
     "lerna": "lerna",
-    "compile:ivy": "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules --async false",
+    "compile:ivy": "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules",
     "postinstall": "npm run compile:ivy"
   },
   "devDependencies": {
@@ -37,21 +37,21 @@
     "@abp/ng.theme.shared": "~3.2.0-rc.2",
     "@abp/utils": "^3.2.0-rc.2",
     "@angular-builders/jest": "^10.0.0",
-    "@angular-devkit/build-angular": "~0.1000.6",
-    "@angular-devkit/build-ng-packagr": "~0.1000.6",
+    "@angular-devkit/build-angular": "~0.1001.2",
+    "@angular-devkit/build-ng-packagr": "~0.1001.2",
     "@angular-devkit/schematics-cli": "^0.1001.1",
-    "@angular/animations": "~10.0.10",
-    "@angular/cli": "~10.0.6",
-    "@angular/common": "~10.0.10",
-    "@angular/compiler": "10.0.0",
-    "@angular/compiler-cli": "10.0.0",
-    "@angular/core": "~10.0.10",
-    "@angular/forms": "~10.0.10",
-    "@angular/language-service": "~10.0.10",
-    "@angular/localize": "~10.0.10",
-    "@angular/platform-browser": "~10.0.10",
-    "@angular/platform-browser-dynamic": "~10.0.10",
-    "@angular/router": "~10.0.10",
+    "@angular/animations": "~10.1.2",
+    "@angular/cli": "~10.1.2",
+    "@angular/common": "~10.1.2",
+    "@angular/compiler": "10.1.2",
+    "@angular/compiler-cli": "10.1.2",
+    "@angular/core": "~10.1.2",
+    "@angular/forms": "~10.1.2",
+    "@angular/language-service": "~10.1.2",
+    "@angular/localize": "~10.1.2",
+    "@angular/platform-browser": "~10.1.2",
+    "@angular/platform-browser-dynamic": "~10.1.2",
+    "@angular/router": "~10.1.2",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@ng-bootstrap/ng-bootstrap": "^7.0.0",
     "@ngneat/spectator": "^5.13.0",
@@ -68,7 +68,7 @@
     "angular-oauth2-oidc": "^10.0.3",
     "bootstrap": "^4.5.0",
     "chart.js": "^2.9.3",
-    "codelyzer": "^5.1.2",
+    "codelyzer": "^6.0.0",
     "conventional-changelog-cli": "^2.0.31",
     "cz-conventional-changelog": "3.0.2",
     "font-awesome": "^4.7.0",
@@ -91,18 +91,14 @@
     "symlink-manager": "^1.5.0",
     "ts-node": "~7.0.0",
     "ts-toolbelt": "6.15.4",
-    "tsickle": "^0.38.1",
+    "tsickle": "^0.39.1",
     "tslint": "~6.1.0",
-    "typescript": "~3.9.5",
+    "typescript": "~4.0.3",
     "zone.js": "~0.10.2"
   },
   "dependencies": {
     "tslib": "^2.0.0"
   },
-  "resolutions": {
-    "@angular/compiler": "10.0.0",
-    "@angular/compiler-cli": "10.0.0"
-  },
   "config": {
     "commitizen": {
       "path": "cz-conventional-changelog"

npm/ng-packs/packages/account/src/lib/models/user.ts

@@ -14,7 +14,6 @@ export interface RegisterResponse {
   emailConfirmed: boolean;
   phoneNumber: string;
   phoneNumberConfirmed: boolean;
-  twoFactorEnabled: boolean;
   lockoutEnabled: boolean;
   lockoutEnd: string;
   concurrencyStamp: string;

npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@@ -169,18 +169,6 @@
                 'AbpIdentity::DisplayName:LockoutEnabled' | abpLocalization
               }}</label>
             </div>
-
-            <div class="custom-checkbox custom-control mb-2">
-              <input
-                type="checkbox"
-                id="two-factor-checkbox"
-                class="custom-control-input"
-                formControlName="twoFactorEnabled"
-              />
-              <label class="custom-control-label" for="two-factor-checkbox">{{
-                'AbpIdentity::DisplayName:TwoFactorEnabled' | abpLocalization
-              }}</label>
-            </div>
           </ng-template>
         </li>
 

npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

@@ -101,8 +101,7 @@ export class UsersComponent implements OnInit {
         name: [this.selected.name || '', [Validators.maxLength(64)]],
         surname: [this.selected.surname || '', [Validators.maxLength(64)]],
         phoneNumber: [this.selected.phoneNumber || '', [Validators.maxLength(16)]],
-        lockoutEnabled: [this.selected.lockoutEnabled || (this.selected.id ? false : true)],
-        twoFactorEnabled: [this.selected.twoFactorEnabled || (this.selected.id ? false : true)],
+        lockoutEnabled: [this.selected.id ? this.selected.lockoutEnabled : true],
         roleNames: this.fb.array(
           this.roles.map(role =>
             this.fb.group({

npm/ng-packs/packages/identity/src/lib/proxy/identity/models.ts

@@ -41,7 +41,6 @@ export interface IdentityUserCreateOrUpdateDtoBase extends ExtensibleObject {
   surname: string;
   email: string;
   phoneNumber: string;
-  twoFactorEnabled: boolean;
   lockoutEnabled: boolean;
   roleNames: string[];
 }
@@ -55,7 +54,6 @@ export interface IdentityUserDto extends ExtensibleFullAuditedEntityDto<string>
   emailConfirmed: boolean;
   phoneNumber: string;
   phoneNumberConfirmed: boolean;
-  twoFactorEnabled: boolean;
   lockoutEnabled: boolean;
   lockoutEnd?: string;
   concurrencyStamp: string;

npm/ng-packs/tsconfig.base.json

@@ -1,41 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2015",
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["es2018", "dom"],
-    "types": ["jest"],
-    "paths": {
-      "@abp/ng.core": ["packages/core/src/public-api.ts"],
-      "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"],
-      "@abp/ng.theme.shared/extensions": ["packages/theme-shared/extensions/src/public-api.ts"],
-      "@abp/ng.components/tree": ["packages/components/tree/src/public-api.ts"],
-      "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"],
-      "@abp/ng.account": ["packages/account/src/public-api.ts"],
-      "@abp/ng.account/config": ["packages/account/config/src/public-api.ts"],
-      "@abp/ng.identity": ["packages/identity/src/public-api.ts"],
-      "@abp/ng.identity/config": ["packages/identity/config/src/public-api.ts"],
-      "@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],
-      "@abp/ng.tenant-management/config": ["packages/tenant-management/config/src/public-api.ts"],
-      "@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"],
-      "@abp/ng.setting-management/config": ["packages/setting-management/config/src/public-api.ts"],
-      "@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"],
-      "@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"],
-      "@proxy": ["apps/dev-app/src/app/proxy/index.ts"],
-      "@proxy/*": ["apps/dev-app/src/app/proxy/*"]
-    }
-  },
-  "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
-  }
-}

npm/ng-packs/tsconfig.json

@@ -1,41 +1,41 @@
-/*
-  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": "./packages/core/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/theme-shared/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/theme-basic/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/account/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/permission-management/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/identity/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/feature-management/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/tenant-management/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/setting-management/tsconfig.lib.json"
-    },
-    {
-      "path": "./apps/dev-app/tsconfig.dev.json"
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2018", "dom"],
+    "types": ["jest"],
+    "paths": {
+      "@abp/ng.core": ["packages/core/src/public-api.ts"],
+      "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"],
+      "@abp/ng.theme.shared/extensions": ["packages/theme-shared/extensions/src/public-api.ts"],
+      "@abp/ng.components/tree": ["packages/components/tree/src/public-api.ts"],
+      "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"],
+      "@abp/ng.account": ["packages/account/src/public-api.ts"],
+      "@abp/ng.account/config": ["packages/account/config/src/public-api.ts"],
+      "@abp/ng.identity": ["packages/identity/src/public-api.ts"],
+      "@abp/ng.identity/config": ["packages/identity/config/src/public-api.ts"],
+      "@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],
+      "@abp/ng.tenant-management/config": ["packages/tenant-management/config/src/public-api.ts"],
+      "@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"],
+      "@abp/ng.setting-management/config": ["packages/setting-management/config/src/public-api.ts"],
+      "@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"],
+      "@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"],
+      "@proxy": ["apps/dev-app/src/app/proxy/index.ts"],
+      "@proxy/*": ["apps/dev-app/src/app/proxy/*"]
     }
-  ]
-}
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  }
+}

templates/app/angular/e2e/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",

templates/app/angular/package.json

@@ -17,40 +17,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.10",
-    "@angular/common": "~10.0.10",
-    "@angular/compiler": "~10.0.10",
-    "@angular/core": "~10.0.10",
-    "@angular/forms": "~10.0.10",
-    "@angular/platform-browser": "~10.0.10",
-    "@angular/platform-browser-dynamic": "~10.0.10",
-    "@angular/router": "~10.0.10",
-    "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.0",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
     "@abp/ng.schematics": "~3.2.0-rc.2",
-    "@angular-devkit/build-angular": "~0.1000.6",
-    "@angular-devkit/build-ng-packagr": "~0.1000.6",
-    "@angular/cli": "~10.0.6",
-    "@angular/compiler-cli": "~10.0.10",
-    "@angular/language-service": "~10.0.10",
+    "@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",
+    "@angular/language-service": "~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",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.9.5"
+    "typescript": "~4.0.2"
   }
 }

templates/app/angular/tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
     "types": []

templates/app/angular/tsconfig.base.json

@@ -1,26 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2015",
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["es2018", "dom"],
-    "paths": {
-      "@proxy": ["src/app/proxy/index.ts"],
-      "@proxy/*": ["src/app/proxy/*"]
-    }
-  },
-  "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true,
-    "enableIvy": true
-  }
-}

templates/app/angular/tsconfig.json

@@ -1,17 +1,26 @@
-/*
-  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": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2018", "dom"],
+    "paths": {
+      "@proxy": ["src/app/proxy/index.ts"],
+      "@proxy/*": ["src/app/proxy/*"]
     }
-  ]
-}
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableIvy": true
+  }
+}

templates/app/angular/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [

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"
   }
-}
+}

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",

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": []

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": [

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": [

templates/module/angular/tsconfig.base.json

@@ -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/*"]
-    }
-  }
-}

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/*"]
     }
-  ]
-}
+  }
+}