Skip to content

fix(@angular/build): correctly map Sass sourcemaps to source files #29613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(@angular/build): correctly map Sass sourcemaps to source files #29613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/angular/build/src/builders/application/tests/options/sourcemap_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,5 +240,22 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
.content.not.toContain('sourceMappingURL=app.component.css.map');
harness.expectFile('dist/browser/app.component.css.map').toNotExist();
});

it('should generate a correct sourcemap when input file is SCSS', async () => {
await harness.writeFile('src/styles.scss', `* { color: red}`);

harness.useTarget('build', {
...BASE_OPTIONS,
sourceMap: true,
styles: ['src/styles.scss'],
});

const { result } = await harness.executeOnce();

expect(result?.success).toBeTrue();
harness
.expectFile('dist/browser/styles.css.map')
.content.toContain('"sources": ["src/styles.scss"]');
});
});
});
13 changes: 3 additions & 10 deletions packages/angular/build/src/tools/esbuild/stylesheets/sass-language.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import type { OnLoadResult, PartialMessage, PartialNote, ResolveResult } from 'esbuild';
import { dirname, join, relative } from 'node:path';
import { dirname, join } from 'node:path';
import { fileURLToPath, pathToFileURL } from 'node:url';
import type { CanonicalizeContext, CompileResult, Exception, Syntax } from 'sass';
import type { SassWorkerImplementation } from '../../sass/sass-service';
Expand Down Expand Up @@ -170,7 +170,7 @@ async function compileString(

return {
loader: 'css',
contents: sourceMap ? `${css}\n${sourceMapToUrlComment(sourceMap, dirname(filePath))}` : css,
contents: sourceMap ? `${css}\n${sourceMapToUrlComment(sourceMap)}` : css,
watchFiles: loadedUrls.map((url) => fileURLToPath(url)),
warnings,
};
Expand Down Expand Up @@ -199,14 +199,7 @@ async function compileString(
}
}

function sourceMapToUrlComment(
sourceMap: Exclude<CompileResult['sourceMap'], undefined>,
root: string,
): string {
// Remove `file` protocol from all sourcemap sources and adjust to be relative to the input file.
// This allows esbuild to correctly process the paths.
sourceMap.sources = sourceMap.sources.map((source) => relative(root, fileURLToPath(source)));

function sourceMapToUrlComment(sourceMap: Exclude<CompileResult['sourceMap'], undefined>): string {
const urlSourceMap = Buffer.from(JSON.stringify(sourceMap), 'utf-8').toString('base64');

return `/*# sourceMappingURL=data:application/json;charset=utf-8;base64,${urlSourceMap} */`;
Expand Down
Loading