Turbopack: more static typeof replacements for ESM

turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs

@@ -23,6 +23,7 @@ use super::{
 use crate::{
     analyzer::{is_unresolved, WellKnownObjectKind},
     utils::{unparen, AstPathRange},
+    SpecifiedModuleType,
 };
 
 #[derive(Debug, Clone)]
@@ -312,8 +313,8 @@ impl EvalContext {
         }
     }
 
-    pub fn is_esm(&self) -> bool {
-        self.imports.is_esm()
+    pub fn is_esm(&self, specified_type: SpecifiedModuleType) -> bool {
+        self.imports.is_esm(specified_type)
     }
 
     fn eval_prop_name(&self, prop: &PropName) -> JsValue {

turbopack/crates/turbopack-ecmascript/src/analyzer/imports.rs

@@ -17,7 +17,10 @@ use turbo_tasks::{RcStr, Vc};
 use turbopack_core::{issue::IssueSource, source::Source};
 
 use super::{top_level_await::has_top_level_await, JsValue, ModuleValue};
-use crate::tree_shake::{find_turbopack_part_id_in_asserts, PartId};
+use crate::{
+    tree_shake::{find_turbopack_part_id_in_asserts, PartId},
+    SpecifiedModuleType,
+};
 
 #[turbo_tasks::value(serialization = "auto_for_input")]
 #[derive(Default, Debug, Clone, Hash)]
@@ -209,8 +212,14 @@ pub(crate) struct ImportMapReference {
 }
 
 impl ImportMap {
-    pub fn is_esm(&self) -> bool {
-        self.has_exports || self.has_imports || self.has_top_level_await
+    pub fn is_esm(&self, specified_type: SpecifiedModuleType) -> bool {
+        match specified_type {
+            SpecifiedModuleType::Automatic => {
+                self.has_exports || self.has_imports || self.has_top_level_await
+            }
+            SpecifiedModuleType::CommonJs => false,
+            SpecifiedModuleType::EcmaScript => true,
+        }
     }
 
     pub fn get_import(&self, id: &Id) -> Option<JsValue> {

turbopack/crates/turbopack-ecmascript/src/lib.rs

@@ -885,8 +885,7 @@ async fn gen_content_with_visitors(
             Ok(EcmascriptModuleContent {
                 inner_code: bytes.into(),
                 source_map: Some(Vc::upcast(srcmap)),
-                is_esm: eval_context.is_esm()
-                    || specified_module_type == SpecifiedModuleType::EcmaScript,
+                is_esm: eval_context.is_esm(specified_module_type),
             }
             .cell())
         }

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

@@ -491,23 +491,35 @@ pub(crate) async fn analyse_ecmascript_module_internal(
         return analysis.build(false).await;
     };
 
-    let compile_time_info = if (specified_type == SpecifiedModuleType::CommonJs)
-        || (specified_type == SpecifiedModuleType::Automatic && !eval_context.is_esm())
-    {
+    let compile_time_info = {
         let compile_time_info = raw_module.compile_time_info.await?;
         let mut free_var_references = compile_time_info.free_var_references.await?.clone_value();
+
+        let (typeof_exports, typeof_module) = if eval_context.is_esm(specified_type) {
+            ("undefined", "undefined")
+        } else {
+            ("object", "object")
+        };
+
         free_var_references
             .entry(vec![
-                DefineableNameSegment::Name("exports".into()),
+                DefineableNameSegment::Name("import".into()),
+                DefineableNameSegment::Name("meta".into()),
                 DefineableNameSegment::TypeOf,
             ])
             .or_insert("object".into());
+        free_var_references
+            .entry(vec![
+                DefineableNameSegment::Name("exports".into()),
+                DefineableNameSegment::TypeOf,
+            ])
+            .or_insert(typeof_exports.into());
         free_var_references
             .entry(vec![
                 DefineableNameSegment::Name("module".into()),
                 DefineableNameSegment::TypeOf,
             ])
-            .or_insert("object".into());
+            .or_insert(typeof_module.into());
         free_var_references
             .entry(vec![
                 DefineableNameSegment::Name("require".into()),
@@ -521,8 +533,6 @@ pub(crate) async fn analyse_ecmascript_module_internal(
             free_var_references: FreeVarReferences(free_var_references).cell(),
         }
         .cell()
-    } else {
-        raw_module.compile_time_info
     };
 
     let mut import_references = Vec::new();
@@ -844,7 +854,7 @@ pub(crate) async fn analyse_ecmascript_module_internal(
         set_handler_and_globals(&handler, globals, || has_top_level_await(program));
     let has_top_level_await = top_level_await_span.is_some();
 
-    if eval_context.is_esm() || specified_type == SpecifiedModuleType::EcmaScript {
+    if eval_context.is_esm(specified_type) {
         let async_module = AsyncModule {
             has_top_level_await,
             import_externals,

turbopack/crates/turbopack-tests/tests/snapshot/comptime/typeof/input/cjs.js

@@ -0,0 +1,5 @@
+console.log("typeof require", typeof require)
+console.log("typeof import.meta", typeof import.meta)
+// CJS, should be `object`
+console.log("typeof module", typeof module)
+console.log("typeof exports", typeof exports)

turbopack/crates/turbopack-tests/tests/snapshot/comptime/typeof/input/esm-automatic.js

@@ -0,0 +1,7 @@
+import './dep.js'
+
+console.log("typeof require", typeof require)
+console.log("typeof import.meta", typeof import.meta)
+// ESM, should be `undefined`
+console.log("typeof module", typeof module)
+console.log("typeof exports", typeof exports)

turbopack/crates/turbopack-tests/tests/snapshot/comptime/typeof/input/esm-specified.mjs

@@ -0,0 +1,5 @@
+console.log("typeof require", typeof require)
+console.log("typeof import.meta", typeof import.meta)
+// ESM, should be `undefined`
+console.log("typeof module", typeof module)
+console.log("typeof exports", typeof exports)

turbopack/crates/turbopack-tests/tests/snapshot/comptime/typeof/input/index.js

@@ -0,0 +1,3 @@
+import "./cjs.js"
+import "./esm-automatic.js"
+import "./esm-specified.mjs"

turbopack/crates/turbopack-tests/tests/snapshot/comptime/typeof/issues/Specified module format (EcmaScript Modules) is no-d7ae6c.txt

@@ -0,0 +1,3 @@
+warning - [analysis] [project]/turbopack/crates/turbopack-tests/tests/snapshot/comptime/typeof/input/esm-specified.mjs  Specified module format (EcmaScript Modules) is not matching the module format of the source code (CommonJs)
+  The EcmaScript module format was specified in the package.json that is affecting this source file or by using an special extension, but it looks like that CommonJs syntax is used in the source code.
+  Exports made by CommonJs syntax will lead to a runtime error, since the module is in EcmaScript mode. Either change the "type" field in the package.json or replace CommonJs syntax with EcmaScript import/export syntax in the source file.