fix(build): fix resolution algorithm when build.ssr is true (#9989)

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

@@ -721,7 +721,11 @@ export function tryNodeResolve(
     let resolvedId = id
     if (isDeepImport) {
       if (!pkg?.data.exports && path.extname(id) !== resolvedExt) {
-        resolvedId += resolvedExt
+        resolvedId = resolved.id.slice(resolved.id.indexOf(id))
+        isDebug &&
+          debug(
+            `[processResult] ${colors.cyan(id)} -> ${colors.dim(resolvedId)}`
+          )
       }
     }
     return { ...resolved, id: resolvedId, external: true }

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

@@ -0,0 +1,13 @@
+import { expect, test } from 'vitest'
+import { isBuild, readFile, testDir } from '~utils'
+
+test.runIf(isBuild)('correctly resolve entrypoints', async () => {
+  const contents = readFile('dist/main.mjs')
+
+  const _ = `['"]`
+  expect(contents).toMatch(new RegExp(`from ${_}entries/dir/index.js${_}`))
+  expect(contents).toMatch(new RegExp(`from ${_}entries/file.js${_}`))
+  expect(contents).toMatch(new RegExp(`from ${_}pkg-exports/entry${_}`))
+
+  await expect(import(`${testDir}/dist/main.mjs`)).resolves.toBeTruthy()
+})

playground/ssr-resolve/entries/dir/index.js

@@ -0,0 +1 @@
+module.exports = __filename.slice(__filename.lastIndexOf('entries'))

playground/ssr-resolve/entries/file.js

@@ -0,0 +1 @@
+module.exports = __filename.slice(__filename.lastIndexOf('entries'))

playground/ssr-resolve/entries/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "entries",
+  "private": true,
+  "version": "0.0.0"
+}

playground/ssr-resolve/main.js

@@ -0,0 +1,12 @@
+// no `exports` key, should resolve to entries/dir/index.js
+import dirEntry from 'entries/dir'
+// no `exports` key, should resolve to entries/file.js
+import fileEntry from 'entries/file'
+// has `exports` key, should resolve to pkg-exports/entry
+import pkgExportsEntry from 'pkg-exports/entry'
+
+export default `
+  entries/dir: ${dirEntry}
+  entries/file: ${fileEntry}
+  pkg-exports/entry: ${pkgExportsEntry}
+`

playground/ssr-resolve/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "ssr-resolve",
+  "private": true,
+  "version": "0.0.0",
+  "scripts": {
+    "build": "vite build",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite build"
+  },
+  "dependencies": {
+    "entries": "file:./entries",
+    "pkg-exports": "file:./pkg-exports"
+  }
+}

playground/ssr-resolve/pkg-exports/entry.js

@@ -0,0 +1 @@
+module.exports = 'pkg-exports entry'

playground/ssr-resolve/pkg-exports/index.js

@@ -0,0 +1 @@
+module.exports = undefined

playground/ssr-resolve/pkg-exports/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "pkg-exports",
+  "private": true,
+  "version": "0.0.0",
+  "exports": {
+    ".": "./index.js",
+    "./entry": "./entry.js"
+  }
+}

playground/ssr-resolve/vite.config.js

@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  build: {
+    ssr: './main.js'
+  }
+})

pnpm-lock.yaml

@@ -1085,6 +1085,20 @@ importers:
       express: 4.18.1
       serve-static: 1.15.0
 
+  playground/ssr-resolve:
+    specifiers:
+      entries: file:./entries
+      pkg-exports: file:./pkg-exports
+    dependencies:
+      entries: file:playground/ssr-resolve/entries
+      pkg-exports: file:playground/ssr-resolve/pkg-exports
+
+  playground/ssr-resolve/entries:
+    specifiers: {}
+
+  playground/ssr-resolve/pkg-exports:
+    specifiers: {}
+
   playground/ssr-vue:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
@@ -9323,6 +9337,18 @@ packages:
     version: 0.0.0
     dev: false
 
+  file:playground/ssr-resolve/entries:
+    resolution: {directory: playground/ssr-resolve/entries, type: directory}
+    name: entries
+    version: 0.0.0
+    dev: false
+
+  file:playground/ssr-resolve/pkg-exports:
+    resolution: {directory: playground/ssr-resolve/pkg-exports, type: directory}
+    name: pkg-exports-cjs
+    version: 0.0.0
+    dev: false
+
   file:playground/ssr-vue/example-external-component:
     resolution: {directory: playground/ssr-vue/example-external-component, type: directory}
     name: example-external-component