fix: respect ssr.noExternal when externalizing dependencies (#8862)

Author: sheremet-va

packages/vitest/src/node/config/resolveConfig.ts

@@ -369,29 +369,6 @@ export function resolveConfig(
  resolved.deps ??= {}
  resolved.deps.moduleDirectories ??= []
 
- const envModuleDirectories
- = process.env.VITEST_MODULE_DIRECTORIES
- || process.env.npm_config_VITEST_MODULE_DIRECTORIES
-
- if (envModuleDirectories) {
- resolved.deps.moduleDirectories.push(...envModuleDirectories.split(','))
- }
-
- resolved.deps.moduleDirectories = resolved.deps.moduleDirectories.map(
- (dir) => {
- if (dir[0] !== '/') {
- dir = `/${dir}`
- }
- if (!dir.endsWith('/')) {
- dir += '/'
- }
- return normalize(dir)
- },
- )
- if (!resolved.deps.moduleDirectories.includes('/node_modules/')) {
- resolved.deps.moduleDirectories.push('/node_modules/')
- }
-
  resolved.deps.optimizer ??= {}
  resolved.deps.optimizer.ssr ??= {}
  resolved.deps.optimizer.ssr.enabled ??= false

packages/vitest/src/node/plugins/runnerTransform.ts

@@ -1,6 +1,8 @@
 import type { ResolvedConfig, UserConfig, Plugin as VitePlugin } from 'vite'
 import { builtinModules } from 'node:module'
+import { normalize } from 'pathe'
 import { mergeConfig } from 'vite'
+import { escapeRegExp } from '../../utils/base'
 import { resolveOptimizerConfig } from './utils'
 
 export function ModuleRunnerTransform(): VitePlugin {
@@ -23,6 +25,34 @@ export function ModuleRunnerTransform(): VitePlugin {
  names.add('__vitest_vm__')
  }
 
+ let moduleDirectories = testConfig.deps?.moduleDirectories || []
+
+ const envModuleDirectories
+ = process.env.VITEST_MODULE_DIRECTORIES
+ || process.env.npm_config_VITEST_MODULE_DIRECTORIES
+
+ if (envModuleDirectories) {
+ moduleDirectories.push(...envModuleDirectories.split(','))
+ }
+
+ moduleDirectories = moduleDirectories.map(
+ (dir) => {
+ if (dir[0] !== '/') {
+ dir = `/${dir}`
+ }
+ if (!dir.endsWith('/')) {
+ dir += '/'
+ }
+ return normalize(dir)
+ },
+ )
+ if (!moduleDirectories.includes('/node_modules/')) {
+ moduleDirectories.push('/node_modules/')
+ }
+
+ testConfig.deps ??= {}
+ testConfig.deps.moduleDirectories = moduleDirectories
+
  const external: (string | RegExp)[] = []
  const noExternal: (string | RegExp)[] = []
 
@@ -64,18 +94,43 @@ export function ModuleRunnerTransform(): VitePlugin {
  environment.resolve || {},
  ) as ResolvedConfig['resolve']
 
- const envNoExternal = resolveViteResolveOptions('noExternal', currentResolveOptions)
+ const envNoExternal = resolveViteResolveOptions('noExternal', currentResolveOptions, moduleDirectories)
  if (envNoExternal === true) {
  noExternalAll = true
  }
- else {
+ else if (envNoExternal.length) {
  noExternal.push(...envNoExternal)
  }
+ else if (name === 'client' || name === 'ssr') {
+ const deprecatedNoExternal = resolveDeprecatedOptions(
+ name === 'client'
+ ? config.resolve?.noExternal
+ : config.ssr?.noExternal,
+ moduleDirectories,
+ )
+ if (deprecatedNoExternal === true) {
+ noExternalAll = true
+ }
+ else {
+ noExternal.push(...deprecatedNoExternal)
+ }
+ }
 
- const envExternal = resolveViteResolveOptions('external', currentResolveOptions)
- if (envExternal !== true) {
+ const envExternal = resolveViteResolveOptions('external', currentResolveOptions, moduleDirectories)
+ if (envExternal !== true && envExternal.length) {
  external.push(...envExternal)
  }
+ else if (name === 'client' || name === 'ssr') {
+ const deprecatedExternal = resolveDeprecatedOptions(
+ name === 'client'
+ ? config.resolve?.external
+ : config.ssr?.external,
+ moduleDirectories,
+ )
+ if (deprecatedExternal !== true) {
+ external.push(...deprecatedExternal)
+ }
+ }
 
  // remove Vite's externalization logic because we have our own (unfortunetly)
  environment.resolve ??= {}
@@ -146,18 +201,52 @@ export function ModuleRunnerTransform(): VitePlugin {
 function resolveViteResolveOptions(
  key: 'noExternal' | 'external',
  options: ResolvedConfig['resolve'],
+ moduleDirectories: string[] | undefined,
 ): true | (string | RegExp)[] {
  if (Array.isArray(options[key])) {
- return options[key]
+ // mergeConfig will merge a custom `true` into an array
+ if (options[key].some(p => (p as any) === true)) {
+ return true
+ }
+ return options[key].map(dep => processWildcard(dep, moduleDirectories))
  }
  else if (
  typeof options[key] === 'string'
  || options[key] instanceof RegExp
  ) {
- return [options[key]]
+ return [options[key]].map(dep => processWildcard(dep, moduleDirectories))
  }
  else if (typeof options[key] === 'boolean') {
  return true
  }
  return []
 }
+
+function resolveDeprecatedOptions(
+ options: string | RegExp | (string | RegExp)[] | true | undefined,
+ moduleDirectories: string[] | undefined,
+): true | (string | RegExp)[] {
+ if (options === true) {
+ return true
+ }
+ else if (Array.isArray(options)) {
+ return options.map(dep => processWildcard(dep, moduleDirectories))
+ }
+ else if (options != null) {
+ return [processWildcard(options, moduleDirectories)]
+ }
+ return []
+}
+
+function processWildcard(dep: string | RegExp, moduleDirectories: string[] | undefined) {
+ if (typeof dep !== 'string') {
+ return dep
+ }
+ if (typeof dep === 'string' && dep.includes('*')) {
+ const directories = (moduleDirectories || ['/node_modules/']).map(r => escapeRegExp(r))
+ return new RegExp(
+ `(${directories.join('|')})${dep.replace(/\*/g, '[\\w/]+')}`,
+ )
+ }
+ return dep
+}

packages/vitest/src/node/resolver.ts

@@ -161,13 +161,13 @@ async function _shouldExternalize(
 
  const moduleDirectories = options?.moduleDirectories || ['/node_modules/']
 
- if (matchExternalizePattern(id, moduleDirectories, options?.inline)) {
+ if (matchPattern(id, moduleDirectories, options?.inline)) {
  return false
  }
  if (options?.inlineFiles && options?.inlineFiles.includes(id)) {
  return false
  }
- if (matchExternalizePattern(id, moduleDirectories, options?.external)) {
+ if (matchPattern(id, moduleDirectories, options?.external)) {
  return id
  }
 
@@ -181,10 +181,10 @@ async function _shouldExternalize(
  const guessCJS = isLibraryModule && options?.fallbackCJS
  id = guessCJS ? guessCJSversion(id) || id : id
 
- if (matchExternalizePattern(id, moduleDirectories, defaultInline)) {
+ if (matchPattern(id, moduleDirectories, defaultInline)) {
  return false
  }
- if (matchExternalizePattern(id, moduleDirectories, depsExternal)) {
+ if (matchPattern(id, moduleDirectories, depsExternal)) {
  return id
  }
 
@@ -195,7 +195,7 @@ async function _shouldExternalize(
  return false
 }
 
-function matchExternalizePattern(
+function matchPattern(
  id: string,
  moduleDirectories: string[],
  patterns?: (string | RegExp)[] | true,

packages/vitest/src/public/node.ts

@@ -7,6 +7,7 @@ export { isValidApiRequest } from '../api/check'
 export { escapeTestName } from '../node/ast-collect'
 export { parseCLI } from '../node/cli/cac'
 export type { CliParseOptions } from '../node/cli/cac'
+export type { CliOptions } from '../node/cli/cli-api'
 export { startVitest } from '../node/cli/cli-api'
 export { resolveApiServerConfig } from '../node/config/resolveConfig'
 export type {