From f3fa556053a79b9d655e40da174e8cf75a49ec17 Mon Sep 17 00:00:00 2001
From: Manuel Saelices <msaelices@gmail.com>
Date: Wed, 20 Mar 2019 22:46:36 +0100
Subject: [PATCH 1/7] Changes to include the nativescript-vue-navigator for
 native navigation

---
 generator/index.js                            |  8 +++++++
 generator/templates/simple/src/App.vue        | 22 ++++++++++---------
 generator/templates/simple/src/main.native.js |  7 +++++-
 generator/templates/simple/src/router.js      | 12 +++++++---
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/generator/index.js b/generator/index.js
index 61a0fac..cd09d77 100644
--- a/generator/index.js
+++ b/generator/index.js
@@ -114,6 +114,14 @@ module.exports = async (api, options, rootOptions) => {
     //
   }
 
+  if (rootOptions.router) {
+    api.extendPackage({
+      dependencies: {
+        'nativescript-vue-navigator': '^0.0.3'
+      }
+    });
+  }
+
   if (api.hasPlugin('typescript')) {
     api.extendPackage({
       dependencies: {},
diff --git a/generator/templates/simple/src/App.vue b/generator/templates/simple/src/App.vue
index ffc1a9f..b19c233 100644
--- a/generator/templates/simple/src/App.vue
+++ b/generator/templates/simple/src/App.vue
@@ -56,9 +56,6 @@
 <script>
 <%_   if (!rootOptions.router) { _%>
   import HelloWorld from '~/components/HelloWorld';
-<%_   } else { _%>
-  import Home from '~/views/Home';
-  import About from '~/views/About';
 <%_   } _%>
 
 <%_   if (!rootOptions.router) { _%>
@@ -84,10 +81,13 @@
     methods: {
 <%_   if (rootOptions.router) { _%>
       goToHomePage() {
-        this.$navigateTo(Home);
+        this.goTo('home');
       },
       goToAboutPage() {
-        VUE_APP_MODE == 'web' ? this.$router.push('about') : this.$navigateTo(About);
+        this.goTo('about');
+      },
+      goTo(route) {
+        VUE_APP_MODE === 'web' ? this.$router.push(route) : this.$navigator.navigate(route);
       }
 <%_   } _%>
     }
@@ -99,9 +99,6 @@
   import { Component, Vue } from 'vue-property-decorator';
 <%_ if (!rootOptions.router) { _%>
   import HelloWorld from '~/components/HelloWorld.vue';
-<%_ } else { _%>
-  import Home from '~/views/Home.vue';
-  import About from '~/views/About.vue';
 <%_ } _%>
 
 <%_   if (!rootOptions.router) { _%>
@@ -125,12 +122,17 @@
 <%_ } _%>
 
 <%_ if (rootOptions.router) { _%>
+
     public goToHomePage() {
-      Vue.prototype.$navigateTo(Home);
+      this.goTo('home');
     }
 
     public goToAboutPage() {
-      VUE_APP_MODE === 'web' ? this.$router.push('about') : Vue.prototype.$navigateTo(About);
+      this.goTo('about');
+    }
+
+    public goTo(route) {
+      VUE_APP_MODE === 'web' ? this.$router.push(route) : this.$navigator.navigate(route);
     }
 <%_ } _%>
   }
diff --git a/generator/templates/simple/src/main.native.js b/generator/templates/simple/src/main.native.js
index 9686265..430e2b4 100644
--- a/generator/templates/simple/src/main.native.js
+++ b/generator/templates/simple/src/main.native.js
@@ -13,7 +13,12 @@ import Vue from 'nativescript-vue';
 <%# END_REPLACE %>
 
 <%# REPLACE %>
+import Navigator from 'nativescript-vue-navigator'
+
 import App from './App.vue';
+import { options } from './router';
+
+Vue.use(Navigator, { routes: options.routes })
 <%# END_REPLACE %>
 
 <%# REPLACE %>
@@ -25,7 +30,7 @@ Vue.config.silent = false;
 <%# END_REPLACE %>
 
 <%# REPLACE %>
-(h) => h('frame', [h(App)]),
+(h) => h(App),
 <%# END_REPLACE %>
 
 <%# REPLACE %>
diff --git a/generator/templates/simple/src/router.js b/generator/templates/simple/src/router.js
index 6830956..49fdf1e 100644
--- a/generator/templates/simple/src/router.js
+++ b/generator/templates/simple/src/router.js
@@ -3,7 +3,8 @@ extend: '@vue/cli-service/generator/router/template/src/router.js'
 replace:
   - !!js/regexp /import Vue from 'vue'/
   - !!js/regexp /import Router from 'vue-router'/
-  - !!js/regexp /Vue.use\(Router\)/   
+  - !!js/regexp /Vue.use\(Router\)/
+  - !!js/regexp /export default new Router\(\{/
   - !!js/regexp /import Home from './views/Home.vue'/
   - !!js/regexp /'./views/About.vue'\)/
   - !!js/regexp /\}\)/
@@ -21,6 +22,10 @@ import Router from 'vue-router';
 Vue.use(Router);
 <%# END_REPLACE %>
 
+<%# REPLACE %>
+export const options = {
+<%# END_REPLACE %>
+
 <%# REPLACE %>
 import Home from '~/views/Home.vue';
 <%# END_REPLACE %>
@@ -30,5 +35,6 @@ import Home from '~/views/Home.vue';
 <%# END_REPLACE %>
 
 <%# REPLACE %>
-});
-<%# END_REPLACE %>
\ No newline at end of file
+};
+export default new Router(options);
+<%# END_REPLACE %>

