@vitejs/plugin-react-swc 3.2.0 → 3.3.1

package/index.cjs

@@ -22,6 +22,14 @@ var react = (_options) => {
     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:resolve-runtime",
+      apply: "serve",
+      enforce: "pre",
+      // Run before Vite default resolve to avoid syscalls
+      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
+    },
     {
       name: "vite:react-swc",
       apply: "serve",
@@ -31,8 +39,16 @@ var react = (_options) => {
           include: [`${options.jsxImportSource}/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,
+      configResolved(config) {
+        const mdxIndex = config.plugins.findIndex(
+          (p) => p.name === "@mdx-js/rollup"
+        );
+        if (mdxIndex !== -1 && mdxIndex > config.plugins.findIndex((p) => p.name === "vite:react-swc")) {
+          throw new Error(
+            "[vite:react-swc] The MDX plugin should be placed before this plugin"
+          );
+        }
+      },
       transformIndexHtml: (_, config) => [
         {
           tag: "script",
@@ -45,10 +61,9 @@ var react = (_options) => {
       ],
       async transform(code, _id, transformOptions) {
         const id = _id.split("?")[0];
-        const result = await transformWithOptions(id, code, options, {
+        const result = await transformWithOptions(id, code, "es2020", options, {
           refresh: !(transformOptions == null ? void 0 : transformOptions.ssr),
           development: true,
-          useBuiltins: true,
           runtime: "automatic",
           importSource: options.jsxImportSource
         });
@@ -69,7 +84,7 @@ ${result.code}
 
 window.$RefreshReg$ = prevRefreshReg;
 window.$RefreshSig$ = prevRefreshSig;
-import(/* @vite-ignore */ import.meta.url).then((currentExports) => {
+RefreshRuntime.__hmr_import(import.meta.url).then((currentExports) => {
   RefreshRuntime.registerExportsForReactRefresh("${id}", currentExports);
   import.meta.hot.accept((nextExports) => {
     if (!nextExports) return;
@@ -88,15 +103,18 @@ import(/* @vite-ignore */ import.meta.url).then((currentExports) => {
       apply: "build",
       enforce: "pre",
       // Run before esbuild
-      transform: (code, _id) => transformWithOptions(_id.split("?")[0], code, options, {
-        useBuiltins: true,
+      config: (userConfig) => ({
+        build: silenceUseClientWarning(userConfig)
+      }),
+      transform: (code, _id) => transformWithOptions(_id.split("?")[0], code, "esnext", options, {
         runtime: "automatic",
         importSource: options.jsxImportSource
       })
     } : {
       name: "vite:react-swc",
       apply: "build",
-      config: () => ({
+      config: (userConfig) => ({
+        build: silenceUseClientWarning(userConfig),
         esbuild: {
           jsx: "automatic",
           jsxImportSource: options.jsxImportSource,
@@ -108,9 +126,7 @@ import(/* @vite-ignore */ import.meta.url).then((currentExports) => {
     }
   ];
 };
-var transformWithOptions = async (id, code, options, reactConfig) => {
-  if (id.includes("node_modules"))
-    return;
+var transformWithOptions = async (id, code, target, options, reactConfig) => {
   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 } : id.endsWith(".mdx") ? (
     // JSX is required to trigger fast refresh transformations, even if MDX already transforms it
@@ -126,7 +142,7 @@ var transformWithOptions = async (id, code, options, reactConfig) => {
       configFile: false,
       sourceMaps: true,
       jsc: {
-        target: "es2020",
+        target,
         parser,
         experimental: { plugins: options.plugins },
         transform: {
@@ -149,6 +165,21 @@ var transformWithOptions = async (id, code, options, reactConfig) => {
   }
   return result;
 };
+var silenceUseClientWarning = (userConfig) => ({
+  rollupOptions: {
+    onwarn(warning, defaultHandler) {
+      var _a, _b;
+      if (warning.code === "MODULE_LEVEL_DIRECTIVE" && warning.message.includes("use client")) {
+        return;
+      }
+      if ((_b = (_a = userConfig.build) == null ? void 0 : _a.rollupOptions) == null ? void 0 : _b.onwarn) {
+        userConfig.build.rollupOptions.onwarn(warning, defaultHandler);
+      } else {
+        defaultHandler(warning);
+      }
+    }
+  }
+});
 var src_default = react;
 
 // <stdin>

package/index.mjs

@@ -2,7 +2,9 @@
 import { readFileSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
-import { transform } from "@swc/core";
+import {
+  transform
+} from "@swc/core";
 import { createRequire } from "module";
 var runtimePublicPath = "/@react-refresh";
 var preambleCode = `import { injectIntoGlobalHook } from "__PATH__";
@@ -21,6 +23,14 @@ var react = (_options) => {
     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:resolve-runtime",
+      apply: "serve",
+      enforce: "pre",
+      // Run before Vite default resolve to avoid syscalls
+      resolveId: (id) => id === runtimePublicPath ? id : void 0,
+      load: (id) => id === runtimePublicPath ? readFileSync(join(_dirname, "refresh-runtime.js"), "utf-8") : void 0
+    },
     {
       name: "vite:react-swc",
       apply: "serve",
@@ -30,8 +40,16 @@ var react = (_options) => {
           include: [`${options.jsxImportSource}/jsx-dev-runtime`]
         }
       }),
-      resolveId: (id) => id === runtimePublicPath ? id : void 0,
-      load: (id) => id === runtimePublicPath ? readFileSync(join(_dirname, "refresh-runtime.js"), "utf-8") : void 0,
+      configResolved(config) {
+        const mdxIndex = config.plugins.findIndex(
+          (p) => p.name === "@mdx-js/rollup"
+        );
+        if (mdxIndex !== -1 && mdxIndex > config.plugins.findIndex((p) => p.name === "vite:react-swc")) {
+          throw new Error(
+            "[vite:react-swc] The MDX plugin should be placed before this plugin"
+          );
+        }
+      },
       transformIndexHtml: (_, config) => [
         {
           tag: "script",
@@ -44,10 +62,9 @@ var react = (_options) => {
       ],
       async transform(code, _id, transformOptions) {
         const id = _id.split("?")[0];
-        const result = await transformWithOptions(id, code, options, {
+        const result = await transformWithOptions(id, code, "es2020", options, {
           refresh: !(transformOptions == null ? void 0 : transformOptions.ssr),
           development: true,
-          useBuiltins: true,
           runtime: "automatic",
           importSource: options.jsxImportSource
         });
@@ -68,7 +85,7 @@ ${result.code}
 
 window.$RefreshReg$ = prevRefreshReg;
 window.$RefreshSig$ = prevRefreshSig;
-import(/* @vite-ignore */ import.meta.url).then((currentExports) => {
+RefreshRuntime.__hmr_import(import.meta.url).then((currentExports) => {
   RefreshRuntime.registerExportsForReactRefresh("${id}", currentExports);
   import.meta.hot.accept((nextExports) => {
     if (!nextExports) return;
@@ -87,15 +104,18 @@ import(/* @vite-ignore */ import.meta.url).then((currentExports) => {
       apply: "build",
       enforce: "pre",
       // Run before esbuild
-      transform: (code, _id) => transformWithOptions(_id.split("?")[0], code, options, {
-        useBuiltins: true,
+      config: (userConfig) => ({
+        build: silenceUseClientWarning(userConfig)
+      }),
+      transform: (code, _id) => transformWithOptions(_id.split("?")[0], code, "esnext", options, {
         runtime: "automatic",
         importSource: options.jsxImportSource
       })
     } : {
       name: "vite:react-swc",
       apply: "build",
-      config: () => ({
+      config: (userConfig) => ({
+        build: silenceUseClientWarning(userConfig),
         esbuild: {
           jsx: "automatic",
           jsxImportSource: options.jsxImportSource,
@@ -107,9 +127,7 @@ import(/* @vite-ignore */ import.meta.url).then((currentExports) => {
     }
   ];
 };
-var transformWithOptions = async (id, code, options, reactConfig) => {
-  if (id.includes("node_modules"))
-    return;
+var transformWithOptions = async (id, code, target, options, reactConfig) => {
   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 } : id.endsWith(".mdx") ? (
     // JSX is required to trigger fast refresh transformations, even if MDX already transforms it
@@ -125,7 +143,7 @@ var transformWithOptions = async (id, code, options, reactConfig) => {
       configFile: false,
       sourceMaps: true,
       jsc: {
-        target: "es2020",
+        target,
         parser,
         experimental: { plugins: options.plugins },
         transform: {
@@ -148,6 +166,21 @@ var transformWithOptions = async (id, code, options, reactConfig) => {
   }
   return result;
 };
+var silenceUseClientWarning = (userConfig) => ({
+  rollupOptions: {
+    onwarn(warning, defaultHandler) {
+      var _a, _b;
+      if (warning.code === "MODULE_LEVEL_DIRECTIVE" && warning.message.includes("use client")) {
+        return;
+      }
+      if ((_b = (_a = userConfig.build) == null ? void 0 : _a.rollupOptions) == null ? void 0 : _b.onwarn) {
+        userConfig.build.rollupOptions.onwarn(warning, defaultHandler);
+      } else {
+        defaultHandler(warning);
+      }
+    }
+  }
+});
 var src_default = react;
 export {
   src_default as default

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@vitejs/plugin-react-swc",
   "description": "Speed up your Vite dev server with SWC",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "author": "Arnaud Barré (https://github.com/ArnaudBarre)",
   "license": "MIT",
   "repository": "github:vitejs/vite-plugin-react-swc",
+  "type": "module",
   "main": "index.cjs",
   "types": "index.d.ts",
   "module": "index.mjs",
@@ -27,6 +28,6 @@
     "vite": "^4"
   },
   "dependencies": {
-    "@swc/core": "^1.3.35"
+    "@swc/core": "^1.3.56"
   }
 }

package/refresh-runtime.js

@@ -364,6 +364,11 @@ function isLikelyComponentType(type) {
     }
   }
 }
+if (window.$RefreshReg$) {
+  throw new Error(
+    "React refresh runtime was loaded twice. Maybe you forgot the base path?"
+  );
+}
 function getRefreshReg(filename) {
   return (type, id) => register(type, filename + " " + id);
 }
@@ -373,7 +378,7 @@ function registerExportsForReactRefresh(filename, moduleExports) {
       continue;
     const exportValue = moduleExports[key];
     if (isLikelyComponentType(exportValue)) {
-      register(exportValue, filename + " " + key);
+      register(exportValue, filename + " export " + key);
     }
   }
 }
@@ -419,8 +424,13 @@ function predicateOnExport(moduleExports, predicate) {
   }
   return true;
 }
+const __hmr_import = (module) => import(
+  /* @vite-ignore */
+  module
+);
 var refresh_runtime_default = { injectIntoGlobalHook };
 export {
+  __hmr_import,
   createSignatureFunctionForTransform,
   refresh_runtime_default as default,
   getRefreshReg,