Unverified Commit 2704e8bd authored by Luke Sandberg's avatar Luke Sandberg Committed by GitHub

[turbopack] Support relative paths in turbopack source maps. (#85146)

### What

Add an option to turbopack to render sourcemap relative file paths in source maps

For now this is unused since it requires some support in next to be added in #85576

### Why
This will be useful for server source maps because it enables node and other runtimes to automatically format file paths to be working directory relative when printing errors to the console which many terminal emulators support to make clickable.


### TIL

My initial approach for this was to set the `sourceRoot` option to avoid prepending the same string onto nearly every source uri.  However, the spec on this sourcemap feature is garbage.  Intuitively i thought it worked like `<base href=...>` where relative uris would 'resolve' against it, but no, it is just a string concatenation feature. sigh.
parent 281a6c00
...@@ -58,10 +58,7 @@ impl NextMode { ...@@ -58,10 +58,7 @@ impl NextMode {
} }
pub fn is_production(&self) -> bool { pub fn is_production(&self) -> bool {
match self { !self.is_development()
NextMode::Development => false,
NextMode::Build => true,
}
} }
pub fn runtime_type(&self) -> RuntimeType { pub fn runtime_type(&self) -> RuntimeType {
......
...@@ -19,8 +19,8 @@ use turbopack_browser::{ ...@@ -19,8 +19,8 @@ use turbopack_browser::{
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
ChunkingConfig, ChunkingContext, MangleType, MinifyType, SourceMapsType, ChunkingConfig, ChunkingContext, MangleType, MinifyType, SourceMapSourceType,
module_id_strategies::ModuleIdStrategy, SourceMapsType, module_id_strategies::ModuleIdStrategy,
}, },
compile_time_info::{CompileTimeDefines, CompileTimeInfo, FreeVarReference, FreeVarReferences}, compile_time_info::{CompileTimeDefines, CompileTimeInfo, FreeVarReference, FreeVarReferences},
environment::{BrowserEnvironment, Environment, ExecutionEnvironment}, environment::{BrowserEnvironment, Environment, ExecutionEnvironment},
...@@ -489,7 +489,7 @@ pub async fn get_client_chunking_context( ...@@ -489,7 +489,7 @@ pub async fn get_client_chunking_context(
if next_mode.is_development() { if next_mode.is_development() {
builder = builder builder = builder
.hot_module_replacement() .hot_module_replacement()
.use_file_source_map_uris() .source_map_source_type(SourceMapSourceType::AbsoluteFileUri)
.dynamic_chunk_content_loading(true); .dynamic_chunk_content_loading(true);
} else { } else {
builder = builder builder = builder
......
...@@ -16,7 +16,7 @@ use turbopack::{ ...@@ -16,7 +16,7 @@ use turbopack::{
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
ChunkingConfig, MangleType, MinifyType, SourceMapsType, ChunkingConfig, MangleType, MinifyType, SourceMapSourceType, SourceMapsType,
module_id_strategies::ModuleIdStrategy, module_id_strategies::ModuleIdStrategy,
}, },
compile_time_defines, compile_time_defines,
...@@ -1060,9 +1060,13 @@ pub async fn get_server_chunking_context_with_client_assets( ...@@ -1060,9 +1060,13 @@ pub async fn get_server_chunking_context_with_client_assets(
.file_tracing(next_mode.is_production()) .file_tracing(next_mode.is_production())
.debug_ids(*debug_ids.await?); .debug_ids(*debug_ids.await?);
if next_mode.is_development() { builder = builder.source_map_source_type(if next_mode.is_development() {
builder = builder.use_file_source_map_uris(); SourceMapSourceType::AbsoluteFileUri
} else { } else {
// TODO(lukesandberg): switch to relative once next is compatible.
SourceMapSourceType::TurbopackUri
});
if next_mode.is_production() {
builder = builder builder = builder
.chunking_config( .chunking_config(
Vc::<EcmascriptChunkType>::default().to_resolved().await?, Vc::<EcmascriptChunkType>::default().to_resolved().await?,
...@@ -1142,9 +1146,11 @@ pub async fn get_server_chunking_context( ...@@ -1142,9 +1146,11 @@ pub async fn get_server_chunking_context(
.debug_ids(*debug_ids.await?); .debug_ids(*debug_ids.await?);
if next_mode.is_development() { if next_mode.is_development() {
builder = builder.use_file_source_map_uris() builder = builder.source_map_source_type(SourceMapSourceType::AbsoluteFileUri);
} else { } else {
builder = builder builder = builder
// TODO(lukesandberg): switch to relative once next is compatible.
.source_map_source_type(SourceMapSourceType::TurbopackUri)
.chunking_config( .chunking_config(
Vc::<EcmascriptChunkType>::default().to_resolved().await?, Vc::<EcmascriptChunkType>::default().to_resolved().await?,
ChunkingConfig { ChunkingConfig {
......
use std::{ use std::{
io::{self, ErrorKind}, io::{self, ErrorKind},
path::Path, path::{Path, PathBuf},
}; };
use anyhow::{Context, Result, anyhow}; use anyhow::{Context, Result, anyhow};
...@@ -19,10 +19,7 @@ pub fn extract_disk_access<T>(value: io::Result<T>, path: &Path) -> Result<Optio ...@@ -19,10 +19,7 @@ pub fn extract_disk_access<T>(value: io::Result<T>, path: &Path) -> Result<Optio
} }
} }
#[cfg(not(target_os = "windows"))]
pub async fn uri_from_file(root: FileSystemPath, path: Option<&str>) -> Result<String> { pub async fn uri_from_file(root: FileSystemPath, path: Option<&str>) -> Result<String> {
use turbo_unix_path::sys_to_unix;
let root_fs = root.fs; let root_fs = root.fs;
let root_fs = &*ResolvedVc::try_downcast_type::<DiskFileSystem>(root_fs) let root_fs = &*ResolvedVc::try_downcast_type::<DiskFileSystem>(root_fs)
.context("Expected root to have a DiskFileSystem")? .context("Expected root to have a DiskFileSystem")?
...@@ -33,32 +30,26 @@ pub async fn uri_from_file(root: FileSystemPath, path: Option<&str>) -> Result<S ...@@ -33,32 +30,26 @@ pub async fn uri_from_file(root: FileSystemPath, path: Option<&str>) -> Result<S
None => root, None => root,
}; };
let sys_path = root_fs.to_sys_path(&path); Ok(uri_from_path_buf(root_fs.to_sys_path(&path)))
}
#[cfg(not(target_os = "windows"))]
pub fn uri_from_path_buf(sys_path: PathBuf) -> String {
use turbo_unix_path::sys_to_unix;
let sys_path = sys_path.to_string_lossy(); let sys_path = sys_path.to_string_lossy();
Ok(format!( format!(
"file://{}", "file://{}",
sys_to_unix(&sys_path) sys_to_unix(&sys_path)
.split('/') .split('/')
.map(|s| urlencoding::encode(s)) .map(|s| urlencoding::encode(s))
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join("/") .join("/")
)) )
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
pub async fn uri_from_file(root: FileSystemPath, path: Option<&str>) -> Result<String> { pub fn uri_from_path_buf(sys_path: PathBuf) -> String {
let root_fs = root.fs;
let root_fs = &*ResolvedVc::try_downcast_type::<DiskFileSystem>(root_fs)
.context("Expected root to have a DiskFileSystem")?
.await?;
let sys_path = match path {
Some(path) => root.join(path.into())?,
None => root,
};
let sys_path = root_fs.to_sys_path(&sys_path);
let raw_path = sys_path.to_string_lossy().to_string(); let raw_path = sys_path.to_string_lossy().to_string();
let normalized_path = raw_path.replace('\\', "/"); let normalized_path = raw_path.replace('\\', "/");
...@@ -70,7 +61,5 @@ pub async fn uri_from_file(root: FileSystemPath, path: Option<&str>) -> Result<S ...@@ -70,7 +61,5 @@ pub async fn uri_from_file(root: FileSystemPath, path: Option<&str>) -> Result<S
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join("/"); .join("/");
let uri = format!("file:///{}", encoded_path); format!("file:///{}", encoded_path)
Ok(uri)
} }
...@@ -13,7 +13,7 @@ use turbopack_core::{ ...@@ -13,7 +13,7 @@ use turbopack_core::{
chunk::{ chunk::{
Chunk, ChunkGroupResult, ChunkItem, ChunkType, ChunkableModule, ChunkingConfig, Chunk, ChunkGroupResult, ChunkItem, ChunkType, ChunkableModule, ChunkingConfig,
ChunkingConfigs, ChunkingContext, EntryChunkGroupResult, EvaluatableAsset, ChunkingConfigs, ChunkingContext, EntryChunkGroupResult, EvaluatableAsset,
EvaluatableAssets, MinifyType, ModuleId, SourceMapsType, EvaluatableAssets, MinifyType, ModuleId, SourceMapSourceType, SourceMapsType,
availability_info::AvailabilityInfo, availability_info::AvailabilityInfo,
chunk_group::{MakeChunkGroupResult, make_chunk_group}, chunk_group::{MakeChunkGroupResult, make_chunk_group},
module_id_strategies::{DevModuleIdStrategy, ModuleIdStrategy}, module_id_strategies::{DevModuleIdStrategy, ModuleIdStrategy},
...@@ -91,8 +91,8 @@ impl BrowserChunkingContextBuilder { ...@@ -91,8 +91,8 @@ impl BrowserChunkingContextBuilder {
self self
} }
pub fn use_file_source_map_uris(mut self) -> Self { pub fn source_map_source_type(mut self, source_map_source_type: SourceMapSourceType) -> Self {
self.chunking_context.should_use_file_source_map_uris = true; self.chunking_context.source_map_source_type = source_map_source_type;
self self
} }
...@@ -229,8 +229,8 @@ pub struct BrowserChunkingContext { ...@@ -229,8 +229,8 @@ pub struct BrowserChunkingContext {
name: Option<RcStr>, name: Option<RcStr>,
/// The root path of the project /// The root path of the project
root_path: FileSystemPath, root_path: FileSystemPath,
/// Whether to write file sources as file:// paths in source maps /// The strategy to use for generating source map source uris
should_use_file_source_map_uris: bool, source_map_source_type: SourceMapSourceType,
/// This path is used to compute the url to request chunks from /// This path is used to compute the url to request chunks from
output_root: FileSystemPath, output_root: FileSystemPath,
/// The relative path from the output_root to the root_path. /// The relative path from the output_root to the root_path.
...@@ -311,7 +311,7 @@ impl BrowserChunkingContext { ...@@ -311,7 +311,7 @@ impl BrowserChunkingContext {
client_root, client_root,
client_roots: Default::default(), client_roots: Default::default(),
chunk_root_path, chunk_root_path,
should_use_file_source_map_uris: false, source_map_source_type: SourceMapSourceType::TurbopackUri,
asset_root_path, asset_root_path,
asset_root_paths: Default::default(), asset_root_paths: Default::default(),
chunk_base_path: None, chunk_base_path: None,
...@@ -617,8 +617,8 @@ impl ChunkingContext for BrowserChunkingContext { ...@@ -617,8 +617,8 @@ impl ChunkingContext for BrowserChunkingContext {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn should_use_file_source_map_uris(&self) -> Vc<bool> { fn source_map_source_type(&self) -> Vc<SourceMapSourceType> {
Vc::cell(self.should_use_file_source_map_uris) self.source_map_source_type.cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -6,7 +6,9 @@ use turbo_tasks_fs::FileSystemPath; ...@@ -6,7 +6,9 @@ use turbo_tasks_fs::FileSystemPath;
use turbopack_browser::{BrowserChunkingContext, react_refresh::assert_can_resolve_react_refresh}; use turbopack_browser::{BrowserChunkingContext, react_refresh::assert_can_resolve_react_refresh};
use turbopack_cli_utils::runtime_entry::{RuntimeEntries, RuntimeEntry}; use turbopack_cli_utils::runtime_entry::{RuntimeEntries, RuntimeEntry};
use turbopack_core::{ use turbopack_core::{
chunk::{ChunkableModule, ChunkingContext, EvaluatableAsset, SourceMapsType}, chunk::{
ChunkableModule, ChunkingContext, EvaluatableAsset, SourceMapSourceType, SourceMapsType,
},
environment::Environment, environment::Environment,
file_source::FileSource, file_source::FileSource,
module::Module, module::Module,
...@@ -51,7 +53,7 @@ pub async fn get_client_chunking_context( ...@@ -51,7 +53,7 @@ pub async fn get_client_chunking_context(
RuntimeType::Development, RuntimeType::Development,
) )
.hot_module_replacement() .hot_module_replacement()
.use_file_source_map_uris() .source_map_source_type(SourceMapSourceType::AbsoluteFileUri)
.dynamic_chunk_content_loading(true) .dynamic_chunk_content_loading(true)
.build(), .build(),
)) ))
......
use anyhow::Result; use anyhow::{Result, bail};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
...@@ -133,13 +133,22 @@ pub struct ChunkingConfig { ...@@ -133,13 +133,22 @@ pub struct ChunkingConfig {
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct ChunkingConfigs(FxHashMap<ResolvedVc<Box<dyn ChunkType>>, ChunkingConfig>); pub struct ChunkingConfigs(FxHashMap<ResolvedVc<Box<dyn ChunkType>>, ChunkingConfig>);
#[turbo_tasks::value(shared)]
#[derive(Debug, Clone, Copy, Hash, TaskInput, Default)]
pub enum SourceMapSourceType {
AbsoluteFileUri,
RelativeUri,
#[default]
TurbopackUri,
}
/// A context for the chunking that influences the way chunks are created /// A context for the chunking that influences the way chunks are created
#[turbo_tasks::value_trait] #[turbo_tasks::value_trait]
pub trait ChunkingContext { pub trait ChunkingContext {
#[turbo_tasks::function] #[turbo_tasks::function]
fn name(self: Vc<Self>) -> Vc<RcStr>; fn name(self: Vc<Self>) -> Vc<RcStr>;
#[turbo_tasks::function] #[turbo_tasks::function]
fn should_use_file_source_map_uris(self: Vc<Self>) -> Vc<bool>; fn source_map_source_type(self: Vc<Self>) -> Vc<SourceMapSourceType>;
/// The root path of the project /// The root path of the project
#[turbo_tasks::function] #[turbo_tasks::function]
fn root_path(self: Vc<Self>) -> Vc<FileSystemPath>; fn root_path(self: Vc<Self>) -> Vc<FileSystemPath>;
...@@ -385,6 +394,13 @@ pub trait ChunkingContextExt { ...@@ -385,6 +394,13 @@ pub trait ChunkingContextExt {
) -> Vc<OutputAssetsWithReferenced> ) -> Vc<OutputAssetsWithReferenced>
where where
Self: Send; Self: Send;
/// Computes the relative path from the chunk output root to the project root.
///
/// This is used to compute relative paths for source maps in certain configurations.
fn relative_path_from_chunk_root_to_project_root(self: Vc<Self>) -> Vc<RcStr>
where
Self: Send;
} }
impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingContextExt for T { impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingContextExt for T {
...@@ -499,6 +515,52 @@ impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingConte ...@@ -499,6 +515,52 @@ impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingConte
availability_info, availability_info,
) )
} }
fn relative_path_from_chunk_root_to_project_root(self: Vc<Self>) -> Vc<RcStr> {
relative_path_from_chunk_root_to_project_root(Vc::upcast_non_strict(self))
}
}
#[turbo_tasks::function]
async fn relative_path_from_chunk_root_to_project_root(
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<RcStr>> {
// Example,
// project root: /project/root
// output root: /project/root/dist
// chunk root path: /project/root/dist/ssr/chunks
// output_root_to_chunk_root: ../
//
// Example2,
// project root: /project/root
// output root: /project/out
// chunk root path: /project/out/ssr/chunks
// output_root_to_chunk_root: ../root
//
// From that we want to return ../../../root to get from a path in `chunks` to a path in the
// project root.
let chunk_root_path = chunking_context.chunk_root_path().await?;
let output_root = chunking_context.output_root().await?;
let chunk_to_output_root = chunk_root_path.get_relative_path_to(&output_root);
let Some(chunk_to_output_root) = chunk_to_output_root else {
bail!(
"expected chunk_root_path: {chunk_root_path} to be inside of output_root: \
{output_root}",
chunk_root_path = chunk_root_path.value_to_string().await?,
output_root = output_root.value_to_string().await?
);
};
let output_root_to_chunk_root_path = chunking_context.output_root_to_root_path().await?;
// Note we cannot use `normalize_path` here since it rejects paths that start with `../`
Ok(Vc::cell(
format!(
"{}/{}",
chunk_to_output_root, output_root_to_chunk_root_path
)
.into(),
))
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -29,7 +29,8 @@ pub use self::{ ...@@ -29,7 +29,8 @@ pub use self::{
}, },
chunking_context::{ chunking_context::{
ChunkGroupResult, ChunkGroupType, ChunkingConfig, ChunkingConfigs, ChunkingContext, ChunkGroupResult, ChunkGroupType, ChunkingConfig, ChunkingConfigs, ChunkingContext,
ChunkingContextExt, EntryChunkGroupResult, MangleType, MinifyType, SourceMapsType, ChunkingContextExt, EntryChunkGroupResult, MangleType, MinifyType, SourceMapSourceType,
SourceMapsType,
}, },
data::{ChunkData, ChunkDataOption, ChunksData}, data::{ChunkData, ChunkDataOption, ChunksData},
evaluate::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets}, evaluate::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
......
...@@ -6,9 +6,10 @@ use once_cell::sync::Lazy; ...@@ -6,9 +6,10 @@ use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::value::RawValue; use serde_json::value::RawValue;
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString}; use turbo_tasks::{ResolvedVc, ValueToString};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
DiskFileSystem, FileContent, FileSystemPath, rope::Rope, util::uri_from_file, DiskFileSystem, FileContent, FileSystemPath, rope::Rope, util::uri_from_path_buf,
}; };
use url::Url; use url::Url;
...@@ -71,6 +72,7 @@ struct SourceMapJson { ...@@ -71,6 +72,7 @@ struct SourceMapJson {
ignore_list: Option<Box<RawValue>>, ignore_list: Option<Box<RawValue>>,
// A somewhat widespread non-standard extension // A somewhat widespread non-standard extension
#[serde(skip_serializing_if = "Option::is_none")]
debug_id: Option<Box<RawValue>>, debug_id: Option<Box<RawValue>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
...@@ -224,12 +226,18 @@ fn unencoded_str_to_raw_value(unencoded: &str) -> Box<RawValue> { ...@@ -224,12 +226,18 @@ fn unencoded_str_to_raw_value(unencoded: &str) -> Box<RawValue> {
.expect("serde_json::to_string should produce valid JSON") .expect("serde_json::to_string should produce valid JSON")
} }
/// Turns `turbopack:///[project]` references in sourcemap sources into absolute `file://` uris. This /// Helper function to transform turbopack:/// file references in a sourcemap.
/// is useful for debugging environments. /// Handles parsing the sourcemap, resolving the filesystem, applying transformations, and
pub async fn fileify_source_map( /// serializing back.
/// The transform function is given the source string as found in the sourcemap (i.e. a URI).
async fn transform_relative_files<F>(
map: Option<&Rope>, map: Option<&Rope>,
context_path: FileSystemPath, context_path: &FileSystemPath,
) -> Result<Option<Rope>> { mut transform: F,
) -> Result<Option<Rope>>
where
F: FnMut(&DiskFileSystem, &str) -> Result<String>,
{
let Some(map) = map else { let Some(map) = map else {
return Ok(None); return Ok(None);
}; };
...@@ -243,29 +251,75 @@ pub async fn fileify_source_map( ...@@ -243,29 +251,75 @@ pub async fn fileify_source_map(
let context_fs = &*ResolvedVc::try_downcast_type::<DiskFileSystem>(context_fs) let context_fs = &*ResolvedVc::try_downcast_type::<DiskFileSystem>(context_fs)
.context("Expected the chunking context to have a DiskFileSystem")? .context("Expected the chunking context to have a DiskFileSystem")?
.await?; .await?;
let prefix = format!("{}///[{}]/", SOURCE_URL_PROTOCOL, context_fs.name()); let prefix = format!("{}///[{}]/", SOURCE_URL_PROTOCOL, context_fs.name());
let transform_source = async |src: &mut Option<String>| { let mut apply_transform = |src: &mut String| -> Result<()> {
if let Some(src) = src if let Some(src_rest) = src.strip_prefix(&prefix) {
&& let Some(src_rest) = src.strip_prefix(&prefix) *src = transform(context_fs, src_rest)?;
{
*src = uri_from_file(context_path.clone(), Some(src_rest)).await?;
} }
anyhow::Ok(()) Ok(())
}; };
for src in map.sources.iter_mut().flatten() { for src in map.sources.iter_mut().flatten().flatten() {
transform_source(src).await?; apply_transform(src)?;
} }
for section in map.sections.iter_mut().flatten() { for section in map.sections.iter_mut().flatten() {
for src in section.map.sources.iter_mut().flatten() { for src in section.map.sources.iter_mut().flatten().flatten() {
transform_source(src).await?; apply_transform(src)?;
} }
} }
let map = Rope::from(serde_json::to_vec(&map)?); Ok(Some(Rope::from(serde_json::to_vec(&map)?)))
}
Ok(Some(map)) /// Turns `turbopack:///[project]` references in sourcemap sources into absolute `file://` uris. This
/// is useful for debugging environments.
pub async fn absolute_fileify_source_map(
map: Option<&Rope>,
context_path: FileSystemPath,
) -> Result<Option<Rope>> {
transform_relative_files(map, &context_path, |context_fs, src_rest| {
let path = context_path.join(src_rest)?;
Ok(uri_from_path_buf(context_fs.to_sys_path(&path)))
})
.await
}
fn uri_encode_path(path: &str) -> String {
path.split('/')
.map(|s| urlencoding::encode(s))
.collect::<Vec<_>>()
.join("/")
}
/// Turns `turbopack:///[project]` references in sourcemap sources into relative './' prefixed uris.
/// This is useful in server environments and especially build environments.
pub async fn relative_fileify_source_map(
map: Option<&Rope>,
context_path: FileSystemPath,
relative_path_to_output_root: RcStr,
) -> Result<Option<Rope>> {
let relative_path_to_output_root = relative_path_to_output_root
.split('/')
.map(|s| urlencoding::encode(s))
.collect::<Vec<_>>()
.join("/");
transform_relative_files(map, &context_path, |_context_fs, src_rest| {
// NOTE: we just include the relative path prefix here instead of using `sourceRoot`
// since the spec on sourceRoot is broken.
// TODO(bgw): this shouldn't be necessary to uri encode since the strings we get out of the
// source map should already be uri encoded, however in the case of the turbopack scheme in
// particular we are inconsistent so be defensive here.
let src_rest = uri_encode_path(src_rest);
if relative_path_to_output_root.is_empty() {
Ok(src_rest.to_string())
} else {
Ok(format!("{relative_path_to_output_root}/{src_rest}",))
}
})
.await
} }
#[cfg(test)] #[cfg(test)]
......
...@@ -18,8 +18,8 @@ use turbopack_core::{ ...@@ -18,8 +18,8 @@ use turbopack_core::{
chunk::{ chunk::{
AsyncModuleInfo, Chunk, ChunkItem, ChunkItemBatchGroup, ChunkItemExt, AsyncModuleInfo, Chunk, ChunkItem, ChunkItemBatchGroup, ChunkItemExt,
ChunkItemOrBatchWithAsyncModuleInfo, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkItemOrBatchWithAsyncModuleInfo, ChunkItemWithAsyncModuleInfo, ChunkType,
ChunkableModule, ChunkingContext, MinifyType, OutputChunk, OutputChunkRuntimeInfo, ChunkableModule, ChunkingContext, ChunkingContextExt, MinifyType, OutputChunk,
round_chunk_item_size, OutputChunkRuntimeInfo, SourceMapSourceType, round_chunk_item_size,
}, },
code_builder::{Code, CodeBuilder}, code_builder::{Code, CodeBuilder},
ident::AssetIdent, ident::AssetIdent,
...@@ -32,7 +32,10 @@ use turbopack_core::{ ...@@ -32,7 +32,10 @@ use turbopack_core::{
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
reference_type::ImportContext, reference_type::ImportContext,
server_fs::ServerFileSystem, server_fs::ServerFileSystem,
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, utils::fileify_source_map}, source_map::{
GenerateSourceMap, OptionStringifiedSourceMap,
utils::{absolute_fileify_source_map, relative_fileify_source_map},
},
}; };
use self::{single_item_chunk::chunk::SingleItemCssChunk, source_map::CssChunkSourceMapAsset}; use self::{single_item_chunk::chunk::SingleItemCssChunk, source_map::CssChunkSourceMapAsset};
...@@ -96,18 +99,27 @@ impl CssChunk { ...@@ -96,18 +99,27 @@ impl CssChunk {
let close = write_import_context(&mut body, content.import_context).await?; let close = write_import_context(&mut body, content.import_context).await?;
let source_map = if *self let chunking_context = self.chunking_context();
.chunking_context() let source_map = match *chunking_context.source_map_source_type().await? {
.should_use_file_source_map_uris() SourceMapSourceType::AbsoluteFileUri => {
.await? absolute_fileify_source_map(
{ content.source_map.as_ref(),
fileify_source_map( chunking_context.root_path().owned().await?,
content.source_map.as_ref(), )
self.chunking_context().root_path().owned().await?, .await?
) }
.await? SourceMapSourceType::RelativeUri => {
} else { relative_fileify_source_map(
content.source_map.clone() content.source_map.as_ref(),
chunking_context.root_path().owned().await?,
chunking_context
.relative_path_from_chunk_root_to_project_root()
.owned()
.await?,
)
.await?
}
SourceMapSourceType::TurbopackUri => content.source_map.clone(),
}; };
body.push_source(&content.inner_code, source_map); body.push_source(&content.inner_code, source_map);
......
...@@ -3,18 +3,21 @@ use std::io::Write; ...@@ -3,18 +3,21 @@ use std::io::Write;
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use smallvec::SmallVec; use smallvec::SmallVec;
use turbo_rcstr::rcstr; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, Upcast, ValueToString, Vc, NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, Upcast, ValueToString, Vc,
trace::TraceRawVcs, trace::TraceRawVcs,
}; };
use turbo_tasks_fs::{FileSystemPath, rope::Rope}; use turbo_tasks_fs::{FileSystemPath, rope::Rope};
use turbopack_core::{ use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkingContext, ModuleId}, chunk::{
AsyncModuleInfo, ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkingContext,
ChunkingContextExt, ModuleId, SourceMapSourceType,
},
code_builder::{Code, CodeBuilder}, code_builder::{Code, CodeBuilder},
error::PrettyPrintError, error::PrettyPrintError,
issue::{IssueExt, IssueSeverity, StyledString, code_gen::CodeGenerationIssue}, issue::{IssueExt, IssueSeverity, StyledString, code_gen::CodeGenerationIssue},
source_map::utils::fileify_source_map, source_map::utils::{absolute_fileify_source_map, relative_fileify_source_map},
}; };
use crate::{ use crate::{
...@@ -24,6 +27,26 @@ use crate::{ ...@@ -24,6 +27,26 @@ use crate::{
utils::StringifyJs, utils::StringifyJs,
}; };
#[derive(
Debug,
Clone,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
TraceRawVcs,
TaskInput,
NonLocalValue,
Default,
)]
pub enum RewriteSourcePath {
AbsoluteFilePath(FileSystemPath),
RelativeFilePath(FileSystemPath, RcStr),
#[default]
None,
}
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
#[derive(Default, Clone)] #[derive(Default, Clone)]
pub struct EcmascriptChunkItemContent { pub struct EcmascriptChunkItemContent {
...@@ -31,7 +54,7 @@ pub struct EcmascriptChunkItemContent { ...@@ -31,7 +54,7 @@ pub struct EcmascriptChunkItemContent {
pub source_map: Option<Rope>, pub source_map: Option<Rope>,
pub additional_ids: SmallVec<[ResolvedVc<ModuleId>; 1]>, pub additional_ids: SmallVec<[ResolvedVc<ModuleId>; 1]>,
pub options: EcmascriptChunkItemOptions, pub options: EcmascriptChunkItemOptions,
pub rewrite_source_path: Option<FileSystemPath>, pub rewrite_source_path: RewriteSourcePath,
pub placeholder_for_future_extensions: (), pub placeholder_for_future_extensions: (),
} }
...@@ -53,10 +76,18 @@ impl EcmascriptChunkItemContent { ...@@ -53,10 +76,18 @@ impl EcmascriptChunkItemContent {
let strict = content.strict; let strict = content.strict;
Ok(EcmascriptChunkItemContent { Ok(EcmascriptChunkItemContent {
rewrite_source_path: if *chunking_context.should_use_file_source_map_uris().await? { rewrite_source_path: match *chunking_context.source_map_source_type().await? {
Some(chunking_context.root_path().owned().await?) SourceMapSourceType::AbsoluteFileUri => {
} else { RewriteSourcePath::AbsoluteFilePath(chunking_context.root_path().owned().await?)
None }
SourceMapSourceType::RelativeUri => RewriteSourcePath::RelativeFilePath(
chunking_context.root_path().owned().await?,
chunking_context
.relative_path_from_chunk_root_to_project_root()
.owned()
.await?,
),
SourceMapSourceType::TurbopackUri => RewriteSourcePath::None,
}, },
inner_code: content.inner_code.clone(), inner_code: content.inner_code.clone(),
source_map: content.source_map.clone(), source_map: content.source_map.clone(),
...@@ -112,10 +143,19 @@ impl EcmascriptChunkItemContent { ...@@ -112,10 +143,19 @@ impl EcmascriptChunkItemContent {
)?; )?;
} }
let source_map = if let Some(rewrite_source_path) = &self.rewrite_source_path { let source_map = match &self.rewrite_source_path {
fileify_source_map(self.source_map.as_ref(), rewrite_source_path.clone()).await? RewriteSourcePath::AbsoluteFilePath(path) => {
} else { absolute_fileify_source_map(self.source_map.as_ref(), path.clone()).await?
self.source_map.clone() }
RewriteSourcePath::RelativeFilePath(path, relative_path) => {
relative_fileify_source_map(
self.source_map.as_ref(),
path.clone(),
relative_path.clone(),
)
.await?
}
RewriteSourcePath::None => self.source_map.clone(),
}; };
code.push_source(&self.inner_code, source_map); code.push_source(&self.inner_code, source_map);
......
...@@ -13,7 +13,7 @@ use crate::{ ...@@ -13,7 +13,7 @@ use crate::{
EcmascriptAnalyzableExt, EcmascriptAnalyzableExt,
chunk::{ chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItemOptions, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItemOptions,
EcmascriptChunkPlaceable, EcmascriptChunkType, EcmascriptChunkPlaceable, EcmascriptChunkType, item::RewriteSourcePath,
}, },
references::async_module::AsyncModuleOptions, references::async_module::AsyncModuleOptions,
runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_IMPORT}, runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_IMPORT},
...@@ -166,7 +166,7 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem { ...@@ -166,7 +166,7 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem {
Ok(EcmascriptChunkItemContent { Ok(EcmascriptChunkItemContent {
inner_code: code, inner_code: code,
source_map: None, source_map: None,
rewrite_source_path: None, rewrite_source_path: RewriteSourcePath::None,
options: EcmascriptChunkItemOptions { options: EcmascriptChunkItemOptions {
strict: true, strict: true,
async_module: if has_top_level_await { async_module: if has_top_level_await {
......
...@@ -8,7 +8,7 @@ use turbopack_core::{ ...@@ -8,7 +8,7 @@ use turbopack_core::{
chunk::{ chunk::{
Chunk, ChunkGroupResult, ChunkItem, ChunkType, ChunkableModule, ChunkingConfig, Chunk, ChunkGroupResult, ChunkItem, ChunkType, ChunkableModule, ChunkingConfig,
ChunkingConfigs, ChunkingContext, EntryChunkGroupResult, EvaluatableAssets, MinifyType, ChunkingConfigs, ChunkingContext, EntryChunkGroupResult, EvaluatableAssets, MinifyType,
ModuleId, SourceMapsType, ModuleId, SourceMapSourceType, SourceMapsType,
availability_info::AvailabilityInfo, availability_info::AvailabilityInfo,
chunk_group::{MakeChunkGroupResult, make_chunk_group}, chunk_group::{MakeChunkGroupResult, make_chunk_group},
module_id_strategies::{DevModuleIdStrategy, ModuleIdStrategy}, module_id_strategies::{DevModuleIdStrategy, ModuleIdStrategy},
...@@ -99,8 +99,8 @@ impl NodeJsChunkingContextBuilder { ...@@ -99,8 +99,8 @@ impl NodeJsChunkingContextBuilder {
self self
} }
pub fn use_file_source_map_uris(mut self) -> Self { pub fn source_map_source_type(mut self, source_map_source_type: SourceMapSourceType) -> Self {
self.chunking_context.should_use_file_source_map_uris = true; self.chunking_context.source_map_source_type = source_map_source_type;
self self
} }
...@@ -182,8 +182,8 @@ pub struct NodeJsChunkingContext { ...@@ -182,8 +182,8 @@ pub struct NodeJsChunkingContext {
module_id_strategy: ResolvedVc<Box<dyn ModuleIdStrategy>>, module_id_strategy: ResolvedVc<Box<dyn ModuleIdStrategy>>,
/// The module export usage info, if available. /// The module export usage info, if available.
export_usage: Option<ResolvedVc<ExportUsageInfo>>, export_usage: Option<ResolvedVc<ExportUsageInfo>>,
/// Whether to use file:// uris for source map sources /// The strategy to use for generating source map source uris
should_use_file_source_map_uris: bool, source_map_source_type: SourceMapSourceType,
/// The chunking configs /// The chunking configs
chunking_configs: Vec<(ResolvedVc<Box<dyn ChunkType>>, ChunkingConfig)>, chunking_configs: Vec<(ResolvedVc<Box<dyn ChunkType>>, ChunkingConfig)>,
/// Enable debug IDs for chunks and source maps. /// Enable debug IDs for chunks and source maps.
...@@ -222,7 +222,7 @@ impl NodeJsChunkingContext { ...@@ -222,7 +222,7 @@ impl NodeJsChunkingContext {
minify_type: MinifyType::NoMinify, minify_type: MinifyType::NoMinify,
source_maps_type: SourceMapsType::Full, source_maps_type: SourceMapsType::Full,
manifest_chunks: false, manifest_chunks: false,
should_use_file_source_map_uris: false, source_map_source_type: SourceMapSourceType::TurbopackUri,
module_id_strategy: ResolvedVc::upcast(DevModuleIdStrategy::new_resolved()), module_id_strategy: ResolvedVc::upcast(DevModuleIdStrategy::new_resolved()),
export_usage: None, export_usage: None,
chunking_configs: Default::default(), chunking_configs: Default::default(),
...@@ -387,8 +387,8 @@ impl ChunkingContext for NodeJsChunkingContext { ...@@ -387,8 +387,8 @@ impl ChunkingContext for NodeJsChunkingContext {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn should_use_file_source_map_uris(&self) -> Vc<bool> { fn source_map_source_type(&self) -> Vc<SourceMapSourceType> {
Vc::cell(self.should_use_file_source_map_uris) self.source_map_source_type.cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -33,7 +33,7 @@ use turbopack_core::{ ...@@ -33,7 +33,7 @@ use turbopack_core::{
asset::Asset, asset::Asset,
chunk::{ chunk::{
ChunkingConfig, ChunkingContext, ChunkingContextExt, EvaluatableAsset, EvaluatableAssetExt, ChunkingConfig, ChunkingContext, ChunkingContextExt, EvaluatableAsset, EvaluatableAssetExt,
EvaluatableAssets, MinifyType, availability_info::AvailabilityInfo, EvaluatableAssets, MinifyType, SourceMapSourceType, availability_info::AvailabilityInfo,
}, },
compile_time_defines, compile_time_defines,
compile_time_info::{CompileTimeDefineValue, CompileTimeInfo, DefinableNameSegment}, compile_time_info::{CompileTimeDefineValue, CompileTimeInfo, DefinableNameSegment},
...@@ -91,6 +91,8 @@ struct SnapshotOptions { ...@@ -91,6 +91,8 @@ struct SnapshotOptions {
production_chunking: bool, production_chunking: bool,
#[serde(default)] #[serde(default)]
enable_debug_ids: bool, enable_debug_ids: bool,
#[serde(default)]
source_map_source_type: SourceMapSourceType,
} }
#[derive(Debug, Deserialize, Default)] #[derive(Debug, Deserialize, Default)]
...@@ -121,6 +123,7 @@ impl Default for SnapshotOptions { ...@@ -121,6 +123,7 @@ impl Default for SnapshotOptions {
scope_hoisting: false, scope_hoisting: false,
production_chunking: false, production_chunking: false,
enable_debug_ids: false, enable_debug_ids: false,
source_map_source_type: SourceMapSourceType::default(),
} }
} }
} }
...@@ -460,7 +463,8 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> { ...@@ -460,7 +463,8 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
.minify_type(options.minify_type) .minify_type(options.minify_type)
.module_merging(options.scope_hoisting) .module_merging(options.scope_hoisting)
.export_usage(export_usage) .export_usage(export_usage)
.debug_ids(options.enable_debug_ids); .debug_ids(options.enable_debug_ids)
.source_map_source_type(options.source_map_source_type);
if options.production_chunking { if options.production_chunking {
builder = builder.chunking_config( builder = builder.chunking_config(
...@@ -489,7 +493,8 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> { ...@@ -489,7 +493,8 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
.minify_type(options.minify_type) .minify_type(options.minify_type)
.module_merging(options.scope_hoisting) .module_merging(options.scope_hoisting)
.export_usage(export_usage) .export_usage(export_usage)
.debug_ids(options.enable_debug_ids); .debug_ids(options.enable_debug_ids)
.source_map_source_type(options.source_map_source_type);
if options.production_chunking { if options.production_chunking {
builder = builder.chunking_config( builder = builder.chunking_config(
......
...@@ -3,5 +3,6 @@ ...@@ -3,5 +3,6 @@
"runtimeType": "Development", "runtimeType": "Development",
"minifyType": "NoMinify", "minifyType": "NoMinify",
"environment": "NodeJs", "environment": "NodeJs",
"enableDebugIds": true "enableDebugIds": true,
"sourceMapSourceType": "RelativeUri"
} }
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
"sources": [], "sources": [],
"debugId": "3d97c2d1-90e5-a3ef-c710-5c78b21b3b3a", "debugId": "3d97c2d1-90e5-a3ef-c710-5c78b21b3b3a",
"sections": [ "sections": [
{"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/debug-ids/node/input/index.js"],"sourcesContent":["console.log('Hello World')\n"],"names":[],"mappings":"AAAA,QAAQ,GAAG,CAAC"}}] {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["../../../../../../../../turbopack/crates/turbopack-tests/tests/snapshot/debug-ids/node/input/index.js"],"sourcesContent":["console.log('Hello World')\n"],"names":[],"mappings":"AAAA,QAAQ,GAAG,CAAC"}}]
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment