Skip to content

Commit 725357b

Browse files
committed
test: refactor more
1 parent b0554fd commit 725357b

File tree

1 file changed

+15
-23
lines changed

1 file changed

+15
-23
lines changed

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

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -92,28 +92,28 @@ test.describe(() => {
9292
src: 'examples/starter',
9393
dest: root,
9494
files: {
95+
'vite.config.base.ts': 'fs:cp:vite.config.ts',
9596
'vite.config.ts': /* js */ `
9697
import rsc from '@vitejs/plugin-rsc'
9798
import react from '@vitejs/plugin-react'
98-
import { defineConfig } from 'vite'
99+
import { defineConfig, mergeConfig } from 'vite'
100+
import baseConfig from './vite.config.base.ts'
101+
102+
delete baseConfig.plugins
99103
100-
export default defineConfig({
104+
const overrideConfig = defineConfig({
101105
plugins: [
102106
react({
103107
babel: { plugins: ['babel-plugin-react-compiler'] },
104108
}).map((p) => ({
105109
...p,
106110
applyToEnvironment: (e) => e.name === 'client',
107111
})),
108-
rsc({
109-
entries: {
110-
client: './src/framework/entry.browser.tsx',
111-
ssr: './src/framework/entry.ssr.tsx',
112-
rsc: './src/framework/entry.rsc.tsx',
113-
}
114-
}),
112+
rsc(),
115113
],
116114
})
115+
116+
export default mergeConfig(baseConfig, overrideConfig)
117117
`,
118118
},
119119
})
@@ -185,22 +185,12 @@ test.describe(() => {
185185
src: 'examples/starter',
186186
dest: root,
187187
files: {
188+
'vite.config.base.ts': 'fs:cp:vite.config.ts',
188189
'vite.config.ts': /* js */ `
189-
import rsc from '@vitejs/plugin-rsc'
190-
import react from '@vitejs/plugin-react'
191-
import { defineConfig, createRunnableDevEnvironment } from 'vite'
190+
import { defineConfig, mergeConfig, createRunnableDevEnvironment } from 'vite'
191+
import baseConfig from './vite.config.base.ts'
192192
193-
export default defineConfig({
194-
plugins: [
195-
react(),
196-
rsc({
197-
entries: {
198-
client: './src/framework/entry.browser.tsx',
199-
ssr: './src/framework/entry.ssr.tsx',
200-
rsc: './src/framework/entry.rsc.tsx',
201-
}
202-
}),
203-
],
193+
const overrideConfig = defineConfig({
204194
environments: {
205195
ssr: {
206196
dev: {
@@ -226,6 +216,8 @@ test.describe(() => {
226216
},
227217
},
228218
})
219+
220+
export default mergeConfig(baseConfig, overrideConfig)
229221
`,
230222
},
231223
})

0 commit comments

Comments
 (0)