From ef0cf31c1873bcc3f0f36f79d037041a87748dfb Mon Sep 17 00:00:00 2001 From: yoho Date: Fri, 21 Oct 2022 11:25:05 +0800 Subject: [PATCH 1/5] fix: load file by @fs --- packages/vitest/src/node/reporters/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vitest/src/node/reporters/utils.ts b/packages/vitest/src/node/reporters/utils.ts index aad3aa695c88..06fd5a2d0f28 100644 --- a/packages/vitest/src/node/reporters/utils.ts +++ b/packages/vitest/src/node/reporters/utils.ts @@ -6,7 +6,7 @@ import type { BenchmarkBuiltinReporters, BuiltinReporters } from './index' async function loadCustomReporterModule(path: string, runner: ViteNodeRunner): Promise C> { let customReporterModule: { default: new () => C } try { - customReporterModule = await runner.executeId(path) + customReporterModule = await runner.executeId(`/@fs/${path}`) } catch (customReporterModuleError) { throw new Error(`Failed to load custom Reporter from ${path}`, { cause: customReporterModuleError as Error }) From f41d6ef7e43cc956a5bb7e5ee2d89e35ab0d410a Mon Sep 17 00:00:00 2001 From: yoho Date: Fri, 21 Oct 2022 12:09:35 +0800 Subject: [PATCH 2/5] fix: window --- packages/vitest/src/node/reporters/utils.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vitest/src/node/reporters/utils.ts b/packages/vitest/src/node/reporters/utils.ts index 06fd5a2d0f28..819b4a73cbf0 100644 --- a/packages/vitest/src/node/reporters/utils.ts +++ b/packages/vitest/src/node/reporters/utils.ts @@ -1,4 +1,5 @@ import type { ViteNodeRunner } from 'vite-node/client' +import { normalize } from 'pathe' import type { Reporter } from '../../types' import { BenchmarkReportsMap, ReportersMap } from './index' import type { BenchmarkBuiltinReporters, BuiltinReporters } from './index' @@ -6,7 +7,7 @@ import type { BenchmarkBuiltinReporters, BuiltinReporters } from './index' async function loadCustomReporterModule(path: string, runner: ViteNodeRunner): Promise C> { let customReporterModule: { default: new () => C } try { - customReporterModule = await runner.executeId(`/@fs/${path}`) + customReporterModule = await runner.executeId(normalize(`/@fs/${path}`)) } catch (customReporterModuleError) { throw new Error(`Failed to load custom Reporter from ${path}`, { cause: customReporterModuleError as Error }) From 0a33ef9e8005a455b8d20675fb27ab13ed84ab0b Mon Sep 17 00:00:00 2001 From: yoho <907415276@qq.com> Date: Sat, 22 Oct 2022 17:47:56 +0800 Subject: [PATCH 3/5] chore: update Co-authored-by: Anthony Fu --- packages/vitest/src/node/reporters/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vitest/src/node/reporters/utils.ts b/packages/vitest/src/node/reporters/utils.ts index 819b4a73cbf0..4173140d9501 100644 --- a/packages/vitest/src/node/reporters/utils.ts +++ b/packages/vitest/src/node/reporters/utils.ts @@ -7,7 +7,7 @@ import type { BenchmarkBuiltinReporters, BuiltinReporters } from './index' async function loadCustomReporterModule(path: string, runner: ViteNodeRunner): Promise C> { let customReporterModule: { default: new () => C } try { - customReporterModule = await runner.executeId(normalize(`/@fs/${path}`)) + customReporterModule = await runner.executeFile(path) } catch (customReporterModuleError) { throw new Error(`Failed to load custom Reporter from ${path}`, { cause: customReporterModuleError as Error }) From 1f08a5236eda0d94296028f958687b3ae36ae01c Mon Sep 17 00:00:00 2001 From: yoho Date: Sat, 22 Oct 2022 17:52:12 +0800 Subject: [PATCH 4/5] fix: path --- packages/vitest/src/node/reporters/utils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vitest/src/node/reporters/utils.ts b/packages/vitest/src/node/reporters/utils.ts index 4173140d9501..ed7e433d400d 100644 --- a/packages/vitest/src/node/reporters/utils.ts +++ b/packages/vitest/src/node/reporters/utils.ts @@ -1,5 +1,4 @@ import type { ViteNodeRunner } from 'vite-node/client' -import { normalize } from 'pathe' import type { Reporter } from '../../types' import { BenchmarkReportsMap, ReportersMap } from './index' import type { BenchmarkBuiltinReporters, BuiltinReporters } from './index' From 18424320bcedc953c9e33e35408710224ae75bf3 Mon Sep 17 00:00:00 2001 From: yoho Date: Sun, 23 Oct 2022 13:16:53 +0800 Subject: [PATCH 5/5] fix: test --- test/reporters/tests/utils.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/reporters/tests/utils.test.ts b/test/reporters/tests/utils.test.ts index 24aa83510f4d..e41b71ca62fc 100644 --- a/test/reporters/tests/utils.test.ts +++ b/test/reporters/tests/utils.test.ts @@ -10,7 +10,7 @@ import TestReporter from '../src/custom-reporter' const customReporterPath = resolve(__dirname, '../src/custom-reporter.js') const fetchModule = { - executeId: (id: string) => import(id), + executeFile: (id: string) => import(id), } as ViteNodeRunner describe('Reporter Utils', () => {