feat: upgrade angular version of ng-packs to v10

#4494
6 years ago · 0f8925dd24
18 changed files with 981 additions and 724 deletions
--- a/npm/ng-packs/apps/dev-app/.browserslistrc
+++ b/npm/ng-packs/apps/dev-app/.browserslistrc
--- a/npm/ng-packs/apps/dev-app/tsconfig.dev.json
+++ b/npm/ng-packs/apps/dev-app/tsconfig.dev.json
@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
  "compilerOptions": {
    "outDir": "../../out-tsc/app",
    "types": []
--- a/npm/ng-packs/apps/dev-app/tsconfig.spec.json
+++ b/npm/ng-packs/apps/dev-app/tsconfig.spec.json
@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
  "compilerOptions": {
    "outDir": "../../out-tsc/spec",
    "types": ["node", "jest"]
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@ -34,20 +34,20 @@
    "@abp/ng.theme.shared": "~2.9.0",
    "@abp/utils": "^3.0.0-alpha.1",
    "@angular-builders/jest": "^9.0.1",
-    "@angular-devkit/build-angular": "~0.901.9",
-    "@angular-devkit/build-ng-packagr": "~0.901.9",
-    "@angular/animations": "~9.1.11",
-    "@angular/cli": "~9.1.9",
-    "@angular/common": "~9.1.11",
-    "@angular/compiler": "~9.1.11",
-    "@angular/compiler-cli": "~9.1.11",
-    "@angular/core": "~9.1.11",
-    "@angular/forms": "~9.1.11",
-    "@angular/language-service": "~9.1.11",
-    "@angular/localize": "~9.1.11",
-    "@angular/platform-browser": "~9.1.11",
-    "@angular/platform-browser-dynamic": "~9.1.11",
-    "@angular/router": "~9.1.11",
+    "@angular-devkit/build-angular": "~0.1000.0",
+    "@angular-devkit/build-ng-packagr": "~0.1000.0",
+    "@angular/animations": "~10.0.0",
+    "@angular/cli": "~10.0.0",
+    "@angular/common": "~10.0.0",
+    "@angular/compiler": "~10.0.0",
+    "@angular/compiler-cli": "~10.0.0",
+    "@angular/core": "~10.0.0",
+    "@angular/forms": "~10.0.0",
+    "@angular/language-service": "~10.0.0",
+    "@angular/localize": "~10.0.0",
+    "@angular/platform-browser": "~10.0.0",
+    "@angular/platform-browser-dynamic": "~10.0.0",
+    "@angular/router": "~10.0.0",
    "@fortawesome/fontawesome-free": "^5.13.0",
    "@ng-bootstrap/ng-bootstrap": "^6.1.0",
    "@ngneat/spectator": "^5.11.0",
@ -73,23 +73,23 @@
    "just-clone": "^3.1.0",
    "just-compare": "^1.3.0",
    "lerna": "^3.19.0",
-    "ng-packagr": "^9.1.5",
+    "ng-packagr": "^10.0.0",
    "ngxs-reset-plugin": "^1.3.0",
    "ngxs-schematic": "^1.1.9",
    "prettier": "^1.18.2",
-    "protractor": "~5.4.0",
+    "protractor": "~7.0.0",
    "rxjs": "~6.5.4",
    "snq": "^1.0.3",
    "symlink-manager": "^1.5.0",
    "ts-node": "~7.0.0",
    "ts-toolbelt": "^6.9.9",
-    "tsickle": "^0.37.0",
-    "tslint": "~5.20.0",
-    "typescript": "~3.8.0",
+    "tsickle": "^0.38.1",
+    "tslint": "~6.1.0",
+    "typescript": "~3.9.5",
    "zone.js": "~0.10.2"
  },
  "dependencies": {
-    "tslib": "^1.10.0"
+    "tslib": "^2.0.0"
  },
  "config": {
    "commitizen": {
@ -99,4 +99,4 @@
  "resolutions": {
    "@ngx-validate/core": "^0.0.8"
  }
-}
+}
--- a/npm/ng-packs/packages/account/package.json
+++ b/npm/ng-packs/packages/account/package.json
@ -8,7 +8,8 @@
  },
  "dependencies": {
    "@abp/ng.theme.shared": "~2.9.0"
-  },
+  ,    "tslib": "^2.0.0"
+},
  "publishConfig": {
    "access": "public"
  }
--- a/npm/ng-packs/packages/core/package.json
+++ b/npm/ng-packs/packages/core/package.json
@ -16,7 +16,8 @@
    "just-clone": "^3.1.0",
    "just-compare": "^1.3.0",
    "snq": "^1.0.3",
-    "ts-toolbelt": "^6.9.9"
+    "ts-toolbelt": "^6.9.9",
+    "tslib": "^2.0.0"
  },
  "publishConfig": {
    "access": "public"
--- a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts
@ -126,6 +126,7 @@ export abstract class AbstractTreeService<T extends object> {
  }
 }

