@vitejs/plugin-react-swc 3.6.0 → 3.7.0

package/index.cjs

@@ -14,6 +14,7 @@ var _dirname = typeof __dirname !== "undefined" ? __dirname : (0, import_path.di
 var resolve = (0, import_module.createRequire)(
   typeof __filename !== "undefined" ? __filename : import_meta.url
 ).resolve;
+var reactCompRE = /extends\s+(?:React\.)?(?:Pure)?Component/;
 var refreshContentRE = /\$Refresh(?:Reg|Sig)\$\(/;
 var _a, _b;
 var isWebContainer = (_b = (_a = globalThis.process) == null ? void 0 : _a.versions) == null ? void 0 : _b.webcontainer;
@@ -46,8 +47,7 @@ var react = (_options) => {
         }
       }),
       configResolved(config) {
-        if (config.server.hmr === false)
-          hmrDisabled = true;
+        if (config.server.hmr === false) hmrDisabled = true;
         const mdxIndex = config.plugins.findIndex(
           (p) => p.name === "@mdx-js/rollup"
         );
@@ -87,14 +87,18 @@ var react = (_options) => {
             importSource: options.jsxImportSource
           }
         );
-        if (!result)
-          return;
-        if (!refresh || !refreshContentRE.test(result.code)) {
-          return result;
-        }
+        if (!result) return;
+        if (!refresh) return result;
+        const hasRefresh = refreshContentRE.test(result.code);
+        if (!hasRefresh && !reactCompRE.test(result.code)) return result;
+        const sourceMap = JSON.parse(result.map);
+        sourceMap.mappings = ";;" + sourceMap.mappings;
         result.code = `import * as RefreshRuntime from "${runtimePublicPath}";
 
-if (!window.$RefreshReg$) throw new Error("React refresh preamble was not loaded. Something is wrong.");
+${result.code}`;
+        if (hasRefresh) {
+          sourceMap.mappings = ";;;;;;" + sourceMap.mappings;
+          result.code = `if (!window.$RefreshReg$) throw new Error("React refresh preamble was not loaded. Something is wrong.");
 const prevRefreshReg = window.$RefreshReg$;
 const prevRefreshSig = window.$RefreshSig$;
 window.$RefreshReg$ = RefreshRuntime.getRefreshReg("${id}");
@@ -104,6 +108,9 @@ ${result.code}
 
 window.$RefreshReg$ = prevRefreshReg;
 window.$RefreshSig$ = prevRefreshSig;
+`;
+        }
+        result.code += `
 RefreshRuntime.__hmr_import(import.meta.url).then((currentExports) => {
   RefreshRuntime.registerExportsForReactRefresh("${id}", currentExports);
   import.meta.hot.accept((nextExports) => {
@@ -113,8 +120,6 @@ RefreshRuntime.__hmr_import(import.meta.url).then((currentExports) => {
   });
 });
 `;
-        const sourceMap = JSON.parse(result.map);
-        sourceMap.mappings = ";;;;;;;;" + sourceMap.mappings;
         return { code: result.code, map: sourceMap };
       }
     },
@@ -152,8 +157,7 @@ var transformWithOptions = async (id, code, target, options, reactConfig) => {
     // JSX is required to trigger fast refresh transformations, even if MDX already transforms it
     { syntax: "ecmascript", jsx: true }
   ) : void 0;
