Skip to content

Commit 2c8b12f

Browse files
alan-agius4vikerman
authored andcommitted
feat(@angular-devkit/build-angular): update sass-loader to 8.0.0
Full list of changes https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md#800-2019-08-29
1 parent 4dc856a commit 2c8b12f

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

packages/angular_devkit/build_angular/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"regenerator-runtime": "0.13.3",
4444
"rxjs": "6.4.0",
4545
"sass": "1.22.10",
46-
"sass-loader": "7.3.1",
46+
"sass-loader": "8.0.0",
4747
"semver": "6.3.0",
4848
"source-map": "0.7.3",
4949
"source-map-support": "0.5.13",

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts

+5-10
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,11 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
123123
}
124124

125125
let sassImplementation: {} | undefined;
126-
let fiber: {} | undefined;
127126
try {
128127
// tslint:disable-next-line:no-implicit-dependencies
129128
sassImplementation = require('node-sass');
130129
} catch {
131130
sassImplementation = require('sass');
132-
133-
try {
134-
// tslint:disable-next-line:no-implicit-dependencies
135-
fiber = require('fibers');
136-
} catch {}
137131
}
138132

139133
// set base rules to derive final rules from
@@ -146,11 +140,12 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
146140
loader: 'sass-loader',
147141
options: {
148142
implementation: sassImplementation,
149-
fiber,
150143
sourceMap: cssSourceMap,
151-
// bootstrap-sass requires a minimum precision of 8
152-
precision: 8,
153-
includePaths,
144+
sassOptions: {
145+
// bootstrap-sass requires a minimum precision of 8
146+
precision: 8,
147+
includePaths,
148+
},
154149
},
155150
},
156151
],

packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe('Browser Builder AOT', () => {
8888
const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
8989
const output = await run.result;
9090
expect(output.success).toBe(false);
91-
expect(logs.join()).toContain(`Expected "}".`);
91+
expect(logs.join()).toContain('SassError: expected "}".');
9292
await run.stop();
9393
});
9494
});

yarn.lock

+16-8
Original file line numberDiff line numberDiff line change
@@ -7150,7 +7150,7 @@ loader-utils@1.2.3, loader-utils@^1.2.3:
71507150
emojis-list "^2.0.0"
71517151
json5 "^1.0.1"
71527152

7153-
loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
7153+
loader-utils@^1.0.2, loader-utils@^1.1.0:
71547154
version "1.1.0"
71557155
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
71567156
integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
@@ -10101,15 +10101,15 @@ safe-regex@^1.1.0:
1010110101
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
1010210102
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
1010310103

10104-
sass-loader@7.3.1:
10105-
version "7.3.1"
10106-
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f"
10107-
integrity sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==
10104+
sass-loader@8.0.0:
10105+
version "8.0.0"
10106+
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.0.tgz#e7b07a3e357f965e6b03dd45b016b0a9746af797"
10107+
integrity sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==
1010810108
dependencies:
1010910109
clone-deep "^4.0.1"
10110-
loader-utils "^1.0.1"
10111-
neo-async "^2.5.0"
10112-
pify "^4.0.1"
10110+
loader-utils "^1.2.3"
10111+
neo-async "^2.6.1"
10112+
schema-utils "^2.1.0"
1011310113
semver "^6.3.0"
1011410114

1011510115
sass@1.22.10:
@@ -10189,6 +10189,14 @@ schema-utils@^2.0.0, schema-utils@^2.0.1:
1018910189
ajv "^6.1.0"
1019010190
ajv-keywords "^3.1.0"
1019110191

10192+
schema-utils@^2.1.0:
10193+
version "2.1.0"
10194+
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.1.0.tgz#940363b6b1ec407800a22951bdcc23363c039393"
10195+
integrity sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==
10196+
dependencies:
10197+
ajv "^6.1.0"
10198+
ajv-keywords "^3.1.0"
10199+
1019210200
seedrandom@^2.4.4:
1019310201
version "2.4.4"
1019410202
resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"

0 commit comments

Comments
 (0)