feat(ssr): add module-sync to default externalCondition

Author: sapphi-red

packages/vite/src/node/constants.ts

@@ -64,7 +64,10 @@ export const DEFAULT_SERVER_CONDITIONS = Object.freeze(
   DEFAULT_CONDITIONS.filter((c) => c !== 'browser'),
 )
 
-export const DEFAULT_EXTERNAL_CONDITIONS = Object.freeze(['node'])
+export const DEFAULT_EXTERNAL_CONDITIONS = Object.freeze([
+  'node',
+  'module-sync',
+])
 
 /**
  * The browser versions that are included in the Baseline Widely Available on 2025-05-01.

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

@@ -753,7 +753,7 @@ export function tryNodeResolve(
   const resolveId = deepMatch ? resolveDeepImport : resolvePackageEntry
   const unresolvedId = deepMatch ? '.' + id.slice(pkgId.length) : id
 
-  let resolved = resolveId(unresolvedId, pkg, options)
+  let resolved = resolveId(unresolvedId, pkg, options, externalize)
   if (!resolved) {
     return
   }
@@ -893,6 +893,7 @@ export function resolvePackageEntry(
   id: string,
   { dir, data, setResolvedCache, getResolvedCache }: PackageData,
   options: InternalResolveOptions,
+  externalize?: boolean,
 ): string | undefined {
   const { file: idWithoutPostfix, postfix } = splitFileAndPostfix(id)
 
@@ -907,7 +908,13 @@ export function resolvePackageEntry(
     // resolve exports field with highest priority
     // using https://github.com/lukeed/resolve.exports
     if (data.exports) {
-      entryPoint = resolveExportsOrImports(data, '.', options, 'exports')
+      entryPoint = resolveExportsOrImports(
+        data,
+        '.',
+        options,
+        'exports',
+        externalize,
+      )
     }
 
     // fallback to mainFields if still not resolved
@@ -987,8 +994,12 @@ function resolveExportsOrImports(
   key: string,
   options: InternalResolveOptions,
   type: 'imports' | 'exports',
+  externalize?: boolean,
 ) {
-  const conditions = options.conditions.map((condition) => {
+  const rawConditions = externalize
+    ? options.externalConditions
+    : options.conditions
+  const conditions = rawConditions.map((condition) => {
     if (condition === DEV_PROD_CONDITION) {
       return options.isProduction ? 'production' : 'development'
     }
@@ -1010,6 +1021,7 @@ function resolveDeepImport(
   id: string,
   { setResolvedCache, getResolvedCache, dir, data }: PackageData,
   options: InternalResolveOptions,
+  externalize?: boolean,
 ): string | undefined {
   const cache = getResolvedCache(id, options)
   if (cache) {
@@ -1024,7 +1036,13 @@ function resolveDeepImport(
     if (isObject(exportsField) && !Array.isArray(exportsField)) {
       // resolve without postfix (see #7098)
       const { file, postfix } = splitFileAndPostfix(relativeId)
-      const exportsId = resolveExportsOrImports(data, file, options, 'exports')
+      const exportsId = resolveExportsOrImports(
+        data,
+        file,
+        options,
+        'exports',
+        externalize,
+      )
       if (exportsId !== undefined) {
         relativeId = exportsId + postfix
       } else {

playground/ssr-resolve/__tests__/ssr-resolve.spec.ts

@@ -23,6 +23,8 @@ test.runIf(isBuild)('correctly resolve entrypoints', async () => {
     new RegExp(`from ${_}@vitejs/test-deep-import/bar${_}`),
   )
 
+  expect(contents).toMatch(new RegExp(`from ${_}@vitejs/test-module-sync${_}`))
+
   await expect(import(`${testDir}/dist/main.mjs`)).resolves.toBeTruthy()
 })
 

playground/ssr-resolve/main.js

@@ -6,6 +6,7 @@ import fileEntry from '@vitejs/test-entries/file'
 import pkgExportsEntry from '@vitejs/test-resolve-pkg-exports/entry'
 import deepFoo from '@vitejs/test-deep-import/foo'
 import deepBar from '@vitejs/test-deep-import/bar'
+import moduleSync from '@vitejs/test-module-sync'
 import { used } from './util'
 
 export default `
@@ -14,5 +15,6 @@ export default `
   pkg-exports/entry: ${pkgExportsEntry}
   deep-import/foo: ${deepFoo}
   deep-import/bar: ${deepBar}
+  module-sync: ${moduleSync}
   util: ${used(['[success]'])}
 `

playground/ssr-resolve/package.json

@@ -8,8 +8,9 @@
     "debug": "node --inspect-brk ../../packages/vite/bin/vite build"
   },
   "dependencies": {
+    "@vitejs/test-deep-import": "file:./deep-import",
     "@vitejs/test-entries": "file:./entries",
-    "@vitejs/test-resolve-pkg-exports": "file:./pkg-exports",
-    "@vitejs/test-deep-import": "file:./deep-import"
+    "@vitejs/test-module-sync": "file:./pkg-module-sync",
+    "@vitejs/test-resolve-pkg-exports": "file:./pkg-exports"
   }
 }

playground/ssr-resolve/pkg-module-sync/index.js

@@ -0,0 +1 @@
+export default 'module-sync'

playground/ssr-resolve/pkg-module-sync/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@vitejs/test-module-sync",
+  "type": "module",
+  "private": true,
+  "version": "0.0.0",
+  "exports": {
+    ".": {
+      "module-sync": "./index.js"
+    }
+  }
+}