+@Injectable()
 export abstract class AbstractNavTreeService<T extends ABP.Nav> extends AbstractTreeService<T>
  implements OnDestroy {
  readonly id = 'name';
--- a/npm/ng-packs/packages/feature-management/package.json
+++ b/npm/ng-packs/packages/feature-management/package.json
@ -7,7 +7,8 @@
    "url": "https://github.com/abpframework/abp.git"
  },
  "dependencies": {
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
  },
  "publishConfig": {
    "access": "public"
--- a/npm/ng-packs/packages/identity/package.json
+++ b/npm/ng-packs/packages/identity/package.json
@ -8,7 +8,8 @@
  },
  "dependencies": {
    "@abp/ng.permission-management": "~2.9.0",
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
  },
  "publishConfig": {
    "access": "public"
--- a/npm/ng-packs/packages/permission-management/package.json
+++ b/npm/ng-packs/packages/permission-management/package.json
@ -7,7 +7,8 @@
    "url": "https://github.com/abpframework/abp.git"
  },
  "dependencies": {
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
  },
  "publishConfig": {
    "access": "public"
--- a/npm/ng-packs/packages/setting-management/package.json
+++ b/npm/ng-packs/packages/setting-management/package.json
@ -7,7 +7,8 @@
    "url": "https://github.com/abpframework/abp.git"
  },
  "dependencies": {
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
  },
  "publishConfig": {
    "access": "public"
--- a/npm/ng-packs/packages/tenant-management/package.json
+++ b/npm/ng-packs/packages/tenant-management/package.json
@ -8,7 +8,8 @@
  },
  "dependencies": {
    "@abp/ng.feature-management": "~2.9.0",
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
  },
  "publishConfig": {
    "access": "public"
--- a/npm/ng-packs/packages/theme-basic/package.json
+++ b/npm/ng-packs/packages/theme-basic/package.json
@ -8,7 +8,8 @@
  },
  "dependencies": {
    "@abp/ng.theme.shared": "~2.9.0"
-  },
+  ,    "tslib": "^2.0.0"
+},
  "publishConfig": {
    "access": "public"
  }
--- a/npm/ng-packs/packages/theme-shared/package.json
+++ b/npm/ng-packs/packages/theme-shared/package.json
@ -13,7 +13,8 @@
    "@ngx-validate/core": "^0.0.9",
    "@swimlane/ngx-datatable": "^17.0.0",
    "bootstrap": "^4.5.0",
-    "chart.js": "^2.9.3"
+    "chart.js": "^2.9.3",
+    "tslib": "^2.0.0"
  },
  "publishConfig": {
    "access": "public"
--- a/npm/ng-packs/tsconfig.base.json
+++ b/npm/ng-packs/tsconfig.base.json
@ -0,0 +1,38 @@
+{
+  "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/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"]
+    }
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  }
+}
--- a/npm/ng-packs/tsconfig.json
+++ b/npm/ng-packs/tsconfig.json
@ -1,38 +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.
+*/
 {
-  "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/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"]
+  "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"
    }
-  },
-  "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
-  }
-}
+  ]
+}
--- a/npm/ng-packs/tslint.json
+++ b/npm/ng-packs/tslint.json
@ -2,16 +2,38 @@
  "extends": "tslint:recommended",
  "rulesDirectory": ["node_modules/codelyzer"],
  "rules": {
+    "align": {
+      "options": [
+        "parameters",
+        "statements"
+      ]
+    },
    "array-type": false,
    "contextual-lifecycle": true,
    "component-class-suffix": [true, "Component"],
    "directive-class-suffix": [true, "Directive"],
+    "eofline": true,
+    "import-spacing": true,
+    "indent": {
+      "options": [
+        "spaces"
+      ]
+    },
    "max-line-length": [true, 140],
    "no-consecutive-blank-lines": false,
    "no-redundant-jsdoc": true,
    "no-var-requires": false,
    "object-literal-key-quotes": [true, "as-needed"],
    "ordered-imports": false,
+    "space-before-function-paren": {
+      "options": {
+        "anonymous": "never",
+        "asyncArrow": "always",
+        "constructor": "never",
+        "method": "never",
+        "named": "never"
+      }
+    },
    "trailing-comma": false,
    "component-max-inline-declarations": [true, { "animations": 20, "styles": 20, "template": 20 }],
    "no-forward-ref": true,
@ -21,6 +43,24 @@
    "no-unused-css": true,
    "prefer-output-readonly": true,
    "template-conditional-complexity": [true, 4],
+    "typedef-whitespace": {
+      "options": [
+        {
+          "call-signature": "nospace",
+          "index-signature": "nospace",
+          "parameter": "nospace",
+          "property-declaration": "nospace",
+          "variable-declaration": "nospace"
+        },
+        {
+          "call-signature": "onespace",
+          "index-signature": "onespace",
+          "parameter": "onespace",
+          "property-declaration": "onespace",
+          "variable-declaration": "onespace"
+        }
+      ]
+    },
    "use-component-selector": true,
    "max-classes-per-file": false,
    "arrow-parens": false,
@ -96,5 +136,15 @@
    "use-pipe-transform-interface": true,
    "variable-name": false,
    "prefer-for-of": false
-  }
+  ,    "whitespace": {
+      "options": [
+        "check-branch",
+        "check-decl",
+        "check-operator",
+        "check-separator",
+        "check-type",
+        "check-typecast"
+      ]
+    }
+}
 }
--- a/npm/ng-packs/yarn.lock
+++ b/npm/ng-packs/yarn.lock