diff --git a/crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___a4c79e8f.js b/crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___3b647096.js similarity index 84% rename from crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___a4c79e8f.js rename to crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___3b647096.js index 3809e853a0..88e0242c24 100644 --- a/crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___a4c79e8f.js +++ b/crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___3b647096.js @@ -38,7 +38,7 @@ const mod = await __turbopack_context__.y("bar_import2"); __turbopack_context__.n(mod); __turbopack_async_result__(); } catch(e) { __turbopack_async_result__(e); } }, true);}), -462, ((__turbopack_context__) => { +17, ((__turbopack_context__) => { "use strict"; return __turbopack_context__.a(async (__turbopack_handle_async_dependencies__, __turbopack_async_result__) => { try { @@ -57,7 +57,7 @@ try { __turbopack_context__.v(mod); __turbopack_async_result__(); } catch(e) { __turbopack_async_result__(e); } }, true);}), -747, ((__turbopack_context__) => { +596, ((__turbopack_context__) => { "use strict"; return __turbopack_context__.a(async (__turbopack_handle_async_dependencies__, __turbopack_async_result__) => { try { @@ -86,15 +86,15 @@ var __TURBOPACK__imported__module__414__ = __turbopack_context__.i(414); var __TURBOPACK__imported__module__43__ = __turbopack_context__.i(43); var __TURBOPACK__imported__module__377__ = __turbopack_context__.i(377); var __TURBOPACK__imported__module__569__ = __turbopack_context__.i(569); -var __TURBOPACK__imported__module__462__ = __turbopack_context__.i(462); -var __TURBOPACK__imported__module__747__ = __turbopack_context__.i(747); +var __TURBOPACK__imported__module__17__ = __turbopack_context__.i(17); +var __TURBOPACK__imported__module__596__ = __turbopack_context__.i(596); var __turbopack_async_dependencies__ = __turbopack_handle_async_dependencies__([ __TURBOPACK__imported__module__377__, __TURBOPACK__imported__module__569__, - __TURBOPACK__imported__module__462__, - __TURBOPACK__imported__module__747__ + __TURBOPACK__imported__module__17__, + __TURBOPACK__imported__module__596__ ]); -[__TURBOPACK__imported__module__377__, __TURBOPACK__imported__module__569__, __TURBOPACK__imported__module__462__, __TURBOPACK__imported__module__747__] = __turbopack_async_dependencies__.then ? (await __turbopack_async_dependencies__)() : __turbopack_async_dependencies__; +[__TURBOPACK__imported__module__377__, __TURBOPACK__imported__module__569__, __TURBOPACK__imported__module__17__, __TURBOPACK__imported__module__596__] = __turbopack_async_dependencies__.then ? (await __turbopack_async_dependencies__)() : __turbopack_async_dependencies__; ; ; ; @@ -103,10 +103,10 @@ var __turbopack_async_dependencies__ = __turbopack_handle_async_dependencies__([ ; ; console.log(__TURBOPACK__imported__module__631__["default"], __TURBOPACK__imported__module__414__["default"], __TURBOPACK__imported__module__43__["default"], __TURBOPACK__imported__module__377__["default"], __TURBOPACK__imported__module__569__["default"]); -console.log(__TURBOPACK__imported__module__462__["default"], __TURBOPACK__imported__module__747__["default"]); +console.log(__TURBOPACK__imported__module__17__["default"], __TURBOPACK__imported__module__596__["default"]); __turbopack_context__.s([]); __turbopack_async_result__(); } catch(e) { __turbopack_async_result__(e); } }, false);}), ]); -//# sourceMappingURL=_root-of-the-server___a4c79e8f.js.map \ No newline at end of file +//# sourceMappingURL=_root-of-the-server___3b647096.js.map \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___a4c79e8f.js.map b/crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___3b647096.js.map similarity index 95% rename from crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___a4c79e8f.js.map rename to crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___3b647096.js.map index 4dbd60390a..79a5565d78 100644 --- a/crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___a4c79e8f.js.map +++ b/crates/pack-tests/tests/snapshot/externals/basic/output/_root-of-the-server___3b647096.js.map @@ -2,5 +2,5 @@ "version": 3, "sources": [], "sections": [ - {"offset": {"line": 83, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/externals/basic/input/index.js"],"sourcesContent":["import foo from \"foo\";\nimport foo_require from \"foo_require\";\nimport foo_require2 from \"foo_require2\";\nimport foo_import from \"foo_import\";\nimport foo_import2 from \"foo_import2\";\nimport foo_script from \"foo_script\";\nimport foo_script2 from \"foo_script2\";\n\nconsole.log(foo, foo_require, foo_require2, foo_import, foo_import2);\nconsole.log(foo_script, foo_script2);"],"names":["console","log"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;AAEAA,QAAQC,GAAG,CAAC,+CAAG,EAAE,+CAAW,EAAE,8CAAY,EAAE,+CAAU,EAAE,+CAAW;AACnED,QAAQC,GAAG,CAAC,+CAAU,EAAE,+CAAW"}}] + {"offset": {"line": 83, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/externals/basic/input/index.js"],"sourcesContent":["import foo from \"foo\";\nimport foo_require from \"foo_require\";\nimport foo_require2 from \"foo_require2\";\nimport foo_import from \"foo_import\";\nimport foo_import2 from \"foo_import2\";\nimport foo_script from \"foo_script\";\nimport foo_script2 from \"foo_script2\";\n\nconsole.log(foo, foo_require, foo_require2, foo_import, foo_import2);\nconsole.log(foo_script, foo_script2);"],"names":["console","log"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;AAEAA,QAAQC,GAAG,CAAC,+CAAG,EAAE,+CAAW,EAAE,8CAAY,EAAE,+CAAU,EAAE,+CAAW;AACnED,QAAQC,GAAG,CAAC,8CAAU,EAAE,+CAAW"}}] } \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/externals/basic/output/main.js b/crates/pack-tests/tests/snapshot/externals/basic/output/main.js index 58fa6084d1..afdc379b4b 100644 --- a/crates/pack-tests/tests/snapshot/externals/basic/output/main.js +++ b/crates/pack-tests/tests/snapshot/externals/basic/output/main.js @@ -1,5 +1,5 @@ (globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([ typeof document === "object" ? document.currentScript : undefined, - {"otherChunks":["_root-of-the-server___a4c79e8f.js"],"runtimeModuleIds":[212]} + {"otherChunks":["_root-of-the-server___3b647096.js"],"runtimeModuleIds":[212]} ]); // Dummy runtime diff --git a/crates/pack-tests/tests/snapshot/externals/script/config.json b/crates/pack-tests/tests/snapshot/externals/script/config.json new file mode 100644 index 0000000000..92584867f3 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/externals/script/config.json @@ -0,0 +1,17 @@ +{ + "config": { + "entry": [ + { + "import": "input/index.ts", + "name": "main" + } + ], + "externals": { + "lodash": { + "root": "_", + "type": "script", + "script": "https://gw.alipayobjects.com/os/lib/lodash/4.17.21/lodash.min.js" + } + } + } +} \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/externals/script/input/index.ts b/crates/pack-tests/tests/snapshot/externals/script/input/index.ts new file mode 100644 index 0000000000..cfef02f745 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/externals/script/input/index.ts @@ -0,0 +1,6 @@ +const func = async () => { + // @ts-ignore + const _ = await import('lodash'); + console.log(Object.keys(_.default.omit({ a: 1 }, 'a')).length === 0); +}; +func(); \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/externals/script/output/_externals____2fc6bb03.js b/crates/pack-tests/tests/snapshot/externals/script/output/_externals____2fc6bb03.js new file mode 100644 index 0000000000..060da45d20 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/externals/script/output/_externals____2fc6bb03.js @@ -0,0 +1,21 @@ +(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([typeof document === "object" ? document.currentScript : undefined, +20, ((__turbopack_context__) => { +"use strict"; + +return __turbopack_context__.a(async (__turbopack_handle_async_dependencies__, __turbopack_async_result__) => { try { + +let mod; +try { + await __turbopack_context__.L("https://gw.alipayobjects.com/os/lib/lodash/4.17.21/lodash.min.js"); + if (typeof global["_"] === 'undefined') { + throw new Error('Variable "_" is not available on global object after loading "https://gw.alipayobjects.com/os/lib/lodash/4.17.21/lodash.min.js"'); + } + mod = global["_"]; +} catch (error) { + throw new Error('Failed to load external URL module "_@https://gw.alipayobjects.com/os/lib/lodash/4.17.21/lodash.min.js": ' + (error.message || error)); +} + +__turbopack_context__.v(mod); +__turbopack_async_result__(); +} catch(e) { __turbopack_async_result__(e); } }, true);}), +]); \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/externals/script/output/_externals____2fc6bb03.js.map b/crates/pack-tests/tests/snapshot/externals/script/output/_externals____2fc6bb03.js.map new file mode 100644 index 0000000000..c15d7ec003 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/externals/script/output/_externals____2fc6bb03.js.map @@ -0,0 +1,5 @@ +{ + "version": 3, + "sources": [], + "sections": [] +} \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/externals/script/output/_root-of-the-server___7ced73a1.js b/crates/pack-tests/tests/snapshot/externals/script/output/_root-of-the-server___7ced73a1.js new file mode 100644 index 0000000000..a212748ab2 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/externals/script/output/_root-of-the-server___7ced73a1.js @@ -0,0 +1,25 @@ +(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([typeof document === "object" ? document.currentScript : undefined, +19, ((__turbopack_context__, module, exports) => { + +const func = async ()=>{ + // @ts-ignore + const _ = await __turbopack_context__.A(96); + console.log(Object.keys(_.default.omit({ + a: 1 + }, 'a')).length === 0); +}; +func(); +}), +96, ((__turbopack_context__) => { + +__turbopack_context__.v((parentImport) => { + return Promise.all([ + "_externals____2fc6bb03.js" +].map((chunk) => __turbopack_context__.l(chunk))).then(() => { + return parentImport(20); + }); +}); +}), +]); + +//# sourceMappingURL=_root-of-the-server___7ced73a1.js.map \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/externals/script/output/_root-of-the-server___7ced73a1.js.map b/crates/pack-tests/tests/snapshot/externals/script/output/_root-of-the-server___7ced73a1.js.map new file mode 100644 index 0000000000..8872fb9190 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/externals/script/output/_root-of-the-server___7ced73a1.js.map @@ -0,0 +1,6 @@ +{ + "version": 3, + "sources": [], + "sections": [ + {"offset": {"line": 3, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/externals/script/input/index.ts"],"sourcesContent":["const func = async () => {\n // @ts-ignore\n const _ = await import('lodash');\n console.log(Object.keys(_.default.omit({ a: 1 }, 'a')).length === 0);\n};\nfunc();"],"names":["func","_","console","log","Object","keys","default","omit","a","length"],"mappings":"AAAA,MAAMA,OAAO;IACT,aAAa;IACb,MAAMC,IAAI;IACVC,QAAQC,GAAG,CAACC,OAAOC,IAAI,CAACJ,EAAEK,OAAO,CAACC,IAAI,CAAC;QAAEC,GAAG;IAAE,GAAG,MAAMC,MAAM,KAAK;AACtE;AACAT"}}] +} \ No newline at end of file diff --git a/crates/pack-tests/tests/snapshot/externals/script/output/main.js b/crates/pack-tests/tests/snapshot/externals/script/output/main.js new file mode 100644 index 0000000000..30cd1ce3f3 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/externals/script/output/main.js @@ -0,0 +1,5 @@ +(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([ + typeof document === "object" ? document.currentScript : undefined, + {"otherChunks":["_root-of-the-server___7ced73a1.js"],"runtimeModuleIds":[19]} +]); +// Dummy runtime diff --git a/crates/pack-tests/tests/snapshot/externals/script/output/main.js.map b/crates/pack-tests/tests/snapshot/externals/script/output/main.js.map new file mode 100644 index 0000000000..c15d7ec003 --- /dev/null +++ b/crates/pack-tests/tests/snapshot/externals/script/output/main.js.map @@ -0,0 +1,5 @@ +{ + "version": 3, + "sources": [], + "sections": [] +} \ No newline at end of file diff --git a/next.js b/next.js index a4c05f3e04..46c7a81928 160000 --- a/next.js +++ b/next.js @@ -1 +1 @@ -Subproject commit a4c05f3e04d1a88e5c3e7fe2308e9bb52a34eb4f +Subproject commit 46c7a81928689ed7c51db7e8533a9a22bb6fa5d9