Skip to content

Commit 8fb7675

Browse files
fix(optimizer): close custom extension analysis bundles (#23207)
1 parent a0cfcf7 commit 8fb7675

2 files changed

Lines changed: 100 additions & 9 deletions

File tree

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
import fs from 'node:fs'
2+
import os from 'node:os'
3+
import path from 'node:path'
4+
import { afterEach, expect, test } from 'vitest'
5+
import type { ViteDevServer } from '../..'
6+
import { createServer } from '../..'
7+
8+
const servers = new Set<ViteDevServer>()
9+
let root: string | undefined
10+
11+
afterEach(async () => {
12+
await Promise.allSettled([...servers].map((server) => server.close()))
13+
servers.clear()
14+
if (root) fs.rmSync(root, { recursive: true, force: true })
15+
root = undefined
16+
})
17+
18+
test('closes temporary Rolldown bundles used to analyze custom optimizeDeps extensions', async () => {
19+
root = fs.mkdtempSync(
20+
path.join(fs.realpathSync(os.tmpdir()), 'vite-optimizer-extension-close-'),
21+
)
22+
const cacheDir = path.join(root, '.vite')
23+
const depDir = path.join(root, 'node_modules', 'custom-extension-dep')
24+
fs.mkdirSync(depDir, { recursive: true })
25+
fs.writeFileSync(
26+
path.join(depDir, 'package.json'),
27+
JSON.stringify({
28+
name: 'custom-extension-dep',
29+
version: '1.0.0',
30+
type: 'module',
31+
main: 'index.notjs',
32+
}),
33+
)
34+
fs.writeFileSync(
35+
path.join(depDir, 'index.notjs'),
36+
'<notjs>export const marker = "custom-extension"</notjs>\n',
37+
)
38+
39+
let bundleStarts = 0
40+
let bundleCloses = 0
41+
const optimizerPlugin = {
42+
name: 'test:custom-extension-bundle-lifecycle',
43+
buildStart() {
44+
bundleStarts++
45+
},
46+
closeBundle() {
47+
bundleCloses++
48+
},
49+
load: {
50+
filter: { id: /\.notjs$/ },
51+
handler(id: string) {
52+
return fs
53+
.readFileSync(id, 'utf8')
54+
.replace('<notjs>', '')
55+
.replace('</notjs>', '')
56+
},
57+
},
58+
}
59+
60+
const server = await createServer({
61+
configFile: false,
62+
root,
63+
cacheDir,
64+
logLevel: 'silent',
65+
optimizeDeps: {
66+
force: true,
67+
noDiscovery: true,
68+
include: ['custom-extension-dep'],
69+
extensions: ['.notjs'],
70+
rolldownOptions: {
71+
plugins: [optimizerPlugin],
72+
},
73+
},
74+
server: {
75+
middlewareMode: true,
76+
ws: false,
77+
},
78+
})
79+
servers.add(server)
80+
81+
// One bundle analyzes exports for the custom extension and another performs
82+
// the dependency prebundle. Every Rolldown JavaScript-API bundle should be
83+
// closed after generation so optimizer-only closeBundle hooks and native
84+
// resources are settled.
85+
expect(bundleStarts).toBeGreaterThan(1)
86+
expect(bundleCloses).toBe(bundleStarts)
87+
})

‎packages/vite/src/node/optimizer/index.ts‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,15 +1143,19 @@ export async function extractExportsData(
11431143
...remainingRolldownOptions.moduleTypes,
11441144
},
11451145
})
1146-
const result = await build.generate({
1147-
...rolldownOptions.output,
1148-
format: 'esm',
1149-
sourcemap: false,
1150-
})
1151-
const [, exports, , hasModuleSyntax] = parse(result.output[0].code)
1152-
return {
1153-
hasModuleSyntax,
1154-
exports: exports.map((e) => e.n),
1146+
try {
1147+
const result = await build.generate({
1148+
...rolldownOptions.output,
1149+
format: 'esm',
1150+
sourcemap: false,
1151+
})
1152+
const [, exports, , hasModuleSyntax] = parse(result.output[0].code)
1153+
return {
1154+
hasModuleSyntax,
1155+
exports: exports.map((e) => e.n),
1156+
}
1157+
} finally {
1158+
await build.close()
11551159
}
11561160
}
11571161

0 commit comments

Comments
 (0)