Skip to content

Commit b3e3921

Browse files
jawa-the-huttjawa-the-hutt
committed
Typescript support is now working
Still WIP Need to cleanup various functions, templates and flesh out Readme
1 parent 2ae9e7a commit b3e3921

26 files changed

+1124
-406
lines changed

‎generator/index.js‎

Lines changed: 197 additions & 122 deletions
Large diffs are not rendered by default.

‎generator/templates/simple/without-nvw/app/App.android.vue‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -29,68 +29,67 @@
2929

3030
export default {
3131

32-
data() {
32+
data () {
3333
return {
34-
navbarTitle: 'App.android.vue',
35-
}
36-
},
34+
navbarTitle: 'App.android.vue'
35+
};
36+
},
3737
methods: {
38-
goToHomePage() {
38+
goToHomePage () {
3939
this.$navigateTo(Home);
4040
},
41-
goToAboutPage() {
41+
goToAboutPage () {
4242
this.$navigateTo(About);
4343
}
4444
}
45-
}
45+
};
4646

4747
</script>
4848
<%_ } else if (!rootOptions.router && usingTS) { _%>
4949
<script lang="ts">
50-
5150
import Home from '~/views/Home.android.vue';
5251
import About from '~/views/About.android.vue';
5352

5453
export default {
5554

56-
data() {
55+
data () {
5756
return {
58-
navbarTitle: 'App.android.vue',
59-
}
60-
},
57+
navbarTitle: 'App.android.vue'
58+
};
59+
},
6160
methods: {
62-
goToHomePage() {
63-
this.$navigateTo(Home);
61+
goToHomePage () {
62+
(this as any).$navigateTo(Home);
6463
},
65-
goToAboutPage() {
66-
this.$navigateTo(About);
64+
goToAboutPage () {
65+
(this as any).$navigateTo(About);
6766
}
6867
}
69-
}
68+
};
7069

7170
</script>
7271
<%_ } else if (rootOptions.router && !usingTS){ _%>
7372
<script>
7473

75-
import Home from '~/views/Home';
74+
import Home from '~/views/Home';
7675
import About from '~/views/About';
7776

7877
export default {
7978

80-
data() {
79+
data () {
8180
return {
82-
navbarTitle: 'App.android.vue',
83-
}
84-
},
81+
navbarTitle: 'App.android.vue'
82+
};
83+
},
8584
methods: {
86-
goToHomePage() {
85+
goToHomePage () {
8786
this.$navigateTo(Home);
8887
},
89-
goToAboutPage() {
88+
goToAboutPage () {
9089
this.$navigateTo(About);
9190
}
9291
}
93-
}
92+
};
9493

9594
</script>
9695
<%_ } else if (rootOptions.router && usingTS){ _%>
@@ -101,20 +100,20 @@
101100

102101
export default {
103102

104-
data() {
103+
data () {
105104
return {
106-
navbarTitle: 'App.android.vue',
107-
}
108-
},
105+
navbarTitle: 'App.android.vue'
106+
};
107+
},
109108
methods: {
110-
goToHomePage() {
111-
this.$navigateTo(Home);
109+
goToHomePage () {
110+
(this as any).$navigateTo(Home);
112111
},
113-
goToAboutPage() {
114-
this.$navigateTo(About);
112+
goToAboutPage () {
113+
(this as any).$navigateTo(About);
115114
}
116115
}
117-
}
116+
};
118117

119118
</script>
120119
<%_ } else { _%>

‎generator/templates/simple/without-nvw/app/App.ios.vue‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@
2323
<%_ } _%>
2424

