Merge branch 'main' into main

Author: sheremet-va

docs/api/vi.md

@@ -832,7 +832,7 @@ Returns `true` if fake timers are enabled.
 
 - **Type:** `() => Vitest`
 
-When timers are run out, you may call this method to return mocked timers to its original implementations. All timers that were scheduled before will be discarded.
+When timers have run out, you may call this method to return mocked timers to its original implementations. All timers that were scheduled before will be discarded.
 
 ## Miscellaneous
 

docs/guide/improving-performance.md

@@ -88,7 +88,7 @@ vitest run --reporter=blob --shard=3/3 # 3rd machine
 Collect the results stored in `.vitest-reports` directory from each machine and merge them with [`--merge-reports`](/guide/cli#merge-reports) option:
 
 ```sh
-vitest --merge-reports
+vitest run --merge-reports
 ```
 
 ::: details Github action example
@@ -180,7 +180,7 @@ VITEST_MAX_THREADS=7 vitest run --reporter=blob --shard=3/4 & \
 VITEST_MAX_THREADS=7 vitest run --reporter=blob --shard=4/4 & \
 wait # https://man7.org/linux/man-pages/man2/waitpid.2.html
 
-vitest --merge-reports
+vitest run --merge-reports
 ```
 
 :::

docs/package.json

@@ -20,8 +20,8 @@
   "devDependencies": {
     "@iconify-json/carbon": "catalog:",
     "@iconify-json/logos": "catalog:",
-    "@shikijs/transformers": "^3.2.1",
-    "@shikijs/vitepress-twoslash": "^3.2.1",
+    "@shikijs/transformers": "^3.2.2",
+    "@shikijs/vitepress-twoslash": "^3.2.2",
     "@unocss/reset": "catalog:",
     "@vite-pwa/assets-generator": "^0.2.6",
     "@vite-pwa/vitepress": "^0.5.4",
@@ -33,7 +33,7 @@
     "vite": "^5.2.8",
     "vite-plugin-pwa": "^0.21.2",
     "vitepress": "2.0.0-alpha.4",
-    "vitepress-plugin-group-icons": "^1.3.8",
+    "vitepress-plugin-group-icons": "^1.5.2",
     "vitepress-plugin-tabs": "^0.7.0",
     "workbox-window": "^7.3.0"
   }

examples/lit/package.json

@@ -14,7 +14,7 @@
     "test:ui": "vitest --ui"
   },
   "dependencies": {
-    "lit": "^3.2.1"
+    "lit": "^3.3.0"
   },
   "devDependencies": {
     "@vitest/browser": "latest",

examples/workspace/package.json

@@ -12,7 +12,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.6.1",
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.1.2",
     "@vitejs/plugin-react": "^4.3.4",
     "@vitest/ui": "latest",
     "fastify": "^4.29.0",

package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "version": "3.1.1",
   "private": true,
-  "packageManager": "pnpm@10.7.1",
+  "packageManager": "pnpm@10.8.1",
   "description": "Next generation testing framework powered by Vite",
   "engines": {
     "node": "^18.0.0 || >=20.0.0"
@@ -36,13 +36,13 @@
     "test:browser:playwright": "pnpm -C test/browser run test:playwright"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.11.0",
+    "@antfu/eslint-config": "^4.12.0",
     "@antfu/ni": "^24.3.0",
     "@playwright/test": "^1.51.1",
     "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.14.1",
     "@types/ws": "catalog:",
     "@vitest/browser": "workspace:*",
     "@vitest/coverage-istanbul": "workspace:*",
@@ -53,10 +53,10 @@
     "esbuild": "^0.25.2",
     "eslint": "^9.24.0",
     "magic-string": "^0.30.17",
-    "oxc-transform": "^0.62.0",
+    "oxc-transform": "^0.63.0",
     "pathe": "^2.0.3",
     "rimraf": "^6.0.1",
-    "rollup": "^4.39.0",
+    "rollup": "^4.40.0",
     "rollup-plugin-dts": "^6.2.1",
     "rollup-plugin-license": "^3.6.0",
     "tinyglobby": "^0.2.12",
@@ -66,7 +66,7 @@
     "unplugin-oxc": "^0.3.3",
     "vite": "^6.2.0",
     "vitest": "workspace:*",
-    "zx": "^8.5.0"
+    "zx": "^8.5.2"
   },
   "pnpm": {
     "overrides": {

packages/browser/package.json

@@ -102,7 +102,7 @@
     "@vitest/runner": "workspace:*",
     "@vitest/ui": "workspace:*",
     "@vitest/ws-client": "workspace:*",
-    "@wdio/protocols": "^9.12.3",
+    "@wdio/protocols": "^9.12.5",
     "@wdio/types": "^9.12.3",
     "birpc": "catalog:",
     "flatted": "catalog:",
@@ -114,6 +114,6 @@
     "playwright-core": "^1.51.1",
     "safaridriver": "^1.0.0",
     "vitest": "workspace:*",
-    "webdriverio": "^9.12.4"
+    "webdriverio": "^9.12.5"
   }
 }

packages/ui/package.json

@@ -56,7 +56,7 @@
     "tinyrainbow": "catalog:"
   },
   "devDependencies": {
-    "@faker-js/faker": "^9.5.0",
+    "@faker-js/faker": "^9.7.0",
     "@iconify-json/carbon": "catalog:",
     "@iconify-json/logos": "catalog:",
     "@testing-library/vue": "^8.1.0",
@@ -76,7 +76,7 @@
     "codemirror-theme-vars": "^0.1.2",
     "d3-graph-controller": "^3.1.0",
     "floating-vue": "^5.2.2",
-    "rollup": "^4.39.0",
+    "rollup": "^4.40.0",
     "splitpanes": "^3.2.0",
     "unocss": "catalog:",
     "unplugin-auto-import": "^0.19.0",

packages/vite-node/src/client.ts

@@ -625,7 +625,7 @@ function exportAll(exports: any, sourceModule: any) {
   }
 
   for (const key in sourceModule) {
-    if (key !== 'default') {
+    if (key !== 'default' && !(key in exports)) {
       try {
         defineExport(exports, key, () => sourceModule[key])
       }

packages/vitest/package.json

@@ -186,7 +186,7 @@
     "@types/istanbul-reports": "catalog:",
     "@types/jsdom": "^21.1.7",
     "@types/micromatch": "^4.0.9",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.14.1",
     "@types/prompts": "^2.4.9",
     "@types/sinonjs__fake-timers": "^8.1.5",
     "acorn-walk": "catalog:",
@@ -197,7 +197,7 @@
     "flatted": "catalog:",
     "get-tsconfig": "^4.10.0",
     "happy-dom": "^17.4.4",
-    "jsdom": "^26.0.0",
+    "jsdom": "^26.1.0",
     "local-pkg": "^1.1.1",
     "micromatch": "^4.0.8",
     "pretty-format": "^29.7.0",