summaryrefslogtreecommitdiff
path: root/cli/standalone
diff options
context:
space:
mode:
authorsnek <snek@deno.com>2024-09-19 21:10:34 -0700
committerGitHub <noreply@github.com>2024-09-19 21:10:34 -0700
commita01dce3a25e0bf671c6c21bd6ff57861be613087 (patch)
treebecb8a7c90e5a21e83c81160eec9d91e1281bc92 /cli/standalone
parentf1ba26661346a83b6e7fe5e7ffeed4553a9571ae (diff)
fix: cjs resolution cases (#25739)
Fixes cjs modules being loaded as esm.
Diffstat (limited to 'cli/standalone')
-rw-r--r--cli/standalone/mod.rs19
1 files changed, 11 insertions, 8 deletions
diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
index 1b1635d59..bab266734 100644
--- a/cli/standalone/mod.rs
+++ b/cli/standalone/mod.rs
@@ -580,8 +580,17 @@ pub async fn run(
let cjs_resolutions = Arc::new(CjsResolutionStore::default());
let cache_db = Caches::new(deno_dir_provider.clone());
let node_analysis_cache = NodeAnalysisCache::new(cache_db.node_analysis_db());
- let cjs_esm_code_analyzer =
- CliCjsCodeAnalyzer::new(node_analysis_cache, fs.clone());
+ let cli_node_resolver = Arc::new(CliNodeResolver::new(
+ cjs_resolutions.clone(),
+ fs.clone(),
+ node_resolver.clone(),
+ npm_resolver.clone(),
+ ));
+ let cjs_esm_code_analyzer = CliCjsCodeAnalyzer::new(
+ node_analysis_cache,
+ fs.clone(),
+ cli_node_resolver.clone(),
+ );
let node_code_translator = Arc::new(NodeCodeTranslator::new(
cjs_esm_code_analyzer,
deno_runtime::deno_node::DenoFsNodeResolverEnv::new(fs.clone()),
@@ -637,12 +646,6 @@ pub async fn run(
metadata.workspace_resolver.pkg_json_resolution,
)
};
- let cli_node_resolver = Arc::new(CliNodeResolver::new(
- cjs_resolutions.clone(),
- fs.clone(),
- node_resolver.clone(),
- npm_resolver.clone(),
- ));
let module_loader_factory = StandaloneModuleLoaderFactory {
shared: Arc::new(SharedModuleLoaderState {
eszip: WorkspaceEszip {