diff --git a/packages/playground/dynamic-import/__tests__/dynamic-import.spec.ts b/packages/playground/dynamic-import/__tests__/dynamic-import.spec.ts index fa97cc1393f28a..2332c0df0ecdf0 100644 --- a/packages/playground/dynamic-import/__tests__/dynamic-import.spec.ts +++ b/packages/playground/dynamic-import/__tests__/dynamic-import.spec.ts @@ -1,29 +1,19 @@ -import { untilUpdated } from '../../testUtils' +import { isBuild, untilUpdated } from '../../testUtils' test('should load literal dynamic import', async () => { await page.click('.baz') - await untilUpdated(() => page.textContent('.view'), 'Baz view') + await untilUpdated(() => page.textContent('.view'), 'Baz view', true) }) test('should load full dynamic import from public', async () => { await page.click('.qux') - await untilUpdated(() => page.textContent('.view'), 'Qux view') + await untilUpdated(() => page.textContent('.view'), 'Qux view', true) }) -// since this test has a timeout, it should be put last so that it -// does not bleed on the last test('should load dynamic import with vars', async () => { await page.click('.foo') - await untilUpdated(() => page.textContent('.view'), 'Foo view') + await untilUpdated(() => page.textContent('.view'), 'Foo view', true) - // first page click will not load the remote message - // because vite needs to compile the lodash dependency await page.click('.bar') - await untilUpdated(() => page.textContent('.view'), '') - - // wait until reload and click again - setTimeout(async () => { - await page.click('.bar') - await untilUpdated(() => page.textContent('.view'), 'Bar view') - }, 10) + await untilUpdated(() => page.textContent('.view'), 'Bar view', true) }) diff --git a/packages/playground/dynamic-import/package.json b/packages/playground/dynamic-import/package.json index 1bc86fbf6bf84e..91048d3c3b90a2 100644 --- a/packages/playground/dynamic-import/package.json +++ b/packages/playground/dynamic-import/package.json @@ -7,8 +7,5 @@ "build": "vite build", "debug": "node --inspect-brk ../../vite/bin/vite", "serve": "vite preview" - }, - "dependencies": { - "lodash": "4.17.21" } } diff --git a/packages/playground/dynamic-import/views/bar.js b/packages/playground/dynamic-import/views/bar.js index bf14cd33bceb5e..94401802f2dd50 100644 --- a/packages/playground/dynamic-import/views/bar.js +++ b/packages/playground/dynamic-import/views/bar.js @@ -1,5 +1 @@ -import { n } from '../nested/shared' -import { isBoolean } from 'lodash' -console.log('bar' + isBoolean(n)) - export const msg = 'Bar view' diff --git a/packages/playground/testUtils.ts b/packages/playground/testUtils.ts index 027506c75f735f..39d014f9529f3d 100644 --- a/packages/playground/testUtils.ts +++ b/packages/playground/testUtils.ts @@ -100,9 +100,10 @@ export function readManifest(base = '') { */ export async function untilUpdated( poll: () => string | Promise, - expected: string + expected: string, + runInBuild = false ) { - if (isBuild) return + if (isBuild && !runInBuild) return const maxTries = process.env.CI ? 100 : 50 for (let tries = 0; tries < maxTries; tries++) { const actual = (await poll()) || ''