From 9e8b437de19d356f912d648921e84bd657d196c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Barr=C3=A9?= <arnaud.barre@carbometrix.com>
Date: Thu, 30 Mar 2023 00:42:10 +0200
Subject: [PATCH] chore: clean jsxDev setup in config

---
 packages/plugin-react/package.json |  2 +-
 packages/plugin-react/src/index.ts | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json
index 4898a31..d790db4 100644
--- a/packages/plugin-react/package.json
+++ b/packages/plugin-react/package.json
@@ -46,6 +46,6 @@
     "react-refresh": "^0.14.0"
   },
   "peerDependencies": {
-    "vite": "^4.1.0-beta.0"
+    "vite": "^4.2.0"
   }
 }
diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts
index 09e54e9..2fa5948 100644
--- a/packages/plugin-react/src/index.ts
+++ b/packages/plugin-react/src/index.ts
@@ -1,7 +1,6 @@
-import path from 'node:path'
 import type { ParserOptions, TransformOptions } from '@babel/core'
 import * as babel from '@babel/core'
-import { createFilter, loadEnv, normalizePath, resolveEnvPrefix } from 'vite'
+import { createFilter } from 'vite'
 import type { Plugin, PluginOption, ResolvedConfig } from 'vite'
 import MagicString from 'magic-string'
 import type { SourceMap } from 'magic-string'
@@ -119,21 +118,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
   const viteBabel: Plugin = {
     name: 'vite:react-babel',
     enforce: 'pre',
-    config(userConfig, { mode }) {
-      // Copied from https://github.com/vitejs/vite/blob/4e9bdd4fb3654a9d43917e1cb682d3d2bad25115/packages/vite/src/node/config.ts#L477-L494
-
-      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 isProduction =
-        (process.env.NODE_ENV || process.env.VITE_USER_NODE_ENV || mode) ===
-        'production'
-
+    config() {
       if (opts.jsxRuntime === 'classic') {
         return {
           esbuild: {
@@ -148,7 +133,6 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
       } else {
         return {
           esbuild: {
-            jsxDev: !isProduction,
             jsx: 'automatic',
             jsxImportSource: opts.jsxImportSource,
             jsxSideEffects: opts.jsxPure === false,