Skip to content

Commit 08bff6a

Browse files
authored
chore(deps): update dependency sass-loader to v8 (#139)
* chore(deps): update dependency sass-loader to v8 * chore: fix tests
1 parent 237047b commit 08bff6a

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

lib/module.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ const cdn = {
2020
'fa4': 'https://cdn.jsdelivr.net/npm/[email protected]/css/font-awesome.min.css'
2121
}
2222

23-
// See https://github.com/vuetifyjs/vuetify/releases/tag/v2.0.0-alpha.12
2423
const sassLoaderOptions = {
2524
implementation: require('sass'),
26-
fiber: require('fibers')
25+
sassOptions: {
26+
indentedSyntax: true
27+
}
2728
}
2829

2930
module.exports = function (moduleOptions) {
@@ -42,15 +43,20 @@ module.exports = function (moduleOptions) {
4243
}
4344
}
4445

46+
// Ensure sass-loader@8 compatibility (https://github.com/webpack-contrib/sass-loader/releases/tag/v8.0.0)
47+
delete this.options.build.loaders.sass.indentedSyntax
48+
this.options.build.loaders.sass.prependData = this.options.build.loaders.sass.data
49+
delete this.options.build.loaders.sass.data
50+
4551
// Customize sass-loader options
4652
Object.assign(this.options.build.loaders.scss, sassLoaderOptions)
4753
Object.assign(this.options.build.loaders.sass, sassLoaderOptions)
4854

4955
// Custom variables
50-
const sassLoaderData = this.options.build.loaders.sass.data
56+
const sassLoaderData = this.options.build.loaders.sass.prependData
5157
if (options.customVariables.length > 0 && typeof sassLoaderData !== 'function') {
5258
const imports = options.customVariables.map(path => `@import '${path}'`).join('\n')
53-
this.options.build.loaders.sass.data = sassLoaderData ? sassLoaderData.concat('\n', imports) : imports
59+
this.options.build.loaders.sass.prependData = sassLoaderData ? sassLoaderData.concat('\n', imports) : imports
5460
}
5561

5662
// Add styles

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"deepmerge": "^4.0.0",
3333
"fibers": "^4.0.1",
3434
"sass": "^1.22.10",
35-
"sass-loader": "^7.3.1",
35+
"sass-loader": "^8.0.0",
3636
"vuetify": "^2.0.11",
3737
"vuetify-loader": "^1.3.0"
3838
},

test/module.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ describe('module', () => {
7373
}
7474
})
7575

76-
expect(nuxt.options.build.loaders.sass.data).toContain("@import '/path/to/variables.scss'")
76+
expect(nuxt.options.build.loaders.sass.prependData).toContain("@import '/path/to/variables.scss'")
7777
})
7878

7979
test('with treeShake', async () => {

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6174,7 +6174,7 @@ loader-utils@^0.2.16:
61746174
json5 "^0.5.0"
61756175
object-assign "^4.0.1"
61766176

6177-
loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.0, loader-utils@^1.2.3:
6177+
loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.0, loader-utils@^1.2.3:
61786178
version "1.2.3"
61796179
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
61806180
integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -8809,15 +8809,15 @@ sane@^4.0.3:
88098809
minimist "^1.1.1"
88108810
walker "~1.0.5"
88118811

8812-
sass-loader@^7.3.1:
8813-
version "7.3.1"
8814-
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f"
8815-
integrity sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==
8812+
sass-loader@^8.0.0:
8813+
version "8.0.0"
8814+
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.0.tgz#e7b07a3e357f965e6b03dd45b016b0a9746af797"
8815+
integrity sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==
88168816
dependencies:
88178817
clone-deep "^4.0.1"
8818-
loader-utils "^1.0.1"
8819-
neo-async "^2.5.0"
8820-
pify "^4.0.1"
8818+
loader-utils "^1.2.3"
8819+
neo-async "^2.6.1"
8820+
schema-utils "^2.1.0"
88218821
semver "^6.3.0"
88228822

88238823
sass@^1.22.10:
@@ -8841,7 +8841,7 @@ schema-utils@^1.0.0:
88418841
ajv-errors "^1.0.0"
88428842
ajv-keywords "^3.1.0"
88438843

8844-
schema-utils@^2.0.0:
8844+
schema-utils@^2.0.0, schema-utils@^2.1.0:
88458845
version "2.1.0"
88468846
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.1.0.tgz#940363b6b1ec407800a22951bdcc23363c039393"
88478847
integrity sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==

0 commit comments

Comments
 (0)