diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-07-31 13:46:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 17:46:58 +0000 |
| commit | 99daad054102dbca7fad704d5e81ada1357331fd (patch) | |
| tree | e38e9b15d94b4d7b0dccb181129f29397c0ad078 | |
| parent | 6b74a6f0b6ce8bf8e41a19ab771d1a051cb34467 (diff) | |
refactor: NodeCodeTranslator - optional source to translate_cjs_to_esm (#20000)
| -rw-r--r-- | cli/module_loader.rs | 2 | ||||
| -rw-r--r-- | ext/node/analyze.rs | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/cli/module_loader.rs b/cli/module_loader.rs index 8395016b3..6f1a23761 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -782,7 +782,7 @@ impl NpmModuleLoader { // translate cjs to esm if it's cjs and inject node globals self.node_code_translator.translate_cjs_to_esm( specifier, - &code, + Some(code.as_str()), permissions, )? } else { diff --git a/ext/node/analyze.rs b/ext/node/analyze.rs index cf292d82f..902fe9f44 100644 --- a/ext/node/analyze.rs +++ b/ext/node/analyze.rs @@ -72,15 +72,13 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer> NodeCodeTranslator<TCjsCodeAnalyzer> { pub fn translate_cjs_to_esm( &self, specifier: &ModuleSpecifier, - source: &str, + source: Option<&str>, permissions: &dyn NodePermissions, ) -> Result<String, AnyError> { let mut temp_var_count = 0; let mut handled_reexports: HashSet<String> = HashSet::default(); - let analysis = self - .cjs_code_analyzer - .analyze_cjs(specifier, Some(source))?; + let analysis = self.cjs_code_analyzer.analyze_cjs(specifier, source)?; let mut source = vec![ r#"import {createRequire as __internalCreateRequire} from "node:module"; |