Skip to content

Commit f3c45bb

Browse files
Merge pull request #1 from robertcrockett/feature/sass-loader-upgrade
Feature/sass loader upgrade
2 parents ee10263 + 7645a06 commit f3c45bb

File tree

3 files changed

+9
-28
lines changed

3 files changed

+9
-28
lines changed

app/webpack.development.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const rendererConfig = merge({}, common.renderer, config, {
5757
use: [
5858
'style-loader',
5959
{ loader: 'css-loader', options: { sourceMap: true } },
60-
'sass-loader?sourceMap',
60+
{ loader: 'sass-loader', options: { sourceMap: true } },
6161
],
6262
},
6363
],
@@ -79,7 +79,7 @@ const crashConfig = merge({}, common.crash, config, {
7979
use: [
8080
'style-loader',
8181
{ loader: 'css-loader', options: { sourceMap: true } },
82-
'sass-loader?sourceMap',
82+
{ loader: 'sass-loader', options: { sourceMap: true } },
8383
],
8484
},
8585
],

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"prettier": "^2.6.0",
9494
"rimraf": "^2.5.2",
9595
"sass": "^1.27.0",
96-
"sass-loader": "^10.0.3",
96+
"sass-loader": "^11.1.1",
9797
"semver": "^5.7.2",
9898
"split2": "^3.2.2",
9999
"style-loader": "^3.3.1",

yarn.lock

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6384,13 +6384,6 @@ json5@^1.0.1:
63846384
dependencies:
63856385
minimist "^1.2.0"
63866386

6387-
json5@^2.1.2:
6388-
version "2.1.3"
6389-
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
6390-
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
6391-
dependencies:
6392-
minimist "^1.2.5"
6393-
63946387
json5@^2.2.3:
63956388
version "2.2.3"
63966389
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
@@ -6589,15 +6582,6 @@ loader-utils@^1.1.0:
65896582
emojis-list "^3.0.0"
65906583
json5 "^1.0.1"
65916584

6592-
loader-utils@^2.0.0:
6593-
version "2.0.0"
6594-
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
6595-
integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
6596-
dependencies:
6597-
big.js "^5.2.2"
6598-
emojis-list "^3.0.0"
6599-
json5 "^2.1.2"
6600-
66016585
locate-path@^2.0.0:
66026586
version "2.0.0"
66036587
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6957,7 +6941,7 @@ [email protected]:
69576941
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
69586942
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
69596943

6960-
minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
6944+
minimist@^1.2.0, minimist@^1.2.6:
69616945
version "1.2.7"
69626946
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
69636947
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
@@ -8180,16 +8164,13 @@ safe-regex@^1.1.0:
81808164
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
81818165
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
81828166

8183-
sass-loader@^10.0.3:
8184-
version "10.0.3"
8185-
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.3.tgz#9e2f1bfdd6355f2adde4e4835d838b020bf800b0"
8186-
integrity sha512-W4+FV5oUdYy0PnC11ZoPrcAexODgDCa3ngxoy5X5qBhZYoPz9FPjb6Oox8Aa0ZYEyx34k8AQfOVuvqefOSAAUQ==
8167+
sass-loader@^11.1.1:
8168+
version "11.1.1"
8169+
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.1.1.tgz#0db441bbbe197b2af96125bebb7f4be6476b13a7"
8170+
integrity sha512-fOCp/zLmj1V1WHDZbUbPgrZhA7HKXHEqkslzB+05U5K9SbSbcmH91C7QLW31AsXikxUMaxXRhhcqWZAxUMLDyA==
81878171
dependencies:
81888172
klona "^2.0.4"
8189-
loader-utils "^2.0.0"
81908173
neo-async "^2.6.2"
8191-
schema-utils "^3.0.0"
8192-
semver "^7.3.2"
81938174

81948175
sass@^1.27.0:
81958176
version "1.27.0"
@@ -8210,7 +8191,7 @@ saxes@^6.0.0:
82108191
dependencies:
82118192
xmlchars "^2.2.0"
82128193

8213-
schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
8194+
schema-utils@^3.1.0, schema-utils@^3.1.1:
82148195
version "3.1.1"
82158196
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
82168197
integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==

0 commit comments

Comments
 (0)