Merge pull request #175 from TAMULib/sprint9-staging-updates

Angular 10 upgrade

e2e/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

package.json

@@ -44,70 +44,71 @@
     "static:clean": "rimraf static"
   },
   "dependencies": {
-    "@angular/animations": "^9.0.1",
-    "@angular/common": "^9.0.1",
-    "@angular/compiler": "^9.0.1",
-    "@angular/core": "^9.0.1",
-    "@angular/elements": "^9.0.1",
-    "@angular/forms": "^9.0.1",
-    "@angular/localize": "^9.1.6",
-    "@angular/platform-browser": "^9.0.1",
-    "@angular/platform-browser-dynamic": "^9.0.1",
-    "@angular/router": "^9.0.1",
-    "@lhci/cli": "^0.3.14",
-    "@ng-bootstrap/ng-bootstrap": "^5.3.0",
-    "@storybook/react": "^5.3.18",
-    "bootstrap": "^4.4.1",
-    "chalk": "^4.0.0",
-    "chrome-launcher": "^0.13.2",
+    "@angular/animations": "^10.0.7",
+    "@angular/common": "^10.0.7",
+    "@angular/compiler": "^10.0.7",
+    "@angular/core": "^10.0.7",
+    "@angular/elements": "^10.0.7",
+    "@angular/forms": "^10.0.7",
+    "@angular/localize": "^10.0.7",
+    "@angular/platform-browser": "^10.0.7",
+    "@angular/platform-browser-dynamic": "^10.0.7",
+    "@angular/router": "^10.0.7",
+    "@lhci/cli": "^0.4.3",
+    "@ng-bootstrap/ng-bootstrap": "^7.0.0",
+    "@storybook/react": "^5.3.19",
+    "bootstrap": "^4.5.0",
+    "chalk": "^4.1.0",
+    "chrome-launcher": "^0.13.4",
     "classlist.js": "^1.1.20150312",
     "console-stamp": "^3.0.0-rc4.2",
     "css-element-queries": "^1.2.3",
     "document-register-element": "^1.14.3",
-    "elements-zone-strategy": "^9.0.0",
+    "elements-zone-strategy": "^10.0.0",
     "glob": "^7.1.6",
-    "ie11-custom-properties": "^3.0.6",
-    "jsdom": "^16.2.2",
-    "lighthouse-badges": "^1.0.27",
-    "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "ie11-custom-properties": "^4.1.0",
+    "jsdom": "^16.3.0",
+    "lighthouse-badges": "^1.0.32",
+    "rxjs": "~6.6.2",
+    "tslib": "^2.0.0",
     "web-animations-js": "^2.3.2",
-    "zone.js": "~0.10.2"
+    "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.900.2",
-    "@angular-devkit/build-ng-packagr": "~0.900.2",
-    "@angular/cli": "^9.0.2",
-    "@angular/compiler-cli": "^9.0.1",
-    "@angular/language-service": "^9.0.1",
-    "@babel/core": "^7.8.4",
+    "@angular-devkit/build-angular": "~0.1000.4",
+    "@angular-devkit/build-ng-packagr": "~0.1000.4",
+    "@angular-devkit/schematics": "^10.0.4",
+    "@angular/cli": "^10.0.4",
+    "@angular/compiler-cli": "^10.0.7",
+    "@angular/language-service": "^10.0.7",
+    "@babel/core": "^7.11.0",
     "@compodoc/compodoc": "^1.1.11",
     "@pickra/copy-code-block": "^1.2.0",
-    "@types/jasmine": "~3.5.4",
+    "@types/jasmine": "~3.5.11",
     "@types/jasminewd2": "~2.0.8",
-    "@types/node": "^13.7.1",
-    "angular-tslint-rules": "^1.20.3",
-    "babel-loader": "^8.0.6",
-    "codelyzer": "^5.2.1",
+    "@types/node": "^14.0.27",
+    "angular-tslint-rules": "^1.20.4",
+    "babel-loader": "^8.1.0",
+    "codelyzer": "^6.0.0",
     "concat": "^1.0.3",
     "coveralls": "^3.1.0",
-    "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.4.1",
+    "jasmine-core": "~3.6.0",
+    "jasmine-spec-reporter": "~5.0.2",
+    "karma": "~5.1.1",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.1",
-    "karma-jasmine": "~3.1.1",
-    "karma-jasmine-html-reporter": "^1.5.2",
-    "lighthouse": "^6.0.0",
-    "ng-packagr": "^9.0.0",
-    "protractor": "^5.4.3",
+    "karma-coverage-istanbul-reporter": "~3.0.3",
+    "karma-jasmine": "~3.3.1",
+    "karma-jasmine-html-reporter": "^1.5.4",
+    "lighthouse": "^6.1.1",
+    "ng-packagr": "^10.0.3",
+    "protractor": "~7.0.0",
     "rimraf": "^3.0.2",
     "static-server": "^2.2.1",
-    "ts-loader": "^6.2.1",
-    "ts-node": "~8.6.2",
-    "tsickle": "^0.38.0",
-    "tslint": "~6.0.0",
+    "ts-loader": "^8.0.1",
+    "ts-node": "~8.10.2",
+    "tsickle": "^0.39.1",
+    "tslint": "~6.1.3",
     "tslint-angular": "^3.0.2",
-    "typescript": ">=3.6.4 and <= 3.9.0"
+    "typescript": "~3.9.7"
   }
 }

