[pull] main from vitejs:main

.gitignore

@@ -1,4 +1,3 @@
-!**/glob-import/root/dir/node_modules
 .DS_Store
 .idea
 .pnpm-store
@@ -13,6 +12,9 @@ dist
 dist-ssr
 explorations
 node_modules
+!**/glob-import/root/dir/node_modules
+!**/fixtures/glob-exports/node_modules
+!**/fixtures/glob-exports/node_modules/my-pkg/dist
 playground-temp
 temp
 TODOs.md

packages/vite/src/node/__tests__/optimizer/resolve.spec.ts

@@ -0,0 +1,25 @@
+import path from 'node:path'
+import { describe, expect, test } from 'vitest'
+import { expandGlobIds } from '../../optimizer/resolve'
+
+const fixtureRoot = path.join(import.meta.dirname, '../fixtures/glob-exports')
+
+function makeConfig(root: string): any {
+  return {
+    root,
+    resolve: { preserveSymlinks: false },
+    packageCache: new Map(),
+  }
+}
+
+describe('expandGlobIds', () => {
+  test('skips null-valued exports (private subpath patterns)', () => {
+    const result = expandGlobIds('my-pkg/*', makeConfig(fixtureRoot))
+
+    expect(result).toContain('my-pkg')
+    expect(result).toContain('my-pkg/utils')
+    expect(result).toContain('my-pkg/public')
+    expect(result).not.toContain('my-pkg/private')
+    expect(result).not.toContain('my-pkg/also-private')
+  })
+})

packages/vite/src/node/config.ts

@@ -1708,6 +1708,13 @@ export async function resolveConfig(
 
   // load .env files
   // Backward compatibility: set envDir to false when envFile is false
+  if (config.envFile === false) {
+    logger.warn(
+      colors.yellow(
+        'The `envFile` option is deprecated, please use `envDir: false` instead.',
+      ),
+    )
+  }
   let envDir = config.envFile === false ? false : config.envDir
   if (envDir !== false) {
     envDir = config.envDir

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

@@ -131,6 +131,9 @@ export function expandGlobIds(id: string, config: ResolvedConfig): string[] {
               .filter(Boolean),
           )
         } else {
+          // null export value means the subpath is intentionally private/blocked
+          // https://nodejs.org/api/packages.html#subpath-patterns
+          if (exports[key] == null) continue
           possibleExportPaths.push(key.slice(2))
         }
       }