Skip to content

Commit 74b2222

Browse files
jawa-the-huttjawa-the-hutt
authored
Merge pull request #7 from jawa-the-hutt/master
implement dart-sass support
2 parents b9e0097 + cbf9ca2 commit 74b2222

File tree

18 files changed

+65
-178
lines changed

18 files changed

+65
-178
lines changed

‎generator/index.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,9 @@ const renderDirectoryStructure = (module.exports.renderDirectoryStructure = asyn
868868
case 'sass':
869869
if (rawPath.slice(-5) == '.scss' || rawPath.slice(-5) == '.sass') files.push(rawPath);
870870
break;
871+
case 'dart-sass':
872+
if (rawPath.slice(-5) == '.scss' || rawPath.slice(-5) == '.sass') files.push(rawPath);
873+
break;
871874
case 'less':
872875
if (rawPath.slice(-5) == '.less') files.push(rawPath);
873876
break;

‎generator/templates/nvw/src/App.vue‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,9 @@
128128
<%_ } _%>
129129
<!-- Add "scoped" attribute to limit CSS to this component only -->
130130
<%_ if (rootOptions.cssPreprocessor) { _%>
131-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
132-
<%# -------------------- IS Using scss OR sass -------------------- -%>
133-
<%- rootOptions.cssPreprocessor
134-
? `<style web lang="${
135-
rootOptions.cssPreprocessor === 'sass'
136-
? 'scss'
137-
: rootOptions.cssPreprocessor
138-
}"` + `>`
139-
: ``
140-
%>
131+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
132+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
133+
<style web lang="scss">
141134
@import '~styles/style-one';
142135

143136
.w-page {
@@ -150,14 +143,7 @@
150143
}
151144

152145
</style>
153-
<%- rootOptions.cssPreprocessor
154-
? `<style native lang="${
155-
rootOptions.cssPreprocessor === 'sass'
156-
? 'scss'
157-
: rootOptions.cssPreprocessor
158-
}"` + `>`
159-
: ``
160-
%>
146+
<style native lang="scss">
161147
@import '~styles/style-one';
162148
</style>
163149
<%_ } else if (rootOptions.cssPreprocessor == 'stylus') { _%>

‎generator/templates/nvw/src/components/HelloWorld.android.vue‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,9 @@
3131
<%_ } _%>
3232
<!-- Add "scoped" attribute to limit CSS to this component only -->
3333
<%_ if (rootOptions.cssPreprocessor) { _%>
34-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
35-
<%# -------------------- IS Using scss OR sass -------------------- -%>
36-
<%- rootOptions.cssPreprocessor
37-
? `<style scoped lang="${
38-
rootOptions.cssPreprocessor === 'sass'
39-
? 'scss'
40-
: rootOptions.cssPreprocessor
41-
}"` + `>`
42-
: ``
43-
%>
34+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
35+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
36+
<style scoped lang="scss">
4437
.message {
4538
color: #42b983;
4639
}

‎generator/templates/nvw/src/components/HelloWorld.ios.vue‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,9 @@
3131
<%_ } _%>
3232
<!-- Add "scoped" attribute to limit CSS to this component only -->
3333
<%_ if (rootOptions.cssPreprocessor) { _%>
34-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
35-
<%# -------------------- IS Using scss OR sass -------------------- -%>
36-
<%- rootOptions.cssPreprocessor
37-
? `<style scoped lang="${
38-
rootOptions.cssPreprocessor === 'sass'
39-
? 'scss'
40-
: rootOptions.cssPreprocessor
41-
}"` + `>`
42-
: ``
43-
%>
34+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
35+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
36+
<style scoped lang="scss">
4437
.message {
4538
color: #42b983;
4639
}

‎generator/templates/nvw/src/components/HelloWorld.native.vue‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,9 @@
3131
<%_ } _%>
3232
<!-- Add "scoped" attribute to limit CSS to this component only -->
3333
<%_ if (rootOptions.cssPreprocessor) { _%>
34-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
35-
<%# -------------------- IS Using scss OR sass -------------------- -%>
36-
<%- rootOptions.cssPreprocessor
37-
? `<style scoped lang="${
38-
rootOptions.cssPreprocessor === 'sass'
39-
? 'scss'
40-
: rootOptions.cssPreprocessor
41-
}"` + `>`
42-
: ``
43-
%>
34+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
35+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
36+
<style scoped lang="scss">
4437
.message {
4538
color: #42b983;
4639
}

‎generator/templates/nvw/src/components/HelloWorld.vue‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,9 @@
3232
<%_ } _%>
3333
<!-- Add "scoped" attribute to limit CSS to this component only -->
3434
<%_ if (rootOptions.cssPreprocessor) { _%>
35-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
36-
<%# -------------------- IS Using scss OR sass -------------------- -%>
37-
<%- rootOptions.cssPreprocessor
38-
? `<style scoped lang="${
39-
rootOptions.cssPreprocessor === 'sass'
40-
? 'scss'
41-
: rootOptions.cssPreprocessor
42-
}"` + `>`
43-
: ``
44-
%>
35+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
36+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
37+
<style scoped lang="scss">
4538
.message {
4639
color: #42b983;
4740
display: block;

‎generator/templates/nvw/src/views/About.vue‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,9 @@
4141
<%_ } _%>
4242
<!-- Add "scoped" attribute to limit CSS to this component only -->
4343
<%_ if (rootOptions.cssPreprocessor) { _%>
44-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
45-
<%# -------------------- IS Using scss OR sass -------------------- -%>
46-
<%- rootOptions.cssPreprocessor
47-
? `<style scoped lang="${
48-
rootOptions.cssPreprocessor === 'sass'
49-
? 'scss'
50-
: rootOptions.cssPreprocessor
51-
}"` + `>`
52-
: ``
53-
%>
44+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
45+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
46+
<style scoped lang="scss">
5447
@import '~styles/style-two';
5548
@import '~styles/style-one';
5649

‎generator/templates/nvw/src/views/Home.vue‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,9 @@
6161
<%_ } _%>
6262
<!-- Add "scoped" attribute to limit CSS to this component only -->
6363
<%_ if (rootOptions.cssPreprocessor) { _%>
64-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
65-
<%# -------------------- IS Using scss OR sass -------------------- -%>
66-
<%- rootOptions.cssPreprocessor
67-
? `<style scoped lang="${
68-
rootOptions.cssPreprocessor === 'sass'
69-
? 'scss'
70-
: rootOptions.cssPreprocessor
71-
}"` + `>`
72-
: ``
73-
%>
64+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
65+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
66+
<style scoped lang="scss">
7467
@import '~styles/style-one';
7568
@import '~styles/style-two';
7669

‎generator/templates/simple/src/App.vue‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
}
131131

132132
public goToAboutPage() {
133-
VUE_APP_MODE == 'web' ? this.$router.push('about') : Vue.prototype.$navigateTo(About);
133+
VUE_APP_MODE === 'web' ? this.$router.push('about') : Vue.prototype.$navigateTo(About);
134134
}
135135
<%_ } _%>
136136
}
@@ -140,16 +140,18 @@
140140

