Merge remote-tracking branch 'origin/main' into feat/expect-locator-to-have-screenshot

macarie · macarie · commit 50047212f2a2 · 2025-07-22T14:48:07.000+02:00
diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
@@ -76,6 +76,7 @@ export default ({ mode }: { mode: string }) => {
             '.spec.js': 'vscode-icons:file-type-testjs',
             '.test.js': 'vscode-icons:file-type-testjs',
             'marko': 'vscode-icons:file-type-marko',
+            'qwik': 'logos:qwik-icon',
           },
         }),
       ],
diff --git a/docs/guide/browser/index.md b/docs/guide/browser/index.md
@@ -207,6 +207,24 @@ export default defineConfig({
   }
 })
 ```
+```ts [qwik]
+import { defineConfig } from 'vitest/config'
+import { qwikVite } from '@builder.io/qwik/optimizer'
+
+// optional, run the tests in SSR mode
+import { testSSR } from 'vitest-browser-qwik/ssr-plugin'
+
+export default defineConfig({
+  plugins: [testSSR(), qwikVite()],
+  test: {
+    browser: {
+      enabled: true,
+      provider: 'playwright',
+      instances: [{ browser: 'chromium' }]
+    },
+  },
+})
+```
 :::
 
 If you need to run some tests using Node-based runner, you can define a [`projects`](/guide/projects) option with separate configurations for different testing strategies:
@@ -411,6 +429,7 @@ Community packages are available for other frameworks:
 
 - [`vitest-browser-lit`](https://github.com/EskiMojo14/vitest-browser-lit) to render [lit](https://lit.dev) components
 - [`vitest-browser-preact`](https://github.com/JoviDeCroock/vitest-browser-preact) to render [preact](https://preactjs.com) components
+- [`vitest-browser-qwik`](https://github.com/kunai-consulting/vitest-browser-qwik) to render [qwik](https://qwik.dev) components
 
 If your framework is not represented, feel free to create your own package - it is a simple wrapper around the framework renderer and `page.elementLocator` API. We will add a link to it on this page. Make sure it has a name starting with `vitest-browser-`.
 
@@ -516,6 +535,21 @@ test('greeting appears on click', async () => {
   await expect.element(greeting).toBeInTheDocument()
 })
 ```
+```tsx [qwik]
+import { render } from 'vitest-browser-qwik'
+import Greeting from './greeting'
+
+test('greeting appears on click', async () => {
+  // renderSSR and renderHook are also available
+  const screen = render(<Greeting />)
+
+  const button = screen.getByRole('button')
+  await button.click()
+  const greeting = screen.getByText(/hello world/iu)
+
+  await expect.element(greeting).toBeInTheDocument()
+})
+```
 :::
 
 Vitest doesn't support all frameworks out of the box, but you can use external tools to run tests with these frameworks. We also encourage the community to create their own `vitest-browser` wrappers - if you have one, feel free to add it to the examples above.
