Skip to content

Commit 277cda4

Browse files
committed
fix(@angular-devkit/build-angular): resolve partial SCSS files in sourcemaps
Closes #19505 (cherry picked from commit 064d620)
1 parent 9161337 commit 277cda4

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

packages/angular_devkit/build_angular/src/browser/specs/source-map_spec.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,20 @@ describe('Browser Builder source map', () => {
158158
expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
159159
expect(await files['styles.css']).not.toContain('sourceMappingURL=data:application/json');
160160
});
161+
162+
it('should resolve sources to partial SCSS files', async () => {
163+
const overrides = {
164+
sourceMap: true,
165+
extractCss: true,
166+
styles: ['src/styles.scss'],
167+
};
168+
169+
host.writeMultipleFiles({
170+
'src/styles.scss': `@import './partial';`,
171+
'src/_partial.scss': `p { color: red; }`,
172+
});
173+
174+
const { files } = await browserBuild(architect, host, target, overrides);
175+
expect(await files['styles.css.map']).toContain('_partial.scss');
176+
});
161177
});

packages/angular_devkit/build_angular/src/webpack/configs/styles.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
221221

222222
// load global css as css files
223223
if (globalStylePaths.length > 0) {
224-
const globalSourceMap = !!(
225-
cssSourceMap && !buildOptions.extractCss && !buildOptions.sourceMap.hidden
226-
);
224+
const globalSourceMap = !!cssSourceMap && !buildOptions.sourceMap.hidden;
227225

228226
rules.push(
229227
...baseRules.map(({ test, use }) => {

0 commit comments

Comments
 (0)