fix(resolve): deep import resolvedId error (#13010)

btea · web-flow · commit 30a41ffbeb58 · 2023-04-26T15:53:05.000+02:00
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -773,8 +773,15 @@ export function tryNodeResolve(
     }
     let resolvedId = id
     if (deepMatch && !pkg?.data.exports && path.extname(id) !== resolvedExt) {
-      resolvedId = resolved.id.slice(resolved.id.indexOf(id))
-      debug?.(`[processResult] ${colors.cyan(id)} -> ${colors.dim(resolvedId)}`)
+      // id date-fns/locale
+      // resolve.id ...date-fns/esm/locale/index.js
+      const index = resolved.id.indexOf(id)
+      if (index > -1) {
+        resolvedId = resolved.id.slice(index)
+        debug?.(
+          `[processResult] ${colors.cyan(id)} -> ${colors.dim(resolvedId)}`,
+        )
+      }
     }
     return { ...resolved, id: resolvedId, external: true }
   }

Original file line number	Diff line number	Diff line change
`@@ -773,8 +773,15 @@ export function tryNodeResolve(`
`773`	`773`	`}`
`774`	`774`	`let resolvedId = id`
`775`	`775`	`if (deepMatch && !pkg?.data.exports && path.extname(id) !== resolvedExt) {`
`776`		`- resolvedId = resolved.id.slice(resolved.id.indexOf(id))`
`777`		- debug?.(`[processResult] ${colors.cyan(id)} -> ${colors.dim(resolvedId)}`)
	`776`	`+ // id date-fns/locale`
	`777`	`+ // resolve.id ...date-fns/esm/locale/index.js`
	`778`	`+ const index = resolved.id.indexOf(id)`
	`779`	`+ if (index > -1) {`
	`780`	`+ resolvedId = resolved.id.slice(index)`
	`781`	`+ debug?.(`
	`782`	+ `[processResult] ${colors.cyan(id)} -> ${colors.dim(resolvedId)}`,
	`783`	`+ )`
	`784`	`+ }`
`778`	`785`	`}`
`779`	`786`	`return { ...resolved, id: resolvedId, external: true }`
`780`	`787`	`}`