@jsenv/plugin-preact 1.6.25 → 1.6.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-preact",
-  "version": "1.6.25",
+  "version": "1.6.27",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,8 +24,8 @@
     "babel-plugin-transform-hook-names": "1.0.2",
     "@babel/plugin-transform-react-jsx": "7.25.9",
     "@babel/plugin-transform-react-jsx-development": "7.25.9",
-    "@jsenv/ast": "6.3.5",
-    "@jsenv/sourcemap": "1.2.25",
+    "@jsenv/ast": "6.3.6",
+    "@jsenv/sourcemap": "1.2.26",
     "@jsenv/url-meta": "8.5.2",
     "@prefresh/babel-plugin": "0.5.1",
     "@prefresh/core": "1.5.2",

package/src/jsenv_plugin_preact.js

@@ -113,7 +113,7 @@ export const jsenvPluginPreact = ({
             urlInfo.content.includes("useReducer") ||
             urlInfo.content.includes("useRef") ||
             urlInfo.content.includes("useMemo"));
-        const { code, map } = await applyBabelPlugins({
+        let { code, map } = await applyBabelPlugins({
           babelPlugins: [
             ...(jsxEnabled
               ? [
@@ -136,8 +136,8 @@ export const jsenvPluginPreact = ({
           inputUrl: urlInfo.url,
           outputUrl: urlInfo.generatedUrl,
         });
-        const magicSource = createMagicSource(code);
         if (jsxEnabled) {
+          const magicSource = createMagicSource(code);
           // "@babel/plugin-transform-react-jsx" is injecting some of these 3 imports into the code:
           // 1. import { jsx } from "preact/jsx-runtime"
           // 2. import { jsxDev } from "preact/jsx-dev-runtime"
@@ -168,6 +168,11 @@ export const jsenvPluginPreact = ({
               index = code.indexOf(importSpecifier, index + 1);
             }
           }
+          const afterJsxReplace = magicSource.toContentAndSourcemap({
+            source: "jsenv_preact",
+          });
+          code = afterJsxReplace.content;
+          map = await composeTwoSourcemaps(map, afterJsxReplace.sourcemap);
         }
         if (refreshEnabled) {
           const hasReg = /\$RefreshReg\$\(/.test(code);
@@ -178,28 +183,27 @@ export const jsenvPluginPreact = ({
               expectedType: "js_module",
               specifier: "@jsenv/plugin-preact/src/client/preact_refresh.js",
             });
-            magicSource.prepend(`import { installPreactRefresh } from ${
+            const prelude = `import { installPreactRefresh } from ${
               preactRefreshClientReference.generatedSpecifier
             };
 const __preact_refresh__ = installPreactRefresh(${JSON.stringify(urlInfo.url)});
-`);
+`;
+            code = `${prelude.replace(/\n/g, "")}${code}`;
             if (hasReg) {
-              magicSource.append(`
+              code = `${code}
+
 __preact_refresh__.end();
-import.meta.hot.accept(__preact_refresh__.acceptCallback);`);
+import.meta.hot.accept(__preact_refresh__.acceptCallback);`;
             }
           }
         }
-        const result = magicSource.toContentAndSourcemap({
-          source: "jsenv_preact",
-        });
         return {
-          content: result.content,
-          sourcemap: await composeTwoSourcemaps(map, result.sourcemap),
+          content: code,
+          sourcemap: map,
           // "no sourcemap is better than wrong sourcemap":
           // I don't know exactly what is resulting in bad sourcemaps
           // but I suspect hooknames or prefresh to be responsible
-          sourcemapIsWrong: jsxEnabled && refreshEnabled,
+          // sourcemapIsWrong: jsxEnabled && refreshEnabled,
         };
       },
     },