diff --git a/docs/guide/improving-performance.md b/docs/guide/improving-performance.md
@@ -79,7 +79,7 @@ export default defineConfig({
 
 ## Sharding
 
-Test sharding is a process of splitting your test suite into groups, or shards. This can be useful when you have a large test suite and multiple matchines that could run subsets of that suite simultaneously.
+Test sharding is a process of splitting your test suite into groups, or shards. This can be useful when you have a large test suite and multiple machines that could run subsets of that suite simultaneously.
 
 To split Vitest tests on multiple different runs, use [`--shard`](/guide/cli#shard) option with [`--reporter=blob`](/guide/reporters#blob-reporter) option:
 
diff --git a/docs/package.json b/docs/package.json
@@ -20,8 +20,8 @@
   "devDependencies": {
     "@iconify-json/carbon": "catalog:",
     "@iconify-json/logos": "catalog:",
-    "@shikijs/transformers": "^3.8.0",
-    "@shikijs/vitepress-twoslash": "^3.8.0",
+    "@shikijs/transformers": "^3.8.1",
+    "@shikijs/vitepress-twoslash": "^3.8.1",
     "@unocss/reset": "catalog:",
     "@vite-pwa/assets-generator": "^1.0.0",
     "@vite-pwa/vitepress": "^1.0.0",
diff --git a/examples/projects/package.json b/examples/projects/package.json
@@ -13,7 +13,7 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.6.1",
     "@types/react": "^19.1.8",
-    "@vitejs/plugin-react": "^4.6.0",
+    "@vitejs/plugin-react": "^4.7.0",
     "@vitest/ui": "latest",
     "fastify": "^5.4.0",
     "jsdom": "^26.1.0",
diff --git a/examples/typecheck/package.json b/examples/typecheck/package.json
@@ -10,7 +10,7 @@
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "@types/node": "^20.19.7",
+    "@types/node": "^20.19.9",
     "@vitest/ui": "latest",
     "typescript": "^5.8.3",
     "vite": "latest",
diff --git a/package.json b/package.json
@@ -37,26 +37,26 @@
     "test:browser:playwright": "pnpm -C test/browser run test:playwright"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.16.2",
+    "@antfu/eslint-config": "^4.17.0",
     "@antfu/ni": "^25.0.0",
     "@playwright/test": "^1.54.1",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
-    "@types/node": "^22.16.3",
+    "@types/node": "^22.16.5",
     "@types/ws": "catalog:",
     "@vitest/browser": "workspace:*",
     "@vitest/coverage-istanbul": "workspace:*",
     "@vitest/coverage-v8": "workspace:*",
     "@vitest/ui": "workspace:*",
     "bumpp": "^10.2.0",
     "changelogithub": "^13.16.0",
-    "esbuild": "^0.25.6",
+    "esbuild": "^0.25.8",
     "eslint": "^9.31.0",
     "magic-string": "^0.30.17",
     "pathe": "^2.0.3",
     "rimraf": "^6.0.1",
-    "rollup": "^4.45.0",
+    "rollup": "^4.45.1",
     "rollup-plugin-dts": "^6.2.1",
     "rollup-plugin-license": "^3.6.0",
     "tinyglobby": "catalog:",
@@ -66,7 +66,7 @@
     "unplugin-oxc": "^0.4.6",
     "vite": "^6.3.5",
     "vitest": "workspace:*",
-    "zx": "^8.7.0"
+    "zx": "^8.7.1"
   },
   "pnpm": {
     "overrides": {
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -119,6 +119,6 @@
     "playwright-core": "^1.54.1",
     "safaridriver": "^1.0.0",
     "vitest": "workspace:*",
-    "webdriverio": "^9.17.0"
+    "webdriverio": "^9.18.1"
   }
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -78,7 +78,7 @@
     "d3-graph-controller": "^3.1.1",
     "floating-vue": "^5.2.2",
     "mime": "^4.0.7",
-    "rollup": "^4.45.0",
+    "rollup": "^4.45.1",
     "splitpanes": "^3.2.0",
     "unocss": "catalog:",
     "unplugin-auto-import": "^0.19.0",
diff --git a/packages/vitest/package.json b/packages/vitest/package.json
@@ -163,7 +163,7 @@
     "expect-type": "^1.2.2",
     "magic-string": "catalog:",
     "pathe": "catalog:",
-    "picomatch": "^4.0.2",
+    "picomatch": "^4.0.3",
     "std-env": "catalog:",
     "tinybench": "^2.9.0",
     "tinyexec": "^0.3.2",
@@ -185,8 +185,8 @@
     "@types/istanbul-reports": "catalog:",
     "@types/jsdom": "^21.1.7",
     "@types/mime": "^4.0.0",
-    "@types/node": "^22.16.3",
-    "@types/picomatch": "^4.0.0",
+    "@types/node": "^22.16.5",
+    "@types/picomatch": "^4.0.1",
     "@types/prompts": "^2.4.9",
     "@types/sinonjs__fake-timers": "^8.1.5",
     "acorn-walk": "catalog:",
diff --git a/packages/vitest/src/create/browser/creator.ts b/packages/vitest/src/create/browser/creator.ts
@@ -104,6 +104,11 @@ function getFramework(): prompt.Choice[] {
       value: 'marko',
       description: '"A declarative, HTML-based language that makes building web apps fun"',
     },
+    {
+      title: 'qwik',
+      value: 'qwik',
+      description: '"Instantly interactive web apps at scale"',
+    },
   ]
 }
 
@@ -125,6 +130,8 @@ function getFrameworkTestPackage(framework: string) {
       return '@solidjs/testing-library'
     case 'marko':
       return '@marko/testing-library'
+    case 'qwik':
+      return 'vitest-browser-qwik'
   }
   throw new Error(`Unsupported framework: ${framework}`)
 }
@@ -143,6 +150,8 @@ function getFrameworkPluginPackage(framework: string) {
       return 'vite-plugin-solid'
     case 'marko':
       return '@marko/vite'
+    case 'qwik':
+      return '@builder.io/qwik/optimizer'
   }
   return null
 }
