@vitejs/plugin-react 1.0.8 → 1.1.0

package/CHANGELOG.md

@@ -1,13 +1,20 @@
-## [1.0.8](https://github.com/vitejs/vite/compare/plugin-react@1.0.7...plugin-react@1.0.8) (2021-11-09)
+# [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)) ([93c0016](https://github.com/vitejs/vite/commit/93c0016c89cadfebeae8f113087b70b2a18a7d23))
+* **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.0.7](https://github.com/vitejs/vite/compare/plugin-react@1.0.6...plugin-react@1.0.7) (2021-10-28)
+# [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

package/dist/index.js

@@ -358,15 +358,16 @@ function viteReact(opts = {}) {
       }
       config.plugins.forEach((plugin) => (plugin.name === "react-refresh" || plugin !== viteReactJsx && plugin.name === "vite:react-jsx") && config.logger.warn(`[@vitejs/plugin-react] You should stop using "${plugin.name}" since this plugin conflicts with it.`));
     },
-    async transform(code, id, ssr) {
+    async transform(code, id, options) {
       var _a2, _b2, _c2, _d;
+      const ssr = typeof options === "boolean" ? options : (options == null ? void 0 : options.ssr) === true;
       const [filepath, querystring = ""] = id.split("?");
       const [extension = ""] = querystring.match(fileExtensionRE) || filepath.match(fileExtensionRE) || [];
       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 + "/"));
-        let plugins = isProjectFile ? [...userPlugins] : [];
+        const plugins = isProjectFile ? [...userPlugins] : [];
         let useFastRefresh = false;
         if (!skipFastRefresh && !ssr && !isNodeModules) {
           const isReactModule = isJSX || code.includes("react");
@@ -381,8 +382,8 @@ function viteReact(opts = {}) {
         let ast;
         if (!isProjectFile || isJSX) {
           if (useAutomaticRuntime) {
-            const [restoredAst, isCommonJS] = !isProjectFile ? await restoreJSX(babel, code, id) : [null, false];
-            if (isProjectFile || (ast = restoredAst)) {
+            const [restoredAst, isCommonJS] = !isProjectFile && !isJSX ? await restoreJSX(babel, code, id) : [null, false];
+            if (isJSX || (ast = restoredAst)) {
               plugins.push([
                 await loadPlugin("@babel/plugin-transform-react-jsx" + (isProduction ? "" : "-development")),
                 {
@@ -415,13 +416,13 @@ function viteReact(opts = {}) {
           "classPrivateProperties",
           "classPrivateMethods"
         ];
-        if (!id.endsWith(".ts")) {
+        if (!extension.endsWith(".ts")) {
           parserPlugins.push("jsx");
         }
-        if (/\.tsx?$/.test(id)) {
+        if (/\.tsx?$/.test(extension)) {
           parserPlugins.push("typescript");
         }
-        const isReasonReact = id.endsWith(".bs.js");
+        const isReasonReact = extension.endsWith(".bs.js");
         const babelOpts = __spreadProps(__spreadValues({
           babelrc: false,
           configFile: false
@@ -429,7 +430,7 @@ function viteReact(opts = {}) {
           ast: !isReasonReact,
           root: projectRoot,
           filename: id,
-          sourceFileName: id,
+          sourceFileName: filepath,
           parserOpts: __spreadProps(__spreadValues({}, (_c2 = opts.babel) == null ? void 0 : _c2.parserOpts), {
             sourceType: "module",
             allowAwaitOutsideFunction: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [
@@ -33,13 +33,13 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/plugin-transform-react-jsx": "^7.14.9",
-    "@babel/plugin-transform-react-jsx-development": "^7.14.5",
-    "@babel/plugin-transform-react-jsx-self": "^7.14.9",
-    "@babel/plugin-transform-react-jsx-source": "^7.14.5",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-transform-react-jsx": "^7.16.0",
+    "@babel/plugin-transform-react-jsx-development": "^7.16.0",
+    "@babel/plugin-transform-react-jsx-self": "^7.16.0",
+    "@babel/plugin-transform-react-jsx-source": "^7.16.0",
     "@rollup/pluginutils": "^4.1.1",
-    "react-refresh": "^0.10.0",
+    "react-refresh": "^0.11.0",
     "resolve": "^1.20.0"
   }
 }

package/src/index.ts

@@ -98,7 +98,8 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
           )
       )
     },
-    async transform(code, id, ssr) {
+    async transform(code, id, options) {
+      const ssr = typeof options === 'boolean' ? options : options?.ssr === true
       // File extension could be mocked/overriden in querystring.
       const [filepath, querystring = ''] = id.split('?')
       const [extension = ''] =
@@ -112,7 +113,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
         const isProjectFile =
           !isNodeModules && (id[0] === '\0' || id.startsWith(projectRoot + '/'))
 
-        let plugins = isProjectFile ? [...userPlugins] : []
+        const plugins = isProjectFile ? [...userPlugins] : []
 
         let useFastRefresh = false
         if (!skipFastRefresh && !ssr && !isNodeModules) {
@@ -133,11 +134,12 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
             // By reverse-compiling "React.createElement" calls into JSX,
             // React elements provided by dependencies will also use the
             // automatic runtime!
-            const [restoredAst, isCommonJS] = !isProjectFile
-              ? await restoreJSX(babel, code, id)
-              : [null, false]
+            const [restoredAst, isCommonJS] =
+              !isProjectFile && !isJSX
+                ? await restoreJSX(babel, code, id)
+                : [null, false]
 
-            if (isProjectFile || (ast = restoredAst)) {
+            if (isJSX || (ast = restoredAst)) {
               plugins.push([
                 await loadPlugin(
                   '@babel/plugin-transform-react-jsx' +
@@ -196,15 +198,15 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
           'classPrivateMethods'
         ]
 
-        if (!id.endsWith('.ts')) {
+        if (!extension.endsWith('.ts')) {
           parserPlugins.push('jsx')
         }
 
-        if (/\.tsx?$/.test(id)) {
+        if (/\.tsx?$/.test(extension)) {
           parserPlugins.push('typescript')
         }
 
-        const isReasonReact = id.endsWith('.bs.js')
+        const isReasonReact = extension.endsWith('.bs.js')
 
         const babelOpts: TransformOptions = {
           babelrc: false,
@@ -213,7 +215,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
           ast: !isReasonReact,
           root: projectRoot,
           filename: id,
-          sourceFileName: id,
+          sourceFileName: filepath,
           parserOpts: {
             ...opts.babel?.parserOpts,
             sourceType: 'module',