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.

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

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

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
20 changes: 17 additions & 3 deletions src/compiler/compile/Component.ts
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,15 @@ 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) return null;

return compile_options.outputFilename
? get_relative_path(compile_options.outputFilename, compile_options.filename)
: get_basename(compile_options.filename);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
export const component_filepath = 'src/some/deep/path/input.svelte';

export const component_file_basename = 'input.svelte';

export default {

js_map_sources: [component_file_basename],

options: {
filename: component_filepath
},
compile_options: {
filename: component_filepath,
// ../../index.ts initializes output filenames, reset to undefined for this test
outputFilename: undefined,
cssOutputFilename: undefined
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>sourcemap-basename-without-outputname</h1>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// no additional test needed, _config.js values and the js.map.sources assertion in ../../index.ts cover it
export function test() {}