From 37dbbc201b7bad3e2342fc79996bfae19fbbbfbd Mon Sep 17 00:00:00 2001 From: userquin Date: Thu, 9 Jan 2025 19:56:05 +0100 Subject: [PATCH 1/5] chore(ui): fix static ui client types --- .gitignore | 3 +++ packages/ui/client/composables/client/static.ts | 3 ++- test/browser/package.json | 3 ++- test/core/package.json | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d0949feffdb5..c5f2accdb089 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ test/browser/fixtures/update-snapshot/basic.test.ts test/cli/fixtures/browser-multiple/basic-* .vitest-reports *.tsbuildinfo +# exclude static html reporter folder +test/browser/html/ +test/core/html/ diff --git a/packages/ui/client/composables/client/static.ts b/packages/ui/client/composables/client/static.ts index 044f249d8f6f..f957ca4b7075 100644 --- a/packages/ui/client/composables/client/static.ts +++ b/packages/ui/client/composables/client/static.ts @@ -58,6 +58,7 @@ export function createStaticClient(): VitestClient { onTaskUpdate: noop, writeFile: asyncNoop, rerun: asyncNoop, + rerunTask: asyncNoop, updateSnapshot: asyncNoop, resolveSnapshotPath: asyncNoop, snapshotSaved: asyncNoop, @@ -80,7 +81,7 @@ export function createStaticClient(): VitestClient { ctx.rpc = rpc as any as BirpcReturn - let openPromise: Promise + const openPromise = Promise.resolve() function reconnect() { registerMetadata() diff --git a/test/browser/package.json b/test/browser/package.json index 0d9c6742185d..b550595682a0 100644 --- a/test/browser/package.json +++ b/test/browser/package.json @@ -18,7 +18,8 @@ "coverage": "vitest --coverage.enabled --coverage.provider=istanbul --browser.headless=yes", "test:browser:preview": "PROVIDER=preview vitest", "test:browser:playwright": "PROVIDER=playwright vitest", - "test:browser:webdriverio": "PROVIDER=webdriverio vitest" + "test:browser:webdriverio": "PROVIDER=webdriverio vitest", + "test:browser:playwright:html": "PROVIDER=playwright pnpm vitest --reporter=html --outputFile=./html/index.html" }, "devDependencies": { "@testing-library/react": "^13.2.0", diff --git a/test/core/package.json b/test/core/package.json index 8a058771180d..e08c096494f3 100644 --- a/test/core/package.json +++ b/test/core/package.json @@ -4,6 +4,7 @@ "private": true, "scripts": { "test": "vitest", + "test:html": "pnpm vitest --reporter=html", "test:threads": "vitest --project threads", "test:forks": "vitest --project forks", "test:vmThreads": "vitest --project vmThreads", From d2f654f6b2aeb51d05b4395dcd621aa6b5e608ca Mon Sep 17 00:00:00 2001 From: userquin Date: Sat, 11 Jan 2025 15:49:37 +0100 Subject: [PATCH 2/5] chore: cleanup scripts --- test/browser/package.json | 2 +- test/core/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/browser/package.json b/test/browser/package.json index b550595682a0..4df0924ff960 100644 --- a/test/browser/package.json +++ b/test/browser/package.json @@ -19,7 +19,7 @@ "test:browser:preview": "PROVIDER=preview vitest", "test:browser:playwright": "PROVIDER=playwright vitest", "test:browser:webdriverio": "PROVIDER=webdriverio vitest", - "test:browser:playwright:html": "PROVIDER=playwright pnpm vitest --reporter=html --outputFile=./html/index.html" + "test:browser:playwright:html": "PROVIDER=playwright vitest --reporter=html --outputFile=./html/index.html" }, "devDependencies": { "@testing-library/react": "^13.2.0", diff --git a/test/core/package.json b/test/core/package.json index e08c096494f3..c112f6a9042b 100644 --- a/test/core/package.json +++ b/test/core/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "test": "vitest", - "test:html": "pnpm vitest --reporter=html", + "test:html": "vitest --reporter=html", "test:threads": "vitest --project threads", "test:forks": "vitest --project forks", "test:vmThreads": "vitest --project vmThreads", From 3f021f8f5db8d1d884918601e70ab583392b4a72 Mon Sep 17 00:00:00 2001 From: userquin Date: Sat, 11 Jan 2025 17:09:25 +0100 Subject: [PATCH 3/5] chore: include packages/ui/client folder in tsc typecheck script --- packages/ui/client/composables/explorer/search.ts | 2 +- packages/ui/client/global-setup.ts | 7 ++++--- packages/ui/client/test.ts | 6 +++--- tsconfig.check.json | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/ui/client/composables/explorer/search.ts b/packages/ui/client/composables/explorer/search.ts index e9a96d007398..15e63d7bc286 100644 --- a/packages/ui/client/composables/explorer/search.ts +++ b/packages/ui/client/composables/explorer/search.ts @@ -24,7 +24,7 @@ export function useSearch(searchBox: Ref) { const disableClearSearch = computed(() => search.value === '') const debouncedSearch = ref(search.value) - debouncedWatch(search, (value) => { + debouncedWatch(() => search.value, (value) => { debouncedSearch.value = value?.trim() ?? '' }, { debounce: 256 }) diff --git a/packages/ui/client/global-setup.ts b/packages/ui/client/global-setup.ts index 6c0f24837428..356e1010bde9 100644 --- a/packages/ui/client/global-setup.ts +++ b/packages/ui/client/global-setup.ts @@ -1,6 +1,7 @@ /// -import FloatingVue, { VTooltip } from 'floating-vue' +import type { Directive } from 'vue' +import FloatingVue, { vTooltip } from 'floating-vue' import routes from 'virtual:generated-pages' import { createRouter as _createRouter, @@ -15,8 +16,8 @@ import './styles/main.css' import 'floating-vue/dist/style.css' import 'uno.css' -export const directives = { - tooltip: VTooltip, +export const directives: Record = { + tooltip: vTooltip, } FloatingVue.options.instantMove = true diff --git a/packages/ui/client/test.ts b/packages/ui/client/test.ts index ca7c890c452b..08f599fb1d44 100644 --- a/packages/ui/client/test.ts +++ b/packages/ui/client/test.ts @@ -3,15 +3,15 @@ import { cleanup, type RenderOptions, } from '@testing-library/vue' -import { VTooltip } from 'floating-vue' +import { vTooltip } from 'floating-vue' import { afterEach } from 'vitest' -export function render(component: any, options?: RenderOptions) { +export function render(component: C, options?: RenderOptions) { return _render(component, { ...options, global: { directives: { - tooltip: VTooltip, + tooltip: vTooltip, }, }, }) diff --git a/tsconfig.check.json b/tsconfig.check.json index fe3fa7d051bb..278ac220841f 100644 --- a/tsconfig.check.json +++ b/tsconfig.check.json @@ -11,7 +11,6 @@ "./packages/vitest/dist/**", "./packages/*/*.d.ts", "./packages/*/*.d.cts", - "./packages/ui/client/**", "./examples/**/*.*", "./bench/**", "./test/benchmark/fixtures/**", From aece7101b2c8692752fcfa828f4b3860727970cf Mon Sep 17 00:00:00 2001 From: userquin Date: Sat, 11 Jan 2025 21:36:24 +0100 Subject: [PATCH 4/5] chore: fix static html reporter in test/browser --- test/browser/package.json | 2 +- test/browser/vitest.config.mts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/browser/package.json b/test/browser/package.json index 4df0924ff960..abac62e5ba0f 100644 --- a/test/browser/package.json +++ b/test/browser/package.json @@ -19,7 +19,7 @@ "test:browser:preview": "PROVIDER=preview vitest", "test:browser:playwright": "PROVIDER=playwright vitest", "test:browser:webdriverio": "PROVIDER=webdriverio vitest", - "test:browser:playwright:html": "PROVIDER=playwright vitest --reporter=html --outputFile=./html/index.html" + "test:browser:playwright:html": "HTML_REPORTER=true PROVIDER=playwright vitest --reporter=html" }, "devDependencies": { "@testing-library/react": "^13.2.0", diff --git a/test/browser/vitest.config.mts b/test/browser/vitest.config.mts index 0436736e63ec..66478d0e1d5e 100644 --- a/test/browser/vitest.config.mts +++ b/test/browser/vitest.config.mts @@ -10,6 +10,7 @@ function noop() {} const provider = process.env.PROVIDER || 'playwright' const browser = process.env.BROWSER || (provider === 'playwright' ? 'chromium' : 'chrome') +const outputFile = process.env.HTML_REPORTER ? undefined : './browser.json' const myCustomCommand: BrowserCommand<[arg1: string, arg2: string]> = ({ testPath }, arg1, arg2) => { return { testPath, arg1, arg2 } @@ -102,8 +103,8 @@ export default defineConfig({ }, open: false, diff: './custom-diff-config.ts', - outputFile: './browser.json', - reporters: ['json', { + outputFile, + reporters: [outputFile ? 'json' : undefined, { onInit: noop, onPathsCollected: noop, onCollected: noop, @@ -114,7 +115,7 @@ export default defineConfig({ onWatcherRerun: noop, onServerRestart: noop, onUserConsoleLog: noop, - }, 'default'], + }, 'default'].filter(Boolean), env: { BROWSER: browser, }, From b697dd39e81cccf7a5c8c1e71078992679be4d99 Mon Sep 17 00:00:00 2001 From: userquin Date: Sun, 12 Jan 2025 18:38:17 +0100 Subject: [PATCH 5/5] chore: update suggestion --- test/browser/package.json | 2 +- test/browser/vitest.config.mts | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/browser/package.json b/test/browser/package.json index abac62e5ba0f..fa0e6093de85 100644 --- a/test/browser/package.json +++ b/test/browser/package.json @@ -19,7 +19,7 @@ "test:browser:preview": "PROVIDER=preview vitest", "test:browser:playwright": "PROVIDER=playwright vitest", "test:browser:webdriverio": "PROVIDER=webdriverio vitest", - "test:browser:playwright:html": "HTML_REPORTER=true PROVIDER=playwright vitest --reporter=html" + "test:browser:playwright:html": "PROVIDER=playwright vitest --reporter=html" }, "devDependencies": { "@testing-library/react": "^13.2.0", diff --git a/test/browser/vitest.config.mts b/test/browser/vitest.config.mts index 66478d0e1d5e..82562c4625f7 100644 --- a/test/browser/vitest.config.mts +++ b/test/browser/vitest.config.mts @@ -10,7 +10,6 @@ function noop() {} const provider = process.env.PROVIDER || 'playwright' const browser = process.env.BROWSER || (provider === 'playwright' ? 'chromium' : 'chrome') -const outputFile = process.env.HTML_REPORTER ? undefined : './browser.json' const myCustomCommand: BrowserCommand<[arg1: string, arg2: string]> = ({ testPath }, arg1, arg2) => { return { testPath, arg1, arg2 } @@ -103,8 +102,11 @@ export default defineConfig({ }, open: false, diff: './custom-diff-config.ts', - outputFile, - reporters: [outputFile ? 'json' : undefined, { + outputFile: { + html: './html/index.html', + json: './browser.json', + }, + reporters: ['json', { onInit: noop, onPathsCollected: noop, onCollected: noop, @@ -115,7 +117,7 @@ export default defineConfig({ onWatcherRerun: noop, onServerRestart: noop, onUserConsoleLog: noop, - }, 'default'].filter(Boolean), + }, 'default'], env: { BROWSER: browser, },