fixups

Author: mischnic

turbopack/crates/turbopack-ecmascript-plugins/src/transform/directives/server_to_client_proxy.rs

@@ -11,6 +11,7 @@ use swc_core::{
 };
 use turbopack_ecmascript::{
     annotations::{with_clause, ANNOTATION_TRANSITION},
+    runtime_functions::TURBOPACK_EXPORT_NAMESPACE,
     TURBOPACK_HELPER,
 };
 
@@ -33,7 +34,8 @@ pub fn create_proxy_module(transition_name: &str, target_import: &str) -> Progra
                 phase: Default::default(),
             })),
             ModuleItem::Stmt(quote!(
-                "__turbopack_export_namespace__($proxy);" as Stmt,
+                "$turbopack_export_namespace($proxy);" as Stmt,
+                turbopack_export_namespace: Expr = TURBOPACK_EXPORT_NAMESPACE.into(),
                 proxy = ident,
             )),
         ],
@@ -58,7 +60,8 @@ pub fn create_error_proxy_module(error_proxy_module: &str) -> Program {
                 phase: Default::default(),
             })),
             ModuleItem::Stmt(quote!(
-                "__turbopack_export_namespace__($proxy);" as Stmt,
+                "$turbopack_export_namespace($proxy);" as Stmt,
+                turbopack_export_namespace: Expr = TURBOPACK_EXPORT_NAMESPACE.into(),
                 proxy = ident,
             )),
         ],

turbopack/crates/turbopack-ecmascript/src/references/amd.rs

