Skip to content

Commit

Permalink
fix: Fix source map produced by lightningcss (#7977)
Browse files Browse the repository at this point in the history
### Description

This PR prepends `/turbopack` to source map paths.

Closes PACK-2965

### Testing Instructions

I updated tests

---------

Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com>
  • Loading branch information
kdy1 and sokra authored Apr 22, 2024
1 parent b0d3283 commit 4011e25
Show file tree
Hide file tree
Showing 31 changed files with 50 additions and 49 deletions.
11 changes: 6 additions & 5 deletions crates/turbopack-css/src/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ use turbopack_core::{
source::Source,
source_map::{GenerateSourceMap, OptionSourceMap},
source_pos::SourcePos,
SOURCE_MAP_ROOT_NAME,
};
use turbopack_swc_utils::emitter::IssueEmitter;

Expand Down Expand Up @@ -515,7 +516,7 @@ async fn process_content(
content_vc: Vc<FileContent>,
code: String,
fs_path_vc: Vc<FileSystemPath>,
ident_str: &str,
filename: &str,
source: Vc<Box<dyn Source>>,
origin: Vc<Box<dyn ResolveOrigin>>,
import_context: Vc<ImportContext>,
Expand Down Expand Up @@ -551,7 +552,7 @@ async fn process_content(

_ => None,
},
filename: ident_str.to_string(),
filename: filename.to_string(),
error_recovery: true,
..Default::default()
};
Expand Down Expand Up @@ -643,7 +644,7 @@ async fn process_content(
)),
);

let fm = cm.new_source_file(FileName::Custom(ident_str.to_string()), code.clone());
let fm = cm.new_source_file(FileName::Custom(filename.to_string()), code.clone());
let mut errors = vec![];

let ss = swc_core::css::parser::parse_file(
Expand Down Expand Up @@ -693,7 +694,7 @@ async fn process_content(
.context("Must include basename preceding .")?
.as_str();
// Truncate this as u32 so it's formated as 8-character hex in the suffic below
let path_hash = turbo_tasks_hash::hash_xxh3_hash64(ident_str) as u32;
let path_hash = turbo_tasks_hash::hash_xxh3_hash64(filename) as u32;

Some(SwcCssModuleMode {
basename: basename.to_string(),
Expand Down Expand Up @@ -976,7 +977,7 @@ impl GenerateSourceMap for ParseCssResultSourceMap {
let mut builder = SourceMapBuilder::new(None);

for src in source_map.get_sources() {
builder.add_source(src);
builder.add_source(&format!("/{SOURCE_MAP_ROOT_NAME}/{src}"));
}

for (idx, content) in source_map.get_sources_content().iter().enumerate() {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4011e25

Please sign in to comment.