fix: Upgrade to Angular v10

localpcguy · localpcguy · commit 988800306162 · 2020-08-04T11:57:46.000-04:00
BREAKING CHANGE: requires Angular v10
diff --git a/angular.json b/angular.json
@@ -11,6 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "outputPath": "dist/angular-inviewport",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -23,6 +24,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -40,6 +47,12 @@
               ]
             },
             "no-progress": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "progress": false
             }
           }
@@ -129,7 +142,7 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "sn",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "sn"
diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "baseUrl": "./",
diff --git a/package.json b/package.json
@@ -48,44 +48,42 @@
     "postrelease": "npm run packagr"
   },
   "private": false,
-  "peerDependencies": {
-    "@angular/core": ">=5.0.0 <9.0.0"
-  },
+  "peerDependencies": {},
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.803.0",
-    "@angular/animations": "8.2.14",
-    "@angular/cli": "8.3.24",
-    "@angular/common": "8.2.14",
-    "@angular/compiler": "8.2.14",
-    "@angular/compiler-cli": "8.2.14",
-    "@angular/core": "8.2.14",
-    "@angular/platform-browser": "8.2.14",
-    "@angular/platform-browser-dynamic": "8.2.14",
-    "@angular/platform-server": "8.2.14",
+    "@angular-devkit/build-angular": "~0.1000.4",
+    "@angular/animations": "10.0.5",
+    "@angular/cli": "10.0.4",
+    "@angular/common": "10.0.5",
+    "@angular/compiler": "10.0.5",
+    "@angular/compiler-cli": "10.0.5",
+    "@angular/core": "10.0.5",
+    "@angular/platform-browser": "10.0.5",
+    "@angular/platform-browser-dynamic": "10.0.5",
+    "@angular/platform-server": "10.0.5",
     "@nguniversal/express-engine": "^8.2.6",
     "@nguniversal/module-map-ngfactory-loader": "^8.2.6",
     "@thisissoon/schematics": "^1.0.0-alpha.17",
     "@types/jasmine": "~3.3.0",
     "@types/jasminewd2": "~2.0.2",
-    "@types/node": "~10.12.10",
-    "codelyzer": "^5.2.1",
+    "@types/node": "^12.11.1",
+    "codelyzer": "^6.0.0",
     "core-js": "^2.4.1",
     "coveralls": "^3.0.0",
     "cz-conventional-changelog": "^2.1.0",
     "express": "^4.16.3",
     "husky": "^1.1.0",
     "intersection-observer": "^0.5.0",
-    "jasmine-core": "~3.3.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "^5.1.0",
-    "karma-chrome-launcher": "~2.2.0",
+    "jasmine-core": "~3.5.0",
+    "jasmine-spec-reporter": "~5.0.0",
+    "karma": "~5.1.0",
+    "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^2.0.4",
-    "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.3.1",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~3.3.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "^2.2.5",
     "lint-staged": "^8.1.0",
-    "ng-packagr": "^4.4.0",
+    "ng-packagr": "^10.0.0",
     "prettier": "^1.15.2",
     "protractor": "^7.0.0",
     "rxjs": "^6.2.0",
@@ -98,12 +96,10 @@
     "stylelint-scss": "^3.4.0",
     "ts-loader": "^5.2.1",
     "ts-node": "~7.0.1",
-    "tsickle": "^0.34.0",
-    "tslib": "^1.9.3",
-    "tslint": "~5.11.0",
+    "tslint": "~6.1.0",
     "tslint-config-prettier": "^1.16.0",
-    "typescript": "~3.4.0",
-    "zone.js": "^0.9.1"
+    "typescript": "~3.9.7",
+    "zone.js": "~0.10.3"
   },
   "config": {
     "commitizen": {
@@ -134,5 +130,8 @@
       "prettier --config .prettierrc --write",
       "git add"
     ]
+  },
+  "dependencies": {
+    "tslib": "^2.0.0"
   }
 }
diff --git a/src/app/in-viewport/in-viewport.module.ts b/src/app/in-viewport/in-viewport.module.ts
@@ -14,7 +14,7 @@ import { WINDOW_MOCK } from '../window/window-mock';
   exports: [InViewportDirective]
 })
 export class InViewportModule {
-  static forServer(): ModuleWithProviders {
+  static forServer(): ModuleWithProviders<InViewportModule> {
     return {
       ngModule: InViewportModule,
       providers: [{ provide: WINDOW, useValue: WINDOW_MOCK }]
diff --git a/src/main.server.ts b/src/main.server.ts
@@ -7,3 +7,5 @@ if (environment.production) {
 }
 
 export { AppServerModule } from './app/app.server.module';
+
+export { renderModule, renderModuleFactory } from '@angular/platform-server';
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "baseUrl": "./",
-    "module": "es2015",
     "types": []
   },
-  "exclude": ["test.ts", "**/*.spec.ts"]
+  "files": ["main.ts", "polyfills.ts"],
+  "include": ["src/**/*.d.ts"]
 }
diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json
@@ -2,9 +2,12 @@
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app-server",
-    "baseUrl": "."
+    "baseUrl": ".",
+    "target": "es2016"
   },
   "angularCompilerOptions": {
     "entryModule": "app/app.server.module#AppServerModule"
-  }
+  },
+  "files": ["main.server.ts"],
+  "include": ["src/**/*.d.ts"]
 }
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
@@ -1,9 +1,8 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/spec",
     "baseUrl": "./",
-    "module": "commonjs",
     "target": "es5",
     "types": ["jasmine", "node"]
   },
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -0,0 +1,15 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "module": "es2020",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2017", "dom"]
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,14 +1,20 @@
+/*
+  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": {
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "target": "es5",
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["es2017", "dom"]
-  }
-}
+  "files": [],
+  "references": [
+    {
+      "path": "./src/tsconfig.app.json"
+    },
+    {
+      "path": "./src/tsconfig.spec.json"
+    },
+    {
+      "path": "./src/tsconfig.server.json"
+    }
+  ]
+}
diff --git a/tslint.json b/tslint.json
@@ -6,6 +6,9 @@
     "arrow-return-shorthand": true,
     "callable-types": true,
     "class-name": true,
+    "deprecation": {
+      "severity": "warning"
+    },
     "forin": true,
     "import-blacklist": [
       true,
@@ -53,7 +56,6 @@
     "no-switch-case-fall-through": true,
     "no-unnecessary-initializer": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "prefer-const": true,
diff --git a/yarn.lock b/yarn.lock

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/e2e",`
`5`	`5`	`"baseUrl": "./",`
Original file line number	Diff line number	Diff line change
`@@ -7,3 +7,5 @@ if (environment.production) {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`export { AppServerModule } from './app/app.server.module';`
	`10`	`+`
	`11`	`+export { renderModule, renderModuleFactory } from '@angular/platform-server';`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`		`- "extends": "../tsconfig.json",`
	`2`	`+ "extends": "../tsconfig.base.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"outDir": "../out-tsc/app",`
`5`	`5`	`"baseUrl": "./",`
`6`		`- "module": "es2015",`
`7`	`6`	`"types": []`
`8`	`7`	`},`
`9`		`- "exclude": ["test.ts", "*/.spec.ts"]`
	`8`	`+ "files": ["main.ts", "polyfills.ts"],`
	`9`	`+ "include": ["src/*/.d.ts"]`
`10`	`10`	`}`