fix(ssr): re-add knownImports argument to resolveSSRExternal

This argument is necessary to ensure transient dependencies in node_modules are marked as external.
vitejs · Oct 7, 2021 · 18acf5c · 18acf5c
1 parent 356dbb3
commit 18acf5c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -36,6 +36,8 @@ import { buildImportAnalysisPlugin } from './plugins/importAnalysisBuild'
 import { resolveSSRExternal, shouldExternalizeForSSR } from './ssr/ssrExternal'
 import { ssrManifestPlugin } from './ssr/ssrManifestPlugin'
 import { isCSSRequest } from './plugins/css'
+import { DepOptimizationMetadata } from './optimizer'
+import { scanImports } from './optimizer/scan'
 import { assetImportMetaUrlPlugin } from './plugins/assetImportMetaUrl'
 import { loadFallbackPlugin } from './plugins/loadFallback'
 
@@ -382,7 +384,25 @@ async function doBuild(
   const userExternal = options.rollupOptions?.external
   let external = userExternal
   if (ssr) {
-    external = resolveExternal(resolveSSRExternal(config), userExternal)
+    // see if we have cached deps data available
+    let knownImports: string[] | undefined
+    if (config.cacheDir) {
+      const dataPath = path.join(config.cacheDir, '_metadata.json')
+      try {
+        const data = JSON.parse(
+          fs.readFileSync(dataPath, 'utf-8')
+        ) as DepOptimizationMetadata
+        knownImports = Object.keys(data.optimized)
+      } catch (e) {}
+    }
+    if (!knownImports) {
+      // no dev deps optimization data, do a fresh scan
+      knownImports = Object.keys((await scanImports(config)).deps)
+    }
+    external = resolveExternal(
+      resolveSSRExternal(config, knownImports),
+      userExternal
+    )
   }
 
   const rollup = require('rollup') as typeof Rollup

diff --git a/packages/vite/src/node/optimizer/registerMissing.ts b/packages/vite/src/node/optimizer/registerMissing.ts
@@ -54,7 +54,10 @@ export function createMissingImporterRegisterFn(
       knownOptimized = newData!.optimized
 
       // update ssr externals
-      server._ssrExternals = resolveSSRExternal(server.config)
+      server._ssrExternals = resolveSSRExternal(
+        server.config,
+        Object.keys(knownOptimized)
+      )
 
       logger.info(
         chalk.greenBright(`✨ dependencies updated, reloading page...`),

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -371,7 +371,12 @@ export async function createServer(
     },
     transformIndexHtml: null!, // to be immediately set
     ssrLoadModule(url) {
-      server._ssrExternals ||= resolveSSRExternal(config)
+      server._ssrExternals ||= resolveSSRExternal(
+        config,
+        server._optimizeDepsMetadata
+          ? Object.keys(server._optimizeDepsMetadata.optimized)
+          : []
+      )
       return ssrLoadModule(url, server)
     },
     ssrFixStacktrace(e) {

diff --git a/packages/vite/src/node/ssr/ssrExternal.ts b/packages/vite/src/node/ssr/ssrExternal.ts
@@ -21,6 +21,7 @@ const debug = createDebugger('vite:ssr-external')
  */
 export function resolveSSRExternal(
   config: ResolvedConfig,
+  knownImports: string[],
   ssrExternals: Set<string> = new Set(),
   seen: Set<string> = new Set()
 ): string[] {
@@ -34,6 +35,14 @@ export function resolveSSRExternal(
   })
 
   collectExternals(config.root, ssrExternals, seen)
+
+  for (const dep of knownImports) {
+    // assume external if not yet seen
+    if (!seen.has(dep)) {
+      ssrExternals.add(dep)
+    }
+  }
+
   ssrExternals.delete('vite')
 
   let externals = [...ssrExternals]