@vitejs/plugin-react-swc 3.0.1 → 3.1.0

package/README.md

@@ -24,7 +24,7 @@ export default defineConfig({
 
 ## Caveats
 
-This plugin is only used in development and aims to be kept simple to enable good performances and be transpiler agnostic. Here is the list of non-configurable options that impact runtime behaviour:
+This plugin has limited options to enable good performances and be transpiler agnostic. Here is the list of non-configurable options that impact runtime behaviour:
 
 - [useDefineForClassFields](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#the-usedefineforclassfields-flag-and-the-declare-property-modifier) is always activated, as this matches the current ECMAScript spec
 - `jsx runtime` is always `automatic`
@@ -34,17 +34,30 @@ This plugin is only used in development and aims to be kept simple to enable goo
   - JS files are not transformed
   - tsconfig is not resolved, so properties other than the ones listed above behaves like TS defaults
 
-## Changing the JSX import source
+## Options
 
-You can use the jsxImportSource option like this:
+### jsxImportSource
+
+Control where the JSX factory is imported from.
 
 ```ts
-import { defineConfig } from "vite";
-import react from "@vitejs/plugin-react-swc";
+react({ jsxImportSource: "@emotion/react" });
+```
 
-export default defineConfig({
-  plugins: [react({ jsxImportSource: "@emotion/react" })],
-});
+### tsDecorators
+
+Enable TypeScript decorators. Requires `experimentalDecorators` in tsconfig.
+
+```ts
+react({ tsDecorators: true });
+```
+
+## plugins
+
+Use SWC plugins. Enable SWC at build time.
+
+```ts
+react({ plugins: [["@swc/plugin-styled-components", {}]] });
 ```
 
 ## Consistent components exports

package/index.cjs

@@ -3,6 +3,7 @@ var import_fs = require("fs");
 var import_path = require("path");
 var import_url = require("url");
 var import_core = require("@swc/core");
+var import_module = require("module");
 var import_meta = {};
 var runtimePublicPath = "/@react-refresh";
 var preambleCode = `import { injectIntoGlobalHook } from "__PATH__";
@@ -10,72 +11,51 @@ injectIntoGlobalHook(window);
 window.$RefreshReg$ = () => {};
 window.$RefreshSig$ = () => (type) => type;`;
 var _dirname = typeof __dirname !== "undefined" ? __dirname : (0, import_path.dirname)((0, import_url.fileURLToPath)(import_meta.url));
+var resolve = (0, import_module.createRequire)(
+  typeof __filename !== "undefined" ? __filename : import_meta.url
+).resolve;
 var refreshContentRE = /\$Refresh(?:Reg|Sig)\$\(/;
-var react = (options) => [
-  {
-    name: "vite:react-swc",
-    apply: "serve",
-    config: () => ({
-      esbuild: false,
-      optimizeDeps: { include: ["react/jsx-dev-runtime"] }
-    }),
-    resolveId: (id) => id === runtimePublicPath ? id : void 0,
-    load: (id) => id === runtimePublicPath ? (0, import_fs.readFileSync)((0, import_path.join)(_dirname, "refresh-runtime.js"), "utf-8") : void 0,
-    transformIndexHtml: (_, config) => [
-      {
-        tag: "script",
-        attrs: { type: "module" },
-        children: preambleCode.replace(
-          "__PATH__",
-          config.server.config.base + runtimePublicPath.slice(1)
-        )
-      }
-    ],
-    async transform(code, _id, transformOptions) {
-      const id = _id.split("?")[0];
-      if (id.includes("node_modules"))
-        return;
-      const parser = id.endsWith(".tsx") ? { syntax: "typescript", tsx: true } : id.endsWith(".ts") ? { syntax: "typescript", tsx: false } : id.endsWith(".jsx") ? { syntax: "ecmascript", jsx: true } : void 0;
-      if (!parser)
-        return;
-      let result;
-      try {
-        result = await (0, import_core.transform)(code, {
-          filename: id,
-          swcrc: false,
-          configFile: false,
-          sourceMaps: true,
-          jsc: {
-            target: "es2020",
-            parser,
-            transform: {
-              useDefineForClassFields: true,
-              react: {
-                refresh: !(transformOptions == null ? void 0 : transformOptions.ssr),
-                development: true,
-                useBuiltins: true,
-                runtime: "automatic",
-                importSource: options == null ? void 0 : options.jsxImportSource
-              }
-            }
-          }
+var react = (_options) => {
+  const options = {
+    jsxImportSource: _options == null ? void 0 : _options.jsxImportSource,
+    tsDecorators: _options == null ? void 0 : _options.tsDecorators,
+    plugins: (_options == null ? void 0 : _options.plugins) ? _options == null ? void 0 : _options.plugins.map((el) => [resolve(el[0]), el[1]]) : void 0
+  };
+  return [
+    {
+      name: "vite:react-swc",
+      apply: "serve",
+      config: () => ({
+        esbuild: false,
+        optimizeDeps: { include: ["react/jsx-dev-runtime"] }
+      }),
+      resolveId: (id) => id === runtimePublicPath ? id : void 0,
+      load: (id) => id === runtimePublicPath ? (0, import_fs.readFileSync)((0, import_path.join)(_dirname, "refresh-runtime.js"), "utf-8") : void 0,
+      transformIndexHtml: (_, config) => [
+        {
+          tag: "script",
+          attrs: { type: "module" },
+          children: preambleCode.replace(
+            "__PATH__",
+            config.server.config.base + runtimePublicPath.slice(1)
+          )
+        }
+      ],
+      async transform(code, _id, transformOptions) {
+        const id = _id.split("?")[0];
+        const result = await transformWithOptions(id, code, options, {
+          refresh: !(transformOptions == null ? void 0 : transformOptions.ssr),
+          development: true,
+          useBuiltins: true,
+          runtime: "automatic",
+          importSource: options == null ? void 0 : options.jsxImportSource
         });
-      } catch (e) {
-        const message = e.message;
-        const fileStartIndex = message.indexOf("\u256D\u2500[");
-        if (fileStartIndex !== -1) {
-          const match = message.slice(fileStartIndex).match(/:(\d+):(\d+)]/);
-          if (match) {
-            e.line = match[1];
-            e.column = match[2];
-          }
+        if (!result)
+          return;
+        if ((transformOptions == null ? void 0 : transformOptions.ssr) || !refreshContentRE.test(result.code)) {
+          return result;
         }
-        throw e;
-      }
-      if ((transformOptions == null ? void 0 : transformOptions.ssr) || !refreshContentRE.test(result.code)) {
-        return result;
-      }
-      result.code = `import * as RefreshRuntime from "${runtimePublicPath}";
+        result.code = `import * as RefreshRuntime from "${runtimePublicPath}";
   
   if (!window.$RefreshReg$) throw new Error("React refresh preamble was not loaded. Something is wrong.");
   const prevRefreshReg = window.$RefreshReg$;
@@ -87,31 +67,81 @@ var react = (options) => [
   
   window.$RefreshReg$ = prevRefreshReg;
   window.$RefreshSig$ = prevRefreshSig;
-  import.meta.hot.accept((nextExports) => {
-  if (!nextExports) return;
-  import(/* @vite-ignore */ import.meta.url).then((current) => {
-    const invalidateMessage = RefreshRuntime.validateRefreshBoundaryAndEnqueueUpdate(current, nextExports);
-    if (invalidateMessage) import.meta.hot.invalidate(invalidateMessage);
+  import(/* @vite-ignore */ import.meta.url).then((currentExports) => {
+    RefreshRuntime.registerExportsForReactRefresh("${id}", currentExports);
+    import.meta.hot.accept((nextExports) => {
+      if (!nextExports) return;
+      const invalidateMessage = RefreshRuntime.validateRefreshBoundaryAndEnqueueUpdate(currentExports, nextExports);
+      if (invalidateMessage) import.meta.hot.invalidate(invalidateMessage);
+    });
   });
-});
   `;
-      const sourceMap = JSON.parse(result.map);
-      sourceMap.mappings = ";;;;;;;;" + sourceMap.mappings;
-      return { code: result.code, map: sourceMap };
+        const sourceMap = JSON.parse(result.map);
+        sourceMap.mappings = ";;;;;;;;" + sourceMap.mappings;
+        return { code: result.code, map: sourceMap };
+      }
+    },
+    options.plugins ? {
+      name: "vite:react-swc",
+      apply: "build",
+      transform: (code, _id) => transformWithOptions(_id.split("?")[0], code, options, {
+        useBuiltins: true,
+        runtime: "automatic",
+        importSource: options == null ? void 0 : options.jsxImportSource
+      })
+    } : {
+      name: "vite:react-swc",
+      apply: "build",
+      config: () => ({
+        esbuild: {
+          jsx: "automatic",
+          jsxImportSource: options == null ? void 0 : options.jsxImportSource,
+          tsconfigRaw: {
+            compilerOptions: { useDefineForClassFields: true }
+          }
+        }
+      })
     }
-  },
-  {
-    name: "vite:react-swc",
-    apply: "build",
-    config: () => ({
-      esbuild: {
-        jsx: "automatic",
-        jsxImportSource: options == null ? void 0 : options.jsxImportSource,
-        tsconfigRaw: { compilerOptions: { useDefineForClassFields: true } }
+  ];
+};
+var transformWithOptions = async (id, code, options, reactConfig) => {
+  if (id.includes("node_modules"))
+    return;
+  const decorators = (options == null ? void 0 : options.tsDecorators) ?? false;
+  const parser = id.endsWith(".tsx") ? { syntax: "typescript", tsx: true, decorators } : id.endsWith(".ts") ? { syntax: "typescript", tsx: false, decorators } : id.endsWith(".jsx") ? { syntax: "ecmascript", jsx: true } : void 0;
+  if (!parser)
+    return;
+  let result;
+  try {
+    result = await (0, import_core.transform)(code, {
+      filename: id,
+      swcrc: false,
+      configFile: false,
+      sourceMaps: true,
+      jsc: {
+        target: "es2020",
+        parser,
+        experimental: { plugins: options.plugins },
+        transform: {
+          useDefineForClassFields: true,
+          react: reactConfig
+        }
+      }
+    });
+  } catch (e) {
+    const message = e.message;
+    const fileStartIndex = message.indexOf("\u256D\u2500[");
+    if (fileStartIndex !== -1) {
+      const match = message.slice(fileStartIndex).match(/:(\d+):(\d+)]/);
+      if (match) {
+        e.line = match[1];
+        e.column = match[2];
       }
-    })
+    }
+    throw e;
   }
-];
+  return result;
+};
 var src_default = react;
 
 // <stdin>

package/index.d.ts

@@ -5,6 +5,16 @@ type Options = {
      * @default "react"
      */
     jsxImportSource?: string;
+    /**
+     * Enable TypeScript decorators. Requires experimentalDecorators in tsconfig.
+     * @default false
+     */
+    tsDecorators?: boolean;
+    /**
+     * Use SWC plugins. Enable SWC at build time.
+     * @default undefined
+     */
+    plugins?: [string, Record<string, any>][];
 };
-declare const react: (options?: Options) => PluginOption[];
+declare const react: (_options?: Options) => PluginOption[];
 export default react;

package/index.mjs

@@ -3,78 +3,58 @@ import { readFileSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { transform } from "@swc/core";
+import { createRequire } from "module";
 var runtimePublicPath = "/@react-refresh";
 var preambleCode = `import { injectIntoGlobalHook } from "__PATH__";
 injectIntoGlobalHook(window);
 window.$RefreshReg$ = () => {};
 window.$RefreshSig$ = () => (type) => type;`;
 var _dirname = typeof __dirname !== "undefined" ? __dirname : dirname(fileURLToPath(import.meta.url));
+var resolve = createRequire(
+  typeof __filename !== "undefined" ? __filename : import.meta.url
+).resolve;
 var refreshContentRE = /\$Refresh(?:Reg|Sig)\$\(/;
-var react = (options) => [
-  {
-    name: "vite:react-swc",
-    apply: "serve",
-    config: () => ({
-      esbuild: false,
-      optimizeDeps: { include: ["react/jsx-dev-runtime"] }
-    }),
-    resolveId: (id) => id === runtimePublicPath ? id : void 0,
-    load: (id) => id === runtimePublicPath ? readFileSync(join(_dirname, "refresh-runtime.js"), "utf-8") : void 0,
-    transformIndexHtml: (_, config) => [
-      {
-        tag: "script",
-        attrs: { type: "module" },
-        children: preambleCode.replace(
-          "__PATH__",
-          config.server.config.base + runtimePublicPath.slice(1)
-        )
-      }
-    ],
-    async transform(code, _id, transformOptions) {
-      const id = _id.split("?")[0];
-      if (id.includes("node_modules"))
-        return;
-      const parser = id.endsWith(".tsx") ? { syntax: "typescript", tsx: true } : id.endsWith(".ts") ? { syntax: "typescript", tsx: false } : id.endsWith(".jsx") ? { syntax: "ecmascript", jsx: true } : void 0;
-      if (!parser)
-        return;
-      let result;
-      try {
-        result = await transform(code, {
-          filename: id,
-          swcrc: false,
-          configFile: false,
-          sourceMaps: true,
-          jsc: {
-            target: "es2020",
-            parser,
-            transform: {
-              useDefineForClassFields: true,
-              react: {
-                refresh: !(transformOptions == null ? void 0 : transformOptions.ssr),
-                development: true,
-                useBuiltins: true,
-                runtime: "automatic",
-                importSource: options == null ? void 0 : options.jsxImportSource
-              }
-            }
-          }
+var react = (_options) => {
+  const options = {
+    jsxImportSource: _options == null ? void 0 : _options.jsxImportSource,
+    tsDecorators: _options == null ? void 0 : _options.tsDecorators,
+    plugins: (_options == null ? void 0 : _options.plugins) ? _options == null ? void 0 : _options.plugins.map((el) => [resolve(el[0]), el[1]]) : void 0
+  };
+  return [
+    {
+      name: "vite:react-swc",
+      apply: "serve",
+      config: () => ({
+        esbuild: false,
+        optimizeDeps: { include: ["react/jsx-dev-runtime"] }
+      }),
+      resolveId: (id) => id === runtimePublicPath ? id : void 0,
+      load: (id) => id === runtimePublicPath ? readFileSync(join(_dirname, "refresh-runtime.js"), "utf-8") : void 0,
+      transformIndexHtml: (_, config) => [
+        {
+          tag: "script",
+          attrs: { type: "module" },
+          children: preambleCode.replace(
+            "__PATH__",
+            config.server.config.base + runtimePublicPath.slice(1)
+          )
+        }
+      ],
+      async transform(code, _id, transformOptions) {
+        const id = _id.split("?")[0];
+        const result = await transformWithOptions(id, code, options, {
+          refresh: !(transformOptions == null ? void 0 : transformOptions.ssr),
+          development: true,
+          useBuiltins: true,
+          runtime: "automatic",
+          importSource: options == null ? void 0 : options.jsxImportSource
         });
-      } catch (e) {
-        const message = e.message;
-        const fileStartIndex = message.indexOf("\u256D\u2500[");
-        if (fileStartIndex !== -1) {
-          const match = message.slice(fileStartIndex).match(/:(\d+):(\d+)]/);
-          if (match) {
-            e.line = match[1];
-            e.column = match[2];
-          }
+        if (!result)
+          return;
+        if ((transformOptions == null ? void 0 : transformOptions.ssr) || !refreshContentRE.test(result.code)) {
+          return result;
         }
-        throw e;
-      }
-      if ((transformOptions == null ? void 0 : transformOptions.ssr) || !refreshContentRE.test(result.code)) {
-        return result;
-      }
-      result.code = `import * as RefreshRuntime from "${runtimePublicPath}";
+        result.code = `import * as RefreshRuntime from "${runtimePublicPath}";
   
   if (!window.$RefreshReg$) throw new Error("React refresh preamble was not loaded. Something is wrong.");
   const prevRefreshReg = window.$RefreshReg$;
@@ -86,31 +66,81 @@ var react = (options) => [
   
   window.$RefreshReg$ = prevRefreshReg;
   window.$RefreshSig$ = prevRefreshSig;
-  import.meta.hot.accept((nextExports) => {
-  if (!nextExports) return;
-  import(/* @vite-ignore */ import.meta.url).then((current) => {
-    const invalidateMessage = RefreshRuntime.validateRefreshBoundaryAndEnqueueUpdate(current, nextExports);
-    if (invalidateMessage) import.meta.hot.invalidate(invalidateMessage);
+  import(/* @vite-ignore */ import.meta.url).then((currentExports) => {
+    RefreshRuntime.registerExportsForReactRefresh("${id}", currentExports);
+    import.meta.hot.accept((nextExports) => {
+      if (!nextExports) return;
+      const invalidateMessage = RefreshRuntime.validateRefreshBoundaryAndEnqueueUpdate(currentExports, nextExports);
+      if (invalidateMessage) import.meta.hot.invalidate(invalidateMessage);
+    });
   });
-});
   `;
-      const sourceMap = JSON.parse(result.map);
-      sourceMap.mappings = ";;;;;;;;" + sourceMap.mappings;
-      return { code: result.code, map: sourceMap };
+        const sourceMap = JSON.parse(result.map);
+        sourceMap.mappings = ";;;;;;;;" + sourceMap.mappings;
+        return { code: result.code, map: sourceMap };
+      }
+    },
+    options.plugins ? {
+      name: "vite:react-swc",
+      apply: "build",
+      transform: (code, _id) => transformWithOptions(_id.split("?")[0], code, options, {
+        useBuiltins: true,
+        runtime: "automatic",
+        importSource: options == null ? void 0 : options.jsxImportSource
+      })
+    } : {
+      name: "vite:react-swc",
+      apply: "build",
+      config: () => ({
+        esbuild: {
+          jsx: "automatic",
+          jsxImportSource: options == null ? void 0 : options.jsxImportSource,
+          tsconfigRaw: {
+            compilerOptions: { useDefineForClassFields: true }
+          }
+        }
+      })
     }
-  },
-  {
-    name: "vite:react-swc",
-    apply: "build",
-    config: () => ({
-      esbuild: {
-        jsx: "automatic",
-        jsxImportSource: options == null ? void 0 : options.jsxImportSource,
-        tsconfigRaw: { compilerOptions: { useDefineForClassFields: true } }
+  ];
+};
+var transformWithOptions = async (id, code, options, reactConfig) => {
+  if (id.includes("node_modules"))
+    return;
+  const decorators = (options == null ? void 0 : options.tsDecorators) ?? false;
+  const parser = id.endsWith(".tsx") ? { syntax: "typescript", tsx: true, decorators } : id.endsWith(".ts") ? { syntax: "typescript", tsx: false, decorators } : id.endsWith(".jsx") ? { syntax: "ecmascript", jsx: true } : void 0;
+  if (!parser)
+    return;
+  let result;
+  try {
+    result = await transform(code, {
+      filename: id,
+      swcrc: false,
+      configFile: false,
+      sourceMaps: true,
+      jsc: {
+        target: "es2020",
+        parser,
+        experimental: { plugins: options.plugins },
+        transform: {
+          useDefineForClassFields: true,
+          react: reactConfig
+        }
       }
-    })
+    });
+  } catch (e) {
+    const message = e.message;
+    const fileStartIndex = message.indexOf("\u256D\u2500[");
+    if (fileStartIndex !== -1) {
+      const match = message.slice(fileStartIndex).match(/:(\d+):(\d+)]/);
+      if (match) {
+        e.line = match[1];
+        e.column = match[2];
+      }
+    }
+    throw e;
   }
-];
+  return result;
+};
 var src_default = react;
 export {
   src_default as default

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitejs/plugin-react-swc",
   "description": "Speed up your Vite dev server with SWC",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "author": "Arnaud Barré (https://github.com/ArnaudBarre)",
   "license": "MIT",
   "repository": "github:vitejs/vite-plugin-react-swc",
@@ -10,8 +10,8 @@
   "module": "index.mjs",
   "exports": {
     ".": {
-      "require": "./index.cjs",
       "types": "./index.d.ts",
+      "require": "./index.cjs",
       "import": "./index.mjs"
     }
   },
@@ -27,6 +27,6 @@
     "vite": "^4"
   },
   "dependencies": {
-    "@swc/core": "^1.3.22"
+    "@swc/core": "^1.3.30"
   }
 }

package/refresh-runtime.js

@@ -4,12 +4,12 @@ const REACT_MEMO_TYPE = Symbol.for("react.memo");
 let allFamiliesByID = /* @__PURE__ */ new Map();
 let allFamiliesByType = /* @__PURE__ */ new WeakMap();
 let allSignaturesByType = /* @__PURE__ */ new WeakMap();
-let updatedFamiliesByType = /* @__PURE__ */ new WeakMap();
+const updatedFamiliesByType = /* @__PURE__ */ new WeakMap();
 let pendingUpdates = [];
-let helpersByRendererID = /* @__PURE__ */ new Map();
-let helpersByRoot = /* @__PURE__ */ new Map();
-let mountedRoots = /* @__PURE__ */ new Set();
-let failedRoots = /* @__PURE__ */ new Set();
+const helpersByRendererID = /* @__PURE__ */ new Map();
+const helpersByRoot = /* @__PURE__ */ new Map();
+const mountedRoots = /* @__PURE__ */ new Set();
+const failedRoots = /* @__PURE__ */ new Set();
 let rootElements = /* @__PURE__ */ new WeakMap();
 let isPerformingRefresh = false;
 function computeFullKey(signature) {
@@ -26,17 +26,17 @@ function computeFullKey(signature) {
     return fullKey;
   }
   for (let i = 0; i < hooks.length; i++) {
-    let hook = hooks[i];
+    const hook = hooks[i];
     if (typeof hook !== "function") {
       signature.forceReset = true;
       signature.fullKey = fullKey;
       return fullKey;
     }
-    let nestedHookSignature = allSignaturesByType.get(hook);
+    const nestedHookSignature = allSignaturesByType.get(hook);
     if (nestedHookSignature === void 0) {
       continue;
     }
-    let nestedHookKey = computeFullKey(nestedHookSignature);
+    const nestedHookKey = computeFullKey(nestedHookSignature);
     if (nestedHookSignature.forceReset) {
       signature.forceReset = true;
     }
@@ -46,8 +46,8 @@ function computeFullKey(signature) {
   return fullKey;
 }
 function haveEqualSignatures(prevType, nextType) {
-  let prevSignature = allSignaturesByType.get(prevType);
-  let nextSignature = allSignaturesByType.get(nextType);
+  const prevSignature = allSignaturesByType.get(prevType);
+  const nextSignature = allSignaturesByType.get(nextType);
   if (prevSignature === void 0 && nextSignature === void 0) {
     return true;
   }
@@ -93,13 +93,12 @@ function performReactRefresh() {
   }
   isPerformingRefresh = true;
   try {
-    let staleFamilies = /* @__PURE__ */ new Set();
-    let updatedFamilies = /* @__PURE__ */ new Set();
-    let updates = pendingUpdates;
+    const staleFamilies = /* @__PURE__ */ new Set();
+    const updatedFamilies = /* @__PURE__ */ new Set();
+    const updates = pendingUpdates;
     pendingUpdates = [];
-    updates.forEach(function(_ref) {
-      let family = _ref[0], nextType = _ref[1];
-      let prevType = family.current;
+    updates.forEach(([family, nextType]) => {
+      const prevType = family.current;
       updatedFamiliesByType.set(prevType, family);
       updatedFamiliesByType.set(nextType, family);
       family.current = nextType;
@@ -109,20 +108,22 @@ function performReactRefresh() {
         staleFamilies.add(family);
       }
     });
-    let update = {
+    const update = {
       updatedFamilies,
+      // Families that will re-render preserving state
       staleFamilies
+      // Families that will be remounted
     };
-    helpersByRendererID.forEach(function(helpers) {
+    helpersByRendererID.forEach((helpers) => {
       helpers.setRefreshHandler(resolveFamily);
     });
     let didError = false;
     let firstError = null;
-    let failedRootsSnapshot = new Set(failedRoots);
-    let mountedRootsSnapshot = new Set(mountedRoots);
-    let helpersByRootSnapshot = new Map(helpersByRoot);
-    failedRootsSnapshot.forEach(function(root) {
-      let helpers = helpersByRootSnapshot.get(root);
+    const failedRootsSnapshot = new Set(failedRoots);
+    const mountedRootsSnapshot = new Set(mountedRoots);
+    const helpersByRootSnapshot = new Map(helpersByRoot);
+    failedRootsSnapshot.forEach((root) => {
+      const helpers = helpersByRootSnapshot.get(root);
       if (helpers === void 0) {
         throw new Error(
           "Could not find helpers for a root. This is a bug in React Refresh."
@@ -130,10 +131,13 @@ function performReactRefresh() {
       }
       if (!failedRoots.has(root)) {
       }
+      if (rootElements === null) {
+        return;
+      }
       if (!rootElements.has(root)) {
         return;
       }
-      let element = rootElements.get(root);
+      const element = rootElements.get(root);
       try {
         helpers.scheduleRoot(root, element);
       } catch (err) {
@@ -143,8 +147,8 @@ function performReactRefresh() {
         }
       }
     });
-    mountedRootsSnapshot.forEach(function(root) {
-      let helpers = helpersByRootSnapshot.get(root);
+    mountedRootsSnapshot.forEach((root) => {
+      const helpers = helpersByRootSnapshot.get(root);
       if (helpers === void 0) {
         throw new Error(
           "Could not find helpers for a root. This is a bug in React Refresh."
@@ -169,14 +173,6 @@ function performReactRefresh() {
     isPerformingRefresh = false;
   }
 }
-function debounce(fn, delay) {
-  let handle;
-  return () => {
-    clearTimeout(handle);
-    handle = setTimeout(fn, delay);
-  };
-}
-const enqueueUpdate = debounce(performReactRefresh, 16);
 function register(type, id) {
   if (type === null) {
     return;
@@ -189,9 +185,7 @@ function register(type, id) {
   }
   let family = allFamiliesByID.get(id);
   if (family === void 0) {
-    family = {
-      current: type
-    };
+    family = { current: type };
     allFamiliesByID.set(id, family);
   } else {
     pendingUpdates.push([family, type]);
@@ -208,18 +202,13 @@ function register(type, id) {
     }
   }
 }
-function getRefreshReg(filename) {
-  return (type, id) => register(type, filename + " " + id);
-}
-function setSignature(type, key, forceReset = false, getCustomHooks) {
+function setSignature(type, key, forceReset, getCustomHooks) {
   if (!allSignaturesByType.has(type)) {
     allSignaturesByType.set(type, {
       forceReset,
       ownKey: key,
       fullKey: null,
-      getCustomHooks: getCustomHooks || function() {
-        return [];
-      }
+      getCustomHooks: getCustomHooks || (() => [])
     });
   }
   if (typeof type === "object" && type !== null) {
@@ -234,7 +223,7 @@ function setSignature(type, key, forceReset = false, getCustomHooks) {
   }
 }
 function collectCustomHooksForSignature(type) {
-  let signature = allSignaturesByType.get(type);
+  const signature = allSignaturesByType.get(type);
   if (signature !== void 0) {
     computeFullKey(signature);
   }
@@ -246,14 +235,12 @@ function injectIntoGlobalHook(globalObject) {
     globalObject.__REACT_DEVTOOLS_GLOBAL_HOOK__ = hook = {
       renderers: /* @__PURE__ */ new Map(),
       supportsFiber: true,
-      inject: function(injected) {
-        return nextID++;
-      },
-      onScheduleFiberRoot: function(id, root, children) {
+      inject: (injected) => nextID++,
+      onScheduleFiberRoot: (id, root, children) => {
       },
-      onCommitFiberRoot: function(id, root, maybePriorityLevel, didError) {
+      onCommitFiberRoot: (id, root, maybePriorityLevel, didError) => {
       },
-      onCommitFiberUnmount: function() {
+      onCommitFiberUnmount() {
       }
     };
   }
@@ -263,38 +250,40 @@ function injectIntoGlobalHook(globalObject) {
     );
     return;
   }
-  let oldInject = hook.inject;
+  const oldInject = hook.inject;
   hook.inject = function(injected) {
-    let id = oldInject.apply(this, arguments);
+    const id = oldInject.apply(this, arguments);
     if (typeof injected.scheduleRefresh === "function" && typeof injected.setRefreshHandler === "function") {
       helpersByRendererID.set(id, injected);
     }
     return id;
   };
-  hook.renderers.forEach(function(injected, id) {
+  hook.renderers.forEach((injected, id) => {
     if (typeof injected.scheduleRefresh === "function" && typeof injected.setRefreshHandler === "function") {
       helpersByRendererID.set(id, injected);
     }
   });
-  let oldOnCommitFiberRoot = hook.onCommitFiberRoot;
-  let oldOnScheduleFiberRoot = hook.onScheduleFiberRoot || function() {
-  };
+  const oldOnCommitFiberRoot = hook.onCommitFiberRoot;
+  const oldOnScheduleFiberRoot = hook.onScheduleFiberRoot || (() => {
+  });
   hook.onScheduleFiberRoot = function(id, root, children) {
     if (!isPerformingRefresh) {
       failedRoots.delete(root);
-      rootElements.set(root, children);
+      if (rootElements !== null) {
+        rootElements.set(root, children);
+      }
     }
     return oldOnScheduleFiberRoot.apply(this, arguments);
   };
   hook.onCommitFiberRoot = function(id, root, maybePriorityLevel, didError) {
-    let helpers = helpersByRendererID.get(id);
+    const helpers = helpersByRendererID.get(id);
     if (helpers !== void 0) {
       helpersByRoot.set(root, helpers);
-      let current = root.current;
-      let alternate = current.alternate;
+      const current = root.current;
+      const alternate = current.alternate;
       if (alternate !== null) {
-        let wasMounted = alternate.memoizedState != null && alternate.memoizedState.element != null;
-        let isMounted = current.memoizedState != null && current.memoizedState.element != null;
+        const wasMounted = alternate.memoizedState != null && alternate.memoizedState.element != null && mountedRoots.has(root);
+        const isMounted = current.memoizedState != null && current.memoizedState.element != null;
         if (!wasMounted && isMounted) {
           mountedRoots.add(root);
           failedRoots.delete(root);
@@ -375,6 +364,27 @@ function isLikelyComponentType(type) {
     }
   }
 }
+function getRefreshReg(filename) {
+  return (type, id) => register(type, filename + " " + id);
+}
+function registerExportsForReactRefresh(filename, moduleExports) {
+  for (const key in moduleExports) {
+    if (key === "__esModule")
+      continue;
+    const exportValue = moduleExports[key];
+    if (isLikelyComponentType(exportValue)) {
+      register(exportValue, filename + " " + key);
+    }
+  }
+}
+function debounce(fn, delay) {
+  let handle;
+  return () => {
+    clearTimeout(handle);
+    handle = setTimeout(fn, delay);
+  };
+}
+const enqueueUpdate = debounce(performReactRefresh, 16);
 function validateRefreshBoundaryAndEnqueueUpdate(prevExports, nextExports) {
   if (!predicateOnExport(prevExports, (key) => !!nextExports[key])) {
     return "Could not Fast Refresh (export removed)";
@@ -409,16 +419,12 @@ function predicateOnExport(moduleExports, predicate) {
   }
   return true;
 }
-var refresh_runtime_default = {
-  getRefreshReg,
-  injectIntoGlobalHook,
-  createSignatureFunctionForTransform,
-  validateRefreshBoundaryAndEnqueueUpdate
-};
+var refresh_runtime_default = { injectIntoGlobalHook };
 export {
   createSignatureFunctionForTransform,
   refresh_runtime_default as default,
   getRefreshReg,
   injectIntoGlobalHook,
+  registerExportsForReactRefresh,
   validateRefreshBoundaryAndEnqueueUpdate
 };