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
angular · Sep 4, 2019 · 2c8b12f · 2c8b12f
1 parent 4dc856a
commit 2c8b12f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
@@ -43,7 +43,7 @@
     "regenerator-runtime": "0.13.3",
     "rxjs": "6.4.0",
     "sass": "1.22.10",
-    "sass-loader": "7.3.1",
+    "sass-loader": "8.0.0",
     "semver": "6.3.0",
     "source-map": "0.7.3",
     "source-map-support": "0.5.13",

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -123,17 +123,11 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   }
 
   let sassImplementation: {} | undefined;
-  let fiber: {} | undefined;
   try {
     // tslint:disable-next-line:no-implicit-dependencies
     sassImplementation = require('node-sass');
   } catch {
     sassImplementation = require('sass');
-
-    try {
-      // tslint:disable-next-line:no-implicit-dependencies
-      fiber = require('fibers');
-    } catch {}
   }
 
   // set base rules to derive final rules from
@@ -146,11 +140,12 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
           loader: 'sass-loader',
           options: {
             implementation: sassImplementation,
-            fiber,
             sourceMap: cssSourceMap,
-            // bootstrap-sass requires a minimum precision of 8
-            precision: 8,
-            includePaths,
+            sassOptions: {
+              // bootstrap-sass requires a minimum precision of 8
+              precision: 8,
+              includePaths,
+            },
           },
         },
       ],

diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -88,7 +88,7 @@ describe('Browser Builder AOT', () => {
     const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
     const output = await run.result;
     expect(output.success).toBe(false);
-    expect(logs.join()).toContain(`Expected "}".`);
+    expect(logs.join()).toContain('SassError: expected "}".');
     await run.stop();
   });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -7150,7 +7150,7 @@ [email protected], loader-utils@^1.2.3:
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
@@ -10101,15 +10101,15 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-loader@7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f"
-  integrity sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==
+sass-loader@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.0.tgz#e7b07a3e357f965e6b03dd45b016b0a9746af797"
+  integrity sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==
   dependencies:
     clone-deep "^4.0.1"
-    loader-utils "^1.0.1"
-    neo-async "^2.5.0"
-    pify "^4.0.1"
+    loader-utils "^1.2.3"
+    neo-async "^2.6.1"
+    schema-utils "^2.1.0"
     semver "^6.3.0"
 
 [email protected]:
@@ -10189,6 +10189,14 @@ schema-utils@^2.0.0, schema-utils@^2.0.1:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
+schema-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.1.0.tgz#940363b6b1ec407800a22951bdcc23363c039393"
+  integrity sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
 seedrandom@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"