Merge remote-tracking branch 'upstream/main' into chore-rsc-nightly

Author: github-actions[bot]

packages/plugin-react/src/index.ts

@@ -340,43 +340,43 @@ export default function viteReact(opts: Options = {}): Plugin[] {
     },
   }
 
+  // for rolldown-vite
   const viteRefreshWrapper: Plugin = {
     name: 'vite:react:refresh-wrapper',
     apply: 'serve',
-    transform: isRolldownVite
-      ? {
-          filter: {
-            id: {
-              include: makeIdFiltersToMatchWithQuery(include),
-              exclude: makeIdFiltersToMatchWithQuery(exclude),
-            },
-          },
-          handler(code, id, options) {
-            const ssr = options?.ssr === true
-
-            const [filepath] = id.split('?')
-            const isJSX = filepath.endsWith('x')
-            const useFastRefresh =
-              !skipFastRefresh &&
-              !ssr &&
-              (isJSX ||
-                code.includes(jsxImportDevRuntime) ||
-                code.includes(jsxImportRuntime))
-            if (!useFastRefresh) return
-
-            const { code: newCode } = addRefreshWrapper(
-              code,
-              avoidSourceMapOption,
-              '@vitejs/plugin-react',
-              id,
-              opts.reactRefreshHost,
-            )
-            return { code: newCode, map: null }
-          },
-        }
-      : undefined,
+    transform: {
+      filter: {
+        id: {
+          include: makeIdFiltersToMatchWithQuery(include),
+          exclude: makeIdFiltersToMatchWithQuery(exclude),
+        },
+      },
+      handler(code, id, options) {
+        const ssr = options?.ssr === true
+
+        const [filepath] = id.split('?')
+        const isJSX = filepath.endsWith('x')
+        const useFastRefresh =
+          !skipFastRefresh &&
+          !ssr &&
+          (isJSX ||
+            code.includes(jsxImportDevRuntime) ||
+            code.includes(jsxImportRuntime))
+        if (!useFastRefresh) return
+
+        const { code: newCode } = addRefreshWrapper(
+          code,
+          avoidSourceMapOption,
+          '@vitejs/plugin-react',
+          id,
+          opts.reactRefreshHost,
+        )
+        return { code: newCode, map: null }
+      },
+    },
   }
 
+  // for rolldown-vite
   const viteConfigPost: Plugin = {
     name: 'vite:react:config-post',
     enforce: 'post',
@@ -449,7 +449,11 @@ export default function viteReact(opts: Options = {}): Plugin[] {
     },
   }
 
-  return [viteBabel, viteRefreshWrapper, viteConfigPost, viteReactRefresh]
+  return [
+    viteBabel,
+    ...(isRolldownVite ? [viteRefreshWrapper, viteConfigPost] : []),
+    viteReactRefresh,
+  ]
 }
 
 viteReact.preambleCode = preambleCode

packages/plugin-rsc/src/transforms/wrap-export.test.ts

@@ -227,7 +227,6 @@ export const a = 0;
 export const b = function() {}
 export const c = () => {}
 export default function d() {}
-export default () => {}
 `
     const result = await testTransform(input, {
       filter: (_name, meta) => !!(meta.isFunction && meta.declName),
@@ -238,7 +237,6 @@ export default () => {}
       let b = function() {}
       let c = () => {}
       function d() {}
-      const $$default = () => {}
       export { a };
       b = /* #__PURE__ */ $$wrap(b, "<id>", "b");
       export { b };
@@ -247,6 +245,21 @@ export default () => {}
       ;
       const $$wrap_d = /* #__PURE__ */ $$wrap(d, "<id>", "default");
       export { $$wrap_d as default };
+      "
+    `)
+  })
+
+  test('filter meta 2', async () => {
+    const input = `
+export default () => {}
+`
+    const result = await testTransform(input, {
+      filter: (_name, meta) => !!(meta.isFunction && meta.declName),
+    })
+    expect(result).toMatchInlineSnapshot(`
+      "
+      const $$default = () => {}
+      ;
       export { $$default as default };
       "
     `)