diff options
| author | Luca Casonato <hello@lcas.dev> | 2022-08-24 19:36:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 19:36:05 +0200 |
| commit | 33c4d45328166d103e99a8c243727eead626080c (patch) | |
| tree | 70331a9964f8faf780942696c34aab867accf7bf /cli/proc_state.rs | |
| parent | 6bb72a80863ac3913d32ea21aae32dd327ce6b71 (diff) | |
fix: resolve `jsxImportSource` relative to module (#15561)
Previously `jsxImportSource` was resolved relative to the config file
during graph building, and relative to the emitted module during
runtime.
This is now fixed so that the JSX import source is resolved relative to
the module both during graph building and at runtime.
Diffstat (limited to 'cli/proc_state.rs')
| -rw-r--r-- | cli/proc_state.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cli/proc_state.rs b/cli/proc_state.rs index ee9098c76..bc5c36e13 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -192,8 +192,8 @@ impl ProcState { let maybe_import_map_resolver = maybe_import_map.clone().map(ImportMapResolver::new); let maybe_jsx_resolver = cli_options - .to_maybe_jsx_import_source_module() - .map(|im| JsxResolver::new(im, maybe_import_map_resolver.clone())); + .to_maybe_jsx_import_source_config() + .map(|cfg| JsxResolver::new(cfg, maybe_import_map_resolver.clone())); let maybe_resolver: Option< Arc<dyn deno_graph::source::Resolver + Send + Sync>, > = if cli_options.compat() { @@ -643,8 +643,8 @@ impl ProcState { let maybe_imports = self.options.to_maybe_imports()?; let maybe_jsx_resolver = self .options - .to_maybe_jsx_import_source_module() - .map(|im| JsxResolver::new(im, maybe_import_map_resolver.clone())); + .to_maybe_jsx_import_source_config() + .map(|cfg| JsxResolver::new(cfg, maybe_import_map_resolver.clone())); let maybe_resolver = if maybe_jsx_resolver.is_some() { maybe_jsx_resolver.as_ref().map(|jr| jr.as_resolver()) } else { |