diff --git a/crates/pack-api/src/library.rs b/crates/pack-api/src/library.rs index 8d16717f89..0824247a6e 100644 --- a/crates/pack-api/src/library.rs +++ b/crates/pack-api/src/library.rs @@ -143,7 +143,7 @@ impl LibraryEndpoint { self.project().client_compile_time_info().environment(), self.project().mode(), self.project().config(), - Vc::cell(true), + Vc::cell(false), Vc::cell(false), self.project().pack_path().owned().await?, )) diff --git a/crates/pack-core/src/library/contexts.rs b/crates/pack-core/src/library/contexts.rs index 209e4d7804..0786288abe 100644 --- a/crates/pack-core/src/library/contexts.rs +++ b/crates/pack-core/src/library/contexts.rs @@ -8,7 +8,7 @@ use turbopack_core::{ ChunkingContext, MangleType, MinifyType, SourceMapSourceType, SourceMapsType, module_id_strategies::ModuleIdStrategy, }, - environment::Environment, + environment::{EdgeWorkerEnvironment, Environment, ExecutionEnvironment, NodeJsVersion}, module_graph::export_usage::OptionExportUsageInfo, }; @@ -22,6 +22,9 @@ pub struct LibraryChunkingContextOptions { pub root_path: FileSystemPath, pub output_root: FileSystemPath, pub output_root_to_root_path: RcStr, + /// The environment provided by the caller. Note that this is ignored in favor of + /// an EdgeWorker environment to disable async chunk splitting. See + /// `get_library_chunking_context` for details. pub environment: Vc, pub module_id_strategy: Vc>, pub no_mangling: Vc, @@ -40,7 +43,8 @@ pub async fn get_library_chunking_context( root_path, output_root, output_root_to_root_path, - environment, + // Note: We ignore the provided environment and use EdgeWorker instead. + environment: _provided_environment, module_id_strategy, no_mangling, runtime_root, @@ -70,12 +74,22 @@ pub async fn get_library_chunking_context( }; let output = config.output().await?; + // Use an EdgeWorker environment to disable async chunk splitting for library builds. + // This ensures the library is bundled as a single, self-contained file. + let library_environment = Environment::new(ExecutionEnvironment::EdgeWorker( + EdgeWorkerEnvironment { + node_version: NodeJsVersion::default().resolved_cell(), + } + .resolved_cell(), + )) + .to_resolved() + .await?; let mut builder = LibraryChunkingContext::builder( root_path, output_root, output_root_to_root_path, - environment.to_resolved().await?, + library_environment, runtime_type, (*runtime_root.await?).clone(), (*runtime_export.await?).clone(), diff --git a/crates/pack-tests/tests/snapshot/concatenate_modules/library-shared/output/main.js b/crates/pack-tests/tests/snapshot/concatenate_modules/library-shared/output/main.js index f1958cf22b..f64a26ae12 100644 --- a/crates/pack-tests/tests/snapshot/concatenate_modules/library-shared/output/main.js +++ b/crates/pack-tests/tests/snapshot/concatenate_modules/library-shared/output/main.js @@ -81,7 +81,20 @@ __turbopack_context__.s([]); }), 828: ((__turbopack_context__, module, exports) => { -setTimeout(()=>Promise.resolve().then(()=>__turbopack_context__.r(12)), 500); +setTimeout(()=>Promise.resolve().then(()=>__turbopack_context__.i(12)), 500); +}), +503: ((__turbopack_context__, module, exports) => { + +setTimeout(()=>Promise.resolve().then(()=>__turbopack_context__.i(742)), 1000); +}), +109: ((__turbopack_context__) => { +"use strict"; + +var __TURBOPACK__imported__module__828__ = __turbopack_context__.i(828); +var __TURBOPACK__imported__module__503__ = __turbopack_context__.i(503); +; +; +__turbopack_context__.s([]); }), 742: ((__turbopack_context__) => { "use strict"; @@ -96,19 +109,6 @@ console.log('y', __TURBOPACK__imported__module__794__["default"]); ; __turbopack_context__.s([], 742); }), -503: ((__turbopack_context__, module, exports) => { - -setTimeout(()=>Promise.resolve().then(()=>__turbopack_context__.r(742)), 1000); -}), -109: ((__turbopack_context__) => { -"use strict"; - -var __TURBOPACK__imported__module__828__ = __turbopack_context__.i(828); -var __TURBOPACK__imported__module__503__ = __turbopack_context__.i(503); -; -; -__turbopack_context__.s([]); -}), }, {"otherChunks":[],"runtimeModuleIds":[109]}, ]]); diff --git a/crates/pack-tests/tests/snapshot/concatenate_modules/library-shared/output/main.js.map b/crates/pack-tests/tests/snapshot/concatenate_modules/library-shared/output/main.js.map index efabd40094..74dc4cadaf 100644 --- a/crates/pack-tests/tests/snapshot/concatenate_modules/library-shared/output/main.js.map +++ b/crates/pack-tests/tests/snapshot/concatenate_modules/library-shared/output/main.js.map @@ -5,7 +5,7 @@ {"offset": {"line": 7, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/big/other.js","turbopack:///[project]/concatenate_modules/library-shared/input/big/index.js"],"sourcesContent":["export default `\n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\n`\n","import big from './other.js'\n\nexport default big.length\n"],"names":[],"mappings":";;;;qCAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqDhB,CAAC;;sCCnDc,+BAAI,MAAM"}}, {"offset": {"line": 76, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/x/inner.js"],"sourcesContent":["import big from '../big'\nconsole.log('x', big)\n"],"names":[],"mappings":"AAAA;;AACA,QAAQ,GAAG,CAAC,KAAK,+CAAG"}}, {"offset": {"line": 83, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/x/index.js"],"sourcesContent":["setTimeout(() => import('./inner'), 500)\n"],"names":[],"mappings":"AAAA,WAAW,6DAAyB"}}, - {"offset": {"line": 88, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/y/inner.js"],"sourcesContent":["import big from '../big'\nconsole.log('y', big)\n"],"names":[],"mappings":";;;;AAAA;;AACA,QAAQ,GAAG,CAAC,KAAK,+CAAG"}}, - {"offset": {"line": 100, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/y/index.js"],"sourcesContent":["setTimeout(() => import('./middle'), 1000)\n"],"names":[],"mappings":"AAAA,WAAW,8DAA0B"}}, - {"offset": {"line": 105, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/index.js"],"sourcesContent":["import './x/index'\nimport './y/index'\n"],"names":[],"mappings":"AAAA;AACA"}}] + {"offset": {"line": 87, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/y/index.js"],"sourcesContent":["setTimeout(() => import('./middle'), 1000)\n"],"names":[],"mappings":"AAAA,WAAW,8DAA0B"}}, + {"offset": {"line": 92, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/index.js"],"sourcesContent":["import './x/index'\nimport './y/index'\n"],"names":[],"mappings":"AAAA;AACA"}}, + {"offset": {"line": 101, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/concatenate_modules/library-shared/input/y/inner.js"],"sourcesContent":["import big from '../big'\nconsole.log('y', big)\n"],"names":[],"mappings":";;;;AAAA;;AACA,QAAQ,GAAG,CAAC,KAAK,+CAAG"}}] } \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/config.json b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/config.json new file mode 100644 index 0000000000..3d2e0d024b --- /dev/null +++ b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/config.json @@ -0,0 +1,13 @@ +{ + "config": { + "entry": [ + { + "import": "input/index.ts", + "name": "main", + "library": { + "name": "MyLibrary" + } + } + ] + } +} \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/input/a.ts b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/input/a.ts new file mode 100644 index 0000000000..961d97e14b --- /dev/null +++ b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/input/a.ts @@ -0,0 +1 @@ +export const a = "a"; \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/input/index.ts b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/input/index.ts new file mode 100644 index 0000000000..b2af981ef3 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/input/index.ts @@ -0,0 +1,6 @@ + +export async function Test() { + const module = await import('./a'); + return module; +} + diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/output/main.js b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/output/main.js new file mode 100644 index 0000000000..12c6ffa941 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/output/main.js @@ -0,0 +1,32 @@ +((__TURBOPACK__) => { +// Dummy runtime +})([["main.js", { + +23: ((__turbopack_context__) => { +"use strict"; + +const a = "a"; +__turbopack_context__.s([ + "a", + 0, + a +]); +}), +71: ((__turbopack_context__) => { +"use strict"; + +async function Test() { + const module = await Promise.resolve().then(()=>__turbopack_context__.i(23)); + return module; +} +__turbopack_context__.s([ + "Test", + ()=>Test +]); +}), +}, +{"otherChunks":[],"runtimeModuleIds":[71]}, +]]); + + +//# sourceMappingURL=main.js.map \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/output/main.js.map b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/output/main.js.map new file mode 100644 index 0000000000..4e92ec2e96 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/dynamic_import/library-chunk/output/main.js.map @@ -0,0 +1,7 @@ +{ + "version": 3, + "sources": [], + "sections": [ + {"offset": {"line": 7, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/dynamic_import/library-chunk/input/a.ts"],"sourcesContent":["export const a = \"a\";"],"names":[],"mappings":"AAAO,MAAM,IAAI"}}, + {"offset": {"line": 17, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/dynamic_import/library-chunk/input/index.ts"],"sourcesContent":["\nexport async function Test() {\n const module = await import('./a');\n return module;\n} \n\n"],"names":[],"mappings":"AACO,eAAe;IAClB,MAAM,SAAS;IACf,OAAO;AACX"}}] +} \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/output/dynamic_import_input_index_ts_403d7278.js.map b/crates/pack-tests/tests/snapshot/dynamic_import/output/dynamic_import_input_index_ts_403d7278.js.map deleted file mode 100644 index 535372be37..0000000000 --- a/crates/pack-tests/tests/snapshot/dynamic_import/output/dynamic_import_input_index_ts_403d7278.js.map +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": 3, - "sources": [], - "sections": [ - {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/dynamic_import/input/index.ts"],"sourcesContent":["export async function importUrl(url: string) {\n return import(`${url}`).then((module) => module.default);\n}\n\nexport async function requireStat(name: string) {\n return require(name);\n}\n"],"names":[],"mappings":"AAAO,eAAe,UAAU,GAAW;IACvC,OAAO;;;;OAAiB,IAAI,CAAC,CAAC,SAAW,OAAO,OAAO;AAC3D;AAEO,eAAe,YAAY,IAAY;IAC1C;;;;;AACJ"}}] -} \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/config.json b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/config.json similarity index 100% rename from crates/pack-tests/tests/snapshot/dynamic_import/config.json rename to crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/config.json diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/input/index.ts b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/input/index.ts similarity index 100% rename from crates/pack-tests/tests/snapshot/dynamic_import/input/index.ts rename to crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/input/index.ts diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/issues/__l___lint TP1001__ import(__q____q____q____star__-532304.txt b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/issues/__l___lint TP1001__ import(__q____q____q____star__-d36eeb.txt similarity index 76% rename from crates/pack-tests/tests/snapshot/dynamic_import/issues/__l___lint TP1001__ import(__q____q____q____star__-532304.txt rename to crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/issues/__l___lint TP1001__ import(__q____q____q____star__-d36eeb.txt index 4078ba09ec..728a80480c 100644 --- a/crates/pack-tests/tests/snapshot/dynamic_import/issues/__l___lint TP1001__ import(__q____q____q____star__-532304.txt +++ b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/issues/__l___lint TP1001__ import(__q____q____q____star__-d36eeb.txt @@ -1,4 +1,4 @@ -suggestion - [analysis] /dynamic_import/input/index.ts:2:11 lint TP1001 import(???*0*) is very dynamic +suggestion - [analysis] /dynamic_import/very-dynamic/input/index.ts:2:11 lint TP1001 import(???*0*) is very dynamic 1 | export async function importUrl(url: string) { + v--------------v diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/issues/__l___lint TP1002__ require(__q____q____q____star_-044a33.txt b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/issues/__l___lint TP1002__ require(__q____q____q____star_-95f331.txt similarity index 74% rename from crates/pack-tests/tests/snapshot/dynamic_import/issues/__l___lint TP1002__ require(__q____q____q____star_-044a33.txt rename to crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/issues/__l___lint TP1002__ require(__q____q____q____star_-95f331.txt index 6296930c5f..392e7f8e54 100644 --- a/crates/pack-tests/tests/snapshot/dynamic_import/issues/__l___lint TP1002__ require(__q____q____q____star_-044a33.txt +++ b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/issues/__l___lint TP1002__ require(__q____q____q____star_-95f331.txt @@ -1,4 +1,4 @@ -suggestion - [analysis] /dynamic_import/input/index.ts:6:11 lint TP1002 require(???*0*) is very dynamic +suggestion - [analysis] /dynamic_import/very-dynamic/input/index.ts:6:11 lint TP1002 require(???*0*) is very dynamic 2 | return import(`${url}`).then((module) => module.default); 3 | } diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/output/dynamic_import_input_index_ts_403d7278.js b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/dynamic_import_very-dynamic_input_index_ts_570ff46a.js similarity index 86% rename from crates/pack-tests/tests/snapshot/dynamic_import/output/dynamic_import_input_index_ts_403d7278.js rename to crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/dynamic_import_very-dynamic_input_index_ts_570ff46a.js index 96924dca63..72356e7196 100644 --- a/crates/pack-tests/tests/snapshot/dynamic_import/output/dynamic_import_input_index_ts_403d7278.js +++ b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/dynamic_import_very-dynamic_input_index_ts_570ff46a.js @@ -1,5 +1,5 @@ (globalThis.TURBOPACK || (globalThis.TURBOPACK = [])).push([typeof document === "object" ? document.currentScript : undefined, -12, ((__turbopack_context__) => { +67, ((__turbopack_context__) => { "use strict"; async function importUrl(url) { @@ -25,4 +25,4 @@ __turbopack_context__.s([ }), ]); -//# sourceMappingURL=dynamic_import_input_index_ts_403d7278.js.map \ No newline at end of file +//# sourceMappingURL=dynamic_import_very-dynamic_input_index_ts_570ff46a.js.map \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/dynamic_import_very-dynamic_input_index_ts_570ff46a.js.map b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/dynamic_import_very-dynamic_input_index_ts_570ff46a.js.map new file mode 100644 index 0000000000..461f28c63b --- /dev/null +++ b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/dynamic_import_very-dynamic_input_index_ts_570ff46a.js.map @@ -0,0 +1,6 @@ +{ + "version": 3, + "sources": [], + "sections": [ + {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/dynamic_import/very-dynamic/input/index.ts"],"sourcesContent":["export async function importUrl(url: string) {\n return import(`${url}`).then((module) => module.default);\n}\n\nexport async function requireStat(name: string) {\n return require(name);\n}\n"],"names":[],"mappings":"AAAO,eAAe,UAAU,GAAW;IACvC,OAAO;;;;OAAiB,IAAI,CAAC,CAAC,SAAW,OAAO,OAAO;AAC3D;AAEO,eAAe,YAAY,IAAY;IAC1C;;;;;AACJ"}}] +} \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/output/main.js b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/main.js similarity index 59% rename from crates/pack-tests/tests/snapshot/dynamic_import/output/main.js rename to crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/main.js index 0bda53603c..642ea8379c 100644 --- a/crates/pack-tests/tests/snapshot/dynamic_import/output/main.js +++ b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/main.js @@ -1,5 +1,5 @@ (globalThis.TURBOPACK || (globalThis.TURBOPACK = [])).push([ typeof document === "object" ? document.currentScript : undefined, - {"otherChunks":["dynamic_import_input_index_ts_403d7278.js"],"runtimeModuleIds":[12]} + {"otherChunks":["dynamic_import_very-dynamic_input_index_ts_570ff46a.js"],"runtimeModuleIds":[67]} ]); // Dummy runtime diff --git a/crates/pack-tests/tests/snapshot/dynamic_import/output/main.js.map b/crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/main.js.map similarity index 100% rename from crates/pack-tests/tests/snapshot/dynamic_import/output/main.js.map rename to crates/pack-tests/tests/snapshot/dynamic_import/very-dynamic/output/main.js.map diff --git a/crates/pack-tests/tests/snapshot/umd/async-module/output/main.js b/crates/pack-tests/tests/snapshot/umd/async-module/output/main.js index eb04c96c52..0761119e56 100644 --- a/crates/pack-tests/tests/snapshot/umd/async-module/output/main.js +++ b/crates/pack-tests/tests/snapshot/umd/async-module/output/main.js @@ -36,6 +36,21 @@ __turbopack_context__.s([ ]); __turbopack_async_result__(); } catch(e) { __turbopack_async_result__(e); } }, false);}), +803: ((__turbopack_context__) => { +"use strict"; + +// This is the async chunk +var __TURBOPACK__default__export__ = 42; +const nested = ()=>Promise.resolve().then(()=>__turbopack_context__.i(278)); +__turbopack_context__.s([ + "default", + 0, + __TURBOPACK__default__export__, + "nested", + 0, + nested +]); +}), 181: ((__turbopack_context__) => { "use strict"; @@ -77,28 +92,13 @@ __turbopack_context__.s([ ]); __turbopack_async_result__(); } catch(e) { __turbopack_async_result__(e); } }, false);}), -803: ((__turbopack_context__) => { -"use strict"; - -// This is the async chunk -var __TURBOPACK__default__export__ = 42; -const nested = ()=>Promise.resolve().then(()=>__turbopack_context__.r(278)); -__turbopack_context__.s([ - "default", - 0, - __TURBOPACK__default__export__, - "nested", - 0, - nested -]); -}), 826: ((__turbopack_context__) => { "use strict"; return __turbopack_context__.a(async (__turbopack_handle_async_dependencies__, __turbopack_async_result__) => { try { const result = await __turbopack_context__.r(92); -await Promise.resolve().then(()=>__turbopack_context__.r(803)); +await Promise.resolve().then(()=>__turbopack_context__.i(803)); result.default; __turbopack_async_result__(); } catch(e) { __turbopack_async_result__(e); } }, true);}), diff --git a/crates/pack-tests/tests/snapshot/umd/async-module/output/main.js.map b/crates/pack-tests/tests/snapshot/umd/async-module/output/main.js.map index dc84e6b222..cf0fbf048f 100644 --- a/crates/pack-tests/tests/snapshot/umd/async-module/output/main.js.map +++ b/crates/pack-tests/tests/snapshot/umd/async-module/output/main.js.map @@ -4,8 +4,8 @@ "sections": [ {"offset": {"line": 9, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/shared.js"],"sourcesContent":["await 1;\nawait 1;\nexport default \"hello\";\n"],"names":[],"mappings":"AAAA,MAAM;AACN,MAAM;qCACS"}}, {"offset": {"line": 24, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/a.js"],"sourcesContent":["import x from \"./shared\";\n\nexport default x + \" world\";\n"],"names":[],"mappings":"AAAA;;;;;;qCAEe,8CAAC,GAAG"}}, - {"offset": {"line": 43, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/b.js"],"sourcesContent":["import x from \"./shared\";\n\nexport default x + \" world\";\n"],"names":[],"mappings":"AAAA;;;;;;qCAEe,8CAAC,GAAG"}}, - {"offset": {"line": 62, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/main.js"],"sourcesContent":["import a from \"./a\";\nimport b from \"./b\";\n\nexport default a + \", \" + b;\n"],"names":[],"mappings":"AAAA;AACA;;;;;;;;qCAEe,+CAAC,GAAG,OAAO,+CAAC"}}, - {"offset": {"line": 82, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/async.js"],"sourcesContent":["// This is the async chunk\nexport default 42;\nexport const nested = () => import(\"./a\");\n"],"names":[],"mappings":"AAAA,0BAA0B;qCACX;AACR,MAAM,SAAS"}}, + {"offset": {"line": 41, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/async.js"],"sourcesContent":["// This is the async chunk\nexport default 42;\nexport const nested = () => import(\"./a\");\n"],"names":[],"mappings":"AAAA,0BAA0B;qCACX;AACR,MAAM,SAAS"}}, + {"offset": {"line": 58, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/b.js"],"sourcesContent":["import x from \"./shared\";\n\nexport default x + \" world\";\n"],"names":[],"mappings":"AAAA;;;;;;qCAEe,8CAAC,GAAG"}}, + {"offset": {"line": 77, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/main.js"],"sourcesContent":["import a from \"./a\";\nimport b from \"./b\";\n\nexport default a + \", \" + b;\n"],"names":[],"mappings":"AAAA;AACA;;;;;;;;qCAEe,+CAAC,GAAG,OAAO,+CAAC"}}, {"offset": {"line": 99, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/umd/async-module/input/index.js"],"sourcesContent":["const result = await require(\"./main\");\n\nawait import(\"./async\");\n\nresult.default;"],"names":[],"mappings":"AAAA,MAAM,SAAS;AAEf;AAEA,OAAO,OAAO"}}] } \ No newline at end of file