From 96af462d012880d3278331955668f67d3de4ce08 Mon Sep 17 00:00:00 2001 From: Vladimir Sheremet Date: Tue, 21 Mar 2023 10:13:38 +0100 Subject: [PATCH] chore: use /@id/ for importing --- packages/browser/src/client/main.ts | 10 +++++----- test/browser/specs/runner.test.mjs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/browser/src/client/main.ts b/packages/browser/src/client/main.ts index db0b9552e9f1..f194e979bddb 100644 --- a/packages/browser/src/client/main.ts +++ b/packages/browser/src/client/main.ts @@ -25,8 +25,8 @@ const browserHashMap = new Map() const url = new URL(location.href) const testId = url.searchParams.get('id') || 'unknown' -const plainImport = (id: string) => { - const name = `/@plain/${id}` +const importId = (id: string) => { + const name = `/@id/${id}` return import(name) } @@ -92,14 +92,14 @@ async function runTests(paths: string[], config: any) { takeCoverageInsideWorker, stopCoverageInsideWorker, startCoverageInsideWorker, - } = await plainImport('vitest/browser') as typeof import('vitest/browser') + } = await importId('vitest/browser') as typeof import('vitest/browser') const executor = { - executeId: (id: string) => plainImport(id), + executeId: (id: string) => importId(id), } if (!runner) { - const { VitestTestRunner } = await plainImport('vitest/runners') as typeof import('vitest/runners') + const { VitestTestRunner } = await importId('vitest/runners') as typeof import('vitest/runners') const BrowserRunner = createBrowserRunner(VitestTestRunner, { takeCoverage: () => takeCoverageInsideWorker(config.coverage, executor) }) runner = new BrowserRunner({ config, browserHashMap }) } diff --git a/test/browser/specs/runner.test.mjs b/test/browser/specs/runner.test.mjs index 8c87292227b2..a1a877403f3b 100644 --- a/test/browser/specs/runner.test.mjs +++ b/test/browser/specs/runner.test.mjs @@ -5,7 +5,7 @@ import { execa } from 'execa' const browser = process.env.BROWSER || 'chrome' -const { stderr, stdout } = await execa('npx', ['vitest', `--browser=${browser}`], { +const { stderr, stdout } = await execa('npx', ['vitest', `--browser=${browser}`, '--browser.headless'], { env: { ...process.env, CI: 'true',