@vitejs/plugin-react 1.1.4 → 1.2.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [1.2.0](https://github.com/vitejs/vite/compare/plugin-react@1.1.4...plugin-react@1.2.0) (2022-02-09)
+
+
+### Features
+
+* **plugin-react:** ensure `overrides` array exists before `api.reactBabel` hooks are called ([#6750](https://github.com/vitejs/vite/issues/6750)) ([104bdb5](https://github.com/vitejs/vite/commit/104bdb5b5e44e79bf3456cabe15f3753f7c1ef28))
+
+
+
 ## [1.1.4](https://github.com/vitejs/vite/compare/plugin-react@1.1.3...plugin-react@1.1.4) (2022-01-04)
 
 

package/dist/index.d.ts

@@ -40,6 +40,7 @@ export declare interface Options {
 export declare interface ReactBabelOptions extends BabelOptions {
     plugins: Extract<BabelOptions['plugins'], any[]>;
     presets: Extract<BabelOptions['presets'], any[]>;
+    overrides: Extract<BabelOptions['overrides'], any[]>;
     parserOpts: ParserOptions & {
         plugins: Extract<ParserOptions['plugins'], any[]>;
     };

package/dist/index.js

@@ -23,24 +23,28 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[Object.keys(fn)[0]])(fn = 0)), res;
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
 var __export = (target, all) => {
-  __markAsModule(target);
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
+var __reExport = (target, module2, copyDefault, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
+      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
         __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
   }
   return target;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+var __toESM = (module2, isNodeMode) => {
+  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
+var __toCommonJS = /* @__PURE__ */ ((cache) => {
+  return (module2, temp) => {
+    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
+  };
+})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
 
 // src/jsx-runtime/babel-restore-jsx.ts
 var babel_restore_jsx_exports = {};
@@ -170,15 +174,16 @@ var init_babel_restore_jsx = __esm({
 });
 
 // src/index.ts
-__export(exports, {
+var src_exports = {};
+__export(src_exports, {
   default: () => viteReact
 });
-var babel = __toModule(require("@babel/core"));
-var import_pluginutils = __toModule(require("@rollup/pluginutils"));
-var import_resolve = __toModule(require("resolve"));
+var babel = __toESM(require("@babel/core"));
+var import_pluginutils = require("@rollup/pluginutils");
+var import_resolve = __toESM(require("resolve"));
 
 // src/fast-refresh.ts
-var import_fs = __toModule(require("fs"));
+var import_fs = __toESM(require("fs"));
 var runtimePublicPath = "/@react-refresh";
 var runtimeFilePath = require.resolve("react-refresh/cjs/react-refresh-runtime.development.js");
 var runtimeCode = `
@@ -310,7 +315,7 @@ async function restoreJSX(babel2, code, filename) {
     parserOpts: {
       plugins: ["jsx"]
     },
-    plugins: [await babelRestoreJSX]
+    plugins: [(await babelRestoreJSX).default]
   });
   return [result == null ? void 0 : result.ast, isCommonJS];
 }
@@ -342,6 +347,7 @@ function viteReact(opts = {}) {
   }, opts.babel);
   babelOptions.plugins || (babelOptions.plugins = []);
   babelOptions.presets || (babelOptions.presets = []);
+  babelOptions.overrides || (babelOptions.overrides = []);
   babelOptions.parserOpts || (babelOptions.parserOpts = {});
   (_a = babelOptions.parserOpts).plugins || (_a.plugins = opts.parserPlugins || []);
   const importReactRE = /(^|\n)import\s+(\*\s+as\s+)?React(,|\s+)/;
@@ -528,10 +534,10 @@ function viteReact(opts = {}) {
 }
 viteReact.preambleCode = preambleCode;
 function loadPlugin(path) {
-  return Promise.resolve().then(() => __toModule(require(path))).then((module2) => module2.default || module2);
+  return Promise.resolve().then(() => __toESM(require(path))).then((module2) => module2.default || module2);
 }
 module.exports = viteReact;
-viteReact["default"] = viteReact;
+viteReact['default'] = viteReact;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [
@@ -15,7 +15,8 @@
   "scripts": {
     "dev": "tsc -p . -w --incremental",
     "build": "rimraf dist && run-s build-bundle build-types",
-    "build-bundle": "esbuild src/index.ts --bundle --platform=node --target=node12 --external:@babel/* --external:@rollup/* --external:resolve --external:react-refresh/* --outfile=dist/index.js",
+    "build-bundle": "esbuild src/index.ts --bundle --platform=node --target=node12 --external:@babel/* --external:@rollup/* --external:resolve --external:react-refresh/* --outfile=dist/index.js && npm run patch-dist",
+    "patch-dist": "ts-node ../../scripts/patchEsbuildDist.ts dist/index.js viteReact",
     "build-types": "tsc -p . --emitDeclarationOnly --outDir temp && api-extractor run && rimraf temp",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . --lerna-package plugin-react",
     "release": "ts-node ../../scripts/release.ts"
@@ -33,13 +34,13 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.16.5",
-    "@babel/plugin-transform-react-jsx": "^7.16.5",
-    "@babel/plugin-transform-react-jsx-development": "^7.16.5",
-    "@babel/plugin-transform-react-jsx-self": "^7.16.5",
-    "@babel/plugin-transform-react-jsx-source": "^7.16.5",
+    "@babel/core": "^7.16.12",
+    "@babel/plugin-transform-react-jsx": "^7.16.7",
+    "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+    "@babel/plugin-transform-react-jsx-self": "^7.16.7",
+    "@babel/plugin-transform-react-jsx-source": "^7.16.7",
     "@rollup/pluginutils": "^4.1.2",
     "react-refresh": "^0.11.0",
-    "resolve": "^1.20.0"
+    "resolve": "^1.22.0"
   }
 }

package/src/index.ts

@@ -60,6 +60,7 @@ export type BabelOptions = Omit<
 export interface ReactBabelOptions extends BabelOptions {
   plugins: Extract<BabelOptions['plugins'], any[]>
   presets: Extract<BabelOptions['presets'], any[]>
+  overrides: Extract<BabelOptions['overrides'], any[]>
   parserOpts: ParserOptions & {
     plugins: Extract<ParserOptions['plugins'], any[]>
   }
@@ -95,6 +96,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
 
   babelOptions.plugins ||= []
   babelOptions.presets ||= []
+  babelOptions.overrides ||= []
   babelOptions.parserOpts ||= {} as any
   babelOptions.parserOpts.plugins ||= opts.parserPlugins || []
 
@@ -366,5 +368,8 @@ function loadPlugin(path: string): Promise<any> {
 }
 
 // overwrite for cjs require('...')() usage
-module.exports = viteReact
-viteReact['default'] = viteReact
+// The following lines are inserted by scripts/patchEsbuildDist.ts,
+// this doesn't bundle correctly after esbuild 0.14.4
+//
+// module.exports = viteReact
+// viteReact['default'] = viteReact

package/src/jsx-runtime/restore-jsx.ts

@@ -57,7 +57,8 @@ export async function restoreJSX(
     parserOpts: {
       plugins: ['jsx']
     },
-    plugins: [await babelRestoreJSX]
+    // @ts-ignore
+    plugins: [(await babelRestoreJSX).default]
   })
 
   return [result?.ast, isCommonJS]