Merge branch 'main' into feat/move-providers-to-browser

.github/actions/setup-and-cache/action.yml

@@ -4,7 +4,7 @@ inputs:
   node-version:
     required: false
     description: Node version for setup-node
-    default: 18.x
+    default: 20.x
 
 runs:
   using: composite

.github/workflows/ci.yml

@@ -57,12 +57,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node_version: [18]
+        node_version: [18, 20]
         include:
           - os: macos-latest
-            node_version: 18
+            node_version: 20
           - os: windows-latest
-            node_version: 18
+            node_version: 20
       fail-fast: false
 
     steps:
@@ -97,7 +97,7 @@ jobs:
 
       - uses: ./.github/actions/setup-and-cache
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install
         run: pnpm i
@@ -120,7 +120,7 @@ jobs:
 
       - uses: ./.github/actions/setup-and-cache
         with:
-          node-version: 18
+          node-version: 20
 
       - uses: browser-actions/setup-chrome@v1
       - uses: browser-actions/setup-firefox@v1
@@ -160,7 +160,7 @@ jobs:
 
       - uses: ./.github/actions/setup-and-cache
         with:
-          node-version: 18
+          node-version: 20
 
       - uses: browser-actions/setup-chrome@v1
       - uses: browser-actions/setup-edge@v1
@@ -191,7 +191,7 @@ jobs:
 
       - uses: ./.github/actions/setup-and-cache
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install
         run: sudo pnpm i --frozen-lockfile

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
 
       - run: npx changelogithub
         env:

docs/config/index.md

@@ -192,7 +192,7 @@ Directory to save cache files.
 
 ### deps
 
-- **Type:** `{ optimizer?, registerNodeLoader?, ... }`
+- **Type:** `{ optimizer?, ... }`
 
 Handling for dependencies resolution.
 
@@ -278,15 +278,6 @@ By default, files inside `node_modules` are externalized and not transformed, un
 At the moment, this option only works with [`vmThreads`](#vmthreads) pool.
 :::
 
-#### deps.registerNodeLoader<NonProjectOption />
-
-- **Type:** `boolean`
-- **Default:** `false`
-
-Use [experimental Node loader](https://nodejs.org/api/esm.html#loaders) to resolve imports inside externalized files, using Vite resolve algorithm.
-
-If disabled, your `alias` and `<plugin>.resolveId` won't affect imports inside externalized packages (by default, `node_modules`).
-
 #### deps.interopDefault
 
 - **Type:** `boolean`

examples/solid/package.json

@@ -6,14 +6,14 @@
     "coverage": "vitest --coverage"
   },
   "dependencies": {
-    "solid-js": "^1.4.3"
+    "solid-js": "^1.8.3"
   },
   "devDependencies": {
+    "@solidjs/testing-library": "^0.8.4",
     "@testing-library/jest-dom": "^5.16.4",
     "jsdom": "latest",
-    "solid-testing-library": "^0.5.0",
     "vite": "latest",
-    "vite-plugin-solid": "^2.5.0",
+    "vite-plugin-solid": "^2.7.2",
     "vitest": "latest"
   }
 }

