From 33c4d45328166d103e99a8c243727eead626080c Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Wed, 24 Aug 2022 19:36:05 +0200 Subject: 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. --- cli/proc_state.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cli/proc_state.rs') 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, > = 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 { -- cgit v1.2.3