From ae47ca6ebc45d7d4286e525679c5b7dd7b279102 Mon Sep 17 00:00:00 2001
From: Manuel Saelices <msaelices@gmail.com>
Date: Thu, 21 Mar 2019 00:43:33 +0100
Subject: [PATCH 2/7] Fix some issues with the router.

---
 generator/templates/simple/src/main.native.js |  9 ++++++++-
 generator/templates/simple/src/router.js      | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/generator/templates/simple/src/main.native.js b/generator/templates/simple/src/main.native.js
index 430e2b4..871594d 100644
--- a/generator/templates/simple/src/main.native.js
+++ b/generator/templates/simple/src/main.native.js
@@ -18,7 +18,14 @@ import Navigator from 'nativescript-vue-navigator'
 import App from './App.vue';
 import { options } from './router';
 
-Vue.use(Navigator, { routes: options.routes })
+const routes = options.routes.reduce((data, route) => {
+  data[route.name] = {
+    component: route.component
+  }
+  return data
+}, {});
+
+Vue.use(Navigator, { routes });
 <%# END_REPLACE %>
 
 <%# REPLACE %>
diff --git a/generator/templates/simple/src/router.js b/generator/templates/simple/src/router.js
index 49fdf1e..b222319 100644
--- a/generator/templates/simple/src/router.js
+++ b/generator/templates/simple/src/router.js
@@ -5,8 +5,11 @@ replace:
   - !!js/regexp /import Router from 'vue-router'/
   - !!js/regexp /Vue.use\(Router\)/
   - !!js/regexp /export default new Router\(\{/
-  - !!js/regexp /import Home from './views/Home.vue'/
-  - !!js/regexp /'./views/About.vue'\)/
+  - !!js/regexp /import Home from '\./views/Home.vue'/
+  - !!js/regexp /\(\) => import(.*)\.\/views\/About\.vue'\)/
+  - !!js/regexp /(\s+)\/\/ (.*)/
+  - !!js/regexp /(\s+)\/\/ (.*)/
+  - !!js/regexp /(\s+)\/\/ (.*)/
   - !!js/regexp /\}\)/
 ---
 
@@ -28,10 +31,20 @@ export const options = {
 
 <%# REPLACE %>
 import Home from '~/views/Home.vue';
+import About from '~/views/About.vue';
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+About,
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+<%# END_REPLACE %>
+
+<%# REPLACE %>
 <%# END_REPLACE %>
 
 <%# REPLACE %>
-'~/views/About.vue'),
 <%# END_REPLACE %>
 
 <%# REPLACE %>

From 400d580db59af6037e27bd1f83d01f094b422e76 Mon Sep 17 00:00:00 2001
From: Manuel Saelices <msaelices@gmail.com>
Date: Thu, 21 Mar 2019 00:52:30 +0100
Subject: [PATCH 3/7] Final fix. It's working.

---
 generator/templates/simple/src/main.native.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generator/templates/simple/src/main.native.js b/generator/templates/simple/src/main.native.js
index 871594d..e9682cf 100644
--- a/generator/templates/simple/src/main.native.js
+++ b/generator/templates/simple/src/main.native.js
@@ -37,7 +37,7 @@ Vue.config.silent = false;
 <%# END_REPLACE %>
 
 <%# REPLACE %>
-(h) => h(App),
+h => h('frame', [h(App)]),
 <%# END_REPLACE %>
 
 <%# REPLACE %>

From bc3efa370bd129d69199b98a871c2f911c5929f8 Mon Sep 17 00:00:00 2001
From: Manuel Saelices <msaelices@gmail.com>
Date: Thu, 21 Mar 2019 00:58:31 +0100
Subject: [PATCH 4/7] In order to avoid linter errors, use Vue.prototype.

---
 generator/templates/simple/src/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generator/templates/simple/src/App.vue b/generator/templates/simple/src/App.vue
