Skip to content

Commit 05a2be6

Browse files
committed
fix: some isBuild using production mode
1 parent b0d91a9 commit 05a2be6

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

packages/vite/src/node/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@ export async function resolveConfig(
12731273

12741274
const [prePlugins, normalPlugins, postPlugins] = sortUserPlugins(rawPlugins)
12751275

1276-
const isBuild = command === 'build'
1276+
const isBuild = mode === 'production'
12771277

12781278
// run config hooks
12791279
const userPlugins = [...prePlugins, ...normalPlugins, ...postPlugins]

packages/vite/src/node/idResolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export function createIdResolver(
6666
{
6767
root: config.root,
6868
isProduction: config.isProduction,
69-
isBuild: config.command === 'build',
69+
isBuild: config.mode === 'production',
7070
asSrc: true,
7171
preferRelative: false,
7272
tryIndex: true,
@@ -80,7 +80,7 @@ export function createIdResolver(
8080
resolvePlugin({
8181
root: config.root,
8282
isProduction: config.isProduction,
83-
isBuild: config.command === 'build',
83+
isBuild: config.mode === 'production',
8484
asSrc: true,
8585
preferRelative: false,
8686
tryIndex: true,

packages/vite/src/node/plugins/assetImportMetaUrl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
3737
...config.resolve,
3838
root: config.root,
3939
isProduction: config.isProduction,
40-
isBuild: true, // config.command === 'build'
40+
isBuild: config.mode === 'production',
4141
packageCache: config.packageCache,
4242
asSrc: true,
4343
}

packages/vite/src/node/plugins/css.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ const cssUrlAssetRE = /__VITE_CSS_URL__([\da-f]+)__/g
296296
* Plugin applied before user plugins
297297
*/
298298
export function cssPlugin(config: ResolvedConfig): Plugin {
299-
// const isBuild = config.command === 'build'
299+
const isBuild = config.mode === 'production'
300300
let moduleCache: Map<string, Record<string, string>>
301301

302302
const idResolver = createBackCompatIdResolver(config, {
@@ -353,15 +353,15 @@ export function cssPlugin(config: ResolvedConfig): Plugin {
353353

354354
// *.css?url
355355
// in dev, it's handled by assets plugin.
356-
// if (isBuild) {
357-
id = injectQuery(removeUrlQuery(id), 'transform-only')
358-
return (
359-
`import ${JSON.stringify(id)};` +
360-
`export default "__VITE_CSS_URL__${Buffer.from(id).toString(
361-
'hex',
362-
)}__"`
363-
)
364-
// }
356+
if (isBuild) {
357+
id = injectQuery(removeUrlQuery(id), 'transform-only')
358+
return (
359+
`import ${JSON.stringify(id)};` +
360+
`export default "__VITE_CSS_URL__${Buffer.from(id).toString(
361+
'hex',
362+
)}__"`
363+
)
364+
}
365365
}
366366
},
367367
},

packages/vite/src/node/plugins/define.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const importMetaEnvMarker = '__vite_import_meta_env__'
1212
const importMetaEnvKeyReCache = new Map<string, RegExp>()
1313

1414
export function definePlugin(config: ResolvedConfig): Plugin {
15-
// const isBuild = config.command === 'build'
15+
const isBuild = config.mode === 'production'
1616
const isBuildLib = config.build.lib
1717

1818
// ignore replace process.env in lib build
@@ -33,17 +33,17 @@ export function definePlugin(config: ResolvedConfig): Plugin {
3333
const importMetaKeys: Record<string, string> = {}
3434
const importMetaEnvKeys: Record<string, string> = {}
3535
const importMetaFallbackKeys: Record<string, string> = {}
36-
// if (isBuild) {
37-
importMetaKeys['import.meta.hot'] = `undefined`
38-
for (const key in config.env) {
39-
const val = JSON.stringify(config.env[key])
40-
importMetaKeys[`import.meta.env.${key}`] = val
41-
importMetaEnvKeys[key] = val
36+
if (isBuild) {
37+
importMetaKeys['import.meta.hot'] = `undefined`
38+
for (const key in config.env) {
39+
const val = JSON.stringify(config.env[key])
40+
importMetaKeys[`import.meta.env.${key}`] = val
41+
importMetaEnvKeys[key] = val
42+
}
43+
// these will be set to a proper value in `generatePattern`
44+
importMetaKeys['import.meta.env.SSR'] = `undefined`
45+
importMetaFallbackKeys['import.meta.env'] = `undefined`
4246
}
43-
// these will be set to a proper value in `generatePattern`
44-
importMetaKeys['import.meta.env.SSR'] = `undefined`
45-
importMetaFallbackKeys['import.meta.env'] = `undefined`
46-
// }
4747

4848
function generatePattern(environment: Environment) {
4949
const keepProcessEnv = environment.config.keepProcessEnv

0 commit comments

Comments
 (0)