@jsenv/plugin-preact 1.3.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-preact",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
     "babel-plugin-transform-hook-names": "1.0.2",
     "@babel/plugin-transform-react-jsx": "7.22.5",
     "@babel/plugin-transform-react-jsx-development": "7.22.5",
-    "@jsenv/ast": "4.1.0",
-    "@jsenv/sourcemap": "1.0.10",
+    "@jsenv/ast": "5.0.0",
+    "@jsenv/sourcemap": "1.1.0",
     "@jsenv/url-meta": "8.1.0",
     "@prefresh/babel-plugin": "0.5.0",
     "@prefresh/core": "1.5.1",
@@ -38,8 +38,8 @@
     "@jsenv/core": "*"
   },
   "devDependencies": {
-    "preact": "10.15.1",
-    "react-redux": "8.0.7",
+    "preact": "10.16.0",
+    "react-redux": "8.1.1",
     "redux": "4.2.1"
   }
 }

package/src/jsenv_plugin_preact.js

@@ -53,30 +53,33 @@ export const jsenvPluginPreact = ({
     name: "jsenv:preact",
     appliesDuring: "*",
     resolveReference: {
-      js_import: (reference, context) => {
+      js_import: (reference) => {
         if (
           reference.specifier === "react" ||
           reference.specifier === "react-dom"
         ) {
           reference.specifier = "preact/compat";
-          return context.resolveReference(reference)[0].url;
+          // return context.resolveReference(reference).url;
         }
         return null;
       },
     },
     transformUrlContent: {
-      html: (urlInfo, context) => {
+      html: (urlInfo) => {
         if (!preactDevtools) {
           return null;
         }
-        if (context.build && preactDevtools !== "dev_and_build") {
+        if (urlInfo.context.build && preactDevtools !== "dev_and_build") {
+          return null;
+        }
+        if (urlInfo.data.isJsenvToolbar) {
           return null;
         }
         const htmlAst = parseHtmlString(urlInfo.content);
-        const [preactDevtoolsReference] = context.referenceUtils.inject({
+        const preactDevtoolsReference = urlInfo.dependencies.inject({
           type: "js_import",
           expectedType: "js_module",
-          specifier: context.dev ? "preact/debug" : "preact/devtools",
+          specifier: urlInfo.context.dev ? "preact/debug" : "preact/devtools",
         });
         injectHtmlNodeAsEarlyAsPossible(
           htmlAst,
@@ -90,18 +93,18 @@ export const jsenvPluginPreact = ({
         const htmlModified = stringifyHtmlAst(htmlAst);
         return { content: htmlModified };
       },
-      js_module: async (urlInfo, context) => {
+      js_module: async (urlInfo) => {
         const urlMeta = URL_META.applyAssociations({
           url: urlInfo.url,
           associations,
         });
         const jsxEnabled = urlMeta.jsxTranspilation;
-        const refreshEnabled = context.dev
+        const refreshEnabled = urlInfo.context.dev
           ? urlMeta.refreshInstrumentation &&
             !urlInfo.content.includes("import.meta.hot.decline()")
           : false;
         const hookNamesEnabled =
-          context.dev &&
+          urlInfo.context.dev &&
           urlMeta.hookNamesInstrumentation &&
           (urlInfo.content.includes("useState") ||
             urlInfo.content.includes("useReducer") ||
@@ -112,7 +115,7 @@ export const jsenvPluginPreact = ({
             ...(jsxEnabled
               ? [
                   [
-                    context.dev
+                    urlInfo.context.dev
                       ? "@babel/plugin-transform-react-jsx-development"
                       : "@babel/plugin-transform-react-jsx",
                     {
@@ -149,7 +152,7 @@ export const jsenvPluginPreact = ({
             let index = code.indexOf(importSpecifier);
             while (index > -1) {
               const specifier = importSpecifier.slice(1, -1);
-              const [injectedReference] = context.referenceUtils.inject({
+              const injectedJsImportReference = urlInfo.dependencies.inject({
                 type: "js_import",
                 expectedType: "js_module",
                 specifier,
@@ -157,7 +160,7 @@ export const jsenvPluginPreact = ({
               magicSource.replace({
                 start: index,
                 end: index + importSpecifier.length,
-                replacement: injectedReference.generatedSpecifier,
+                replacement: injectedJsImportReference.generatedSpecifier,
               });
               index = code.indexOf(importSpecifier, index + 1);
             }
@@ -167,21 +170,20 @@ export const jsenvPluginPreact = ({
           const hasReg = /\$RefreshReg\$\(/.test(code);
           const hasSig = /\$RefreshSig\$\(/.test(code);
           if (hasReg || hasSig) {
-            const [preactRefreshClientReference] =
-              context.referenceUtils.inject({
-                type: "js_import",
-                expectedType: "js_module",
-                specifier: "@jsenv/plugin-preact/src/client/preact_refresh.js",
-              });
+            const preactRefreshClientReference = urlInfo.dependencies.inject({
+              type: "js_import",
+              expectedType: "js_module",
+              specifier: "@jsenv/plugin-preact/src/client/preact_refresh.js",
+            });
             magicSource.prepend(`import { installPreactRefresh } from ${
               preactRefreshClientReference.generatedSpecifier
-            }
-const __preact_refresh__ = installPreactRefresh(${JSON.stringify(urlInfo.url)})
+            };
+const __preact_refresh__ = installPreactRefresh(${JSON.stringify(urlInfo.url)});
 `);
             if (hasReg) {
               magicSource.append(`
-__preact_refresh__.end()
-import.meta.hot.accept(__preact_refresh__.acceptCallback)`);
+__preact_refresh__.end();
+import.meta.hot.accept(__preact_refresh__.acceptCallback);`);
             }
           }
         }