-  if (!parser)
-    return;
+  if (!parser) return;
   let result;
   try {
     result = await (0, import_core.transform)(code, {

package/index.mjs

@@ -15,6 +15,7 @@ var _dirname = typeof __dirname !== "undefined" ? __dirname : dirname(fileURLToP
 var resolve = createRequire(
   typeof __filename !== "undefined" ? __filename : import.meta.url
 ).resolve;
+var reactCompRE = /extends\s+(?:React\.)?(?:Pure)?Component/;
 var refreshContentRE = /\$Refresh(?:Reg|Sig)\$\(/;
 var _a, _b;
 var isWebContainer = (_b = (_a = globalThis.process) == null ? void 0 : _a.versions) == null ? void 0 : _b.webcontainer;
@@ -47,8 +48,7 @@ var react = (_options) => {
         }
       }),
       configResolved(config) {
-        if (config.server.hmr === false)
-          hmrDisabled = true;
+        if (config.server.hmr === false) hmrDisabled = true;
         const mdxIndex = config.plugins.findIndex(
           (p) => p.name === "@mdx-js/rollup"
         );
@@ -88,14 +88,18 @@ var react = (_options) => {
             importSource: options.jsxImportSource
           }
         );
-        if (!result)
-          return;
-        if (!refresh || !refreshContentRE.test(result.code)) {
-          return result;
-        }
+        if (!result) return;
+        if (!refresh) return result;
+        const hasRefresh = refreshContentRE.test(result.code);
+        if (!hasRefresh && !reactCompRE.test(result.code)) return result;
+        const sourceMap = JSON.parse(result.map);
+        sourceMap.mappings = ";;" + sourceMap.mappings;
         result.code = `import * as RefreshRuntime from "${runtimePublicPath}";
 
-if (!window.$RefreshReg$) throw new Error("React refresh preamble was not loaded. Something is wrong.");
+${result.code}`;
+        if (hasRefresh) {
+          sourceMap.mappings = ";;;;;;" + sourceMap.mappings;
+          result.code = `if (!window.$RefreshReg$) throw new Error("React refresh preamble was not loaded. Something is wrong.");
 const prevRefreshReg = window.$RefreshReg$;
 const prevRefreshSig = window.$RefreshSig$;
 window.$RefreshReg$ = RefreshRuntime.getRefreshReg("${id}");
@@ -105,6 +109,9 @@ ${result.code}
 
 window.$RefreshReg$ = prevRefreshReg;
 window.$RefreshSig$ = prevRefreshSig;
+`;
+        }
+        result.code += `
 RefreshRuntime.__hmr_import(import.meta.url).then((currentExports) => {
   RefreshRuntime.registerExportsForReactRefresh("${id}", currentExports);
   import.meta.hot.accept((nextExports) => {
@@ -114,8 +121,6 @@ RefreshRuntime.__hmr_import(import.meta.url).then((currentExports) => {
   });
 });
 `;
-        const sourceMap = JSON.parse(result.map);
-        sourceMap.mappings = ";;;;;;;;" + sourceMap.mappings;
         return { code: result.code, map: sourceMap };
       }
     },
@@ -153,8 +158,7 @@ var transformWithOptions = async (id, code, target, options, reactConfig) => {
     // JSX is required to trigger fast refresh transformations, even if MDX already transforms it
     { syntax: "ecmascript", jsx: true }
   ) : void 0;
-  if (!parser)
-    return;
+  if (!parser) return;
   let result;
   try {
     result = await transform(code, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitejs/plugin-react-swc",
   "description": "Speed up your Vite dev server with SWC",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "author": "Arnaud Barré (https://github.com/ArnaudBarre)",
   "license": "MIT",
   "repository": "github:vitejs/vite-plugin-react-swc",
@@ -28,6 +28,6 @@
     "vite": "^4 || ^5"
   },
   "dependencies": {
-    "@swc/core": "^1.3.107"
+    "@swc/core": "^1.5.7"
   }
 }

package/refresh-runtime.js

@@ -374,8 +374,7 @@ function getRefreshReg(filename) {
 }
 function registerExportsForReactRefresh(filename, moduleExports) {
   for (const key in moduleExports) {
-    if (key === "__esModule")
-      continue;
+    if (key === "__esModule") continue;
     const exportValue = moduleExports[key];
     if (isLikelyComponentType(exportValue)) {
       register(exportValue, filename + " export " + key);
@@ -394,8 +393,7 @@ window.__registerBeforePerformReactRefresh = (cb) => {
   hooks.push(cb);
 };
 const enqueueUpdate = debounce(async () => {
-  if (hooks.length)
-    await Promise.all(hooks.map((cb) => cb()));
+  if (hooks.length) await Promise.all(hooks.map((cb) => cb()));
   performReactRefresh();
 }, 16);
 function validateRefreshBoundaryAndEnqueueUpdate(id, prevExports, nextExports) {
@@ -421,8 +419,7 @@ function validateRefreshBoundaryAndEnqueueUpdate(id, prevExports, nextExports) {
     nextExports,
     (key, value) => {
       hasExports = true;
-      if (isLikelyComponentType(value))
-        return true;
+      if (isLikelyComponentType(value)) return true;
       return prevExports[key] === nextExports[key];
     }
   );
@@ -434,15 +431,11 @@ function validateRefreshBoundaryAndEnqueueUpdate(id, prevExports, nextExports) {
 }
 function predicateOnExport(ignoredExports, moduleExports, predicate) {
   for (const key in moduleExports) {
-    if (key === "__esModule")
-      continue;
-    if (ignoredExports.includes(key))
-      continue;
+    if (key === "__esModule") continue;
+    if (ignoredExports.includes(key)) continue;
     const desc = Object.getOwnPropertyDescriptor(moduleExports, key);
-    if (desc && desc.get)
-      return key;
-    if (!predicate(key, moduleExports[key]))
-      return key;
+    if (desc && desc.get) return key;
+    if (!predicate(key, moduleExports[key])) return key;
   }
   return true;
 }