141141
<!-- Add "scoped" attribute to limit CSS to this component only -->
142142
<%_ if (rootOptions.cssPreprocessor) { _%>
143-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
144-
<%# -------------------- IS Using scss OR sass -------------------- -%>
145-
<%- rootOptions.cssPreprocessor
146-
? `<style web lang="${
147-
rootOptions.cssPreprocessor === 'sass'
148-
? 'scss'
149-
: rootOptions.cssPreprocessor
150-
}"` + `>`
151-
: ``
152-
%>
143+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
144+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
145+
<style web lang="scss">
146+
@import '~styles/style-one';
147+
148+
.w-page {
149+
height: 100%;
150+
width: 100%;
151+
}
152+
153+
</style>
154+
<style native lang="scss">
153155
@import '~styles/style-one';
154156

155157
.w-page {
@@ -158,14 +160,6 @@
158160
}
159161

160162
</style>
161-
<%- rootOptions.cssPreprocessor
162-
? `<style native lang="${
163-
rootOptions.cssPreprocessor === 'sass'
164-
? 'scss'
165-
: rootOptions.cssPreprocessor
166-
}"` + `>`
167-
: ``
168-
%>
169163
@import '~styles/style-one';
170164
</style>
171165
<%_ } else if (rootOptions.cssPreprocessor == 'stylus') { _%>

‎generator/templates/simple/src/components/HelloWorld.android.vue‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,9 @@
3131
<%_ } _%>
3232
<!-- Add "scoped" attribute to limit CSS to this component only -->
3333
<%_ if (rootOptions.cssPreprocessor) { _%>
34-
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss') { _%>
35-
<%# -------------------- IS Using scss OR sass -------------------- -%>
36-
<%- rootOptions.cssPreprocessor
37-
? `<style scoped lang="${
38-
rootOptions.cssPreprocessor === 'sass'
39-
? 'scss'
40-
: rootOptions.cssPreprocessor
41-
}"` + `>`
42-
: ``
43-
%>
34+
<%_ if (rootOptions.cssPreprocessor == 'sass' || rootOptions.cssPreprocessor == 'scss' || rootOptions.cssPreprocessor == 'dart-sass' ) { _%>
35+
<%# -------------------- IS Using sass, scss OR dart-sass -------------------- -%>
36+
<style scoped lang="scss">
4437
.message {
4538
color: #42b983;
4639
}

0 commit comments

Comments
 (0)