fix: properly handle tsx (#311)

unjs · Sep 30, 2024 · 2ae340f · 2ae340f
1 parent 6a4e13a
commit 2ae340f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/babel.ts b/src/babel.ts
@@ -55,7 +55,10 @@ export default function transform(opts: TransformOptions): TransformResult {
   if (opts.ts) {
     _opts.plugins.push([
       transformTypeScriptPlugin,
-      { allowDeclareFields: true },
+      {
+        allowDeclareFields: true,
+        isTSX: opts.jsx && /\.[cm]?tsx$/.test(opts.filename || ""),
+      },
     ]);
     // `unshift` because these plugin must come before `@babel/plugin-syntax-class-properties`
     _opts.plugins.unshift(

diff --git a/src/eval.ts b/src/eval.ts
@@ -32,7 +32,7 @@ export function evalModule(
   const cache = (evalOptions.cache || ctx.parentCache || {}) as ModuleCache;
 
   // Transpile
-  const isTypescript = ext === ".ts" || ext === ".mts" || ext === ".cts";
+  const isTypescript = /\.[cm]?tsx?$/.test(ext);
   const isESM =
     ext === ".mjs" ||
     (ext === ".js" && readNearestPackageJSON(filename)?.type === "module");
@@ -45,7 +45,7 @@ export function evalModule(
       ctx.isTransformRe.test(filename) ||
       hasESMSyntax(source));
   const start = performance.now();
-  if (needsTranspile || (ctx.opts.jsx && (ext === ".jsx" || ext === ".tsx"))) {
+  if (needsTranspile) {
     source = transform(ctx, {
       filename,
       source,

diff --git a/src/options.ts b/src/options.ts
@@ -18,6 +18,8 @@ export function resolveJitiOptions(userOptions: JitiOptions): JitiOptions {
       ".tsx",
       ".mts",
       ".cts",
+      ".mtsx",
+      ".ctsx",
     ]),
     alias: _jsonEnv<Record<string, string>>("JITI_ALIAS", {}),
     nativeModules: _jsonEnv<string[]>("JITI_NATIVE_MODULES", []),

diff --git a/test/fixtures/jsx/index.ts b/test/fixtures/jsx/index.ts
@@ -1,4 +1,4 @@
-import "./nano-jsx.jsx";
+import "./nano-jsx.tsx";
 import "./preact.jsx";
 import "./react.jsx";
 import "./vue.jsx";
diff --git a/test/fixtures/jsx/nano-jsx.jsx → test/fixtures/jsx/nano-jsx.tsx b/test/fixtures/jsx/nano-jsx.jsx → test/fixtures/jsx/nano-jsx.tsx