fix: fix copilot

Author: hi-ogawa

packages/plugin-rsc/e2e/validate-imports.test.ts

@@ -11,24 +11,6 @@ test.describe('validate imports', () => {
       src: 'examples/starter',
       dest: root,
       files: {
-        'package.json': {
-          edit: (content) => {
-            const pkg = JSON.parse(content)
-            // Add package.json overrides like setupIsolatedFixture
-            const packagesDir = path.join(import.meta.dirname, '..', '..')
-            const overrides = {
-              '@vitejs/plugin-rsc': `file:${path.join(packagesDir, 'plugin-rsc')}`,
-              '@vitejs/plugin-react': `file:${path.join(packagesDir, 'plugin-react')}`,
-            }
-            Object.assign(((pkg.pnpm ??= {}).overrides ??= {}), overrides)
-            // Add external dependencies that are managed in examples/e2e/package.json
-            pkg.dependencies = {
-              ...pkg.dependencies,
-              'server-only': '^0.0.1',
-            }
-            return JSON.stringify(pkg, null, 2)
-          },
-        },
         'src/client.tsx': /* tsx */ `
           "use client";
           import 'server-only';
@@ -56,15 +38,6 @@ test.describe('validate imports', () => {
       },
     })
 
-    // Install dependencies
-    await x('pnpm', ['i'], {
-      throwOnError: true,
-      nodeOptions: {
-        cwd: root,
-        stdio: 'ignore',
-      },
-    })
-
     // Expect build to fail
     const result = await x('pnpm', ['build'], {
       throwOnError: false,

packages/plugin-rsc/examples/e2e/package.json

@@ -2,10 +2,6 @@
   "name": "@vitejs/plugin-rsc-examples-e2e",
   "private": true,
   "type": "module",
-  "dependencies": {
-    "client-only": "^0.0.1",
-    "server-only": "^0.0.1"
-  },
   "devDependencies": {
     "@vitejs/plugin-rsc": "latest",
     "@vitejs/plugin-react": "latest",

packages/plugin-rsc/src/plugin.ts

@@ -1963,46 +1963,39 @@ export function __fix_cloudflare(): Plugin {
 function validateImportPlugin(): Plugin {
   return {
     name: 'rsc:validate-imports',
-    enforce: 'pre',
-    async resolveId(source, importer, options) {
-      // skip validation during optimizeDeps scan since for now
-      // we want to allow going through server/client boundary loosely
-      if (isScanBuild || ('scan' in options && options.scan)) {
-        return
-      }
+    resolveId: {
+      order: 'pre',
+      async handler(source, importer, options) {
+        // optimizer is not aware of server/client boudnary so skip
+        if ('scan' in options && options.scan) {
+          return
+        }
 
-      // Validate client-only imports in server environments
-      if (
-        source === 'client-only' &&
-        (this.environment.name === 'rsc' || this.environment.name === 'ssr')
-      ) {
-        // Allow client-only in client components during SSR builds
-        if (importer && this.environment.name === 'ssr') {
-          try {
-            const code = await this.load({ id: importer })
-            if (
-              code?.code?.includes('"use client"') ||
-              code?.code?.includes("'use client'")
-            ) {
-              return
-            }
-          } catch (e) {
-            // If we can't load the importer, proceed with validation
+        // Validate client-only imports in server environments
+        if (source === 'client-only') {
+          if (this.environment.name === 'rsc') {
+            throw new Error(
+              `'client-only' cannot be imported in server build (importer: '${importer ?? 'unknown'}', environment: ${this.environment.name})`,
+            )
           }
+          return { id: `\0virtual:vite-rsc/empty`, moduleSideEffects: false }
+        }
+        if (source === 'server-only') {
+          if (this.environment.name !== 'rsc') {
+            throw new Error(
+              `'server-only' cannot be imported in client build (importer: '${importer ?? 'unknown'}', environment: ${this.environment.name})`,
+            )
+          }
+          return { id: `\0virtual:vite-rsc/empty`, moduleSideEffects: false }
         }
-        throw new Error(
-          `'client-only' is included in server build (importer: ${importer ?? 'unknown'})`,
-        )
-      }
 
-      // Validate server-only imports in client environment
-      if (source === 'server-only' && this.environment.name === 'client') {
-        throw new Error(
-          `'server-only' is included in client build (importer: ${importer ?? 'unknown'})`,
-        )
+        return
+      },
+    },
+    load(id) {
+      if (id.startsWith('\0virtual:vite-rsc/empty')) {
+        return `export {}`
       }
-
-      return
     },
   }
 }