@vitejs/plugin-react 1.1.4 → 1.3.1

package/README.md

@@ -75,7 +75,7 @@ react({
 })
 ```
 
-This option does not enable _code transformation_. That is handled by ESBuild.
+This option does not enable _code transformation_. That is handled by esbuild.
 
 **Note:** TypeScript syntax is handled automatically.
 

package/dist/index.d.ts

@@ -23,6 +23,12 @@ export declare interface Options {
      * @default "react"
      */
     jsxImportSource?: string;
+    /**
+     * Set this to `true` to annotate the JSX factory with `\/* @__PURE__ *\/`.
+     * This option is ignored when `jsxRuntime` is not `"automatic"`.
+     * @default true
+     */
+    jsxPure?: boolean;
     /**
      * Babel configuration applied in both dev and prod.
      */
@@ -40,6 +46,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

@@ -21,26 +21,23 @@ var __spreadValues = (a, b) => {
   return a;
 };
 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) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, 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);
+  return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/jsx-runtime/babel-restore-jsx.ts
 var babel_restore_jsx_exports = {};
@@ -154,12 +151,12 @@ function babel_restore_jsx_default({ types: t }) {
   const isPlainObjectExpression = (node) => t.isObjectExpression(node) && node.properties.every((property) => t.isSpreadElement(property) || t.isObjectProperty(property, { computed: false }) && getJSXIdentifier(property.key) != null && getJSXAttributeValue(property.value) != null);
   return {
     visitor: {
-      CallExpression(path) {
-        const node = getJSXNode(path.node);
+      CallExpression(path2) {
+        const node = getJSXNode(path2.node);
         if (node == null) {
           return null;
         }
-        path.replaceWith(node);
+        path2.replaceWith(node);
       }
     }
   };
@@ -170,17 +167,22 @@ 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"));
+module.exports = viteReact;
+viteReact['default'] = viteReact;
+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 import_path = __toESM(require("path"));
 var runtimePublicPath = "/@react-refresh";
-var runtimeFilePath = require.resolve("react-refresh/cjs/react-refresh-runtime.development.js");
+var reactRefreshDir = import_path.default.dirname(require.resolve("react-refresh/package.json"));
+var runtimeFilePath = import_path.default.join(reactRefreshDir, "cjs/react-refresh-runtime.development.js");
 var runtimeCode = `
 const exports = {}
 ${import_fs.default.readFileSync(runtimeFilePath, "utf-8")}
@@ -268,10 +270,10 @@ function isComponentLikeName(name) {
 function babelImportToRequire({ types: t }) {
   return {
     visitor: {
-      ImportDeclaration(path) {
-        const decl = path.node;
+      ImportDeclaration(path2) {
+        const decl = path2.node;
         const spec = decl.specifiers[0];
-        path.replaceWith(t.variableDeclaration("var", [
+        path2.replaceWith(t.variableDeclaration("var", [
           t.variableDeclarator(spec.local, t.memberExpression(t.callExpression(t.identifier("require"), [decl.source]), spec.imported))
         ]));
       }
@@ -310,7 +312,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 +344,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+)/;
@@ -387,7 +390,7 @@ function viteReact(opts = {}) {
           if (isReactModule && filter(id)) {
             useFastRefresh = true;
             plugins.push([
-              await loadPlugin("react-refresh/babel.js"),
+              await loadPlugin("react-refresh/babel"),
               { skipEnvCheck: true }
             ]);
           }
@@ -401,7 +404,8 @@ function viteReact(opts = {}) {
                 await loadPlugin("@babel/plugin-transform-react-jsx" + (isProduction ? "" : "-development")),
                 {
                   runtime: "automatic",
-                  importSource: opts.jsxImportSource
+                  importSource: opts.jsxImportSource,
+                  pure: opts.jsxPure !== false
                 }
               ]);
               if (isCommonJS) {
@@ -527,11 +531,9 @@ function viteReact(opts = {}) {
   return [viteBabel, viteReactRefresh, useAutomaticRuntime && viteReactJsx];
 }
 viteReact.preambleCode = preambleCode;
-function loadPlugin(path) {
-  return Promise.resolve().then(() => __toModule(require(path))).then((module2) => module2.default || module2);
+function loadPlugin(path2) {
+  return Promise.resolve().then(() => __toESM(require(path2))).then((module2) => module2.default || module2);
 }
-module.exports = 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.3.1",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [
@@ -15,10 +15,10 @@
   "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"
+    "prepublishOnly": "(cd ../vite && npm run build) && npm run build"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -33,13 +33,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",
-    "@rollup/pluginutils": "^4.1.2",
-    "react-refresh": "^0.11.0",
-    "resolve": "^1.20.0"
+    "@babel/core": "^7.17.9",
+    "@babel/plugin-transform-react-jsx": "^7.17.3",
+    "@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.2.0",
+    "react-refresh": "^0.12.0",
+    "resolve": "^1.22.0"
   }
 }

package/src/fast-refresh.ts

@@ -1,10 +1,15 @@
 import type { types as t } from '@babel/core'
 import fs from 'fs'
+import path from 'path'
 
 export const runtimePublicPath = '/@react-refresh'
 
-const runtimeFilePath = require.resolve(
-  'react-refresh/cjs/react-refresh-runtime.development.js'
+const reactRefreshDir = path.dirname(
+  require.resolve('react-refresh/package.json')
+)
+const runtimeFilePath = path.join(
+  reactRefreshDir,
+  'cjs/react-refresh-runtime.development.js'
 )
 
 export const runtimeCode = `

package/src/index.ts

@@ -32,6 +32,12 @@ export interface Options {
    * @default "react"
    */
   jsxImportSource?: string
+  /**
+   * Set this to `true` to annotate the JSX factory with `\/* @__PURE__ *\/`.
+   * This option is ignored when `jsxRuntime` is not `"automatic"`.
+   * @default true
+   */
+  jsxPure?: boolean
 
   /**
    * Babel configuration applied in both dev and prod.
@@ -60,6 +66,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 +102,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
 
   babelOptions.plugins ||= []
   babelOptions.presets ||= []
+  babelOptions.overrides ||= []
   babelOptions.parserOpts ||= {} as any
   babelOptions.parserOpts.plugins ||= opts.parserPlugins || []
 
@@ -168,7 +176,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
           if (isReactModule && filter(id)) {
             useFastRefresh = true
             plugins.push([
-              await loadPlugin('react-refresh/babel.js'),
+              await loadPlugin('react-refresh/babel'),
               { skipEnvCheck: true }
             ])
           }
@@ -193,7 +201,8 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
                 ),
                 {
                   runtime: 'automatic',
-                  importSource: opts.jsxImportSource
+                  importSource: opts.jsxImportSource,
+                  pure: opts.jsxPure !== false
                 }
               ])
 
@@ -366,5 +375,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]

package/CHANGELOG.md

@@ -1,132 +0,0 @@
-## [1.1.4](https://github.com/vitejs/vite/compare/plugin-react@1.1.3...plugin-react@1.1.4) (2022-01-04)
-
-
-### Bug Fixes
-
-* **plugin-react:** check for import React statement in .js files ([#6320](https://github.com/vitejs/vite/issues/6320)) ([bd9e97b](https://github.com/vitejs/vite/commit/bd9e97bd1b9156059b78b531871a12f6f47c04b1)), closes [#6148](https://github.com/vitejs/vite/issues/6148) [#6148](https://github.com/vitejs/vite/issues/6148)
-* **plugin-react:** restore-jsx bug when component name is lowercase ([#6110](https://github.com/vitejs/vite/issues/6110)) ([ce65c56](https://github.com/vitejs/vite/commit/ce65c567a64fad3be4209cbd1132e62e905fe349))
-
-
-### Features
-
-* **plugin-react:** check for `api.reactBabel` on other plugins ([#5454](https://github.com/vitejs/vite/issues/5454)) ([2ab41b3](https://github.com/vitejs/vite/commit/2ab41b3184d2452be4fa0b427f05c791311644aa))
-
-
-
-## [1.1.3](https://github.com/vitejs/vite/compare/plugin-react@1.1.2...plugin-react@1.1.3) (2021-12-13)
-
-
-### Bug Fixes
-
-* **plugin-react:** only detect preamble in hmr context ([#6096](https://github.com/vitejs/vite/issues/6096)) ([8735294](https://github.com/vitejs/vite/commit/8735294055ce16308a6b8302eba4538f4a2931d0))
-
-
-
-## [1.1.2](https://github.com/vitejs/vite/compare/plugin-react@1.1.1...plugin-react@1.1.2) (2021-12-13)
-
-
-### Bug Fixes
-
-* ignore babel config when running restore-jsx ([#6047](https://github.com/vitejs/vite/issues/6047)) ([9c2843c](https://github.com/vitejs/vite/commit/9c2843cf0506844ee32f042a04c22c440434df2a))
-
-
-
-## [1.1.1](https://github.com/vitejs/vite/compare/plugin-react@1.1.0...plugin-react@1.1.1) (2021-12-07)
-
-
-
-# [1.1.0](https://github.com/vitejs/vite/compare/plugin-react@1.1.0-beta.1...plugin-react@1.1.0) (2021-11-22)
-
-
-
-# [1.1.0-beta.1](https://github.com/vitejs/vite/compare/plugin-react@1.1.0-beta.0...plugin-react@1.1.0-beta.1) (2021-11-19)
-
-
-### Bug Fixes
-
-* **plugin-react:** apply `babel.plugins` to project files only ([#5255](https://github.com/vitejs/vite/issues/5255)) ([377d0be](https://github.com/vitejs/vite/commit/377d0be5cf85a50240e160beaaafda77b7199452))
-* **plugin-react:** remove querystring from sourcemap filename ([#5760](https://github.com/vitejs/vite/issues/5760)) ([d93a9fa](https://github.com/vitejs/vite/commit/d93a9fab8986f3659e79d7b0b065e99ef625a5dd))
-* **plugin-react:** restore usage of extension instead of id ([#5761](https://github.com/vitejs/vite/issues/5761)) ([59471b1](https://github.com/vitejs/vite/commit/59471b186612d3da0083543e23d660747d3287f3))
-* **plugin-react:** uncompiled JSX in linked pkgs ([#5669](https://github.com/vitejs/vite/issues/5669)) ([41a7c9c](https://github.com/vitejs/vite/commit/41a7c9ccfbc1a7bc60aec672056eac3966ddd036))
-
-
-
-# [1.1.0-beta.0](https://github.com/vitejs/vite/compare/plugin-react@1.0.6...plugin-react@1.1.0-beta.0) (2021-10-28)
-
-
-### Bug Fixes
-
-* **plugin-react:** avoid mangling the sourcemaps of virtual modules ([#5421](https://github.com/vitejs/vite/issues/5421)) ([8556ffe](https://github.com/vitejs/vite/commit/8556ffe3c59952d7e64565422bf433699e97756e))
-
-
-
-## [1.0.6](https://github.com/vitejs/vite/compare/plugin-react@1.0.5...plugin-react@1.0.6) (2021-10-25)
-
-
-### Bug Fixes
-
-* **plugin-react:** account for querystring in transform hook ([#5333](https://github.com/vitejs/vite/issues/5333)) ([13c3813](https://github.com/vitejs/vite/commit/13c381368caf8302a0c5b7cec07dfc0eb344bede))
-
-
-
-## [1.0.5](https://github.com/vitejs/vite/compare/plugin-react@1.0.4...plugin-react@1.0.5) (2021-10-18)
-
-
-### Bug Fixes
-
-* **plugin-react:** fix regex for react imports ([#5274](https://github.com/vitejs/vite/issues/5274)) ([00b3e4f](https://github.com/vitejs/vite/commit/00b3e4fe102652b2d92e76a05e8c7a5b766b1d03))
-* **plugin-react:** transform .mjs files ([#5314](https://github.com/vitejs/vite/issues/5314)) ([8ce2ea1](https://github.com/vitejs/vite/commit/8ce2ea17d51b80c660f2cdca7844d4fc6991baed))
-
-
-
-## [1.0.4](https://github.com/vitejs/vite/compare/plugin-react@1.0.3...plugin-react@1.0.4) (2021-10-11)
-
-
-
-## [1.0.3](https://github.com/vitejs/vite/compare/plugin-react@1.0.2...plugin-react@1.0.3) (2021-10-11)
-
-
-### Bug Fixes
-
-* **plugin-react:** turn off jsx for .ts ([#5198](https://github.com/vitejs/vite/issues/5198)) ([916f9d3](https://github.com/vitejs/vite/commit/916f9d3984d5e83f7cb869b3606a1f043a814b97)), closes [#5102](https://github.com/vitejs/vite/issues/5102)
-
-
-
-## [1.0.2](https://github.com/vitejs/vite/compare/plugin-react@1.0.1...plugin-react@1.0.2) (2021-10-05)
-
-
-### Bug Fixes
-
-* **plugin-react:** respect `opts.fastRefresh` in viteBabel ([#5139](https://github.com/vitejs/vite/issues/5139)) ([5cf4e69](https://github.com/vitejs/vite/commit/5cf4e69cd3afc7f960e02072171c7c441747e8f0))
-
-
-
-## [1.0.1](https://github.com/vitejs/vite/compare/plugin-react@1.0.0...plugin-react@1.0.1) (2021-09-22)
-
-
-### Bug Fixes
-
-* **plugin-react:** inconsistent error warning ([#5031](https://github.com/vitejs/vite/issues/5031)) ([89ba8ce](https://github.com/vitejs/vite/commit/89ba8cedb8636968516bc38b37e1d2d5ed6234bb))
-
-
-### Features
-
-* **plugin-react:** pre-optimize jsx-dev-runtime ([#5036](https://github.com/vitejs/vite/issues/5036)) ([a34dd27](https://github.com/vitejs/vite/commit/a34dd2725e64fedf626e23ba9ced480f5465a59b))
-
-
-
-# [1.0.0](https://github.com/vitejs/vite/compare/plugin-react@1.0.0-beta.0...plugin-react@1.0.0) (2021-09-22)
-
-See the [readme](https://github.com/aleclarson/vite/blob/f8129ce6e87684eb7a4edd8106351c5d98207d7b/packages/plugin-react/README.md#vitejsplugin-react-) for more information.
-
-- Support for [automatic JSX runtime](https://github.com/alloc/vite-react-jsx)
-- Babel integration for both development and production builds
-- Add `react` and `react-dom` to [`resolve.dedupe`](https://vitejs.dev/config/#resolve-dedupe) automatically
-
-Thanks to @aleclarson and @pengx17 for preparing this release!
-
-# Legacy
-
-Before `@vitejs/plugin-react`, there was `@vitejs/plugin-react-refresh`.
-
-See its changelog [here.](https://github.com/vitejs/vite/blob/b9e837a2aa2c1a7a8f93d4b19df9f72fd3c6fb09/packages/plugin-react-refresh/CHANGELOG.md)