Merge pull request #12 from nativescript-vue/dev

Fix #9 & Fix #11

Author: jawa-the-hutt

generator/index.js

@@ -904,7 +904,13 @@ const extractCallDir = (module.exports.extractCallDir = () => {
   try {
     const obj = {};
     Error.captureStackTrace(obj);
-    return path.dirname(obj.stack.split('\n')[3].match(/\s\((.*):\d+:\d+\)$/)[1]);
+    const callSite = obj.stack.split('\n')[3];
+    let { fileName } = /(?<fileName>[^(\s]+):[0-9]+:[0-9]+/.exec(callSite).groups;
+    if (fileName.indexOf('file') >= 0) {
+      fileName = new URL(fileName).pathname;
+    }
+    let dirname = path.dirname(fileName);
+    return dirname;
   } catch (err) {
     throw err;
   }

generator/templates/nvw/src/App.vue

@@ -70,6 +70,8 @@
 <%_ } else if (!usingTS && !rootOptions.router) { _%>
 <%# -------------------- IS NOT Using TypeScript AND IS NOT Using vue-router  -------------------- -%>
 <script>
+  import HelloWorld from './components/HelloWorld';
+  
   const { VUE_APP_MODE, VUE_APP_PLATFORM } = process.env;
 
   export default {
@@ -79,6 +81,9 @@
         msg: `Mode=${VUE_APP_MODE} and Platform=${VUE_APP_PLATFORM}`,
       };
     },
+    components: {
+      HelloWorld,
+    },
   };
 </script>
 <%_ } else if (usingTS && rootOptions.router) { _%>

package.json

@@ -17,7 +17,9 @@
     "preversion": "npm test",
     "version": "git add -A",
     "postversion": "git push --tags origin master",
-    "prep": "npm version patch -m \"build %s\""
+    "prep:patch": "npm version patch -m \"build %s\"",
+    "prep:minor": "npm version minor -m \"build %s\"",
+    "prep:major": "npm version major -m \"build %s\""
   },
   "author": "Igor Randjelovic",
   "license": "MIT",