@jsenv/plugin-react 1.3.0 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-react",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "7.22.5",
     "@babel/plugin-transform-react-jsx-development": "7.22.5",
-    "@jsenv/ast": "4.1.0",
-    "@jsenv/plugin-commonjs": "2.1.0",
-    "@jsenv/sourcemap": "1.0.10",
+    "@jsenv/ast": "5.0.0",
+    "@jsenv/plugin-commonjs": "2.2.0",
+    "@jsenv/sourcemap": "1.1.0",
     "@jsenv/url-meta": "8.1.0",
     "react-refresh": "0.14.0"
   },

package/src/jsenv_plugin_react.js

@@ -76,13 +76,13 @@ const jsenvPluginJsxAndRefresh = ({
     name: "jsenv:jsx_and_refresh",
     appliesDuring: "*",
     transformUrlContent: {
-      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;
@@ -90,7 +90,7 @@ const jsenvPluginJsxAndRefresh = ({
           ...(jsxEnabled
             ? [
                 [
-                  context.dev
+                  urlInfo.context.dev
                     ? "@babel/plugin-transform-react-jsx-development"
                     : "@babel/plugin-transform-react-jsx",
                   {
@@ -129,7 +129,7 @@ const jsenvPluginJsxAndRefresh = ({
             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,
@@ -137,7 +137,7 @@ const jsenvPluginJsxAndRefresh = ({
               magicSource.replace({
                 start: index,
                 end: index + importSpecifier.length,
-                replacement: injectedReference.generatedSpecifier,
+                replacement: injectedJsImportReference.generatedSpecifier,
               });
               index = code.indexOf(importSpecifier, index + 1);
             }
@@ -147,22 +147,20 @@ const jsenvPluginJsxAndRefresh = ({
           const hasReg = /\$RefreshReg\$\(/.test(code);
           const hasSig = /\$RefreshSig\$\(/.test(code);
           if (hasReg || hasSig) {
-            const [reactRefreshClientReference] = context.referenceUtils.inject(
-              {
-                type: "js_import",
-                expectedType: "js_module",
-                specifier: "@jsenv/plugin-react/src/client/react_refresh.js",
-              },
-            );
+            const reactRefreshClientReference = urlInfo.dependencies.inject({
+              type: "js_import",
+              expectedType: "js_module",
+              specifier: "@jsenv/plugin-react/src/client/react_refresh.js",
+            });
             magicSource.prepend(`import { installReactRefresh } from ${
               reactRefreshClientReference.generatedSpecifier
             }
-const __react_refresh__ = installReactRefresh(${JSON.stringify(urlInfo.url)})
+const __react_refresh__ = installReactRefresh(${JSON.stringify(urlInfo.url)});
 `);
             if (hasReg) {
               magicSource.append(`
-__react_refresh__.end()
-import.meta.hot.accept(__react_refresh__.acceptCallback)`);
+__react_refresh__.end();
+import.meta.hot.accept(__react_refresh__.acceptCallback);`);
             }
           }
         }

package/src/jsenv_plugin_react_refresh_preamble.js

@@ -15,9 +15,9 @@ export const jsenvPluginReactRefreshPreamble = () => {
     name: "jsenv:react_refresh_preamble",
     appliesDuring: "dev",
     transformUrlContent: {
-      html: (urlInfo, context) => {
+      html: (urlInfo) => {
         const htmlAst = parseHtmlString(urlInfo.content);
-        const [reactRefreshPreambleReference] = context.referenceUtils.inject({
+        const reactRefreshPreambleReference = urlInfo.dependencies.inject({
           type: "script",
           subtype: "js_module",
           expectedType: "js_module",