feat: Angular 15 support (#97)

NathanWalker · web-flow · commit 51ad39e6c52f · 2022-11-30T09:44:32.000-08:00
diff --git a/apps/nativescript-demo-ng/package.json b/apps/nativescript-demo-ng/package.json
@@ -11,8 +11,8 @@
     "@nativescript-community/ui-material-bottom-navigation": "^7.0.0"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.3.0",
-    "@nativescript/ios": "~8.3.0",
+    "@nativescript/android": "~8.4.0",
+    "@nativescript/ios": "~8.4.0",
     "@nativescript/unit-test-runner": "^3.0.1"
   }
 }
diff --git a/apps/nativescript-demo-ng/project.json b/apps/nativescript-demo-ng/project.json
@@ -1,4 +1,5 @@
 {
+  "name": "nativescript-demo-ng",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/nativescript-demo-ng/src",
   "projectType": "application",
@@ -71,7 +72,7 @@
     },
     "test": {
       "executor": "@nativescript/nx:test",
-      "outputs": ["coverage/apps/nativescript-demo-ng"],
+      "outputs": ["{workspaceRoot}/coverage/apps/nativescript-demo-ng"],
       "options": {
         "coverage": false
       },
diff --git a/apps/nativescript-demo-ng/src/app/item/items.component.ts b/apps/nativescript-demo-ng/src/app/item/items.component.ts
@@ -12,7 +12,7 @@ import { ModalDialogService, NativeDialogService } from '@nativescript/angular';
   templateUrl: './items.component.html',
 })
 export class ItemsComponent implements OnInit {
-  message = 'Hello Angular 13!';
+  message = 'Hello Angular 15!';
   items: Array<Item>;
 
   constructor(private itemService: ItemService, private nativeDialog: NativeDialogService, private modalDialog: ModalDialogService, private http: HttpClient) {}
diff --git a/apps/nativescript-demo-ng/src/app/item3/items.component.ts b/apps/nativescript-demo-ng/src/app/item3/items.component.ts
@@ -12,7 +12,7 @@ import { ModalDialogService, NativeDialogService } from '@nativescript/angular';
   templateUrl: './items.component.html',
 })
 export class ItemsComponent implements OnInit {
-  message = 'Hello Angular 13!';
+  message = 'Hello Angular 15!';
   items: Array<Item>;
 
   constructor(private itemService: ItemService, private nativeDialog: NativeDialogService, private modalDialog: ModalDialogService, private http: HttpClient) {}
diff --git a/nx.json b/nx.json
@@ -3,17 +3,6 @@
   "affected": {
     "defaultBase": "main"
   },
-  "implicitDependencies": {
-    "workspace.json": "*",
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    "tsconfig.base.json": "*",
-    "tslint.json": "*",
-    ".eslintrc.json": "*",
-    "nx.json": "*"
-  },
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nrwl/nx-cloud",
@@ -34,7 +23,16 @@
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "targetDefaults": {
     "build": {
-      "dependsOn": ["^build"]
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"]
+    },
+    "test": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
     }
+  },
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
+    "sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
+    "production": ["default", "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)", "!{projectRoot}/tsconfig.spec.json", "!{projectRoot}/jest.config.[jt]s"]
   }
 }
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "clean": "npx rimraf hooks node_modules package-lock.json yarn.lock && npm i --legacy-peer-deps",
+    "clean": "npx rimraf hooks node_modules package-lock.json && yarn",
     "clean.all": "npm run clean && nx run-many --target=clean --all",
     "postinstall": "husky install",
     "nx": "nx",
