fix(ssr): do not resolve to optimized deps during ssr

yyx990803 · yyx990803 · commit d0215060e87c · 2021-02-03T12:06:55.000-05:00
fix #1860
diff --git a/packages/vite/src/node/plugins/preAlias.ts b/packages/vite/src/node/plugins/preAlias.ts
@@ -13,8 +13,8 @@ export function preAliasPlugin(): Plugin {
     configureServer(_server) {
       server = _server
     },
-    resolveId(id) {
-      if (bareImportRE.test(id)) {
+    resolveId(id, _, __, ssr) {
+      if (!ssr && bareImportRE.test(id)) {
         return tryOptimizedResolve(id, server)
       }
     }
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -172,7 +172,12 @@ export function resolvePlugin({
 
       // bare package imports, perform node resolve
       if (bareImportRE.test(id)) {
-        if (asSrc && server && (res = tryOptimizedResolve(id, server))) {
+        if (
+          asSrc &&
+          server &&
+          !ssr &&
+          (res = tryOptimizedResolve(id, server))
+        ) {
           return res
         }
 

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ export function preAliasPlugin(): Plugin {`
`13`	`13`	`configureServer(_server) {`
`14`	`14`	`server = _server`
`15`	`15`	`},`
`16`		`- resolveId(id) {`
`17`		`- if (bareImportRE.test(id)) {`
	`16`	`+ resolveId(id, _, __, ssr) {`
	`17`	`+ if (!ssr && bareImportRE.test(id)) {`
`18`	`18`	`return tryOptimizedResolve(id, server)`
`19`	`19`	`}`
`20`	`20`	`}`