@@ -224,6 +233,9 @@ function getPossibleFramework(dependencies: Record<string, string>) {
   if (dependencies.marko) {
     return 'marko'
   }
+  if (dependencies['@builder.io/qwik'] || dependencies['@qwik.dev/core']) {
+    return 'qwik'
+  }
   return 'vanilla'
 }
 
@@ -257,22 +269,36 @@ function fail() {
   process.exitCode = 1
 }
 
+function getFrameworkImportInfo(framework: string) {
+  switch (framework) {
+    case 'svelte':
+      return { importName: 'svelte', isNamedExport: true }
+    case 'qwik':
+      return { importName: 'qwikVite', isNamedExport: true }
+    default:
+      return { importName: framework, isNamedExport: false }
+  }
+}
+
 async function generateFrameworkConfigFile(options: {
   configPath: string
   framework: string
   frameworkPlugin: string | null
   provider: string
   browsers: string[]
 }) {
-  const frameworkImport = options.framework === 'svelte'
-    ? `import { svelte } from '${options.frameworkPlugin}'`
-    : `import ${options.framework} from '${options.frameworkPlugin}'`
+  const { importName, isNamedExport } = getFrameworkImportInfo(options.framework)
+
+  const frameworkImport = isNamedExport
+    ? `import { ${importName} } from '${options.frameworkPlugin}'`
+    : `import ${importName} from '${options.frameworkPlugin}'`
+
   const configContent = [
     `import { defineConfig } from 'vitest/config'`,
     options.frameworkPlugin ? frameworkImport : null,
     ``,
     'export default defineConfig({',
-    options.frameworkPlugin ? `  plugins: [${options.framework}()],` : null,
+    options.frameworkPlugin ? `  plugins: [${importName}()],` : null,
     `  test: {`,
     `    browser: {`,
     `      enabled: true,`,
diff --git a/packages/vitest/src/create/browser/examples.ts b/packages/vitest/src/create/browser/examples.ts
@@ -191,6 +191,42 @@ test('renders name', async () => {
 `,
 }
 
+const qwikExample = {
+  name: 'HelloWorld.jsx',
+  js: `
+import { component$ } from '@builder.io/qwik'
+
+export default component$(({ name }) => {
+  return (
+    <div>
+      <h1>Hello {name}!</h1>
+    </div>
+  )
+})
+`,
+  ts: `
+import { component$ } from '@builder.io/qwik'
+
+export default component$(({ name }: { name: string }) => {
+  return (
+    <div>
+      <h1>Hello {name}!</h1>
+    </div>
+  )
+})
+`,
+  test: `
+import { expect, test } from 'vitest'
+import { render } from 'vitest-browser-qwik'
+import HelloWorld from './HelloWorld.tsx'
+
+test('renders name', async () => {
+  const { getByText } = render(<HelloWorld name="Vitest" />)
+  await expect.element(getByText('Hello Vitest!')).toBeInTheDocument()
+})
+`,
+}
+
 const vanillaExample = {
   name: 'HelloWorld.js',
   js: `
@@ -251,6 +287,8 @@ function getExampleTest(framework: string) {
       return litExample
     case 'marko':
       return markoExample
+    case 'qwik':
+      return qwikExample
     default:
       return vanillaExample
   }
diff --git a/packages/vitest/src/node/cli/cli-config.ts b/packages/vitest/src/node/cli/cli-config.ts
@@ -887,15 +887,17 @@ export const benchCliOptionsConfig: Pick<
   },
 }
 
-export const collectCliOptionsConfig: Pick<
-  VitestCLIOptions,
-  'json' | 'filesOnly'
-> = {
+export const collectCliOptionsConfig: VitestCLIOptions = {
+  ...cliOptionsConfig,
   json: {
     description: 'Print collected tests as JSON or write to a file (Default: false)',
     argument: '[true/path]',
   },
   filesOnly: {
     description: 'Print only test files with out the test cases',
   },
+  changed: {
+    description: 'Print only tests that are affected by the changed files (default: `false`)',
+    argument: '[since]',
+  },
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/test/cli/test/list-changed.test.ts b/test/cli/test/list-changed.test.ts
diff --git a/test/vite-node/package.json b/test/vite-node/package.json

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,6 @@`
`119`	`119`	`"playwright-core": "^1.54.1",`
`120`	`120`	`"safaridriver": "^1.0.0",`
`121`	`121`	`"vitest": "workspace:*",`
`122`		`- "webdriverio": "^9.17.0"`
	`122`	`+ "webdriverio": "^9.18.1"`
`123`	`123`	`}`
`124`	`124`	`}`