Unverified Commit 0b1767d3 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

[Turbopack] remove asset context and layer from static files (#75892)

### What?

We don't need to duplicate static modules per asset context. They are independent of it.
parent e8a72cc1
...@@ -40,9 +40,7 @@ impl StructuredImageModuleType { ...@@ -40,9 +40,7 @@ impl StructuredImageModuleType {
blur_placeholder_mode: BlurPlaceholderMode, blur_placeholder_mode: BlurPlaceholderMode,
module_asset_context: ResolvedVc<ModuleAssetContext>, module_asset_context: ResolvedVc<ModuleAssetContext>,
) -> Result<Vc<Box<dyn Module>>> { ) -> Result<Vc<Box<dyn Module>>> {
let static_asset = StaticModuleAsset::new(*source, Vc::upcast(*module_asset_context)) let static_asset = StaticModuleAsset::new(*source).to_resolved().await?;
.to_resolved()
.await?;
Ok(module_asset_context Ok(module_asset_context
.process( .process(
Vc::upcast( Vc::upcast(
......
...@@ -21,7 +21,6 @@ use turbo_tasks::{ResolvedVc, Vc}; ...@@ -21,7 +21,6 @@ use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext}, chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext},
context::AssetContext,
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
module_graph::ModuleGraph, module_graph::ModuleGraph,
...@@ -49,20 +48,13 @@ fn modifier() -> Vc<RcStr> { ...@@ -49,20 +48,13 @@ fn modifier() -> Vc<RcStr> {
#[derive(Clone)] #[derive(Clone)]
pub struct StaticModuleAsset { pub struct StaticModuleAsset {
pub source: ResolvedVc<Box<dyn Source>>, pub source: ResolvedVc<Box<dyn Source>>,
pub asset_context: ResolvedVc<Box<dyn AssetContext>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl StaticModuleAsset { impl StaticModuleAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new( pub fn new(source: ResolvedVc<Box<dyn Source>>) -> Vc<Self> {
source: ResolvedVc<Box<dyn Source>>, Self::cell(StaticModuleAsset { source })
asset_context: ResolvedVc<Box<dyn AssetContext>>,
) -> Vc<Self> {
Self::cell(StaticModuleAsset {
source,
asset_context,
})
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -78,10 +70,7 @@ impl StaticModuleAsset { ...@@ -78,10 +70,7 @@ impl StaticModuleAsset {
impl Module for StaticModuleAsset { impl Module for StaticModuleAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
fn ident(&self) -> Vc<AssetIdent> { fn ident(&self) -> Vc<AssetIdent> {
self.source self.source.ident().with_modifier(modifier())
.ident()
.with_modifier(modifier())
.with_layer(self.asset_context.layer())
} }
} }
......
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/4e721_crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_da7049.js", "output/4e721_crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_ba5716.js",
{}, {},
{"otherChunks":["output/turbopack_crates_turbopack-tests_tests_snapshot_import-meta_url_input_6c57ac._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/import-meta/url/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/turbopack_crates_turbopack-tests_tests_snapshot_import-meta_url_input_7615cd._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/import-meta/url/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/turbopack_crates_turbopack-tests_tests_snapshot_import-meta_url_input_6c57ac._.js", { (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/turbopack_crates_turbopack-tests_tests_snapshot_import-meta_url_input_7615cd._.js", {
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/import-meta/url/input/asset.txt [test] (static)": ((__turbopack_context__) => { "[project]/turbopack/crates/turbopack-tests/tests/snapshot/import-meta/url/input/asset.txt (static)": ((__turbopack_context__) => {
var { g: global, d: __dirname } = __turbopack_context__; var { g: global, d: __dirname } = __turbopack_context__;
{ {
...@@ -16,7 +16,7 @@ const __TURBOPACK__import$2e$meta__ = { ...@@ -16,7 +16,7 @@ const __TURBOPACK__import$2e$meta__ = {
return `file://${__turbopack_context__.P("turbopack/crates/turbopack-tests/tests/snapshot/import-meta/url/input/mod.mjs")}`; return `file://${__turbopack_context__.P("turbopack/crates/turbopack-tests/tests/snapshot/import-meta/url/input/mod.mjs")}`;
} }
}; };
const assetUrl = new __turbopack_context__.U(__turbopack_context__.r("[project]/turbopack/crates/turbopack-tests/tests/snapshot/import-meta/url/input/asset.txt [test] (static)")); const assetUrl = new __turbopack_context__.U(__turbopack_context__.r("[project]/turbopack/crates/turbopack-tests/tests/snapshot/import-meta/url/input/asset.txt (static)"));
console.log(assetUrl); console.log(assetUrl);
fetch(assetUrl).then((res)=>res.text()).then(console.log); fetch(assetUrl).then((res)=>res.text()).then(console.log);
}}), }}),
...@@ -31,4 +31,4 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbo ...@@ -31,4 +31,4 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbo
}}), }}),
}]); }]);
//# sourceMappingURL=turbopack_crates_turbopack-tests_tests_snapshot_import-meta_url_input_6c57ac._.js.map //# sourceMappingURL=turbopack_crates_turbopack-tests_tests_snapshot_import-meta_url_input_7615cd._.js.map
\ No newline at end of file \ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/4e721_crates_turbopack-tests_tests_snapshot_imports_ignore-comments_input_26ea62._.js", { (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/4e721_crates_turbopack-tests_tests_snapshot_imports_ignore-comments_input_6c932d._.js", {
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/vercel.cjs [test] (ecmascript)": (function(__turbopack_context__) { "[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/vercel.cjs [test] (ecmascript)": (function(__turbopack_context__) {
...@@ -6,7 +6,7 @@ var { g: global, d: __dirname, m: module, e: exports } = __turbopack_context__; ...@@ -6,7 +6,7 @@ var { g: global, d: __dirname, m: module, e: exports } = __turbopack_context__;
{ {
module.exports = "turbopack"; module.exports = "turbopack";
}}), }}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/vercel.cjs [test] (static)": ((__turbopack_context__) => { "[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/vercel.cjs (static)": ((__turbopack_context__) => {
var { g: global, d: __dirname } = __turbopack_context__; var { g: global, d: __dirname } = __turbopack_context__;
{ {
...@@ -52,4 +52,4 @@ function foo(plugin) { ...@@ -52,4 +52,4 @@ function foo(plugin) {
}}), }}),
}]); }]);
//# sourceMappingURL=4e721_crates_turbopack-tests_tests_snapshot_imports_ignore-comments_input_26ea62._.js.map //# sourceMappingURL=4e721_crates_turbopack-tests_tests_snapshot_imports_ignore-comments_input_6c932d._.js.map
\ No newline at end of file \ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_index_e44b7c.js", "output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_index_958d93.js",
{}, {},
{"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_vercel_mjs_bc04b7._.js","output/4e721_crates_turbopack-tests_tests_snapshot_imports_ignore-comments_input_26ea62._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_vercel_mjs_348d99._.js","output/4e721_crates_turbopack-tests_tests_snapshot_imports_ignore-comments_input_6c932d._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_vercel_mjs_bc04b7._.js", { (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_vercel_mjs_348d99._.js", {
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/vercel.mjs [test] (ecmascript, async loader)": ((__turbopack_context__) => { "[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/vercel.mjs [test] (ecmascript, async loader)": ((__turbopack_context__) => {
......
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/4e721_crates_turbopack-tests_tests_snapshot_imports_static_input_index_b30b52.js", "output/4e721_crates_turbopack-tests_tests_snapshot_imports_static_input_index_d62553.js",
{}, {},
{"otherChunks":["output/turbopack_crates_turbopack-tests_tests_snapshot_imports_static_input_73301e._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/turbopack_crates_turbopack-tests_tests_snapshot_imports_static_input_7116c6._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/turbopack_crates_turbopack-tests_tests_snapshot_imports_static_input_73301e._.js", { (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/turbopack_crates_turbopack-tests_tests_snapshot_imports_static_input_7116c6._.js", {
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static/input/vercel.svg [test] (static)": ((__turbopack_context__) => { "[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static/input/vercel.svg (static)": ((__turbopack_context__) => {
var { g: global, d: __dirname } = __turbopack_context__; var { g: global, d: __dirname } = __turbopack_context__;
{ {
...@@ -11,10 +11,10 @@ __turbopack_context__.v("/static/vercel.957b9b16.svg");}}), ...@@ -11,10 +11,10 @@ __turbopack_context__.v("/static/vercel.957b9b16.svg");}}),
var { g: global, d: __dirname } = __turbopack_context__; var { g: global, d: __dirname } = __turbopack_context__;
{ {
__turbopack_context__.s({}); __turbopack_context__.s({});
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$static$2f$input$2f$vercel$2e$svg__$5b$test$5d$__$28$static$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static/input/vercel.svg [test] (static)"); var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$static$2f$input$2f$vercel$2e$svg__$28$static$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static/input/vercel.svg (static)");
; ;
console.log(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$static$2f$input$2f$vercel$2e$svg__$5b$test$5d$__$28$static$29$__["default"]); console.log(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$static$2f$input$2f$vercel$2e$svg__$28$static$29$__["default"]);
}}), }}),
}]); }]);
//# sourceMappingURL=turbopack_crates_turbopack-tests_tests_snapshot_imports_static_input_73301e._.js.map //# sourceMappingURL=turbopack_crates_turbopack-tests_tests_snapshot_imports_static_input_7116c6._.js.map
\ No newline at end of file \ No newline at end of file
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
"version": 3, "version": 3,
"sources": [], "sources": [],
"sections": [ "sections": [
{"offset": {"line": 12, "column": 0}, "map": {"version":3,"sources":["turbopack://[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static/input/index.js"],"sourcesContent":["import img from \"./vercel.svg\";\nconsole.log(img);\n"],"names":[],"mappings":";AAAA;;AACA,QAAQ,GAAG,CAAC,6LAAA,CAAA,UAAG"}}, {"offset": {"line": 12, "column": 0}, "map": {"version":3,"sources":["turbopack://[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static/input/index.js"],"sourcesContent":["import img from \"./vercel.svg\";\nconsole.log(img);\n"],"names":[],"mappings":";AAAA;;AACA,QAAQ,GAAG,CAAC,+KAAA,CAAA,UAAG"}},
{"offset": {"line": 16, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] {"offset": {"line": 16, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}]
} }
\ No newline at end of file
...@@ -249,11 +249,9 @@ async fn apply_module_type( ...@@ -249,11 +249,9 @@ async fn apply_module_type(
.to_resolved() .to_resolved()
.await?, .await?,
), ),
ModuleType::Static => ResolvedVc::upcast( ModuleType::Static => {
StaticModuleAsset::new(*source, Vc::upcast(module_asset_context)) ResolvedVc::upcast(StaticModuleAsset::new(*source).to_resolved().await?)
.to_resolved() }
.await?,
),
ModuleType::WebAssembly { source_ty } => ResolvedVc::upcast( ModuleType::WebAssembly { source_ty } => ResolvedVc::upcast(
WebAssemblyModuleAsset::new( WebAssemblyModuleAsset::new(
WebAssemblySource::new(*source, *source_ty), WebAssemblySource::new(*source, *source_ty),
......
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