@@ -272,11 +272,12 @@ fn transform_amd_factory(
             });
             *callee = Callee::Expr(quote_expr!(
                 "($f1, r = typeof $f2 !== \"function\" ? $f3 : $call_f) => r !== undefined && \
-                 __turbopack_export_value__(r)",
-                f1 = f.clone(),
-                f2 = f.clone(),
-                f3 = f,
-                call_f: Expr = call_f
+                 $turbopack_export_value(r)",
+                 f1 = f.clone(),
+                 f2 = f.clone(),
+                 f3 = f,
+                 call_f: Expr = call_f,
+                 turbopack_export_value: Expr = TURBOPACK_EXPORT_VALUE.into()
             ));
             args.push(ExprOrSpread {
                 expr: factory,
@@ -286,7 +287,8 @@ fn transform_amd_factory(
         AmdDefineFactoryType::Function => {
             // (r => r !== undefined && __turbopack_export_value__(r))(...([...]))
             *callee = Callee::Expr(quote_expr!(
-                "r => r !== undefined && __turbopack_export_value__(r)"
+                "r => r !== undefined && $turbopack_export_value(r)",
+                turbopack_export_value: Expr = TURBOPACK_EXPORT_VALUE.into()
             ));
             args.push(ExprOrSpread {
                 expr: Box::new(Expr::Call(CallExpr {

turbopack/crates/turbopack-ecmascript/src/references/mod.rs

@@ -3437,10 +3437,12 @@ fn detect_dynamic_export(p: &Program) -> DetectedDynamicExportType {
                 self.cjs = true;
                 self.found = true;
             }
+            // TODO these are members now
             if &*i.sym == "__turbopack_export_value__" {
                 self.value = true;
                 self.found = true;
             }
+            // TODO these are members now
             if &*i.sym == "__turbopack_export_namespace__" {
                 self.namespace = true;
                 self.found = true;

turbopack/crates/turbopack-ecmascript/src/references/pattern_mapping.rs

@@ -32,7 +32,8 @@ use super::util::{request_to_string, throw_module_not_found_expr};
 use crate::{
     references::util::throw_module_not_found_error_expr,
     runtime_functions::{
-        TURBOPACK_EXTERNAL_IMPORT, TURBOPACK_EXTERNAL_REQUIRE, TURBOPACK_IMPORT, TURBOPACK_REQUIRE,
+        TURBOPACK_EXTERNAL_IMPORT, TURBOPACK_EXTERNAL_REQUIRE, TURBOPACK_IMPORT,
+        TURBOPACK_MODULE_CONTEXT, TURBOPACK_REQUIRE,
     },
     utils::module_id_to_lit,
 };
@@ -168,7 +169,8 @@ impl SinglePatternMapping {
                         args: vec![ExprOrSpread {
                             spread: None,
                             expr: quote_expr!(
-                                "() => __turbopack_external_require__($arg, () => require($arg), true)",
+                                "() => $turbopack_external_require($arg, () => require($arg), true)",
+                                turbopack_external_require: Expr = TURBOPACK_EXTERNAL_REQUIRE.into(),
                                 arg: Expr = key_expr.into_owned()
                             ),
                         }],
@@ -182,7 +184,8 @@ impl SinglePatternMapping {
                 args: vec![ExprOrSpread {
                     spread: None,
                     expr: quote_expr!(
-                        "() => __turbopack_external_require__($arg, () => require($arg), true)",
+                        "() => $turbopack_external_require($arg, () => require($arg), true)",
+                        turbopack_external_require: Expr = TURBOPACK_EXTERNAL_REQUIRE.into(),
                         arg: Expr = key_expr.into_owned()
                     ),
                 }],
@@ -212,7 +215,8 @@ impl SinglePatternMapping {
                 args: vec![ExprOrSpread {
                     spread: None,
                     expr: quote_expr!(
-                        "() => __turbopack_import__($arg)",
+                        "() => $turbopack_import($arg)",
+                        turbopack_import: Expr = TURBOPACK_IMPORT.into(),
                         arg: Expr = self.create_id(key_expr)
                     ),
                 }],
@@ -263,7 +267,8 @@ impl PatternMapping {
             PatternMapping::Map(map) => {
                 let map = create_context_map(map, &key_expr, ImportMode::Require);
 
-                quote!("__turbopack_module_context__($map).resolve($key)" as Expr,
+                quote!("$turbopack_module_context($map).resolve($key)" as Expr,
+                    turbopack_module_context: Expr = TURBOPACK_MODULE_CONTEXT.into(),
                     map: Expr = map,
                     key: Expr = key_expr
                 )
@@ -277,7 +282,8 @@ impl PatternMapping {
             PatternMapping::Map(map) => {
                 let map = create_context_map(map, &key_expr, ImportMode::Require);
 
-                quote!("__turbopack_module_context__($map)($key)" as Expr,
+                quote!("$turbopack_module_context($map)($key)" as Expr,
+                    turbopack_module_context: Expr = TURBOPACK_MODULE_CONTEXT.into(),
                     map: Expr = map,
                     key: Expr = key_expr
                 )
@@ -292,7 +298,8 @@ impl PatternMapping {
                 let map =
                     create_context_map(map, &key_expr, ImportMode::Import { import_externals });
 
-                quote!("__turbopack_module_context__($map).import($key)" as Expr,
+                quote!("$turbopack_module_context($map).import($key)" as Expr,
+                    turbopack_module_context: Expr = TURBOPACK_MODULE_CONTEXT.into(),
                     map: Expr = map,
                     key: Expr = key_expr
                 )

turbopack/crates/turbopack-ecmascript/src/references/require_context.rs

@@ -41,7 +41,7 @@ use crate::{
         pattern_mapping::{PatternMapping, ResolveType},
         AstPath,
     },
-    runtime_functions::{TURBOPACK_MODULE_CONTEXT, TURBOPACK_REQUIRE},
+    runtime_functions::{TURBOPACK_EXPORT_VALUE, TURBOPACK_MODULE_CONTEXT, TURBOPACK_REQUIRE},
     utils::module_id_to_lit,
     CodeGenerateable, EcmascriptChunkPlaceable,
 };
@@ -485,7 +485,8 @@ impl EcmascriptChunkItem for RequireContextChunkItem {
         }
 
         let expr = quote_expr!(
-            "{TURBOPACK_EXPORT_VALUE}($obj);",
+            "$turbopack_export_value($obj);",
+            turbopack_export_value: Expr = TURBOPACK_EXPORT_VALUE.into(),
             obj: Expr = Expr::Object(context_map),
         );
 

turbopack/crates/turbopack-ecmascript/src/transform/mod.rs

@@ -167,8 +167,9 @@ impl EcmascriptInputTransform {
                     import_source: import_source.await?.as_deref().map(Atom::from),
                     refresh: if *refresh {
                         Some(swc_core::ecma::transforms::react::RefreshOptions {
-                            refresh_reg: atom!("__turbopack_refresh__.register"),
-                            refresh_sig: atom!("__turbopack_refresh__.signature"),
+                            // __turbopack_context__.k is __turbopack_refresh__
+                            refresh_reg: atom!("__turbopack_context__.k.register"),
+                            refresh_sig: atom!("__turbopack_context__.k.signature"),
                             ..Default::default()
                         })
                     } else {
@@ -192,7 +193,7 @@ impl EcmascriptInputTransform {
                         // AMP / No-JS mode does not inject these helpers
                         "\nif (typeof globalThis.$RefreshHelpers$ === 'object' && \
                          globalThis.$RefreshHelpers !== null) { \
-                         __turbopack_refresh__.registerExports(module, \
+                         __turbopack_context__.k.registerExports(module, \
                          globalThis.$RefreshHelpers$); }\n" as Stmt
                     );
 

turbopack/crates/turbopack-ecmascript/src/tree_shake/util.rs

@@ -481,6 +481,7 @@ impl Visit for ShouldSkip {
             ..
         }) = &*n.arg
         {
+            // TODO this is a member expression now
             if expr.is_ident_ref_to("__turbopack_wasm_module__") {
                 self.skip = true;
                 return;