@jsenv/plugin-react 0.2.11 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-react",
-  "version": "0.2.11",
+  "version": "0.3.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "7.18.6",
     "@babel/plugin-transform-react-jsx-development": "7.18.6",
-    "@jsenv/ast": "1.1.3",
-    "@jsenv/plugin-commonjs": "0.4.0",
+    "@jsenv/ast": "1.2.0",
+    "@jsenv/plugin-commonjs": "1.0.2",
     "@jsenv/sourcemap": "1.0.4",
     "@jsenv/url-meta": "7.0.0",
     "react-refresh": "0.14.0"

package/src/jsenv_plugin_react.js

@@ -56,18 +56,18 @@ const jsenvPluginJsxAndRefresh = ({
     name: "jsenv:jsx_and_refresh",
     appliesDuring: "*",
     transformUrlContent: {
-      js_module: async (urlInfo, { scenario, referenceUtils }) => {
+      js_module: async (urlInfo, context) => {
         const urlMeta = URL_META.applyAssociations({
           url: urlInfo.url,
           associations,
         })
         const jsxEnabled = urlMeta.jsx
-        const refreshEnabled = scenario === "dev" ? urlMeta.refresh : false
+        const refreshEnabled = context.scenarios.dev ? urlMeta.refresh : false
         const babelPlugins = [
           ...(jsxEnabled
             ? [
                 [
-                  scenario === "dev"
+                  context.scenarios.dev
                     ? "@babel/plugin-transform-react-jsx-development"
                     : "@babel/plugin-transform-react-jsx",
                   {
@@ -103,7 +103,7 @@ const jsenvPluginJsxAndRefresh = ({
             let index = code.indexOf(importSpecifier)
             while (index > -1) {
               const specifier = importSpecifier.slice(1, -1)
-              const [injectedReference] = referenceUtils.inject({
+              const [injectedReference] = context.referenceUtils.inject({
                 type: "js_import_export",
                 expectedType: "js_module",
                 specifier,
@@ -121,11 +121,13 @@ const jsenvPluginJsxAndRefresh = ({
           const hasReg = /\$RefreshReg\$\(/.test(code)
           const hasSig = /\$RefreshSig\$\(/.test(code)
           if (hasReg || hasSig) {
-            const [reactRefreshClientReference] = referenceUtils.inject({
-              type: "js_import_export",
-              expectedType: "js_module",
-              specifier: "@jsenv/plugin-react/src/client/react_refresh.js",
-            })
+            const [reactRefreshClientReference] = context.referenceUtils.inject(
+              {
+                type: "js_import_export",
+                expectedType: "js_module",
+                specifier: "@jsenv/plugin-react/src/client/react_refresh.js",
+              },
+            )
             magicSource.prepend(`import { installReactRefresh } from ${
               reactRefreshClientReference.generatedSpecifier
             }

package/src/jsenv_plugin_react_refresh_preamble.js

@@ -13,23 +13,24 @@ export const jsenvPluginReactRefreshPreamble = () => {
 
   return {
     name: "jsenv:react_refresh_preamble",
-    appliesDuring: { dev: true },
+    appliesDuring: "dev",
     transformUrlContent: {
       html: (urlInfo, context) => {
         const htmlAst = parseHtmlString(urlInfo.content)
         const [reactRefreshPreambleReference] = context.referenceUtils.inject({
           type: "script_src",
+          subtype: "js_module",
           expectedType: "js_module",
           specifier: reactRefreshPreambleClientFileUrl,
         })
         injectScriptNodeAsEarlyAsPossible(
           htmlAst,
           createHtmlNode({
-            "tagName": "script",
-            "type": "module",
-            "src": reactRefreshPreambleReference.generatedSpecifier,
-            "injected-by": "jsenv:react_refresh_preamble",
+            tagName: "script",
+            type: "module",
+            src: reactRefreshPreambleReference.generatedSpecifier,
           }),
+          "jsenv:react_refresh_preamble",
         )
         const htmlModified = stringifyHtmlAst(htmlAst)
         return htmlModified