@vitejs/plugin-react 3.0.0-beta.0 → 3.0.1

package/dist/index.cjs

@@ -78,13 +78,6 @@ const timeout = `
     }, 30);
   }
 `;
-const footer = `
-if (import.meta.hot) {
-  window.$RefreshReg$ = prevRefreshReg;
-  window.$RefreshSig$ = prevRefreshSig;
-
-  __ACCEPT__
-}`;
 const checkAndAccept = `
 function isReactRefreshBoundary(mod) {
   if (mod == null || typeof mod !== 'object') {
@@ -111,6 +104,7 @@ function isReactRefreshBoundary(mod) {
 }
 
 import.meta.hot.accept(mod => {
+  if (!mod) return;
   if (isReactRefreshBoundary(mod)) {
     ${timeout}
   } else {
@@ -118,37 +112,15 @@ import.meta.hot.accept(mod => {
   }
 });
 `;
-function addRefreshWrapper(code, id, accept) {
-  return header.replace("__SOURCE__", JSON.stringify(id)) + code + footer.replace("__ACCEPT__", accept ? checkAndAccept : timeout);
-}
-function isRefreshBoundary(ast) {
-  return ast.program.body.every((node) => {
-    if (node.type !== "ExportNamedDeclaration") {
-      return true;
-    }
-    const { declaration, specifiers } = node;
-    if (declaration) {
-      if (declaration.type === "ClassDeclaration")
-        return false;
-      if (declaration.type === "VariableDeclaration") {
-        return declaration.declarations.every(
-          (variable) => isComponentLikeIdentifier(variable.id)
-        );
-      }
-      if (declaration.type === "FunctionDeclaration") {
-        return !!declaration.id && isComponentLikeIdentifier(declaration.id);
-      }
-    }
-    return specifiers.every((spec) => {
-      return isComponentLikeIdentifier(spec.exported);
-    });
-  });
-}
-function isComponentLikeIdentifier(node) {
-  return node.type === "Identifier" && isComponentLikeName(node.name);
-}
-function isComponentLikeName(name) {
-  return typeof name === "string" && name[0] >= "A" && name[0] <= "Z";
+const footer = `
+if (import.meta.hot) {
+  window.$RefreshReg$ = prevRefreshReg;
+  window.$RefreshSig$ = prevRefreshSig;
+
+  ${checkAndAccept}
+}`;
+function addRefreshWrapper(code, id) {
+  return header.replace("__SOURCE__", JSON.stringify(id)) + code + footer;
 }
 
 const prependReactImportCode = "import React from 'react'; ";
@@ -309,11 +281,8 @@ function viteReact(opts = {}) {
         if (/\.tsx?$/.test(extension)) {
           parserPlugins.push("typescript");
         }
-        const transformAsync = babel__namespace.transformAsync.bind(babel__namespace, code);
-        const isReasonReact = extension.endsWith(".bs.js");
-        const result = await transformAsync({
+        const result = await babel__namespace.transformAsync(code, {
           ...babelOptions,
-          ast: !isReasonReact,
           root: projectRoot,
           filename: id,
           sourceFileName: filepath,
@@ -334,8 +303,7 @@ function viteReact(opts = {}) {
         if (result) {
           let code2 = result.code;
           if (useFastRefresh && /\$RefreshReg\$\(/.test(code2)) {
-            const accept = isReasonReact || isRefreshBoundary(result.ast);
-            code2 = addRefreshWrapper(code2, id, accept);
+            code2 = addRefreshWrapper(code2, id);
           }
           return {
             code: code2,

package/dist/index.mjs

@@ -63,13 +63,6 @@ const timeout = `
     }, 30);
   }
 `;
-const footer = `
-if (import.meta.hot) {
-  window.$RefreshReg$ = prevRefreshReg;
-  window.$RefreshSig$ = prevRefreshSig;
-
-  __ACCEPT__
-}`;
 const checkAndAccept = `
 function isReactRefreshBoundary(mod) {
   if (mod == null || typeof mod !== 'object') {
@@ -96,6 +89,7 @@ function isReactRefreshBoundary(mod) {
 }
 
 import.meta.hot.accept(mod => {
+  if (!mod) return;
   if (isReactRefreshBoundary(mod)) {
     ${timeout}
   } else {
@@ -103,37 +97,15 @@ import.meta.hot.accept(mod => {
   }
 });
 `;
-function addRefreshWrapper(code, id, accept) {
-  return header.replace("__SOURCE__", JSON.stringify(id)) + code + footer.replace("__ACCEPT__", accept ? checkAndAccept : timeout);
-}
-function isRefreshBoundary(ast) {
-  return ast.program.body.every((node) => {
-    if (node.type !== "ExportNamedDeclaration") {
-      return true;
-    }
-    const { declaration, specifiers } = node;
-    if (declaration) {
-      if (declaration.type === "ClassDeclaration")
-        return false;
-      if (declaration.type === "VariableDeclaration") {
-        return declaration.declarations.every(
-          (variable) => isComponentLikeIdentifier(variable.id)
-        );
-      }
-      if (declaration.type === "FunctionDeclaration") {
-        return !!declaration.id && isComponentLikeIdentifier(declaration.id);
-      }
-    }
-    return specifiers.every((spec) => {
-      return isComponentLikeIdentifier(spec.exported);
-    });
-  });
-}
-function isComponentLikeIdentifier(node) {
-  return node.type === "Identifier" && isComponentLikeName(node.name);
-}
-function isComponentLikeName(name) {
-  return typeof name === "string" && name[0] >= "A" && name[0] <= "Z";
+const footer = `
+if (import.meta.hot) {
+  window.$RefreshReg$ = prevRefreshReg;
+  window.$RefreshSig$ = prevRefreshSig;
+
+  ${checkAndAccept}
+}`;
+function addRefreshWrapper(code, id) {
+  return header.replace("__SOURCE__", JSON.stringify(id)) + code + footer;
 }
 
 const prependReactImportCode = "import React from 'react'; ";
@@ -294,11 +266,8 @@ function viteReact(opts = {}) {
         if (/\.tsx?$/.test(extension)) {
           parserPlugins.push("typescript");
         }
-        const transformAsync = babel.transformAsync.bind(babel, code);
-        const isReasonReact = extension.endsWith(".bs.js");
-        const result = await transformAsync({
+        const result = await babel.transformAsync(code, {
           ...babelOptions,
-          ast: !isReasonReact,
           root: projectRoot,
           filename: id,
           sourceFileName: filepath,
@@ -319,8 +288,7 @@ function viteReact(opts = {}) {
         if (result) {
           let code2 = result.code;
           if (useFastRefresh && /\$RefreshReg\$\(/.test(code2)) {
-            const accept = isReasonReact || isRefreshBoundary(result.ast);
-            code2 = addRefreshWrapper(code2, id, accept);
+            code2 = addRefreshWrapper(code2, id);
           }
           return {
             code: code2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "3.0.0-beta.0",
+  "version": "3.0.1",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [
@@ -38,13 +38,13 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.20.5",
+    "@babel/core": "^7.20.7",
     "@babel/plugin-transform-react-jsx-self": "^7.18.6",
     "@babel/plugin-transform-react-jsx-source": "^7.19.6",
     "magic-string": "^0.27.0",
     "react-refresh": "^0.14.0"
   },
   "peerDependencies": {
-    "vite": "^4.0.0-alpha.0"
+    "vite": "^4.0.0"
   }
 }