fix(build): ensure linked packages are analyzed for commonjs

packages/vite/src/node/config.ts

@@ -252,6 +252,7 @@ export type ResolvedConfig = Readonly<
     env: Record<string, any>
     resolve: ResolveOptions & {
       alias: Alias[]
+      cjsInclude?: (string | RegExp)[]
     }
     plugins: readonly Plugin[]
     server: ResolvedServerOptions
@@ -363,22 +364,6 @@ export async function resolveConfig(
     { find: /^[\/]?@vite\/client/, replacement: () => CLIENT_ENTRY }
   ]
 
-  // resolve alias with internal client alias
-  const resolvedAlias = normalizeAlias(
-    mergeAlias(
-      // @ts-ignore because @rollup/plugin-alias' type doesn't allow function
-      // replacement, but its implementation does work with function values.
-      clientAlias,
-      config.resolve?.alias || config.alias || []
-    )
-  )
-
-  const resolveOptions: ResolvedConfig['resolve'] = {
-    dedupe: config.dedupe,
-    ...config.resolve,
-    alias: resolvedAlias
-  }
-
   // load .env files
   const envDir = config.envDir
     ? normalizePath(path.resolve(resolvedRoot, config.envDir))
@@ -400,6 +385,46 @@ export async function resolveConfig(
   const BASE_URL = resolveBaseUrl(config.base, command === 'build', logger)
   const resolvedBuildOptions = resolveBuildOptions(config.build)
 
+  let cjsInclude = resolvedBuildOptions.commonjsOptions.include
+  if (cjsInclude !== undefined) {
+    const include = (cjsInclude = arraify(cjsInclude))
+
+    // HACK: This uses an object that looks/acts like a RegExp
+    // but is actually dynamic so that symlinked files can be
+    // analyzed by CommonJS as their symlinks are resolved.
+    let cachedLength = include.length
+    let cachedFilter = createFilter(include)
+    resolvedBuildOptions.commonjsOptions.include = {
+      // Only this method is needed to be `createFilter` compatible.
+      // It assumes the `include` array length only ever increases if mutated.
+      test(id: string) {
+        if (include.length !== cachedLength) {
+          cachedLength = include.length
+          cachedFilter = createFilter(include)
+        }
+        return cachedFilter(id)
+      },
+      // Ensure "instanceof RegExp" returns true.
+      __proto__: RegExp.prototype
+    } as any
+  }
+
+  // resolve alias with internal client alias
+  const resolvedAlias = normalizeAlias(
+    mergeAlias(
+      // @ts-ignore because @rollup/plugin-alias' type doesn't allow function
+      // replacement, but its implementation does work with function values.
+      clientAlias,
+      config.resolve?.alias || config.alias || []
+    )
+  )
+
+  const resolveOptions: ResolvedConfig['resolve'] = {
+    dedupe: config.dedupe,
+    ...config.resolve,
+    alias: resolvedAlias
+  }
+
   // resolve cache directory
   const pkgPath = lookupFile(
     resolvedRoot,

packages/vite/src/node/packages.ts

@@ -48,7 +48,8 @@ export function resolvePackageData(
   id: string,
   basedir: string,
   preserveSymlinks = false,
-  packageCache?: PackageCache
+  packageCache?: PackageCache,
+  cjsInclude?: (string | RegExp)[]
 ): PackageData | null {
   let pkg: PackageData | undefined
   let cacheKey: string | undefined
@@ -60,8 +61,8 @@ export function resolvePackageData(
   }
   let pkgPath: string | undefined
   try {
-    pkgPath = resolveFrom(`${id}/package.json`, basedir, preserveSymlinks)
-    pkg = loadPackageData(pkgPath, true, packageCache)
+    pkgPath = resolveFrom(`${id}/package.json`, basedir, true)
+    pkg = loadPackageData(pkgPath, preserveSymlinks, packageCache, cjsInclude)
     if (packageCache) {
       packageCache.set(cacheKey!, pkg)
     }
@@ -81,10 +82,22 @@ export function resolvePackageData(
 export function loadPackageData(
   pkgPath: string,
   preserveSymlinks?: boolean,
-  packageCache?: PackageCache
+  packageCache?: PackageCache,
+  cjsInclude?: (string | RegExp)[]
 ): PackageData {
   if (!preserveSymlinks) {
+    const originalPkgPath = pkgPath
     pkgPath = fs.realpathSync.native(pkgPath)
+
+    // In case a linked package is a local clone of a CommonJS dependency,
+    // we need to ensure @rollup/plugin-commonjs analyzes the package even
+    // after it's been resolved to its actual file location.
+    if (cjsInclude && pkgPath !== originalPkgPath) {
+      const filter = createFilter(cjsInclude, undefined, { resolve: false })
+      if (!filter(pkgPath) && filter(originalPkgPath)) {
+        cjsInclude.push(path.dirname(pkgPath) + '/**')
+      }
+    }
   }
 
   let cached: PackageData | undefined

packages/vite/src/node/plugins/resolve.ts

@@ -58,6 +58,7 @@ export interface InternalResolveOptions extends ResolveOptions {
   isProduction: boolean
   ssrConfig?: SSROptions
   packageCache?: PackageCache
+  cjsInclude?: (string | RegExp)[]
   /**
    * src code mode also attempts the following:
    * - resolving /xxx as URLs
@@ -81,6 +82,7 @@ export interface InternalResolveOptions extends ResolveOptions {
 export function resolvePlugin(baseOptions: InternalResolveOptions): Plugin {
   const {
     root,
+    isBuild,
     isProduction,
     asSrc,
     ssrConfig,
@@ -120,6 +122,9 @@ export function resolvePlugin(baseOptions: InternalResolveOptions): Plugin {
         ...baseOptions,
         isFromTsImporter: isTsRequest(importer ?? '')
       }
+      if (!options.isBuild) {
+        options.cjsInclude = undefined
+      }
 
       let res: string | PartialResolvedId | undefined
 
@@ -520,7 +525,13 @@ export function tryNodeResolve(
 
   let pkg: PackageData | undefined
   const pkgId = possiblePkgIds.reverse().find((pkgId) => {
-    pkg = resolvePackageData(pkgId, basedir, preserveSymlinks, packageCache)!
+    pkg = resolvePackageData(
+      pkgId,
+      basedir,
+      preserveSymlinks,
+      packageCache,
+      options.cjsInclude
+    )!
     return pkg
   })!
 

packages/vite/src/node/utils.ts

@@ -610,7 +610,7 @@ export function resolveHostname(
   return { host, name }
 }
 
-export function arraify<T>(target: T | T[]): T[] {
+export function arraify<T>(target: T | readonly T[]): T[] {
   return Array.isArray(target) ? target : [target]
 }