fix

Author: magic-akari

crates/swc_ecma_transforms_react/src/jsx/mod.rs

@@ -299,18 +299,18 @@ where
 
     match runtime {
         Runtime::Automatic(config) => (
+            None,
             Some(automatic(
                 config,
                 common,
                 unresolved_mark,
                 comments.clone(),
                 cm.clone(),
             )),
-            None,
         ),
         Runtime::Classic(config) => (
-            None,
             Some(classic(config, common, comments.clone(), cm.clone())),
+            None,
         ),
         Runtime::Preserve => (None, None),
     }

crates/swc_ecma_transforms_typescript/tests/__swc_snapshots__/tests/strip.rs/imports_not_used_as_values_jsx_prag.js

@@ -1,7 +1,4 @@
-/** @jsx h */ import { jsx as _jsx } from "react/jsx-runtime";
-import html, { h } from "example";
+/** @jsxRuntime classic */ /** @jsx h */ import html, { h } from "example";
 serve((_req)=>html({
-        body: /*#__PURE__*/ _jsx("div", {
-            children: "Hello World!"
-        })
+        body: /*#__PURE__*/ h("div", null, "Hello World!")
     }));

crates/swc_ecma_transforms_typescript/tests/__swc_snapshots__/tests/strip.rs/imports_not_used_as_values_shebang_jsx_prag.js

@@ -1,8 +1,5 @@
 #!/usr/bin/env -S deno run -A
-import { jsx as _jsx } from "react/jsx-runtime";
-/** @jsx h */ import html, { h } from "example";
+/** @jsxRuntime classic */ /** @jsx h */ import html, { h } from "example";
 serve((_req)=>html({
-        body: /*#__PURE__*/ _jsx("div", {
-            children: "Hello World!"
-        })
+        body: /*#__PURE__*/ h("div", null, "Hello World!")
     }));

crates/swc_ecma_transforms_typescript/tests/fixture/issue-6923/output.js

@@ -1,4 +1,5 @@
 /* @jsxRuntime classic */ //
+import React from "react";
 import ReactDOM from "react-dom";
 import { _Component } from "./Component";
 const App = /*#__PURE__*/ React.createElement("div", null, /*#__PURE__*/ React.createElement(_Component, null), /*#__PURE__*/ React.createElement("p", null, "Hello World"));

crates/swc_ecma_transforms_typescript/tests/strip.rs

@@ -1805,7 +1805,8 @@ test!(
     }),
     |t| tsxr(t),
     imports_not_used_as_values_jsx_prag,
-    r#"/** @jsx h */
+    r#"/** @jsxRuntime classic */
+/** @jsx h */
 import html, { h } from "example";
 serve((_req) =>
   html({
@@ -1823,6 +1824,7 @@ test!(
     |t| tsxr(t),
     imports_not_used_as_values_shebang_jsx_prag,
     r#"#!/usr/bin/env -S deno run -A
+/** @jsxRuntime classic */
 /** @jsx h */
 import html, { h } from "example";
 serve((_req) =>

crates/swc_ts_fast_strip/src/lib.rs

@@ -415,6 +415,49 @@ pub fn operate(
             let top_level_mark = Mark::new();
 
             HELPERS.set(&Helpers::new(false), || {
+                let transform = options.transform.unwrap_or_default();
+
+                #[cfg(feature = "nightly")]
+                let mut jsx_pass = {
+                    let (mut before_resolver_jsx, after_resolver_jsx) =
+                        swc_ecma_transforms_react::jsx(
+                            cm.clone(),
+                            Some(comments.clone()),
+                            swc_ecma_transforms_react::Options {
+                                runtime: match &transform.jsx {
+                                    Some(jsx_config) => {
+                                        let import_source =
+                                            jsx_config.import_source.clone().unwrap_or_else(
+                                                swc_ecma_transforms_react::default_import_source,
+                                            );
+                                        swc_ecma_transforms_react::Runtime::Automatic(
+                                            swc_ecma_transforms_react::AutomaticConfig {
+                                                import_source,
+                                            },
+                                        )
+                                    }
+                                    None => swc_ecma_transforms_react::Runtime::Automatic(
+                                        Default::default(),
+                                    ),
+                                },
+                                common: swc_ecma_transforms_react::CommonConfig {
+                                    development: transform
+                                        .jsx
+                                        .as_ref()
+                                        .and_then(|jsx| jsx.transform.as_ref())
+                                        .map(|t| matches!(t, JsxTransform::ReactJsxDev))
+                                        .unwrap_or(false)
+                                        .into(),
+                                    ..Default::default()
+                                },
+                                refresh: None,
+                            },
+                            unresolved_mark,
+                        );
+                    program.mutate(&mut before_resolver_jsx);
+                    after_resolver_jsx
+                };
+
                 program.mutate(&mut resolver(unresolved_mark, top_level_mark, true));
 
                 if deprecated_ts_module_as_error {
@@ -434,48 +477,14 @@ pub fn operate(
                     }
                 }
 
-                let transform = options.transform.unwrap_or_default();
-
                 program.mutate(&mut typescript::typescript(
                     transform.typescript,
                     unresolved_mark,
                     top_level_mark,
                 ));
 
                 #[cfg(feature = "nightly")]
-                program.mutate(&mut swc_ecma_transforms_react::jsx(
-                    cm.clone(),
-                    Some(comments.clone()),
-                    swc_ecma_transforms_react::Options {
-                        runtime: match &transform.jsx {
-                            Some(jsx_config) => {
-                                let import_source =
-                                    jsx_config.import_source.clone().unwrap_or_else(
-                                        swc_ecma_transforms_react::default_import_source,
-                                    );
-                                swc_ecma_transforms_react::Runtime::Automatic(
-                                    swc_ecma_transforms_react::AutomaticConfig { import_source },
-                                )
-                            }
-                            None => {
-                                swc_ecma_transforms_react::Runtime::Automatic(Default::default())
-                            }
-                        },
-                        common: swc_ecma_transforms_react::CommonConfig {
-                            development: transform
-                                .jsx
-                                .as_ref()
-                                .and_then(|jsx| jsx.transform.as_ref())
-                                .map(|t| matches!(t, JsxTransform::ReactJsxDev))
-                                .unwrap_or(false)
-                                .into(),
-                            ..Default::default()
-                        },
-                        refresh: None,
-                    },
-                    top_level_mark,
-                    unresolved_mark,
-                ));
+                program.mutate(&mut jsx_pass);
 
                 program.mutate(&mut inject_helpers(unresolved_mark));