@@ -35,44 +35,44 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
   },
   "dependencies": {
-    "@angular/animations": "14.2.3",
-    "@angular/common": "14.2.3",
-    "@angular/compiler": "14.2.3",
-    "@angular/core": "14.2.3",
-    "@angular/forms": "14.2.3",
-    "@angular/platform-browser": "14.2.3",
-    "@angular/platform-browser-dynamic": "14.2.3",
-    "@angular/router": "14.2.3",
-    "@nativescript/core": "~8.3.4",
+    "@angular/animations": "15.0.1",
+    "@angular/common": "15.0.1",
+    "@angular/compiler": "15.0.1",
+    "@angular/core": "15.0.1",
+    "@angular/forms": "15.0.1",
+    "@angular/platform-browser": "15.0.1",
+    "@angular/platform-browser-dynamic": "15.0.1",
+    "@angular/router": "15.0.1",
+    "@nativescript/core": "~8.4.0",
     "@nativescript/theme": "~3.0.2",
     "@ngx-translate/core": "~14.0.0",
     "@nrwl/nx-cloud": "^15.0.2",
     "nativescript-ngx-fonticon": "~7.0.0",
     "rxjs": "^7.5.6",
-    "zone.js": "~0.11.8"
+    "zone.js": "~0.12.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "14.2.3",
-    "@angular-eslint/eslint-plugin": "14.0.3",
-    "@angular-eslint/eslint-plugin-template": "14.0.3",
-    "@angular-eslint/template-parser": "14.0.3",
-    "@angular/compiler-cli": "14.2.3",
+    "@angular-devkit/build-angular": "15.0.1",
+    "@angular-eslint/eslint-plugin": "14.0.4",
+    "@angular-eslint/eslint-plugin-template": "14.0.4",
+    "@angular-eslint/template-parser": "14.0.4",
+    "@angular/compiler-cli": "15.0.1",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@nativescript/types": "~8.3.1",
+    "@nativescript/types": "~8.4.0",
     "@nativescript/unit-test-runner": "^3.0.4",
-    "@nativescript/webpack": "~5.0.8",
-    "@ngtools/webpack": "14.2.3",
-    "@nrwl/angular": "14.7.11",
-    "@nrwl/cli": "14.7.11",
-    "@nrwl/eslint-plugin-nx": "14.7.11",
-    "@nrwl/jest": "14.7.11",
-    "@nrwl/js": "14.7.11",
-    "@nrwl/node": "14.7.11",
-    "@nrwl/workspace": "14.7.11",
-    "@nstudio/angular": "14.3.0",
-    "@nstudio/nativescript": "14.3.0",
-    "@nstudio/nativescript-angular": "14.3.0",
-    "@nstudio/xplat": "14.3.0",
+    "@nativescript/webpack": "~5.0.12",
+    "@ngtools/webpack": "15.0.1",
+    "@nrwl/angular": "15.2.1",
+    "@nrwl/cli": "15.2.1",
+    "@nrwl/eslint-plugin-nx": "15.2.1",
+    "@nrwl/jest": "15.2.1",
+    "@nrwl/js": "15.2.1",
+    "@nrwl/node": "15.2.1",
+    "@nrwl/workspace": "15.2.1",
+    "@nstudio/angular": "15.0.2",
+    "@nstudio/nativescript": "15.0.2",
+    "@nstudio/nativescript-angular": "15.0.2",
+    "@nstudio/xplat": "15.0.2",
     "@types/jasmine": "4.3.0",
     "@types/jest": "28.1.8",
     "@types/node": "^18.7.13",
@@ -93,8 +93,8 @@
     "karma-nativescript-launcher": "0.4.0",
     "karma-sinon": "^1.0.5",
     "lint-staged": "^13.0.3",
-    "ng-packagr": "14.2.1",
-    "nx": "14.7.11",
+    "ng-packagr": "15.0.1",
+    "nx": "15.2.1",
     "nyc": "15.1.0",
     "postcss": "^8.4.16",
     "postcss-import": "14.1.0",
@@ -106,7 +106,7 @@
     "ts-jest": "28.0.8",
     "ts-node": "10.9.1",
     "tslib": "^2.4.0",
-    "typescript": "~4.7.2"
+    "typescript": "~4.8.0"
   },
   "xplat": {
     "prefix": "nativescript",
diff --git a/packages/angular/project.json b/packages/angular/project.json
@@ -1,4 +1,5 @@
 {
+  "name": "angular",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/angular/src",
   "projectType": "library",
@@ -23,7 +24,7 @@
         "jestConfig": "packages/angular/jest.config.ts",
         "passWithNoTests": true
       },
-      "outputs": ["coverage/packages/angular"]
+      "outputs": ["{workspaceRoot}/coverage/packages/angular"]
     }
   },
   "tags": []
