Essent · NathanWalker · Jul 5, 2023 · Jul 5, 2023 · Jul 5, 2023 · Jul 23, 2023
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],
+      "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {

diff --git a/.swp b/.swp
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 - [@essent/nativescript-medallia](packages/nativescript-medallia/README.md)
 - [@essent/nativescript-ng-sentry](packages/nativescript-ng-sentry/README.md)
 - [@essent/nativescript-urban-airship](packages/nativescript-urban-airship/README.md)
+- [@essent/nativescript-webview-ext](packages/nativescript-webview-ext/README.md)
 
 # How to use?
 

diff --git a/apps/demo-angular/package.json b/apps/demo-angular/package.json
@@ -7,7 +7,8 @@
     "@essent/nativescript-appdynamics": "file:../../dist/packages/nativescript-appdynamics",
     "@essent/nativescript-iadvize": "file:../../dist/packages/nativescript-iadvize",
     "@essent/nativescript-medallia": "file:../../dist/packages/nativescript-medallia",
-    "@essent/nativescript-urban-airship": "file:../../dist/packages/nativescript-urban-airship"
+    "@essent/nativescript-urban-airship": "file:../../dist/packages/nativescript-urban-airship",
+    "@essent/nativescript-webview-ext": "file:../../dist/packages/nativescript-webview-ext"
   },
   "devDependencies": {
     "@nativescript/android": "~8.5.0",

diff --git a/apps/demo-angular/project.json b/apps/demo-angular/project.json
@@ -17,7 +17,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -29,7 +29,7 @@
       "dependsOn": [
         {
           "target": "build.demo",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -41,7 +41,7 @@
       "dependsOn": [
         {
           "target": "build.demo",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -52,7 +52,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/demo-angular/**/*.ts"]
       }

diff --git a/apps/demo-angular/src/app-routing.module.ts b/apps/demo-angular/src/app-routing.module.ts
@@ -13,6 +13,7 @@ const routes: Routes = [
   { path: 'nativescript-medallia', loadChildren: () => import('./plugin-demos/nativescript-medallia.module').then((m) => m.NativescriptMedalliaModule) },
   { path: 'nativescript-ng-sentry', loadChildren: () => import('./plugin-demos/nativescript-ng-sentry.module').then((m) => m.NativescriptNgSentryModule) },
   { path: 'nativescript-urban-airship', loadChildren: () => import('./plugin-demos/nativescript-urban-airship.module').then((m) => m.NativescriptUrbanAirshipModule) },
+  { path: 'nativescript-webview-ext', loadChildren: () => import('./plugin-demos/nativescript-webview-ext.module').then((m) => m.NativescriptWebviewExtModule) },
 ];
 
 @NgModule({

diff --git a/apps/demo-angular/src/home.component.ts b/apps/demo-angular/src/home.component.ts
@@ -24,5 +24,8 @@ export class HomeComponent {
     {
       name: 'nativescript-urban-airship',
     },
+    {
+      name: 'nativescript-webview-ext',
+    },
   ];
 }
diff --git a/apps/demo-angular/src/plugin-demos/nativescript-webview-ext.component.html b/apps/demo-angular/src/plugin-demos/nativescript-webview-ext.component.html
@@ -0,0 +1,8 @@
+<ActionBar title="nativescript-webview-ext" class="action-bar"> </ActionBar>
+<StackLayout class="p-20">
+  <ScrollView class="h-full">
+    <StackLayout>
+      <Button text="Test nativescript-webview-ext" (tap)="demoShared.testIt()" class="btn btn-primary"></Button>
+    </StackLayout>
+  </ScrollView>
+</StackLayout>
diff --git a/apps/demo-angular/src/plugin-demos/nativescript-webview-ext.component.ts b/apps/demo-angular/src/plugin-demos/nativescript-webview-ext.component.ts
@@ -0,0 +1,17 @@
+import { Component, NgZone } from '@angular/core';
+import { DemoSharedNativescriptWebviewExt } from '@demo/shared';
+import {} from '@essent/nativescript-webview-ext';
+
+@Component({
+  selector: 'demo-nativescript-webview-ext',
+  templateUrl: 'nativescript-webview-ext.component.html',
+})
+export class NativescriptWebviewExtComponent {
+  demoShared: DemoSharedNativescriptWebviewExt;
+
+  constructor(private _ngZone: NgZone) {}
+
+  ngOnInit() {
+    this.demoShared = new DemoSharedNativescriptWebviewExt();
+  }
+}
diff --git a/apps/demo-angular/src/plugin-demos/nativescript-webview-ext.module.ts b/apps/demo-angular/src/plugin-demos/nativescript-webview-ext.module.ts
@@ -0,0 +1,10 @@
+import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
+import { NativeScriptCommonModule, NativeScriptRouterModule } from '@nativescript/angular';
+import { NativescriptWebviewExtComponent } from './nativescript-webview-ext.component';
+
+@NgModule({
+  imports: [NativeScriptCommonModule, NativeScriptRouterModule.forChild([{ path: '', component: NativescriptWebviewExtComponent }])],
+  declarations: [NativescriptWebviewExtComponent],
+  schemas: [NO_ERRORS_SCHEMA],
+})
+export class NativescriptWebviewExtModule {}
diff --git a/apps/demo/package.json b/apps/demo/package.json
@@ -10,7 +10,8 @@
     "@essent/nativescript-appdynamics": "file:../../packages/nativescript-appdynamics",
     "@essent/nativescript-iadvize": "file:../../packages/nativescript-iadvize",
     "@essent/nativescript-medallia": "file:../../packages/nativescript-medallia",
-    "@essent/nativescript-urban-airship": "file:../../packages/nativescript-urban-airship"
+    "@essent/nativescript-urban-airship": "file:../../packages/nativescript-urban-airship",
+    "@essent/nativescript-webview-ext": "file:../../packages/nativescript-webview-ext"
   },
   "devDependencies": {
     "@nativescript/android": "~8.5.0",

diff --git a/apps/demo/project.json b/apps/demo/project.json
@@ -17,7 +17,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -29,7 +29,7 @@
       "dependsOn": [
         {
           "target": "build.demo",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -41,7 +41,7 @@
       "dependsOn": [
         {
           "target": "build.demo",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -52,7 +52,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/demo/**/*.ts"]
       }

diff --git a/apps/demo/src/main-page.xml b/apps/demo/src/main-page.xml
@@ -11,6 +11,7 @@
         <Button text="nativescript-medallia" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="nativescript-ng-sentry" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="nativescript-urban-airship" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
+<Button text="nativescript-webview-ext" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
       </StackLayout>
     </ScrollView>
   </StackLayout>

diff --git a/apps/demo/src/plugin-demos/nativescript-webview-ext.ts b/apps/demo/src/plugin-demos/nativescript-webview-ext.ts
@@ -0,0 +1,10 @@
+import { Observable, EventData, Page } from '@nativescript/core';
+import { DemoSharedNativescriptWebviewExt } from '@demo/shared';
+import {} from '@essent/nativescript-webview-ext';
+
+export function navigatingTo(args: EventData) {
+  const page = <Page>args.object;
+  page.bindingContext = new DemoModel();
+}
+
+export class DemoModel extends DemoSharedNativescriptWebviewExt {}
diff --git a/apps/demo/src/plugin-demos/nativescript-webview-ext.xml b/apps/demo/src/plugin-demos/nativescript-webview-ext.xml
@@ -0,0 +1,14 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" class="page">
+    <Page.actionBar>
+        <ActionBar title="nativescript-webview-ext" icon="" class="action-bar">
+        </ActionBar>
+    </Page.actionBar>
+    <StackLayout class="p-20">
+        <ScrollView class="h-full">
+          <StackLayout>
+            <Button text="Test nativescript-webview-ext" tap="{{ testIt }}" class="btn btn-primary"/>
+
+          </StackLayout>
+        </ScrollView>
+    </StackLayout>
+</Page>
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,3 +1,3 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@nx/jest');
 
 export default { projects: [...getJestProjects()] };
diff --git a/migrations.json b/migrations.json
diff --git a/package.json b/package.json
@@ -16,31 +16,37 @@
   },
   "private": true,
   "devDependencies": {
-    "@angular/animations": "^15.0.0",
-    "@angular/common": "^15.0.0",
-    "@angular/compiler": "^15.0.0",
-    "@angular/compiler-cli": "^15.0.0",
-    "@angular/core": "^15.0.0",
-    "@angular/forms": "^15.0.0",
-    "@angular/platform-browser": "^15.0.0",
-    "@angular/platform-browser-dynamic": "^15.0.0",
-    "@angular/router": "^15.0.0",
-    "@nativescript/angular": "^15.0.0",
+    "@angular-devkit/build-angular": "^16.0.0",
+    "@angular/animations": "~16.0.0",
+    "@angular/common": "~16.0.0",
+    "@angular/compiler": "~16.0.0",
+    "@angular/compiler-cli": "~16.0.0",
+    "@angular/core": "~16.0.0",
+    "@angular/forms": "~16.0.0",
+    "@angular/platform-browser": "~16.0.0",
+    "@angular/platform-browser-dynamic": "~16.0.0",
+    "@angular/router": "~16.0.0",
+    "@nativescript/angular": "^16.0.0",
     "@nativescript/appversion": "^2.0.0",
     "@nativescript/core": "~8.5.0",
-    "@nativescript/plugin-tools": "5.1.0",
+    "@nativescript/plugin-tools": "5.2.0-alpha.1",
     "@nativescript/types": "~8.5.0",
     "@nativescript/webpack": "~5.0.5",
-    "@ngtools/webpack": "^15.0.0",
+    "@ngtools/webpack": "~16.0.0",
     "husky": "^8.0.0",
     "moment": "^2.0.0",
     "nativescript-vue": "~2.9.0",
     "nativescript-vue-template-compiler": "~2.9.0",
-    "ng-packagr": "^15.0.0",
+    "ng-packagr": "~16.0.0",
+    "promise-polyfill": "~8.3.0",
     "rxjs": "~7.5.0",
-    "typescript": "~4.8.0",
-    "zone.js": "~0.13.0",
-    "@angular-devkit/build-angular": "^15.0.0"
+    "ts-patch": "^3.0.0",
+    "typescript": "~5.0.0",
+    "whatwg-fetch": "^3.6.2",
+    "zone.js": "~0.13.0"
+  },
+  "resolutions": {
+    "ts-patch": "^3.0.0"
   },
   "lint-staged": {
     "**/*.{js,ts,scss,json,html}": [

diff --git a/...vescript-adobe-experience-cloud/platforms/android/nativescript_adobe_experience_cloud.aar b/...vescript-adobe-experience-cloud/platforms/android/nativescript_adobe_experience_cloud.aar
diff --git a/...ivescript-adobe-experience-cloud/platforms/android/nativescript_adobe_marketing_cloud.aar b/...ivescript-adobe-experience-cloud/platforms/android/nativescript_adobe_marketing_cloud.aar
diff --git a/packages/nativescript-adobe-experience-cloud/project.json b/packages/nativescript-adobe-experience-cloud/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "packages/nativescript-adobe-experience-cloud",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "options": {
         "outputPath": "dist/packages/nativescript-adobe-experience-cloud",
         "tsConfig": "packages/nativescript-adobe-experience-cloud/tsconfig.json",
@@ -39,11 +39,10 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         },
         {
-          "target": "build",
-          "projects": "self"
+          "target": "build"
         }
       ]
     },
@@ -55,7 +54,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["packages/nativescript-adobe-experience-cloud/**/*.ts"]
       }

diff --git a/packages/nativescript-appdynamics/platforms/android/appdynamics_plugin.aar b/packages/nativescript-appdynamics/platforms/android/appdynamics_plugin.aar
diff --git a/packages/nativescript-appdynamics/project.json b/packages/nativescript-appdynamics/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "packages/nativescript-appdynamics",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "options": {
         "outputPath": "dist/packages/nativescript-appdynamics",
         "tsConfig": "packages/nativescript-appdynamics/tsconfig.json",
@@ -41,11 +41,10 @@
       "dependsOn": [
         {
           "target": "build.hooks",
-          "projects": "dependencies"
+          "dependencies": true
         },
         {
-          "target": "build",
-          "projects": "self"
+          "target": "build"
         }
       ]
     },
@@ -59,15 +58,13 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         },
         {
-          "target": "build.hooks",
-          "projects": "self"
+          "target": "build.hooks"
         },
         {
-          "target": "build",
-          "projects": "self"
+          "target": "build"
         }
       ]
     },
@@ -81,7 +78,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -93,7 +90,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["packages/nativescript-appdynamics/**/*.ts"]
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,5 +24,8 @@ export class HomeComponent { @@
         {
           name: 'nativescript-urban-airship',
         },
+        {
+          name: 'nativescript-webview-ext',
+        },
       ];
     }