examples/solid/test/Hello.test.jsx

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest'
-import { fireEvent, render } from 'solid-testing-library'
+import { fireEvent, render } from '@solidjs/testing-library'
 import { Hello } from '../components/Hello'
 
 describe('<Hello />', () => {

examples/solid/vite.config.mjs

@@ -13,6 +13,13 @@ export default defineConfig({
         isolate: false,
       },
     },
+    deps: {
+      optimizer: {
+        web: {
+          exclude: ['solid-js'],
+        },
+      },
+    },
   },
   plugins: [solid()],
   resolve: {

packages/vitest/rollup.config.js

@@ -26,7 +26,6 @@ const entries = [
   'src/runtime/worker.ts',
   'src/runtime/vm.ts',
   'src/runtime/child.ts',
-  'src/runtime/loader.ts',
   'src/runtime/entry.ts',
   'src/runtime/entry-vm.ts',
   'src/integrations/spy.ts',

packages/vitest/src/node/config.ts

@@ -198,16 +198,6 @@ export function resolveConfig(
       ?? resolve(resolved.root, resolved.runner)
   }
 
-  if (resolved.deps.registerNodeLoader) {
-    const transformMode = resolved.environment === 'happy-dom' || resolved.environment === 'jsdom' ? 'web' : 'ssr'
-    console.warn(
-      c.yellow(
-      `${c.inverse(c.yellow(' Vitest '))} "deps.registerNodeLoader" is deprecated.`
-      + `If you rely on aliases inside external packages, use "deps.optimizer.${transformMode}.include" instead.`,
-      ),
-    )
-  }
-
   resolved.testNamePattern = resolved.testNamePattern
     ? resolved.testNamePattern instanceof RegExp
       ? resolved.testNamePattern

packages/vitest/src/node/pool.ts

@@ -1,7 +1,4 @@
-import { pathToFileURL } from 'node:url'
 import mm from 'micromatch'
-import { resolve } from 'pathe'
-import { distDir, rootDir } from '../paths'
 import type { Pool } from '../types'
 import type { Vitest } from './core'
 import { createChildProcessPool } from './pools/child'
@@ -27,9 +24,6 @@ export interface PoolProcessOptions {
   env: Record<string, string>
 }
 
-const loaderPath = pathToFileURL(resolve(distDir, './loader.js')).href
-const suppressLoaderWarningsPath = resolve(rootDir, './suppress-warnings.cjs')
-
 export function createPool(ctx: Vitest): ProcessPool {
   const pools: Record<Pool, ProcessPool | null> = {
     forks: null,
@@ -74,19 +68,10 @@ export function createPool(ctx: Vitest): ProcessPool {
 
     const options: PoolProcessOptions = {
       ...ctx.projectFiles,
-      execArgv: ctx.config.deps.registerNodeLoader
-        ? [
-            ...execArgv,
-            '--require',
-            suppressLoaderWarningsPath,
-            '--experimental-loader',
-            loaderPath,
-            ...conditions,
-          ]
-        : [
-            ...execArgv,
-            ...conditions,
-          ],
+      execArgv: [
+        ...execArgv,
+        ...conditions,
+      ],
       env: {
         TEST: 'true',
         VITEST: 'true',

packages/vitest/src/runtime/child.ts

@@ -75,8 +75,12 @@ async function init(ctx: ChildContext) {
     isChildProcess: true,
   }
 
-  // @ts-expect-error I know what I am doing :P
-  globalThis.__vitest_worker__ = state
+  Object.defineProperty(globalThis, '__vitest_worker__', {
+    value: state,
+    configurable: true,
+    writable: true,
+    enumerable: false,
+  })
 
   if (ctx.invalidates) {
     ctx.invalidates.forEach((fsPath) => {

packages/vitest/src/runtime/vm.ts

@@ -86,7 +86,12 @@ export async function run(ctx: WorkerContext) {
   if (!isContext(context))
     throw new TypeError(`Environment ${ctx.environment.name} doesn't provide a valid context. It should be created by "vm.createContext" method.`)
 
-  context.__vitest_worker__ = state
+  Object.defineProperty(context, '__vitest_worker__', {
+    value: state,
+    configurable: true,
+    writable: true,
+    enumerable: false,
+  })
   // this is unfortunately needed for our own dependencies
   // we need to find a way to not rely on this by default
   // because browser doesn't provide these globals

packages/vitest/src/runtime/worker.ts

@@ -60,8 +60,12 @@ async function init(ctx: WorkerContext) {
     rpc,
   }
 
-  // @ts-expect-error I know what I am doing :P
-  globalThis.__vitest_worker__ = state
+  Object.defineProperty(globalThis, '__vitest_worker__', {
+    value: state,
+    configurable: true,
+    writable: true,
+    enumerable: false,
+  })
 
   if (ctx.invalidates) {
     ctx.invalidates.forEach((fsPath) => {

packages/vitest/src/types/config.ts

@@ -181,13 +181,6 @@ interface DepsOptions {
    */
   fallbackCJS?: boolean
 
-  /**
-   * Use experimental Node loader to resolve imports inside node_modules using Vite resolve algorithm.
-   * @default false
-   * @deprecated If you rely on aliases inside external packages, use `deps.optimizer.{web,ssr}.include` instead.
-   */
-  registerNodeLoader?: boolean
-
   /**
    * A list of directories relative to the config file that should be treated as module directories.
    *
@@ -805,7 +798,7 @@ export type ProjectConfig = Omit<
   | 'coverage'
 > & {
   sequencer?: Omit<SequenceOptions, 'sequencer' | 'seed'>
-  deps?: Omit<DepsOptions, 'registerNodeLoader' | 'moduleDirectories'>
+  deps?: Omit<DepsOptions, 'moduleDirectories'>
 }
 
 export type RuntimeConfig = Pick<