Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(define): correctly replace SSR in dev #12204

Merged
merged 3 commits into from Mar 8, 2023
Merged

fix(define): correctly replace SSR in dev #12204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06a249b
fix(define): correctly replace SSR in dev
bluwy Feb 26, 2023
a760c61
chore: fix error
bluwy Feb 26, 2023
16a1651
fix: typo
bluwy Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 29 additions & 13 deletions packages/vite/src/node/plugins/define.ts
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ export function definePlugin(config: ResolvedConfig): Plugin {
// stringified for `import.meta.env`, we can remove the quotes and
// retain being an identifier
typeof val === 'string' && /^[\p{L}_$]/u.test(val.trim())
? `__vite__${val}__vite__`
? `__vite__define__${val}`
: val
}
}
Expand All @@ -56,34 +56,50 @@ export function definePlugin(config: ResolvedConfig): Plugin {
const importMetaKeys: Record<string, string> = {}
const importMetaFallbackKeys: Record<string, string> = {}
if (isBuild) {
const env: Record<string, any> = {
...config.env,
SSR: !!config.build.ssr,
}
// set here to allow override with config.define
importMetaKeys['import.meta.hot'] = `undefined`
for (const key in env) {
importMetaKeys[`import.meta.env.${key}`] = JSON.stringify(env[key])
for (const key in config.env) {
importMetaKeys[`import.meta.env.${key}`] = JSON.stringify(config.env[key])
}
Object.assign(importMetaFallbackKeys, {
'import.meta.env.': `({}).`,
'import.meta.env': JSON.stringify({ ...env, ...userDefineEnv }).replace(
/"__vite__(.+?)__vite__"/g,
(_, val) => val,
),
'import.meta.env': JSON.stringify({
...config.env,
SSR: '__vite__ssr__',
...userDefineEnv,
}).replace(/"__vite__define__(.+?)"/g, (_, val) => val),
})
}

function getImportMetaKeys(ssr: boolean): Record<string, string> {
if (!isBuild) return {}
return {
...importMetaKeys,
'import.meta.env.SSR': ssr + '',
}
}

function getImportMetaFallbackKeys(ssr: boolean): Record<string, string> {
if (!isBuild) return {}
return {
...importMetaFallbackKeys,
'import.meta.env': importMetaFallbackKeys['import.meta.env'].replace(
'"__vite__ssr__"',
ssr + '',
),
}
}

function generatePattern(
ssr: boolean,
): [Record<string, string | undefined>, RegExp | null] {
const replaceProcessEnv = !ssr || config.ssr?.target === 'webworker'

const replacements: Record<string, string> = {
...(replaceProcessEnv ? processNodeEnv : {}),
...importMetaKeys,
...getImportMetaKeys(ssr),
...userDefine,
...importMetaFallbackKeys,
...getImportMetaFallbackKeys(ssr),
...(replaceProcessEnv ? processEnv : {}),
}

Expand Down
4 changes: 2 additions & 2 deletions packages/vite/src/node/plugins/importAnalysis.ts
View file
Open in desktop
Expand Up @@ -171,7 +171,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
if (!_env) {
_env = `import.meta.env = ${JSON.stringify({
...config.env,
SSR: '__vite__ssr__vite__',
SSR: '__vite__ssr__',
})};`
// account for user env defines
for (const key in config.define) {
Expand All @@ -183,7 +183,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
}
}
}
return _env.replace('"__vite__ssr__vite__"', ssr + '')
return _env.replace('"__vite__ssr__"', ssr + '')
}

return {
Expand Down