Skip to content

Integrate Nativescript-vue-navigator #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 26, 2019
Merged

Integrate Nativescript-vue-navigator #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3fa556
Changes to include the nativescript-vue-navigator for native navigation
msaelices Mar 20, 2019
ae47ca6
Fix some issues with the router.
msaelices Mar 20, 2019
400d580
Final fix. It's working.
msaelices Mar 20, 2019
bc3efa3
In order to avoid linter errors, use Vue.prototype.
msaelices Mar 20, 2019
99065eb
Add a useful comment.
msaelices Mar 21, 2019
74f9d20
In order to add conditionals here, it's better not extends+replace an…
msaelices Mar 21, 2019
c72b4a6
When using JS is simpler to use the standard this.$navigator
msaelices Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions generator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {},
Expand Down
22 changes: 12 additions & 10 deletions generator/templates/simple/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) { _%>
Expand All @@ -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);
}
<%_ } _%>
}
Expand All @@ -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) { _%>
Expand All @@ -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) : Vue.prototype.$navigator.navigate(route);
}
<%_ } _%>
}
Expand Down
40 changes: 18 additions & 22 deletions generator/templates/simple/src/main.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
---
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 %>
<%_ if (rootOptions.router) { _%>
import Navigator from 'nativescript-vue-navigator'
<%_ } _%>

<%# REPLACE %>
import App from './App.vue';
<%# END_REPLACE %>
<%_ if (rootOptions.router) { _%>
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
}
return data
}, {});

Vue.use(Navigator, { routes });
<%_ } _%>

<%# 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 %>
31 changes: 25 additions & 6 deletions generator/templates/simple/src/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ 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 /import Home from './views/Home.vue'/
- !!js/regexp /'./views/About.vue'\)/
- !!js/regexp /Vue.use\(Router\)/
- !!js/regexp /export default new Router\(\{/
- !!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 /\}\)/
---

Expand All @@ -21,14 +25,29 @@ import Router from 'vue-router';
Vue.use(Router);
<%# END_REPLACE %>

<%# REPLACE %>
export const options = {
<%# END_REPLACE %>

<%# REPLACE %>
import Home from '~/views/Home.vue';
import About from '~/views/About.vue';
<%# END_REPLACE %>

<%# REPLACE %>
'~/views/About.vue'),
About,
<%# END_REPLACE %>

<%# REPLACE %>
});
<%# END_REPLACE %>
<%# END_REPLACE %>

<%# REPLACE %>
<%# END_REPLACE %>

<%# REPLACE %>
<%# END_REPLACE %>

<%# REPLACE %>
};
export default new Router(options);
<%# END_REPLACE %>