projects/wvr-elements/package.json

@@ -21,9 +21,9 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "tslib": "^1.10.0",
     "css-element-queries": "^1.2.3"
-  },
+  ,    "tslib": "^2.0.0"
+},
   "peerDependencies": {
     "@angular/common": "^9.0.0",
     "@angular/core": "^9.0.0"

projects/wvr-elements/src/lib/shared/wvr-base.component.ts

@@ -1,10 +1,11 @@
-import { ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, Injector, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, Injector, Input, OnInit, Output, ViewChild, Directive } from '@angular/core';
 import { debounceTime, map } from 'rxjs/operators';
 import { fromEvent, Observable, of } from 'rxjs';
 import { wvrBaseComponentProps } from './wvr-base-component-props';
 import { WvrAnimationService } from './wvr-animation.service';
 import { DomSanitizer } from '@angular/platform-browser';
 
+@Directive()
 export abstract class WvrBaseComponent implements OnInit {
 
   private _animationSettings: any = {};

projects/wvr-elements/tsconfig.lib.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/projects"
   },

projects/wvr-elements/tsconfig.spec.json

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

tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "outDir": "dist"
   },

tsconfig.base.json

@@ -0,0 +1,36 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "projects",
+    "sourceMap": true,
+    "declaration": true,
+    "downlevelIteration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es2015",
+    "module": "es2020",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2018",
+      "dom"
+    ],
+    "paths": {
+      "wvr-elements": [
+        "projects/wvr-elements/src/public-api",
+        "dist/wvr-elements"
+      ],
+      "wvr-elements/*": [
+        "projects/wvr-elements/src/public-api/*",
+        "dist/wvr-elements/*",
+      ]
+    }
+  },
+  "angularCompilerOptions": {
+    "ivyCompiler": true
+  }
+}

tsconfig.json

@@ -1,36 +1,23 @@
+/*
+  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": "projects",
-    "sourceMap": true,
-    "declaration": true,
-    "downlevelIteration": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "target": "es2015",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2018",
-      "dom"
-    ],
-    "paths": {
-      "wvr-elements": [
-        "projects/wvr-elements/src/public-api",
-        "dist/wvr-elements"
-      ],
-      "wvr-elements/*": [
-        "projects/wvr-elements/src/public-api/*",
-        "dist/wvr-elements/*",
-      ]
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./projects/wvr-elements/tsconfig.lib.json"
+    },
+    {
+      "path": "./projects/wvr-elements/tsconfig.spec.json"
     }
-  },
-  "angularCompilerOptions": {
-    "ivyCompiler": true
-  }
+  ]
 }

tsconfig.spec.json

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

tslint.json

@@ -13,6 +13,9 @@
       "doc",
       "directive"
     ],
+    "deprecation": {
+      "severity": "warning"
+    },
     "member-ordering": [
       true,
       {