index b19c233..934cb9d 100644
--- a/generator/templates/simple/src/App.vue
+++ b/generator/templates/simple/src/App.vue
@@ -87,7 +87,7 @@
         this.goTo('about');
       },
       goTo(route) {
-        VUE_APP_MODE === 'web' ? this.$router.push(route) : this.$navigator.navigate(route);
+        VUE_APP_MODE === 'web' ? this.$router.push(route) : Vue.prototype.$navigator.navigate(route);
       }
 <%_   } _%>
     }
@@ -132,7 +132,7 @@
     }
 
     public goTo(route) {
-      VUE_APP_MODE === 'web' ? this.$router.push(route) : this.$navigator.navigate(route);
+      VUE_APP_MODE === 'web' ? this.$router.push(route) : Vue.prototype.$navigator.navigate(route);
     }
 <%_ } _%>
   }

From 99065eb869c55823296e32087326d18e3c5b145c Mon Sep 17 00:00:00 2001
From: Manuel Saelices <msaelices@gmail.com>
Date: Thu, 21 Mar 2019 01:05:35 +0100
Subject: [PATCH 5/7] Add a useful comment.

---
 generator/templates/simple/src/main.native.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generator/templates/simple/src/main.native.js b/generator/templates/simple/src/main.native.js
index e9682cf..b162983 100644
--- a/generator/templates/simple/src/main.native.js
+++ b/generator/templates/simple/src/main.native.js
@@ -18,6 +18,7 @@ import Navigator from 'nativescript-vue-navigator'
 import App from './App.vue';
 import { options } from './router';
 
+// adapt vue-router routes to nativescript-vue-navigator
 const routes = options.routes.reduce((data, route) => {
   data[route.name] = {
     component: route.component

From 74f9d206898e669dd0d13e776c4f49944ceda1e0 Mon Sep 17 00:00:00 2001
From: Manuel Saelices <msaelices@gmail.com>
Date: Thu, 21 Mar 2019 13:08:33 +0100
Subject: [PATCH 6/7] In order to add conditionals here, it's better not
 extends+replace and create the whole main.native.js file here.

---
 generator/templates/simple/src/main.native.js | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/generator/templates/simple/src/main.native.js b/generator/templates/simple/src/main.native.js
index b162983..b463509 100644
--- a/generator/templates/simple/src/main.native.js
+++ b/generator/templates/simple/src/main.native.js
@@ -1,21 +1,10 @@
----
-extend: '@vue/cli-service/generator/template/src/main.js'
-replace:
-  - !!js/regexp /import Vue from 'vue'/
-  - !!js/regexp /import App from './App.vue'/
-  - !!js/regexp /Vue.config.productionTip = false/
-  - !!js/regexp /h => h\(App\),/
-  - !!js/regexp /}\)\.\$mount\('#app'\)/
----
-
-<%# REPLACE %>
 import Vue from 'nativescript-vue';
-<%# END_REPLACE %>
-
-<%# REPLACE %>
+<%_ if (rootOptions.router) { _%>
 import Navigator from 'nativescript-vue-navigator'
+<%_ } _%>
 
 import App from './App.vue';
+<%_ if (rootOptions.router) { _%>
 import { options } from './router';
 
 // adapt vue-router routes to nativescript-vue-navigator
@@ -27,20 +16,14 @@ const routes = options.routes.reduce((data, route) => {
 }, {});
 
 Vue.use(Navigator, { routes });
-<%# END_REPLACE %>
+<%_ } _%>
 
-<%# REPLACE %>
 // Set the following to `true` to hide the logs created by nativescript-vue
 Vue.config.silent = false;
 // Set the following to `false` to not colorize the logs created by nativescript-vue
 // disabled in template due to typing issue for Typescript projects....NEEDS TO BE FIXED
 // Vue.config.debug = true;
-<%# END_REPLACE %>
-
-<%# REPLACE %>
-h => h('frame', [h(App)]),
-<%# END_REPLACE %>
 
-<%# REPLACE %>
+new Vue({
+  render: h => h('frame', [h(App)]),
 }).$start();
-<%# END_REPLACE %>
\ No newline at end of file

From c72b4a6838d29755665ad32adef038adf2226841 Mon Sep 17 00:00:00 2001
From: Manuel Saelices <msaelices@gmail.com>
Date: Thu, 21 Mar 2019 13:49:32 +0100
Subject: [PATCH 7/7] When using JS is simpler to use the standard
 this.$navigator

---
 generator/templates/simple/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generator/templates/simple/src/App.vue b/generator/templates/simple/src/App.vue
index 934cb9d..1a1c81d 100644
--- a/generator/templates/simple/src/App.vue
+++ b/generator/templates/simple/src/App.vue
@@ -87,7 +87,7 @@
         this.goTo('about');
       },
       goTo(route) {
-        VUE_APP_MODE === 'web' ? this.$router.push(route) : Vue.prototype.$navigator.navigate(route);
+        VUE_APP_MODE === 'web' ? this.$router.push(route) : this.$navigator.navigate(route);
       }
 <%_   } _%>
     }