diff --git a/packages/angular/src/lib/legacy/router/page-router-outlet.ts b/packages/angular/src/lib/legacy/router/page-router-outlet.ts
@@ -1,4 +1,4 @@
-import { Attribute, ChangeDetectorRef, ComponentFactory, ComponentFactoryResolver, ComponentRef, Directive, Inject, InjectionToken, Injector, OnDestroy, EventEmitter, Output, Type, ViewContainerRef, ElementRef, InjectFlags, NgZone, EnvironmentInjector, inject } from '@angular/core';
+import { Attribute, ChangeDetectorRef, ComponentFactory, ComponentFactoryResolver, ComponentRef, Directive, Inject, InjectionToken, Injector, OnDestroy, EventEmitter, Output, Type, ViewContainerRef, ElementRef, InjectFlags, NgZone, EnvironmentInjector, inject, InjectOptions } from '@angular/core';
 import { ActivatedRoute, ActivatedRouteSnapshot, ChildrenOutletContexts, Data, PRIMARY_OUTLET, Router, RouterOutletContract } from '@angular/router';
 
 import { Frame, Page, NavigatedData, profile, NavigationEntry } from '@nativescript/core';
@@ -43,12 +43,20 @@ function callableOnce<T>(fn: (...args: T[]) => void) {
 export class DestructibleInjector implements Injector {
   private refs = new Set<any>();
   constructor(private destructibleProviders: ProviderSet, private parent: Injector) {}
-  get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T {
+  get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectOptions | InjectFlags): T {
     const ref = this.parent.get(token, notFoundValue, flags);
+
     // if we're skipping ourselves then it's not our responsibility to destroy
-    if (!(flags & InjectFlags.SkipSelf) && this.destructibleProviders.has(token)) {
-      this.refs.add(ref);
+    if (typeof flags === 'number') {
+      if (!(flags & InjectFlags.SkipSelf) && this.destructibleProviders.has(token)) {
+        this.refs.add(ref);
+      }
+    } else {
+      if (!flags?.skipSelf && this.destructibleProviders.has(token)) {
+        this.refs.add(ref);
+      }
     }
+
     return ref;
   }
   destroy() {
diff --git a/packages/angular/tsconfig.lib.prod.json b/packages/angular/tsconfig.lib.prod.json
@@ -1,7 +1,9 @@
 {
   "extends": "./tsconfig.lib.json",
   "compilerOptions": {
-    "declarationMap": false
+    "declarationMap": false,
+    "target": "ES2022",
+    "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     "compilationMode": "partial"
diff --git a/packages/zone-js/project.json b/packages/zone-js/project.json
@@ -1,4 +1,5 @@
 {
+  "name": "zone-js",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/zone-js/src",
   "projectType": "library",
@@ -21,7 +22,7 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/packages/zone-js"],
+      "outputs": ["{workspaceRoot}/coverage/packages/zone-js"],
       "options": {
         "jestConfig": "packages/zone-js/jest.config.ts",
         "passWithNoTests": true
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -8,10 +8,10 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
-    "target": "es2015",
+    "target": "ES2020",
     "module": "esnext",
     "typeRoots": ["node_modules/@types"],
-    "lib": ["es2017", "dom"],
+    "lib": ["ESNext", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`"@nativescript-community/ui-material-bottom-navigation": "^7.0.0"`
`12`	`12`	`},`
`13`	`13`	`"devDependencies": {`
`14`		`- "@nativescript/android": "~8.3.0",`
`15`		`- "@nativescript/ios": "~8.3.0",`
	`14`	`+ "@nativescript/android": "~8.4.0",`
	`15`	`+ "@nativescript/ios": "~8.4.0",`
`16`	`16`	`"@nativescript/unit-test-runner": "^3.0.1"`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "name": "angular",`
`2`	`3`	`"$schema": "../../node_modules/nx/schemas/project-schema.json",`
`3`	`4`	`"sourceRoot": "packages/angular/src",`
`4`	`5`	`"projectType": "library",`
`@@ -23,7 +24,7 @@`
`23`	`24`	`"jestConfig": "packages/angular/jest.config.ts",`
`24`	`25`	`"passWithNoTests": true`
`25`	`26`	`},`
`26`		`- "outputs": ["coverage/packages/angular"]`
	`27`	`+ "outputs": ["{workspaceRoot}/coverage/packages/angular"]`
`27`	`28`	`}`
`28`	`29`	`},`
`29`	`30`	`"tags": []`