test: tweak

Author: hi-ogawa

packages/plugin-rsc/e2e/fixture.ts

@@ -200,7 +200,7 @@ function editFileJson(filepath: string, edit: (s: string) => string) {
 export async function setupInlineFixture(options: {
   src: string
   dest: string
-  files?: Record<string, string>
+  files?: Record<string, string | { cp: string }>
 }) {
   fs.rmSync(options.dest, { recursive: true, force: true })
   fs.mkdirSync(options.dest, { recursive: true })
@@ -214,20 +214,17 @@ export async function setupInlineFixture(options: {
   // write additional files
   if (options.files) {
     for (let [filename, contents] of Object.entries(options.files)) {
-      // custom fs command
-      if (contents.startsWith('fs:cp:')) {
-        const src = contents.slice('fs:cp:'.length)
-        const srcPath = path.resolve(options.src, src)
-        if (!fs.existsSync(srcPath)) {
-          throw new Error(`Source file does not exist: ${srcPath}`)
-        }
-        fs.cpSync(srcPath, path.join(options.dest, filename), {
-          recursive: true,
-        })
+      // custom command
+      if (typeof contents === 'object' && 'cp' in contents) {
+        const srcFile = path.join(options.dest, contents.cp)
+        const destFile = path.join(options.dest, filename)
+        fs.mkdirSync(path.dirname(srcFile), { recursive: true })
+        fs.mkdirSync(path.dirname(destFile), { recursive: true })
+        fs.cpSync(srcFile, destFile, { recursive: true })
         continue
       }
-      // write new file
-      let filepath = path.join(options.dest, filename)
+      // write a file
+      const filepath = path.join(options.dest, filename)
       fs.mkdirSync(path.dirname(filepath), { recursive: true })
       // strip indent
       contents = contents.replace(/^\n*/, '').replace(/\s*$/, '\n')

packages/plugin-rsc/e2e/starter.test.ts

@@ -92,7 +92,7 @@ test.describe(() => {
       src: 'examples/starter',
       dest: root,
       files: {
-        'vite.config.base.ts': 'fs:cp:vite.config.ts',
+        'vite.config.base.ts': { cp: 'vite.config.ts' },
         'vite.config.ts': /* js */ `
           import rsc from '@vitejs/plugin-rsc'
           import react from '@vitejs/plugin-react'
@@ -145,7 +145,7 @@ test.describe(() => {
       src: 'examples/starter',
       dest: root,
       files: {
-        'vite.config.base.ts': 'fs:cp:vite.config.ts',
+        'vite.config.base.ts': { cp: 'vite.config.ts' },
         'vite.config.ts': /* js */ `
           import { defineConfig, mergeConfig } from 'vite'
           import baseConfig from './vite.config.base.ts'
@@ -185,7 +185,7 @@ test.describe(() => {
       src: 'examples/starter',
       dest: root,
       files: {
-        'vite.config.base.ts': 'fs:cp:vite.config.ts',
+        'vite.config.base.ts': { cp: 'vite.config.ts' },
         'vite.config.ts': /* js */ `
           import { defineConfig, mergeConfig, createRunnableDevEnvironment } from 'vite'
           import baseConfig from './vite.config.base.ts'