Skip to content
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

Jump to bottom

[fix] use consistent relative source filename for js sourcemaps #6598

Merged
merged 4 commits into from
Aug 3, 2021
Merged

[fix] use consistent relative source filename for js sourcemaps #6598

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be52155
[fix] use consistent relative source filename for js sourcemaps
dominikg Jul 30, 2021
9537f98
chore: improve codestyle
dominikg Jul 30, 2021
b8c121c
test: add testcase for correct sourcemap source filename when no outp…
dominikg Jul 31, 2021
9ae3cb5
test: add css sourcemap to testcase for output filename
dominikg Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 20 additions & 3 deletions src/compiler/compile/Component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,19 +343,21 @@ export default class Component {
? { code: null, map: null }
: result.css;

const sourcemap_source_filename = get_sourcemap_source_filename(compile_options);

js = print(program, {
sourceMapSource: compile_options.filename
sourceMapSource: sourcemap_source_filename
});

js.map.sources = [
compile_options.filename ? get_relative_path(compile_options.outputFilename || '', compile_options.filename) : null
sourcemap_source_filename
];

js.map.sourcesContent = [
this.source
];

js.map = apply_preprocessor_sourcemap(this.file, js.map, compile_options.sourcemap as (string | RawSourceMap | DecodedSourceMap));
js.map = apply_preprocessor_sourcemap(sourcemap_source_filename, js.map, compile_options.sourcemap as (string | RawSourceMap | DecodedSourceMap));
}

return {
Expand Down Expand Up @@ -1551,3 +1553,18 @@ function get_relative_path(from: string, to: string) {

return from_parts.concat(to_parts).join('/');
}

function get_basename(filename: string) {
return filename.split(/[/\\]/).pop();
}

function get_sourcemap_source_filename(compile_options: CompileOptions) {
if (compile_options.filename) {
benmccann marked this conversation as resolved.
Show resolved Hide resolved
if (compile_options.outputFilename) {
return get_relative_path(compile_options.outputFilename, compile_options.filename);
} else {
return get_basename(compile_options.filename);
}
}
return null;
}