Actually add CommonJsReferenceSubType param

Author: mischnic

crates/next-api/src/app.rs

@@ -66,7 +66,7 @@ use turbopack_core::{
     },
     output::{OutputAsset, OutputAssets},
     raw_output::RawOutput,
-    reference_type::{CssReferenceSubType, ReferenceType},
+    reference_type::{CommonJsReferenceSubType, CssReferenceSubType, ReferenceType},
     resolve::{origin::PlainResolveOrigin, parse::Request, pattern::Pattern},
     source::Source,
     virtual_output::VirtualOutputAsset,
@@ -852,6 +852,7 @@ impl AppProject {
             Request::parse(Pattern::Constant(rcstr!(
                 "next/dist/client/app-next-turbopack.js"
             ))),
+            CommonJsReferenceSubType::Undefined,
             None,
             false,
         )

crates/next-core/src/next_client/runtime_entry.rs

@@ -5,6 +5,7 @@ use turbopack_core::{
     chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
     context::AssetContext,
     module::Module,
+    reference_type::CommonJsReferenceSubType,
     resolve::{origin::PlainResolveOrigin, parse::Request},
     source::Source,
 };
@@ -35,6 +36,7 @@ impl RuntimeEntry {
         let modules = cjs_resolve(
             Vc::upcast(PlainResolveOrigin::new(asset_context, path.clone())),
             *request,
+            CommonJsReferenceSubType::Undefined,
             None,
             false,
         )

turbopack/crates/turbopack-cli-utils/src/runtime_entry.rs

@@ -5,6 +5,7 @@ use turbopack_core::{
     chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
     context::AssetContext,
     module::Module,
+    reference_type::CommonJsReferenceSubType,
     resolve::{origin::PlainResolveOrigin, parse::Request},
     source::Source,
 };
@@ -35,6 +36,7 @@ impl RuntimeEntry {
         let modules = cjs_resolve(
             Vc::upcast(PlainResolveOrigin::new(asset_context, path.clone())),
             **request,
+            CommonJsReferenceSubType::Undefined,
             None,
             false,
         )

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

@@ -19,6 +19,7 @@ use turbopack_core::{
     chunk::{ChunkableModuleReference, ChunkingContext},
     issue::IssueSource,
     reference::ModuleReference,
+    reference_type::CommonJsReferenceSubType,
     resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request},
 };
 use turbopack_resolve::ecmascript::cjs_resolve;
@@ -67,6 +68,7 @@ impl ModuleReference for AmdDefineAssetReference {
         cjs_resolve(
             *self.origin,
             *self.request,
+            CommonJsReferenceSubType::Undefined,
             Some(self.issue_source),
             self.in_try,
         )
@@ -176,6 +178,7 @@ impl AmdDefineWithDependenciesCodeGen {
                             cjs_resolve(
                                 *self.origin,
                                 **request,
+                                CommonJsReferenceSubType::Undefined,
                                 Some(self.issue_source),
                                 self.in_try,
                             ),

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

@@ -13,6 +13,7 @@ use turbopack_core::{
     chunk::{ChunkableModuleReference, ChunkingContext},
     issue::IssueSource,
     reference::ModuleReference,
+    reference_type::CommonJsReferenceSubType,
     resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request},
 };
 use turbopack_resolve::ecmascript::cjs_resolve;
@@ -61,6 +62,7 @@ impl ModuleReference for CjsAssetReference {
         cjs_resolve(
             *self.origin,
             *self.request,
+            CommonJsReferenceSubType::Undefined,
             Some(self.issue_source),
             self.in_try,
         )
@@ -112,6 +114,7 @@ impl ModuleReference for CjsRequireAssetReference {
         cjs_resolve(
             *self.origin,
             *self.request,
+            CommonJsReferenceSubType::Undefined,
             Some(self.issue_source),
             self.in_try,
         )
@@ -236,6 +239,7 @@ impl ModuleReference for CjsRequireResolveAssetReference {
         cjs_resolve(
             *self.origin,
             *self.request,
+            CommonJsReferenceSubType::Undefined,
             Some(self.issue_source),
             self.in_try,
         )

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

@@ -3039,9 +3039,15 @@ async fn require_resolve_visitor(
     Ok(if args.len() == 1 {
         let pat = js_value_to_pattern(&args[0]);
         let request = Request::parse(pat.clone());
-        let resolved = cjs_resolve_source(origin, request, None, true)
-            .resolve()
-            .await?;
+        let resolved = cjs_resolve_source(
+            origin,
+            request,
+            CommonJsReferenceSubType::Undefined,
+            None,
+            true,
+        )
+        .resolve()
+        .await?;
         let mut values = resolved
             .primary_sources()
             .await?

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

@@ -31,6 +31,7 @@ use turbopack_core::{
     module::Module,
     module_graph::ModuleGraph,
     reference::{ModuleReference, ModuleReferences},
+    reference_type::CommonJsReferenceSubType,
     resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request},
     source::Source,
 };
@@ -196,9 +197,15 @@ impl RequireContextMap {
             let request = Request::parse(origin_relative.clone().into())
                 .to_resolved()
                 .await?;
-            let result = cjs_resolve(origin, *request, issue_source, is_optional)
-                .to_resolved()
-                .await?;
+            let result = cjs_resolve(
+                origin,
+                *request,
+                CommonJsReferenceSubType::Undefined,
+                issue_source,
+                is_optional,
+            )
+            .to_resolved()
+            .await?;
 
             map.insert(
                 context_relative.clone(),

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

@@ -205,7 +205,13 @@ impl CompilerReference {
 impl ModuleReference for CompilerReference {
     #[turbo_tasks::function]
     fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
-        cjs_resolve(*self.origin, *self.request, None, false)
+        cjs_resolve(
+            *self.origin,
+            *self.request,
+            CommonJsReferenceSubType::Undefined,
+            None,
+            false,
+        )
     }
 }
 
@@ -281,7 +287,13 @@ impl TsNodeRequireReference {
 impl ModuleReference for TsNodeRequireReference {
     #[turbo_tasks::function]
     fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
-        cjs_resolve(*self.origin, *self.request, None, false)
+        cjs_resolve(
+            *self.origin,
+            *self.request,
+            CommonJsReferenceSubType::Undefined,
+            None,
+            false,
+        )
     }
 }
 

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

@@ -104,10 +104,11 @@ pub async fn esm_resolve(
 pub async fn cjs_resolve(
     origin: Vc<Box<dyn ResolveOrigin>>,
     request: Vc<Request>,
+    ty: CommonJsReferenceSubType,
     issue_source: Option<IssueSource>,
     is_optional: bool,
 ) -> Result<Vc<ModuleResolveResult>> {
-    let ty = ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined);
+    let ty = ReferenceType::CommonJs(ty);
     let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()).await?)
         .resolve()
         .await?;
@@ -118,10 +119,11 @@ pub async fn cjs_resolve(
 pub async fn cjs_resolve_source(
     origin: ResolvedVc<Box<dyn ResolveOrigin>>,
     request: ResolvedVc<Request>,
+    ty: CommonJsReferenceSubType,
     issue_source: Option<IssueSource>,
     is_optional: bool,
 ) -> Result<Vc<ResolveResult>> {
-    let ty = ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined);
+    let ty = ReferenceType::CommonJs(ty);
     let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()).await?)
         .resolve()
         .await?;