fix(@angular-devkit/build-angular): resolve partial SCSS files in sou…

…rcemaps Closes #19505
angular · Nov 30, 2020 · 064d620 · 064d620
1 parent 391d60c
commit 064d620
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/source-map_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/source-map_spec.ts
@@ -158,4 +158,20 @@ describe('Browser Builder source map', () => {
     expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
     expect(await files['styles.css']).not.toContain('sourceMappingURL=data:application/json');
   });
+
+  it('should resolve sources to partial SCSS files', async () => {
+    const overrides = {
+      sourceMap: true,
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `@import './partial';`,
+      'src/_partial.scss': `p { color: red; }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['styles.css.map']).toContain('_partial.scss');
+  });
 });
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts b/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts
@@ -221,9 +221,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
   // load global css as css files
   if (globalStylePaths.length > 0) {
-    const globalSourceMap = !!(
-      cssSourceMap && !buildOptions.extractCss && !buildOptions.sourceMap.hidden
-    );
+    const globalSourceMap = !!cssSourceMap && !buildOptions.sourceMap.hidden;
 
     rules.push(
       ...baseRules.map(({ test, use }) => {