@vitejs/plugin-react 3.0.0-alpha.0 → 3.0.0-alpha.2

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
+const path = require('node:path');
 const babel = require('@babel/core');
 const vite = require('vite');
 const MagicString = require('magic-string');
 const fs = require('node:fs');
-const path = require('node:path');
 const node_module = require('node:module');
 
 function _interopNamespaceDefault(e) {
@@ -69,7 +69,7 @@ if (import.meta.hot) {
     RefreshRuntime.register(type, __SOURCE__ + " " + id)
   };
   window.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
-}`.replace(/[\n]+/gm, "");
+}`.replace(/\n+/g, "");
 const timeout = `
   if (!window.__vite_plugin_react_timeout) {
     window.__vite_plugin_react_timeout = setTimeout(() => {
@@ -163,12 +163,17 @@ function viteReact(opts = {}) {
   let runPluginOverrides = (options, context) => false;
   let staticBabelOptions;
   const useAutomaticRuntime = opts.jsxRuntime !== "classic";
-  const importReactRE = /(^|\n)import\s+(\*\s+as\s+)?React(,|\s+)/;
-  const fileExtensionRE = /\.[^\/\s\?]+$/;
+  const importReactRE = /(?:^|\n)import\s+(?:\*\s+as\s+)?React(?:,|\s+)/;
+  const fileExtensionRE = /\.[^/\s?]+$/;
   const viteBabel = {
     name: "vite:react-babel",
     enforce: "pre",
-    config(_, { mode }) {
+    config(userConfig, { mode }) {
+      const resolvedRoot = vite.normalizePath(
+        userConfig.root ? path.resolve(userConfig.root) : process.cwd()
+      );
+      const envDir = userConfig.envDir ? vite.normalizePath(path.resolve(resolvedRoot, userConfig.envDir)) : resolvedRoot;
+      vite.loadEnv(mode, envDir, vite.resolveEnvPrefix(userConfig));
       const isProduction2 = (process.env.NODE_ENV || process.env.VITE_USER_NODE_ENV || mode) === "production";
       if (opts.jsxRuntime === "classic") {
         return {
@@ -231,7 +236,7 @@ function viteReact(opts = {}) {
       const ssr = options?.ssr === true;
       const [filepath, querystring = ""] = id.split("?");
       const [extension = ""] = querystring.match(fileExtensionRE) || filepath.match(fileExtensionRE) || [];
-      if (/\.(mjs|[tj]sx?)$/.test(extension)) {
+      if (/\.(?:mjs|[tj]sx?)$/.test(extension)) {
         const isJSX = extension.endsWith("x");
         const isNodeModules = id.includes("/node_modules/");
         const isProjectFile = !isNodeModules && (id[0] === "\0" || id.startsWith(projectRoot + "/"));
@@ -412,8 +417,8 @@ function viteReact(opts = {}) {
   return [viteBabel, viteReactRefresh, useAutomaticRuntime && viteReactJsx];
 }
 viteReact.preambleCode = preambleCode;
-function loadPlugin(path) {
-  return import(path).then((module) => module.default || module);
+function loadPlugin(path2) {
+  return import(path2).then((module) => module.default || module);
 }
 function createBabelOptions(rawOptions) {
   var _a;

package/dist/index.mjs

@@ -1,8 +1,8 @@
+import path from 'node:path';
 import * as babel from '@babel/core';
-import { createFilter } from 'vite';
+import { createFilter, normalizePath, loadEnv, resolveEnvPrefix } from 'vite';
 import MagicString from 'magic-string';
 import fs from 'node:fs';
-import path from 'node:path';
 import { createRequire } from 'node:module';
 
 const runtimePublicPath = "/@react-refresh";
@@ -54,7 +54,7 @@ if (import.meta.hot) {
     RefreshRuntime.register(type, __SOURCE__ + " " + id)
   };
   window.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
-}`.replace(/[\n]+/gm, "");
+}`.replace(/\n+/g, "");
 const timeout = `
   if (!window.__vite_plugin_react_timeout) {
     window.__vite_plugin_react_timeout = setTimeout(() => {
@@ -148,12 +148,17 @@ function viteReact(opts = {}) {
   let runPluginOverrides = (options, context) => false;
   let staticBabelOptions;
   const useAutomaticRuntime = opts.jsxRuntime !== "classic";
-  const importReactRE = /(^|\n)import\s+(\*\s+as\s+)?React(,|\s+)/;
-  const fileExtensionRE = /\.[^\/\s\?]+$/;
+  const importReactRE = /(?:^|\n)import\s+(?:\*\s+as\s+)?React(?:,|\s+)/;
+  const fileExtensionRE = /\.[^/\s?]+$/;
   const viteBabel = {
     name: "vite:react-babel",
     enforce: "pre",
-    config(_, { mode }) {
+    config(userConfig, { mode }) {
+      const resolvedRoot = normalizePath(
+        userConfig.root ? path.resolve(userConfig.root) : process.cwd()
+      );
+      const envDir = userConfig.envDir ? normalizePath(path.resolve(resolvedRoot, userConfig.envDir)) : resolvedRoot;
+      loadEnv(mode, envDir, resolveEnvPrefix(userConfig));
       const isProduction2 = (process.env.NODE_ENV || process.env.VITE_USER_NODE_ENV || mode) === "production";
       if (opts.jsxRuntime === "classic") {
         return {
@@ -216,7 +221,7 @@ function viteReact(opts = {}) {
       const ssr = options?.ssr === true;
       const [filepath, querystring = ""] = id.split("?");
       const [extension = ""] = querystring.match(fileExtensionRE) || filepath.match(fileExtensionRE) || [];
-      if (/\.(mjs|[tj]sx?)$/.test(extension)) {
+      if (/\.(?:mjs|[tj]sx?)$/.test(extension)) {
         const isJSX = extension.endsWith("x");
         const isNodeModules = id.includes("/node_modules/");
         const isProjectFile = !isNodeModules && (id[0] === "\0" || id.startsWith(projectRoot + "/"));
@@ -397,8 +402,8 @@ function viteReact(opts = {}) {
   return [viteBabel, viteReactRefresh, useAutomaticRuntime && viteReactJsx];
 }
 viteReact.preambleCode = preambleCode;
-function loadPlugin(path) {
-  return import(path).then((module) => module.default || module);
+function loadPlugin(path2) {
+  return import(path2).then((module) => module.default || module);
 }
 function createBabelOptions(rawOptions) {
   var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "3.0.0-alpha.0",
+  "version": "3.0.0-alpha.2",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [
@@ -38,7 +38,7 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.20.2",
+    "@babel/core": "^7.20.5",
     "@babel/plugin-transform-react-jsx": "^7.19.0",
     "@babel/plugin-transform-react-jsx-development": "^7.18.6",
     "@babel/plugin-transform-react-jsx-self": "^7.18.6",