Skip to content

Commit a2d094f

Browse files
committed
chore: make test work, avoid overrides vitest vite
1 parent 3ab1597 commit a2d094f

File tree

4 files changed

+88
-12
lines changed

4 files changed

+88
-12
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@
9898
"packageManager": "pnpm@10.6.3",
9999
"pnpm": {
100100
"overrides": {
101+
"vitest>vite": "npm:vite@^6.2.6",
101102
"vite": "workspace:rolldown-vite@*"
102-
},
103+
},
103104
"patchedDependencies": {
104105
"http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch",
105106
"sirv@3.0.1": "patches/sirv@3.0.1.patch",
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { render } from './runtime'
2-
import { childValue, parentValue } from './parent'
1+
// TODO(underfin): https://github.com/rolldown/rolldown/issues/4061
2+
// import { render } from './runtime'
3+
// import { childValue, parentValue } from './parent'
34

4-
render({ parent: parentValue, child: childValue })
5+
// render({ parent: parentValue, child: childValue })

playground/vitestSetup.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,11 @@ export async function startDefaultServe(): Promise<void> {
250250
if (!isBuild) {
251251
process.env.VITE_INLINE = 'inline-serve'
252252
const config = await loadConfig({ command: 'serve', mode: 'development' })
253-
viteServer = server = await (await createServer(config)).listen()
253+
254+
viteServer = server = await createServer(config)
255+
const builder = await createBuilder(config, null, 'serve')
256+
await builder.buildApp(server)
257+
await server.listen()
254258
viteTestUrl = server.resolvedUrls.local[0]
255259
if (server.config.base === '/') {
256260
viteTestUrl = viteTestUrl.replace(/\/$/, '')
@@ -272,7 +276,7 @@ export async function startDefaultServe(): Promise<void> {
272276
},
273277
)
274278
if (buildConfig.builder) {
275-
const builder = await createBuilder(buildConfig)
279+
const builder = await createBuilder(buildConfig, null, 'build')
276280
await builder.buildApp()
277281
} else {
278282
/* const rollupOutput = */ await build(buildConfig)

pnpm-lock.yaml

Lines changed: 76 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)