nativescript-vue 3.0.0-beta.6 → 3.0.0-beta.8

package/dist/renderer/patchProp.js

@@ -1,27 +1,27 @@
-import { patchAttr } from "./modules/attrs";
-import { patchClass } from "./modules/class";
-import { patchEvent } from "./modules/events";
-import { patchStyle } from "./modules/style";
-import { isOn } from "../runtimeHelpers";
-import { getViewMeta } from "../registry";
+import { patchAttr } from './modules/attrs';
+import { patchClass } from './modules/class';
+import { patchEvent } from './modules/events';
+import { patchStyle } from './modules/style';
+import { isOn } from '../runtimeHelpers';
+import { getViewMeta } from '../registry';
 export function patchProp(el, key, prevValue, nextValue, isSVG = false, prevChildren, parentComponent, parentSuspense, unmountChildren) {
     switch (key) {
         // special
-        case "class":
+        case 'class':
             // console.log('->patchProp+Class')
             patchClass(el, nextValue);
             break;
-        case "style":
+        case 'style':
             // console.log('->patchProp+Style')
             patchStyle(el, prevValue, nextValue);
             break;
-        case "modelValue":
-        case "onUpdate:modelValue":
+        case 'modelValue':
+        case 'onUpdate:modelValue':
             try {
                 // v-model - maps modelValue/onUpdate:modelValue to the correct prop/events from the registry meta
                 const { prop, event } = getViewMeta(el.tagName)
                     .model;
-                if (key === "modelValue") {
+                if (key === 'modelValue') {
                     patchAttr(el, prop, prevValue, nextValue);
                 }
                 else {

package/dist/runtimeHelpers.d.ts

@@ -1,19 +1,14 @@
-import { View } from "@nativescript/core";
-import { AppContext, Component } from "@vue/runtime-core";
-import { NSVNode } from "./dom";
+import { View } from '@nativescript/core';
+import { AppContext, Component, RendererElement, RendererNode, VNode } from '@vue/runtime-core';
+import { NSVNode } from './dom';
 type Props = Record<string, unknown>;
 export declare const setRootContext: (context: AppContext) => void;
-export declare const createNativeView: <T = View>(component: Component, props?: Props) => {
-    context: {
-        app: import("@vue/runtime-core").App<any>;
-        config: import("@vue/runtime-core").AppConfig;
-        mixins: import("@vue/runtime-core").ComponentOptions<{}, any, any, any, any, any, any, any>[];
-        components: Record<string, Component<any, any, any, import("@vue/runtime-core").ComputedOptions, import("@vue/runtime-core").MethodOptions>>;
-        directives: Record<string, import("@vue/runtime-core").Directive<any, any>>;
-        provides: Record<string | symbol, any>;
-    };
+export declare const createNativeView: <T = View>(component: Component, props?: Props, contextOverrides?: any) => {
+    context: any;
     readonly nativeView: T;
-    mount(root?: NSVNode): T;
+    mount(root?: NSVNode): VNode<RendererNode, RendererElement, {
+        nativeView: T;
+    }>;
     unmount(): void;
 };
 export declare const ELEMENT_REF: unique symbol;

package/dist/runtimeHelpers.js

@@ -1,36 +1,38 @@
-import { h } from "@vue/runtime-core";
-import { NSVRoot } from "./dom";
-import { renderer } from "./renderer";
+import { h, } from '@vue/runtime-core';
+import { NSVRoot } from './dom';
+import { renderer } from './renderer';
 const __DEV__ = true;
 let rootContext = null;
 export const setRootContext = (context) => {
     rootContext = context;
 };
-export const createNativeView = (component, props) => {
+export const createNativeView = (component, props, contextOverrides) => {
     let vnode;
     let isMounted = false;
     let container;
-    const context = { ...rootContext };
+    const context = { ...rootContext, ...contextOverrides };
     return {
         context,
         get nativeView() {
             return vnode.el.nativeView;
         },
         mount(root = new NSVRoot()) {
-            if (isMounted)
-                return vnode.el.nativeView;
+            if (isMounted) {
+                return vnode;
+            }
             vnode = h(component, props);
             vnode.appContext = context;
             renderer.render(vnode, root);
             isMounted = true;
             container = root;
-            return vnode.el.nativeView;
+            return vnode;
         },
         unmount() {
             if (!isMounted)
                 return;
-            renderer.render(null, container);
             vnode = null;
+            renderer.render(null, container);
+            isMounted = false;
             container = null;
         },
     };
@@ -38,9 +40,9 @@ export const createNativeView = (component, props) => {
 export const ELEMENT_REF = Symbol(__DEV__ ? `elementRef` : ``);
 const onRE = /^on.+/;
 export const isOn = (key) => onRE.test(key);
-export const isAndroidKey = (key) => key.startsWith("android:");
-export const isIOSKey = (key) => key.startsWith("ios:");
+export const isAndroidKey = (key) => key.startsWith('android:');
+export const isIOSKey = (key) => key.startsWith('ios:');
 export const isBoolean = (value) => {
-    return typeof value === "boolean" || value instanceof Boolean;
+    return typeof value === 'boolean' || value instanceof Boolean;
 };
 //# sourceMappingURL=runtimeHelpers.js.map

package/dist/runtimeHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtimeHelpers.js","sourceRoot":"","sources":["../src/runtimeHelpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,CAAC,EAAS,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAW,OAAO,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,MAAM,OAAO,GAAG,IAAI,CAAC;AAErB,IAAI,WAAW,GAAe,IAAI,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAmB,EAAE,EAAE;IACpD,WAAW,GAAG,OAAO,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,SAAoB,EACpB,KAAa,EACb,EAAE;IACF,IAAI,KAAY,CAAC;IACjB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,SAAkB,CAAC;IACvB,MAAM,OAAO,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;IAEnC,OAAO;QACL,OAAO;QACP,IAAI,UAAU;YACZ,OAAO,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC;QAC7B,CAAC;QACD,KAAK,CAAC,OAAgB,IAAI,OAAO,EAAE;YACjC,IAAI,SAAS;gBAAE,OAAO,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC;YAE1C,KAAK,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAE5B,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC;YAE3B,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAE7B,SAAS,GAAG,IAAI,CAAC;YACjB,SAAS,GAAG,IAAI,CAAC;YAEjB,OAAO,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC;QAC7B,CAAC;QACD,OAAO;YACL,IAAI,CAAC,SAAS;gBAAE,OAAO;YACvB,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACjC,KAAK,GAAG,IAAI,CAAC;YACb,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE/D,MAAM,IAAI,GAAG,OAAO,CAAC;AACrB,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEpD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAc,EAAW,EAAE;IACnD,OAAO,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,YAAY,OAAO,CAAC;AAChE,CAAC,CAAC"}
+{"version":3,"file":"runtimeHelpers.js","sourceRoot":"","sources":["../src/runtimeHelpers.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,CAAC,GAIF,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAW,OAAO,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,MAAM,OAAO,GAAG,IAAI,CAAC;AAErB,IAAI,WAAW,GAAe,IAAI,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAmB,EAAE,EAAE;IACpD,WAAW,GAAG,OAAO,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,SAAoB,EACpB,KAAa,EACb,gBAAsB,EACtB,EAAE;IACF,IAAI,KAAY,CAAC;IACjB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,SAAkB,CAAC;IACvB,MAAM,OAAO,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAIxD,OAAO;QACL,OAAO;QACP,IAAI,UAAU;YACZ,OAAO,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC;QAC7B,CAAC;QACD,KAAK,CAAC,OAAgB,IAAI,OAAO,EAAE;YACjC,IAAI,SAAS,EAAE;gBACb,OAAO,KAAU,CAAC;aACnB;YAED,KAAK,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAE5B,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC;YAE3B,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAE7B,SAAS,GAAG,IAAI,CAAC;YACjB,SAAS,GAAG,IAAI,CAAC;YAEjB,OAAO,KAAU,CAAC;QACpB,CAAC;QACD,OAAO;YACL,IAAI,CAAC,SAAS;gBAAE,OAAO;YACvB,KAAK,GAAG,IAAI,CAAC;YACb,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACjC,SAAS,GAAG,KAAK,CAAC;YAClB,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE/D,MAAM,IAAI,GAAG,OAAO,CAAC;AACrB,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEpD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAc,EAAW,EAAE;IACnD,OAAO,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,YAAY,OAAO,CAAC;AAChE,CAAC,CAAC"}

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-declare module "@vue/runtime-core" {
+declare module '@vue/runtime-core' {
     interface GlobalComponents {
         Frame: DefineComponent<{}>;
         Page: DefineComponent;

package/nativescript.webpack.js

@@ -1,21 +1,22 @@
-const { VueLoaderPlugin } = require("vue-loader");
+const { VueLoaderPlugin } = require('vue-loader');
 
 /**
  * @param {typeof import("@nativescript/webpack")} webpack
  */
 module.exports = (webpack) => {
-  webpack.useConfig("vue");
+  webpack.useConfig('vue');
 
   webpack.chainWebpack((config) => {
+    // resolve any imports from "vue" to "nativescript-vue"
     config.resolve.alias.set('vue', 'nativescript-vue');
-    
-    config.plugin("VueLoaderPlugin").use(VueLoaderPlugin);
-
-    config.module
-      .rule("vue")
-      .test(/\.vue$/)
-      .use("vue-loader")
-      .loader(require.resolve("vue-loader"))
+
+    config.plugins.get('VueLoaderPlugin').use(VueLoaderPlugin);
+
+    // use "vue-loader" from "nativescript-vue" deps rather than the one from @nativescript/webpack
+    config.module.rules
+      .get('vue')
+      .uses.get('vue-loader')
+      .loader(require.resolve('vue-loader'))
       .tap((options) => {
         return {
           ...options,
@@ -27,7 +28,17 @@ module.exports = (webpack) => {
         };
       });
 
-    config.plugin("DefinePlugin").tap((args) => {
+    config.module.rules
+      .get('css')
+      .uses.get('vue-css-loader')
+      .loader(require.resolve('vue-loader/dist/stylePostLoader.js'));
+
+    config.module.rules
+      .get('scss')
+      .uses.get('vue-css-loader')
+      .loader(require.resolve('vue-loader/dist/stylePostLoader.js'));
+
+    config.plugin('DefinePlugin').tap((args) => {
       Object.assign(args[0], {
         __VUE_OPTIONS_API__: true,
         __VUE_PROD_DEVTOOLS__: false,
@@ -37,7 +48,7 @@ module.exports = (webpack) => {
     });
 
     // disable vue fork ts checker, as it doesn't work with vue3 yet?
-    config.plugin("ForkTsCheckerWebpackPlugin").tap((args) => {
+    config.plugin('ForkTsCheckerWebpackPlugin').tap((args) => {
       args[0] = webpack.merge(args[0], {
         typescript: {
           extensions: {
@@ -47,6 +58,7 @@ module.exports = (webpack) => {
           },
         },
       });
+
       return args;
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-vue",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.8",
   "main": "dist/index.js",
   "files": [
     "dist/",
@@ -9,20 +9,36 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "prepare": "husky install",
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@vue/compiler-dom": "^3.2.41",
-    "@vue/compiler-sfc": "^3.2.41",
+    "@vue/compiler-sfc": "^3.3.4",
+    "@vue/runtime-core": "^3.3.4",
+    "@vue/shared": "^3.3.4",
     "set-value": "^4.1.0",
-    "vue-loader": "^17.0.0"
+    "vue-loader": "^17.2.2"
   },
   "devDependencies": {
-    "@nativescript/core": "^8.3.5",
-    "@nativescript/webpack": "~5.0.12",
-    "esbuild": "^0.15.12",
-    "tsx": "^3.11.0",
-    "typescript": "^4.8.4",
-    "vue": "^3.2.41"
+    "@commitlint/cli": "^17.6.3",
+    "@commitlint/config-conventional": "^17.6.3",
+    "@nativescript/core": "~8.5.0",
+    "@nativescript/webpack": "~5.0.14",
+    "esbuild": "^0.17.19",
+    "husky": "^8.0.3",
+    "lint-staged": "^13.2.2",
+    "prettier": "^2.8.8",
+    "typescript": "^4.9.5"
+  },
+  "lint-staged": {
+    "*": [
+      "prettier --ignore-unknown --write"
+    ]
+  },
+  "prettier": {
+    "useTabs": false,
+    "singleQuote": true
   }
 }