Merge pull request #18 from hypertrace/update-ng

aaron-steinfeld · web-flow · commit eef55af338f5 · 2020-07-15T16:02:36.000-07:00
chore: update angular
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,6 @@
   "name": "hyperdash-angular",
   "version": "0.0.0",
   "scripts": {
-    "postinstall": "ngcc --properties es5 browser module main --first-only --create-ivy-entry-points",
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
@@ -18,29 +17,28 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^9.1.11",
-    "@angular/cdk": "^9.2.4",
-    "@angular/common": "^9.1.11",
-    "@angular/compiler": "^9.1.11",
-    "@angular/core": "^9.1.11",
-    "@angular/forms": "^9.1.11",
-    "@angular/platform-browser": "^9.1.11",
-    "@angular/platform-browser-dynamic": "^9.1.11",
-    "@angular/router": "^9.1.11",
+    "@angular/animations": "^10.0.4",
+    "@angular/common": "^10.0.4",
+    "@angular/compiler": "^10.0.4",
+    "@angular/core": "^10.0.4",
+    "@angular/forms": "^10.0.4",
+    "@angular/platform-browser": "^10.0.4",
+    "@angular/platform-browser-dynamic": "^10.0.4",
+    "@angular/router": "^10.0.4",
     "@hypertrace/hyperdash": "^1.0.0",
     "core-js": "^3.6.5",
     "lodash": "^4.17.15",
     "rxjs": "^6.6.0",
-    "tslib": "^1.0.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
     "@angular-builders/jest": "^9.0.1",
-    "@angular-devkit/build-angular": "~0.901.10",
-    "@angular-devkit/build-ng-packagr": "~0.901.9",
-    "@angular/cli": "^9.1.9",
-    "@angular/compiler-cli": "^9.1.11",
-    "@angular/language-service": "^9.1.11",
+    "@angular-devkit/build-angular": "~0.1000.3",
+    "@angular-devkit/build-ng-packagr": "~0.1000.3",
+    "@angular/cli": "^10.0.3",
+    "@angular/compiler-cli": "^10.0.4",
+    "@angular/language-service": "^10.0.4",
     "@commitlint/cli": "^9.0.1",
     "@commitlint/config-conventional": "^9.0.1",
     "@compodoc/compodoc": "^1.1.11",
@@ -57,14 +55,14 @@
     "jest-config": "^25.5.0",
     "jest-html-reporter": "^3.1.3",
     "jest-junit": "^10.0.0",
-    "ng-packagr": "^9.1.5",
+    "ng-packagr": "^10.0.0",
     "prettier": "^2.0.5",
     "pretty-quick": "^2.0.1",
     "semantic-release": "^17.1.1",
     "ts-node": "~8.10.2",
-    "tslint": "^6.1.2",
+    "tslint": "~6.1.0",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "~3.8.3"
+    "typescript": "~3.9.6"
   },
   "config": {
     "commitizen": {
diff --git a/projects/hyperdash-angular/package.json b/projects/hyperdash-angular/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hypertrace/hyperdash-angular",
   "version": "0.0.0-PLACEHOLDER",
-  "license": "AGPL-3.0",
+  "license": "LicenseRef-LICENSE",
   "repository": {
     "type": "git",
     "url": "git@github.com:hypertrace/hyperdash-angular.git"
@@ -14,14 +14,16 @@
     "commit": "pushd ../.. && npm run commit"
   },
   "peerDependencies": {
-    "@angular/common": "^9.0.0",
-    "@angular/core": "^9.0.0",
-    "@angular/cdk": "^9.1.0",
-    "@angular/platform-browser": "^9.0.0",
-    "core-js": "^3.4.7",
-    "rxjs": "^6.5.3",
+    "@angular/common": "^10.0.0",
+    "@angular/core": "^10.0.0",
+    "@angular/platform-browser": "^10.0.0",
+    "core-js": "^3.6.5",
+    "rxjs": "^6.6.0",
     "zone.js": "^0.10.0",
     "@hypertrace/hyperdash": "^1.0.0",
     "lodash": "^4.17.15"
+  },
+  "dependencies": {
+    "tslib": "^2.0.0"
   }
 }
diff --git a/projects/hyperdash-angular/src/rendering/dashboard-renderer.service.ts b/projects/hyperdash-angular/src/rendering/dashboard-renderer.service.ts
@@ -1,4 +1,3 @@
-import { PortalInjector } from '@angular/cdk/portal';
 import {
   ComponentFactory,
   ComponentFactoryResolver,
@@ -132,9 +131,14 @@ export class DashboardRendererService {
     rendererDestruction$: Observable<void>,
     viewContainerRef: ViewContainerRef
   ): Injector {
-    return new PortalInjector(
-      viewContainerRef.injector,
-      new WeakMap([[RENDERER_API, this.rendererApiFactory.buildApi(model, rendererDestruction$)]])
+    return Injector.create(
+      [
+        {
+          provide: RENDERER_API,
+          useValue: this.rendererApiFactory.buildApi(model, rendererDestruction$)
+        }
+      ],
+      viewContainerRef.injector
     );
   }
 
diff --git a/projects/hyperdash-angular/tsconfig.lib.json b/projects/hyperdash-angular/tsconfig.lib.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "declaration": true,
     "sourceMap": true,
diff --git a/projects/hyperdash-angular/tsconfig.spec.json b/projects/hyperdash-angular/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": ["webpack-env", "jest"],
diff --git a/src/.browserslistrc b/src/.browserslistrc
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "types": []
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/spec",
     "types": ["jest", "webpack-env"],
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "importHelpers": true,
+    "outDir": "./dist/out-tsc",
+    "strict": true,
+    "sourceMap": true,
+    "declaration": false,
+    "module": "es2020",
+    "target": "es5",
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "esModuleInterop": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "downlevelIteration": true,
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2015", "es2016", "es2017", "esnext.array", "dom"],
+    "paths": {
+      "@hypertrace/hyperdash-angular": ["projects/hyperdash-angular/src/public_api.ts"]
+    }
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,24 +1,17 @@
+/*
+  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.
+*/
 {
-  "compilerOptions": {
-    "baseUrl": "./",
-    "importHelpers": true,
-    "outDir": "./dist/out-tsc",
-    "strict": true,
-    "sourceMap": true,
-    "declaration": false,
-    "module": "esnext",
-    "target": "es5",
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "esModuleInterop": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "downlevelIteration": true,
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["es2015", "es2016", "es2017", "esnext.array", "dom"],
-    "paths": {
-      "@hypertrace/hyperdash-angular": ["projects/hyperdash-angular/src/public_api.ts"]
+  "files": [],
+  "references": [
+    {
+      "path": "./src/tsconfig.app.json"
+    },
+    {
+      "path": "./projects/hyperdash-angular/tsconfig.lib.json"
     }
-  }
+  ]
 }
diff --git a/tslint.json b/tslint.json
@@ -46,7 +46,6 @@
     "quotemark": [true, "single", "avoid-escape", "avoid-template"],
     "no-non-null-assertion": false,
     "member-ordering": false,
-    "no-unused-variable": false,
     "max-classes-per-file": false,
     "trailing-comma": [
       true,
@@ -67,7 +66,6 @@
       true,
       "@angular/core/testing",
       "@angular/platform-browser-dynamic/testing",
-      "@angular/cdk/portal",
       "zone.js/dist",
       "core-js",
       "@angular/common/http",
@@ -85,7 +83,6 @@
       }
     ],
     "no-unnecessary-class": false,
-    "no-use-before-declare": false,
     "ordered-imports": [
       true,
       {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": "../../tsconfig.json",`
	`2`	`+ "extends": "../../tsconfig.base.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"declaration": true,`
`5`	`5`	`"sourceMap": true,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": "../tsconfig.json",`
	`2`	`+ "extends": "../tsconfig.base.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"outDir": "../out-tsc/app",`
`5`	`5`	`"types": []`