feat: upgrade to ng 14 (#2014)

sebholstein · Mar 15, 2023 · 5ea98d2 · 5ea98d2
1 parent 340e3e3
commit 5ea98d2
Show file tree

Hide file tree

Showing 16 changed files with 4,441 additions and 4,456 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ speed-measure-plugin*.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/angular.json b/angular.json
@@ -13,7 +13,7 @@
       "prefix": "agm",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "packages/core/tsconfig.lib.json",
             "project": "packages/core/ng-package.json"
@@ -23,17 +23,6 @@
               "tsConfig": "packages/core/tsconfig.lib.prod.json"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "packages/core/tsconfig.lint.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -44,7 +33,7 @@
       "prefix": "agm",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "packages/markerclusterer/tsconfig.lib.json",
             "project": "packages/markerclusterer/ng-package.json"
@@ -54,17 +43,6 @@
               "tsConfig": "packages/markerclusterer/tsconfig.lib.prod.json"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "packages/markerclusterer/tsconfig.lint.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -75,7 +53,7 @@
       "prefix": "agm",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "packages/snazzy-info-window/tsconfig.lib.json",
             "project": "packages/snazzy-info-window/ng-package.json"
@@ -85,17 +63,6 @@
               "tsConfig": "packages/snazzy-info-window/tsconfig.lib.prod.json"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "packages/snazzy-info-window/tsconfig.lint.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -106,7 +73,7 @@
       "prefix": "agm",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "packages/drawing/tsconfig.lib.json",
             "project": "packages/drawing/ng-package.json"
@@ -116,17 +83,6 @@
               "tsConfig": "packages/drawing/tsconfig.lib.prod.json"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "packages/drawing/tsconfig.lint.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }},

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "clean": "rimraf dist node_modules/@agm",
     "prebuild": "yarn clean",
     "build": "ng build core && ng build markerclusterer && ng build snazzy-info-window && ng build drawing",
-    "build:prod": "ng build core --prod && ng build markerclusterer --prod && ng build snazzy-info-window --prod && ng build drawing --prod",
+    "build:prod": "ng build core --configuration production && ng build markerclusterer --configuration production && ng build snazzy-info-window --configuration production && ng build drawing --configuration production",
     "lint": "ng lint",
     "test": "jest",
     "test:watch": "jest --watchAll",
@@ -42,36 +42,35 @@
   },
   "homepage": "https://angular-maps.com",
   "dependencies": {
-    "@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",
+    "@angular/animations": "^14.0.0",
+    "@angular/common": "^14.0.0",
+    "@angular/compiler": "^14.0.0",
+    "@angular/core": "^14.0.0",
+    "@angular/forms": "^14.0.0",
+    "@angular/platform-browser": "^14.0.0",
+    "@angular/platform-browser-dynamic": "^14.0.0",
+    "@angular/router": "^14.0.0",
     "rxjs": "~6.6.0",
-    "tslib": "^2.0.0",
-    "zone.js": "~0.10.3"
+    "tslib": "^2.4.0",
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1000.2",
-    "@angular-devkit/build-ng-packagr": "~0.1000.2",
-    "@angular/cli": "~10.0.0",
-    "@angular/compiler-cli": "~10.0.0",
+    "@angular-devkit/build-angular": "^14.0.0",
+    "@angular/cli": "^14.0.0",
+    "@angular/compiler-cli": "^14.0.0",
     "@compodoc/compodoc": "^1.1.10",
     "@types/jest": "^26.0.4",
     "@types/node": "^14.0.22",
     "codelyzer": "^6.0.0",
     "conventional-changelog": "^3.1.21",
     "jest": "^26.1.0",
     "jest-preset-angular": "^8.2.1",
-    "ng-packagr": "^10.0.0",
+    "ng-packagr": "^14.0.0",
     "protractor": "~7.0.0",
     "rimraf": "^3.0.2",
     "ts-node": "~8.10.2",
     "tslint": "~6.1.0",
-    "typescript": "~3.9.5",
+    "typescript": "~4.6.4",
     "yarn": "^1.22.4"
   }
-}
+}
diff --git a/packages/core/src/lib/services/google-maps-api-wrapper.ts b/packages/core/src/lib/services/google-maps-api-wrapper.ts
@@ -14,7 +14,7 @@ export class GoogleMapsAPIWrapper {
 
   constructor(private _loader: MapsAPILoader, private _zone: NgZone) {
     this._map =
-        new Promise<google.maps.Map>((resolve: () => void) => { this._mapResolver = resolve; });
+        new Promise<google.maps.Map>((resolve: (value: google.maps.Map) => void) => { this._mapResolver = resolve; });
   }
 
   createMap(el: HTMLElement, mapOptions: google.maps.MapOptions): Promise<void> {

diff --git a/packages/core/tsconfig.lib.json b/packages/core/tsconfig.lib.json
@@ -1,9 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "declarationMap": true,
+    "target": "es2020",
     "declaration": true,
     "inlineSources": true,
     "lib": [

diff --git a/packages/core/tsconfig.lib.prod.json b/packages/core/tsconfig.lib.prod.json
@@ -1,7 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "compilationMode": "partial"
   }
 }
diff --git a/packages/drawing/tsconfig.lib.json b/packages/drawing/tsconfig.lib.json
@@ -1,9 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "declarationMap": true,
+    "target": "es2020",
     "declaration": true,
     "inlineSources": true,
     "lib": [

diff --git a/packages/drawing/tsconfig.lib.prod.json b/packages/drawing/tsconfig.lib.prod.json
@@ -1,7 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "compilationMode": "partial"
   }
 }
diff --git a/packages/markerclusterer/tsconfig.lib.json b/packages/markerclusterer/tsconfig.lib.json
@@ -1,9 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "declarationMap": true,
+    "target": "es2020",
     "declaration": true,
     "inlineSources": true,
     "lib": [

diff --git a/packages/markerclusterer/tsconfig.lib.prod.json b/packages/markerclusterer/tsconfig.lib.prod.json
@@ -1,7 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "compilationMode": "partial"
   }
 }
diff --git a/packages/snazzy-info-window/tsconfig.lib.json b/packages/snazzy-info-window/tsconfig.lib.json
@@ -1,9 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "declarationMap": true,
+    "target": "es2020",
     "declaration": true,
     "inlineSources": true,
     "lib": [

diff --git a/packages/snazzy-info-window/tsconfig.lib.prod.json b/packages/snazzy-info-window/tsconfig.lib.prod.json
@@ -1,7 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "compilationMode": "partial"
   }
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,26 +1,42 @@
-/*
-  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"
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2020",
+    "module": "es2020",
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "lib": [
+      "es2018",
+      "dom"
+    ],
+    "paths": {
+      "@agm/core": [
+        "dist/core/agm-core",
+        "dist/core"
+      ],
+      "@agm/markerclusterer": [
+        "dist/markerclusterer/agm-markerclusterer",
+        "dist/markerclusterer"
+      ],
+      "@agm/snazzy-info-window": [
+        "dist/snazzy-info-window/agm-snazzy-info-window",
+        "dist/snazzy-info-window"
+      ],
+      "@agm/drawing": [
+        "dist/drawing/drawing",
+        "dist/drawing"
+      ]
     },
-    {
-      "path": "./packages/markerclusterer/tsconfig.lib.json"
-    },
-    {
-      "path": "./packages/snazzy-info-window/tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    },
-    {
-      "path": "./packages/drawing/tsconfig.lib.json"
-    }
-]
+    "types": [
+      "googlemaps"
+    ]
+  }
 }