Unverified Commit c42d0e3d authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: decode url encoding and relative paths in source maps (#86342)

### What?

decode url encoding and relative paths in source maps
parent 2300bb20
...@@ -4280,6 +4280,7 @@ dependencies = [ ...@@ -4280,6 +4280,7 @@ dependencies = [
"turbopack-node", "turbopack-node",
"turbopack-nodejs", "turbopack-nodejs",
"turbopack-wasm", "turbopack-wasm",
"urlencoding",
"vergen", "vergen",
] ]
......
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
"**/*.ts", "**/*.ts",
"**/*.tsx", "**/*.tsx",
".next/types/**/*.ts", ".next/types/**/*.ts",
".next/dev/types/**/*.ts" ".next/dev/types/**/*.ts",
"dist/types/**/*.ts",
"dist/dev/types/**/*.ts"
], ],
"exclude": ["node_modules"] "exclude": ["node_modules"]
} }
...@@ -40,6 +40,7 @@ turbopack-ecmascript = { workspace = true } ...@@ -40,6 +40,7 @@ turbopack-ecmascript = { workspace = true }
turbopack-node = { workspace = true } turbopack-node = { workspace = true }
turbopack-nodejs = { workspace = true } turbopack-nodejs = { workspace = true }
turbopack-wasm = { workspace = true } turbopack-wasm = { workspace = true }
urlencoding = { workspace = true }
[dev-dependencies] [dev-dependencies]
turbo-tasks-malloc = { workspace = true } turbo-tasks-malloc = { workspace = true }
......
use std::io::Write; use std::{borrow::Cow, io::Write};
use anyhow::Result; use anyhow::Result;
use byteorder::{BE, WriteBytesExt}; use byteorder::{BE, WriteBytesExt};
...@@ -23,7 +23,7 @@ use turbopack_core::{ ...@@ -23,7 +23,7 @@ use turbopack_core::{
reference::all_assets_from_entries, reference::all_assets_from_entries,
}; };
use crate::route::{Endpoint, ModuleGraphs}; use crate::route::ModuleGraphs;
#[derive( #[derive(
Default, Clone, Debug, Deserialize, Eq, NonLocalValue, PartialEq, Serialize, TraceRawVcs, Default, Clone, Debug, Deserialize, Eq, NonLocalValue, PartialEq, Serialize, TraceRawVcs,
...@@ -371,9 +371,16 @@ pub async fn analyze_output_assets(output_assets: Vc<OutputAssets>) -> Result<Vc ...@@ -371,9 +371,16 @@ pub async fn analyze_output_assets(output_assets: Vc<OutputAssets>) -> Result<Vc
let output_file_index = builder.add_output_file(AnalyzeOutputFile { filename }); let output_file_index = builder.add_output_file(AnalyzeOutputFile { filename });
let chunk_parts = split_output_asset_into_parts(*asset).await?; let chunk_parts = split_output_asset_into_parts(*asset).await?;
for chunk_part in chunk_parts { for chunk_part in chunk_parts {
let source_index = builder let decoded_source = urlencoding::decode(&chunk_part.source)?;
.ensure_source(chunk_part.source.trim_start_matches(&prefix)) let source = if let Some(stripped) = decoded_source.strip_prefix(&prefix) {
.1; Cow::Borrowed(stripped)
} else {
Cow::Owned(format!(
"[project]/{}",
decoded_source.trim_start_matches("../")
))
};
let source_index = builder.ensure_source(&source).1;
let chunk_part_index = builder.add_chunk_part(AnalyzeChunkPart { let chunk_part_index = builder.add_chunk_part(AnalyzeChunkPart {
source_index, source_index,
output_file_index, output_file_index,
...@@ -533,13 +540,6 @@ pub async fn analyze_module_graphs(module_graphs: Vc<ModuleGraphs>) -> Result<Vc ...@@ -533,13 +540,6 @@ pub async fn analyze_module_graphs(module_graphs: Vc<ModuleGraphs>) -> Result<Vc
Ok(FileContent::Content(File::from(rope)).cell()) Ok(FileContent::Content(File::from(rope)).cell())
} }
#[turbo_tasks::function]
pub async fn analyze_endpoint(endpoint: Vc<Box<dyn Endpoint>>) -> Result<Vc<FileContent>> {
Ok(analyze_output_assets(
*endpoint.output().await?.output_assets,
))
}
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct AnalyzeDataOutputAsset { pub struct AnalyzeDataOutputAsset {
pub path: FileSystemPath, pub path: FileSystemPath,
...@@ -549,10 +549,13 @@ pub struct AnalyzeDataOutputAsset { ...@@ -549,10 +549,13 @@ pub struct AnalyzeDataOutputAsset {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl AnalyzeDataOutputAsset { impl AnalyzeDataOutputAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn new(path: FileSystemPath, output_assets: Vc<OutputAssets>) -> Result<Vc<Self>> { pub async fn new(
path: FileSystemPath,
output_assets: ResolvedVc<OutputAssets>,
) -> Result<Vc<Self>> {
Ok(Self { Ok(Self {
path, path,
output_assets: output_assets.to_resolved().await?, output_assets,
} }
.cell()) .cell())
} }
......
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