2525
<%_ if (!rootOptions.router && !usingTS) { _%>
26-
<script>
26+
<script></script>
2727
import Home from '~/views/Home';
2828
import About from '~/views/About';
2929

3030
export default {
3131

32-
data() {
32+
data () {
3333
return {
34-
navbarTitle: 'App.ios.vue',
35-
}
36-
},
34+
navbarTitle: 'App.ios.vue'
35+
};
36+
},
3737
methods: {
38-
goToHomePage() {
38+
goToHomePage () {
3939
this.$navigateTo(Home);
4040
},
41-
goToAboutPage() {
41+
goToAboutPage () {
4242
this.$navigateTo(About);
4343
}
4444
}
45-
}
45+
};
4646

4747
</script>
4848
<%_ } else if (!rootOptions.router && usingTS) { _%>
@@ -52,66 +52,68 @@
5252

5353
export default {
5454

55-
data() {
55+
data () {
5656
return {
57-
navbarTitle: 'App.ios.vue',
58-
}
59-
},
57+
navbarTitle: 'App.ios.vue'
58+
};
59+
},
6060
methods: {
61-
goToHomePage() {
62-
this.$navigateTo(Home);
61+
goToHomePage () {
62+
(this as any).$navigateTo(Home);
6363
},
64-
goToAboutPage() {
65-
this.$navigateTo(About);
64+
goToAboutPage () {
65+
(this as any).$navigateTo(About);
6666
}
6767
}
68-
}
68+
};
6969

7070
</script>
7171
<%_ } else if (rootOptions.router && !usingTS){ _%>
7272
<script>
73+
7374
import Home from '~/views/Home';
7475
import About from '~/views/About';
7576

7677
export default {
7778

78-
data() {
79+
data () {
7980
return {
80-
navbarTitle: 'App.ios.vue',
81-
}
82-
},
81+
navbarTitle: 'App.ios.vue'
82+
};
83+
},
8384
methods: {
84-
goToHomePage() {
85+
goToHomePage () {
8586
this.$navigateTo(Home);
8687
},
87-
goToAboutPage() {
88+
goToAboutPage () {
8889
this.$navigateTo(About);
8990
}
9091
}
91-
}
92+
};
9293

9394
</script>
9495
<%_ } else if (rootOptions.router && usingTS){ _%>
9596
<script lang="ts">
97+
9698
import Home from '~/views/Home.ios.vue';
9799
import About from '~/views/About.ios.vue';
98100

99101
export default {
100102

101-
data() {
103+
data () {
102104
return {
103-
navbarTitle: 'App.ios.vue',
104-
}
105-
},
105+
navbarTitle: 'App.ios.vue'
106+
};
107+
},
106108
methods: {
107-
goToHomePage() {
108-
this.$navigateTo(Home);
109+
goToHomePage () {
110+
(this as any).$navigateTo(Home);
109111
},
110-
goToAboutPage() {
111-
this.$navigateTo(About);
112+
goToAboutPage () {
113+
(this as any).$navigateTo(About);
112114
}
113115
}
114-
}
116+
};
115117

116118
</script>
117119
<%_ } else { _%>

‎generator/templates/simple/without-nvw/app/App.native.vue‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@
2929

3030
export default {
3131

32-
data() {
32+
data () {
3333
return {
34-
navbarTitle: 'App.native.vue',
35-
}
36-
},
34+
navbarTitle: 'App.native.vue'
35+
};
36+
},
3737
methods: {
38-
goToHomePage() {
38+
goToHomePage () {
3939
this.$navigateTo(Home);
4040
},
41-
goToAboutPage() {
41+
goToAboutPage () {
4242
this.$navigateTo(About);
4343
}
4444
}
45-
}
45+
};
4646

4747
</script>
4848
<%_ } else if (!rootOptions.router && usingTS) { _%>
@@ -52,66 +52,68 @@
5252

5353
export default {
5454

55-
data() {
55+
data () {
5656
return {
57-
navbarTitle: 'App.native.vue',
58-
}
59-
},
57+
navbarTitle: 'App.native.vue'
58+
};
59+
},
6060
methods: {
61-
goToHomePage() {
62-
this.$navigateTo(Home);
61+
goToHomePage () {
62+
(this as any).$navigateTo(Home);
6363
},
64-
goToAboutPage() {
65-
this.$navigateTo(About);
64+
goToAboutPage () {
65+
(this as any).$navigateTo(About);
6666
}
6767
}
68-
}
68+
};
6969

7070
</script>
7171
<%_ } else if (rootOptions.router && !usingTS){ _%>
7272
<script>
73+
7374
import Home from '~/views/Home';
7475
import About from '~/views/About';
7576

7677
export default {
7778

78-
data() {
79+
data () {
7980
return {
80-
navbarTitle: 'App.native.vue',
81-
}
82-
},
81+
navbarTitle: 'App.native.vue'
82+
};
83+
},
8384
methods: {
84-
goToHomePage() {
85+
goToHomePage () {
8586
this.$navigateTo(Home);
8687
},
87-
goToAboutPage() {
88+
goToAboutPage () {
8889
this.$navigateTo(About);
8990
}
9091
}
91-
}
92+
};
9293

9394
</script>
9495
<%_ } else if (rootOptions.router && usingTS){ _%>
9596
<script lang="ts">
97+
9698
import Home from '~/views/Home.native.vue';
9799
import About from '~/views/About.native.vue';
98100

99101
export default {
100102

101-
data() {
103+
data () {
102104
return {
103-
navbarTitle: 'App.native.vue',
104-
}
105-
},
105+
navbarTitle: 'App.native.vue'
106+
};
107+
},
106108
methods: {
107-
goToHomePage() {
108-
this.$navigateTo(Home);
109+
goToHomePage () {
110+
(this as any).$navigateTo(Home);
109111
},
110-
goToAboutPage() {
111-
this.$navigateTo(About);
112+
goToAboutPage () {
113+
(this as any).$navigateTo(About);
112114
}
113115
}
114-
}
116+
};
115117

116118
</script>
117119
<%_ } else { _%>

‎generator/templates/simple/without-nvw/app/components/HelloWorld.android.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
props: {
1414
msg: String
1515
}
16-
}
16+
};
17+
1718
</script>
1819
<%_ } else { _%>
1920
<script lang="ts">
@@ -22,7 +23,8 @@
2223
props: {
2324
msg: String
2425
}
25-
}
26+
};
27+
2628
</script>
2729
<%_ } _%>
2830

0 commit comments

Comments
 (0)