Skip to content

Commit 6c3bfb7

Browse files
mischnicmischnic
committed
fixup
1 parent 8fa0bcc commit 6c3bfb7

12 files changed

+25
-23
lines changed

‎turbopack/crates/turbopack-ecmascript/src/references/worker.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use crate::{
2020
code_gen::{CodeGenerateable, CodeGeneration},
2121
create_visitor,
2222
references::AstPath,
23+
runtime_functions::TURBOPACK_REQUIRE,
2324
worker_chunk::module::WorkerLoaderModule,
2425
};
2526

@@ -140,7 +141,8 @@ impl CodeGenerateable for WorkerAssetReference {
140141
Some(ExprOrSpread { spread: None, expr }) => {
141142
let item_id = Expr::Lit(Lit::Str(item_id.to_string().into()));
142143
*expr = quote_expr!(
143-
"{TURBOPACK_REQUIRE}($item_id)",
144+
"$turbopack_require($item_id)",
145+
turbopack_require: Expr = TURBOPACK_REQUIRE.into(),
144146
item_id: Expr = item_id
145147
);
146148

‎turbopack/crates/turbopack-ecmascript/src/runtime_functions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pub struct TurbopackRuntimeFunctionShortcut {
99
}
1010

1111
impl TurbopackRuntimeFunctionShortcut {
12-
pub const fn new(shortcut: &'static str, full: &'static str) -> Self {
13-
Self { shortcut, full }
12+
pub const fn new(full: &'static str, shortcut: &'static str) -> Self {
13+
Self { full, shortcut }
1414
}
1515
}
1616

‎turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_44a9b7.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.all([
99
"output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_4f08a3.js"
1010
].map((chunk) => __turbopack_context__.l(chunk))).then(() => {
11-
return __turbopack_import__("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/input/lib.js [test] (ecmascript)");
11+
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/input/lib.js [test] (ecmascript)");
1212
});
1313
});
1414
}}),

‎turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_46e42b.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.all([
99
"output/turbopack_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_b274c7._.js"
1010
].map((chunk) => __turbopack_context__.l(chunk))).then(() => {
11-
return __turbopack_import__("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js [test] (ecmascript)");
11+
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js [test] (ecmascript)");
1212
});
1313
});
1414
}}),

‎turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk_build/output/b1abf_turbopack-tests_tests_snapshot_basic_async_chunk_build_input_import_6f110a.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ module.exports = {
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.all([
99
"output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_build_input_23e8ba._.js"
1010
].map((chunk) => __turbopack_context__.l(chunk))).then(() => {
11-
return __turbopack_import__("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk_build/input/import.js [test] (ecmascript)");
11+
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk_build/input/import.js [test] (ecmascript)");
1212
});
1313
});
1414
}}),

‎turbopack/crates/turbopack-tests/tests/snapshot/basic/top-level-await/output/b1abf_turbopack-tests_tests_snapshot_basic_top-level-await_input_UserAPI_ba56f9.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.all([
99
"output/4e721_crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_aa0a0c._.js"
1010
].map((chunk) => __turbopack_context__.l(chunk))).then(() => {
11-
return __turbopack_import__("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/top-level-await/input/UserAPI.js [test] (ecmascript)");
11+
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/top-level-await/input/UserAPI.js [test] (ecmascript)");
1212
});
1313
});
1414
}}),

‎turbopack/crates/turbopack-tests/tests/snapshot/comptime/typeof/output/turbopack_crates_turbopack-tests_tests_snapshot_comptime_typeof_input_80f572._.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules/output/b1abf_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_css_adb3ea._.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.resolve().then(() => {
9-
return __turbopack_import__("[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css module)");
9+
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css module)");
1010
});
1111
});
1212
}}),

‎turbopack/crates/turbopack-tests/tests/snapshot/css/css/output/08d19_foo_style_css_1f8924._.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.resolve();
99
});
1010
}}),

‎turbopack/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/4e721_crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel_mjs_a2d40e._.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.all([
99
"output/4e721_crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel_mjs_7f2965._.js"
1010
].map((chunk) => __turbopack_context__.l(chunk))).then(() => {
11-
return __turbopack_import__("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs [test] (ecmascript)");
11+
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs [test] (ecmascript)");
1212
});
1313
});
1414
}}),

‎turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_vercel_mjs_bc04b7._.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.all([
99
"output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_vercel_mjs_9a2c48._.js"
1010
].map((chunk) => __turbopack_context__.l(chunk))).then(() => {
11-
return __turbopack_import__("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/vercel.mjs [test] (ecmascript)");
11+
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/vercel.mjs [test] (ecmascript)");
1212
});
1313
});
1414
}}),

‎turbopack/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/4c35f_tests_snapshot_imports_static-and-dynamic_input_vercel_mjs_cbd419._.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
var { g: global, d: __dirname } = __turbopack_context__;
66
{
7-
__turbopack_context__.v((__turbopack_import__) => {
7+
__turbopack_context__.v((parentImport) => {
88
return Promise.resolve().then(() => {
9-
return __turbopack_import__("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs [test] (ecmascript)");
9+
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs [test] (ecmascript)");
1010
});
1111
});
1212
}}),

0 commit comments

Comments
 (0)