Unverified Commit 555b1318 authored by OJ Kwon's avatar OJ Kwon Committed by GitHub

fix(next-core): externalcjs resolve options (#57645)

### What

Probably not a big deal since we run this against cjs / esm both, but looks like it's a minor typo.

Closes WEB-1894
parent 62267ec7
...@@ -65,9 +65,9 @@ async fn is_node_resolveable( ...@@ -65,9 +65,9 @@ async fn is_node_resolveable(
context, context,
request, request,
if is_esm { if is_esm {
node_cjs_resolve_options(context.root())
} else {
node_esm_resolve_options(context.root()) node_esm_resolve_options(context.root())
} else {
node_cjs_resolve_options(context.root())
}, },
); );
let primary_node_assets = node_resolve_result.primary_sources().await?; let primary_node_assets = node_resolve_result.primary_sources().await?;
...@@ -161,34 +161,43 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -161,34 +161,43 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin {
return Ok(ResolveResultOption::none()); return Ok(ResolveResultOption::none());
} }
// We don't know if this is a ESM reference, so also check if it is resolveable
// as ESM.
let is_esm_resolveable =
*is_node_resolveable(self.project_path, request, fs_path, true).await?;
let is_cjs_resolveable =
*is_node_resolveable(self.project_path, request, fs_path, false).await?;
if !is_cjs_resolveable && !is_esm_resolveable {
// can't resolve request with node.js options
return Ok(ResolveResultOption::none());
}
// check if we can resolve the package from the project dir with node.js resolve // check if we can resolve the package from the project dir with node.js resolve
// options (might be hidden by pnpm) // options (might be hidden by pnpm)
if *is_node_resolveable(self.project_path, request, fs_path, false).await? { if is_cjs_resolveable {
// We don't know if this is a ESM reference, so also check if it is resolveable // mark as external
// as ESM. return Ok(ResolveResultOption::some(
if *is_node_resolveable(self.project_path, request, fs_path, true).await? { ResolveResult::primary(ResolveResultItem::OriginalReferenceExternal).cell(),
// mark as external ));
return Ok(ResolveResultOption::some( }
ResolveResult::primary(ResolveResultItem::OriginalReferenceExternal).cell(),
)); // When it's not resolveable as ESM, there is maybe an extension missing, try
} else if let Some(mut request_str) = request.await?.request() { // .js
// When it's not resolveable as ESM, there is maybe an extension missing, try if let Some(mut request_str) = request.await?.request() {
// .js if !request_str.ends_with(".js") {
if !request_str.ends_with(".js") { request_str += ".js";
request_str += ".js"; let request = Request::parse(Value::new(Pattern::Constant(request_str.clone())));
let request = if *is_node_resolveable(self.project_path, request, fs_path, false).await?
Request::parse(Value::new(Pattern::Constant(request_str.clone()))); && *is_node_resolveable(self.project_path, request, fs_path, true).await?
if *is_node_resolveable(self.project_path, request, fs_path, false).await? {
&& *is_node_resolveable(self.project_path, request, fs_path, true).await? // mark as external, but with .js extension
{ return Ok(ResolveResultOption::some(
// mark as external, but with .js extension ResolveResult::primary(ResolveResultItem::OriginalReferenceTypeExternal(
return Ok(ResolveResultOption::some( request_str,
ResolveResult::primary( ))
ResolveResultItem::OriginalReferenceTypeExternal(request_str), .cell(),
) ));
.cell(),
));
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment