fix(browser): fix `process.env` and `import.meta.env` defines in inli…

fix(browser): fix `process.env` and `import.meta.env` defines in inli… · vitest-dev/vitest@b70c961

7 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ export const createBrowserServer: BrowserServerFactory = async (options) => {`
`49`	`49`	`let cacheDir: string`
`50`	`50`	`const vite = await createViteServer({`
`51`	`51`	`...project.options, // spread project config inlined in root workspace config`
	`52`	`+define: project.config.viteDefine,`
`52`	`53`	`base: '/',`
`53`	`54`	`root: project.config.root,`
`54`	`55`	`logLevel,`

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,11 @@ export async function VitestPlugin(`
`61`	`61`
`62`	`62`	`// store defines for globalThis to make them`
`63`	`63`	`// reassignable when running in worker in src/runtime/setup.ts`
	`64`	`+const originalDefine = { ...viteConfig.define } // stash original defines for browser mode`
`64`	`65`	`const defines: Record<string, any> = deleteDefineConfig(viteConfig)`
`65`	`66`
`66`	`67`	`;(options as unknown as ResolvedConfig).defines = defines`
	`68`	`+;(options as unknown as ResolvedConfig).viteDefine = originalDefine`
`67`	`69`
`68`	`70`	`let open: string \| boolean \| undefined = false`
`69`	`71`

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ export function WorkspaceVitestPlugin(`
`125`	`125`	`this.meta.watchMode = false`
`126`	`126`	`},`
`127`	`127`	`config(viteConfig) {`
	`128`	`+const originalDefine = { ...viteConfig.define } // stash original defines for browser mode`
`128`	`129`	`const defines: Record<string, any> = deleteDefineConfig(viteConfig)`
`129`	`130`
`130`	`131`	`const testConfig = viteConfig.test \|\| {}`
`@@ -197,6 +198,7 @@ export function WorkspaceVitestPlugin(`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`;(config.test as ResolvedConfig).defines = defines`
	`201`	`+;(config.test as ResolvedConfig).viteDefine = originalDefine`
`200`	`202`
`201`	`203`	`const classNameStrategy`
`202`	`204`	`= (typeof testConfig.css !== 'boolean'`

Original file line number	Diff line number	Diff line change
`@@ -1049,6 +1049,7 @@ export interface ResolvedConfig`
`1049`	`1049`	`reporters: (InlineReporter \| ReporterWithOptions)[]`
`1050`	`1050`
`1051`	`1051`	`defines: Record<string, any>`
	`1052`	`+viteDefine: Record<string, any>`
`1052`	`1053`
`1053`	`1054`	`api: ApiConfig & { token: string }`
`1054`	`1055`	`cliExclude?: string[]`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+import { test, expect } from 'vitest'`
	`2`	`+`
	`3`	`+test('passes', () => {`
	`4`	`+expect(process.env.TEST_PROCESS_ENV).toBe('PROCESS_OK')`
	`5`	`+expect(import.meta.env.TEST_META_ENV).toBe('META_OK')`
	`6`	`+})`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,28 @@`
	`1`	`+import { playwright } from '@vitest/browser-playwright'`
	`2`	`+import { defineConfig } from 'vitest/config'`
	`3`	`+`
	`4`	`+let config = defineConfig({`
	`5`	`+define: {`
	`6`	`+'process.env.TEST_PROCESS_ENV': JSON.stringify('PROCESS_OK'),`
	`7`	`+'import.meta.env.TEST_META_ENV': JSON.stringify('META_OK'),`
	`8`	`+},`
	`9`	`+test: {`
	`10`	`+browser: {`
	`11`	`+enabled: true,`
	`12`	`+provider: playwright(),`
	`13`	`+instances: [`
	`14`	`+{ browser: 'chromium' },`
	`15`	`+],`
	`16`	`+},`
	`17`	`+},`
	`18`	`+})`
	`19`	`+`
	`20`	`+if (process.env.BROWSER_DEFINE_TEST_PROEJCT === "true") {`
	`21`	`+config = defineConfig({`
	`22`	`+test: {`
	`23`	`+projects: [config],`
	`24`	`+},`
	`25`	`+})`
	`26`	`+}`
	`27`	`+`
	`28`	`+export default config`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,38 @@`
	`1`	`+import { expect, test } from 'vitest'`
	`2`	`+import { runVitest } from '../../test-utils'`
	`3`	`+`
	`4`	`+test('browser root', async () => {`
	`5`	`+process.env.BROWSER_DEFINE_TEST_PROEJCT = 'false'`
	`6`	`+const { testTree, stderr } = await runVitest({`
	`7`	`+root: './fixtures/browser-define',`
	`8`	`+browser: {`
	`9`	`+headless: true,`
	`10`	`+},`
	`11`	`+})`
	`12`	`+expect(stderr).toBe('')`
	`13`	+expect(testTree()).toMatchInlineSnapshot(`
	`14`	`+ {`
	`15`	`+ "basic.test.ts": {`
	`16`	`+ "passes": "passed",`
	`17`	`+ },`
	`18`	`+ }`
	`19`	+ `)
	`20`	`+})`
	`21`	`+`
	`22`	`+test('browser proejct', async () => {`
	`23`	`+process.env.BROWSER_DEFINE_TEST_PROEJCT = 'true'`
	`24`	`+const { testTree, stderr } = await runVitest({`
	`25`	`+root: './fixtures/browser-define',`
	`26`	`+browser: {`
	`27`	`+headless: true,`
	`28`	`+},`
	`29`	`+})`
	`30`	`+expect(stderr).toBe('')`
	`31`	+expect(testTree()).toMatchInlineSnapshot(`
	`32`	`+ {`
	`33`	`+ "basic.test.ts": {`
	`34`	`+ "passes": "passed",`
	`35`	`+ },`
	`36`	`+ }`
	`37`	+ `)
	`38`	`+})`