Skip to content

Commit 2a88f71

Browse files
authored
chore: tweak build config (#18622)
1 parent 0924879 commit 2a88f71

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

packages/vite/rollup.config.ts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ function createSharedNodePlugins({
9494
// Since ws is not that perf critical for us, just ignore these deps.
9595
ignore: ['bufferutil', 'utf-8-validate'],
9696
sourceMap: false,
97+
strictRequires: 'auto',
9798
}),
9899
json(),
99100
]
@@ -108,13 +109,10 @@ const nodeConfig = defineConfig({
108109
},
109110
external: [
110111
/^vite\//,
111-
'lightningcss',
112112
'rollup/parseAst',
113-
// postcss-load-config
114-
'yaml',
115-
'jiti',
116-
/^tsx(\/|$)/,
113+
/^tsx\//,
117114
...Object.keys(pkg.dependencies),
115+
...Object.keys(pkg.peerDependencies),
118116
],
119117
plugins: [
120118
// Some deps have try...catch require of optional deps, but rollup will
@@ -197,14 +195,10 @@ const cjsConfig = defineConfig({
197195
publicUtils: path.resolve(__dirname, 'src/node/publicUtils.ts'),
198196
},
199197
output: {
200-
dir: './dist',
198+
...sharedNodeOptions.output,
201199
entryFileNames: `node-cjs/[name].cjs`,
202200
chunkFileNames: 'node-cjs/chunks/dep-[hash].js',
203-
exports: 'named',
204201
format: 'cjs',
205-
externalLiveBindings: false,
206-
freeze: false,
207-
sourcemap: false,
208202
},
209203
external: Object.keys(pkg.dependencies),
210204
plugins: [...createSharedNodePlugins({}), bundleSizeLimit(175)],
@@ -297,14 +291,15 @@ function cjsPatchPlugin(): Plugin {
297291
const cjsPatch = `
298292
import { createRequire as __cjs_createRequire } from 'node:module';
299293
300-
const require = __cjs_createRequire(import.meta.url);
301-
const __require = require;
294+
const __require = __cjs_createRequire(import.meta.url);
302295
`.trimStart()
303296

304297
return {
305298
name: 'cjs-chunk-patch',
306299
renderChunk(code, chunk) {
307300
if (!chunk.fileName.includes('chunks/dep-')) return
301+
if (!code.includes('__require')) return
302+
308303
const match = /^(?:import[\s\S]*?;\s*)+/.exec(code)
309304
const index = match ? match.index! + match[0].length : 0
310305
const s = new MagicString(code)

packages/vite/rollup.dts.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const external = [
1818
/^vite\//,
1919
'rollup/parseAst',
2020
...Object.keys(pkg.dependencies),
21-
// lightningcss types are bundled
22-
...Object.keys(pkg.devDependencies).filter((d) => d !== 'lightningcss'),
21+
...Object.keys(pkg.peerDependencies),
22+
...Object.keys(pkg.devDependencies),
2323
]
2424

2525
export default defineConfig({

0 commit comments

Comments
 (0)