Skip to content

Commit 3298e04

Browse files
authored
test(ssr-html): deconflict filenames for typescript resolution (vitejs#20016)
1 parent 8679a43 commit 3298e04

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

playground/ssr-html/__tests__/ssr-html.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ describe.runIf(isServe)('stacktrace', () => {
8686

8787
const reg = new RegExp(
8888
path
89-
.resolve(__dirname, '../src', `error.${ext}`)
89+
.resolve(__dirname, '../src', `error-${ext}.${ext}`)
9090
.replace(/\\/g, '\\\\') + ':2:9',
9191
'i',
9292
)

playground/ssr-html/test-stacktrace.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ const vite = await createServer({
3636

3737
const dir = path.dirname(fileURLToPath(import.meta.url))
3838

39-
const abs1 = await vite.ssrLoadModule(`/src/error.${ext}`)
40-
const abs2 = await vite.ssrLoadModule(path.resolve(dir, `./src/error.${ext}`))
41-
const relative = await vite.ssrLoadModule(`./src/error.${ext}`)
39+
const abs1 = await vite.ssrLoadModule(`/src/error-${ext}.${ext}`)
40+
const abs2 = await vite.ssrLoadModule(
41+
path.resolve(dir, `./src/error-${ext}.${ext}`),
42+
)
43+
const relative = await vite.ssrLoadModule(`./src/error-${ext}.${ext}`)
4244

4345
for (const mod of [abs1, abs2, relative]) {
4446
try {

0 commit comments

Comments
 (0)