Skip to content

Commit 592add5

Browse files
committed
chore: merge main
2 parents 8d56953 + aa02ac3 commit 592add5

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

playground/vitest.config.e2e.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ export default defineConfig({
1717
testTimeout: timeout,
1818
hookTimeout: timeout,
1919
reporters: 'dot',
20-
onConsoleLog(log) {
21-
if (log.match(/experimental|jit engine|emitted file|tailwind/i))
22-
return false
23-
},
2420
},
2521
esbuild: {
2622
target: 'node14',

playground/vitestSetup.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ export const serverLogs: string[] = []
6060
export const browserLogs: string[] = []
6161
export const browserErrors: Error[] = []
6262

63-
export let resolvedConfig: ResolvedConfig = undefined!
64-
6563
export let page: Page = undefined!
6664
export let browser: Browser = undefined!
6765
export let viteTestUrl: string = ''
@@ -96,15 +94,6 @@ beforeAll(async (s) => {
9694
browser = await chromium.connect(wsEndpoint)
9795
page = await browser.newPage()
9896

99-
const globalConsole = global.console
100-
const warn = globalConsole.warn
101-
globalConsole.warn = (msg, ...args) => {
102-
// suppress @vue/reactivity-transform warning
103-
if (msg.includes('@vue/reactivity-transform')) return
104-
if (msg.includes('Generated an empty chunk')) return
105-
warn.call(globalConsole, msg, ...args)
106-
}
107-
10897
try {
10998
page.on('console', (msg) => {
11099
// ignore favicon request in headed browser
@@ -217,9 +206,6 @@ async function loadConfig(configEnv: ConfigEnv) {
217206
usePolling: true,
218207
interval: 100,
219208
},
220-
fs: {
221-
strict: !isBuild,
222-
},
223209
},
224210
build: {
225211
// esbuild do not minify ES lib output since that would remove pure annotations and break tree-shaking
@@ -250,6 +236,7 @@ export async function startDefaultServe(): Promise<void> {
250236
await page.goto(viteTestUrl)
251237
} else {
252238
process.env.VITE_INLINE = 'inline-build'
239+
let resolvedConfig: ResolvedConfig
253240
// determine build watch
254241
const resolvedPlugin: () => PluginOption = () => ({
255242
name: 'vite-plugin-watcher',

0 commit comments

Comments
 (0)