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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(env): test NODE_ENV override before expand #11309

Merged
merged 3 commits into from Dec 12, 2022
Merged

fix(env): test NODE_ENV override before expand #11309

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
dffceb4
fix(env): test NODE_ENV override before expand
bluwy Dec 11, 2022
30bc33c
chore: merge main
bluwy Dec 11, 2022
4245323
chore: merge main
patak-dev Dec 12, 2022
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
8 changes: 8 additions & 0 deletions packages/vite/src/node/__tests__/env.spec.ts
View file
Open in desktop
Expand Up @@ -44,6 +44,14 @@ describe('loadEnv', () => {
expect(process.env.VITE_USER_NODE_ENV).toEqual(undefined)
})

test('VITE_USER_NODE_ENV for dev behaviour in build', () => {
const _nodeEnv = process.env.NODE_ENV
process.env.NODE_ENV = 'production'
loadEnv('testing', join(__dirname, './env'))
expect(process.env.VITE_USER_NODE_ENV).toEqual('development')
process.env.NODE_ENV = _nodeEnv
})

test('Already exists VITE_USER_NODE_ENV', () => {
process.env.VITE_USER_NODE_ENV = 'test'
loadEnv('development', join(__dirname, './env'))
Expand Down
1 change: 1 addition & 0 deletions packages/vite/src/node/__tests__/env/.env.testing
View file
Open in desktop
@@ -0,0 +1 @@
NODE_ENV=development
11 changes: 5 additions & 6 deletions packages/vite/src/node/env.ts
View file
Open in desktop
Expand Up @@ -35,6 +35,11 @@ export function loadEnv(
}),
)

// test NODE_ENV override before expand as otherwise process.env.NODE_ENV would override this
if (parsed.NODE_ENV && process.env.VITE_USER_NODE_ENV === undefined) {
process.env.VITE_USER_NODE_ENV = parsed.NODE_ENV
}

try {
// let environment variables use each other
expand({ parsed })
Expand All @@ -53,12 +58,6 @@ export function loadEnv(
for (const [key, value] of Object.entries(parsed)) {
if (prefixes.some((prefix) => key.startsWith(prefix))) {
env[key] = value
} else if (
key === 'NODE_ENV' &&
process.env.VITE_USER_NODE_ENV === undefined
) {
// NODE_ENV override in .env file
process.env.VITE_USER_NODE_ENV = value
}
}

Expand Down