fix: ssrExternal should not skip nested dependencies (#7154)

vitejs · Mar 14, 2022 · f8f934a · f8f934a
1 parent a8dda1b
commit f8f934a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/packages/vite/src/node/ssr/__tests__/ssrExternal.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrExternal.spec.ts
@@ -0,0 +1,5 @@
+import { stripNesting } from '../ssrExternal'
+
+test('stripNesting', async () => {
+  expect(stripNesting(['c', 'p1>c1', 'p2 > c2'])).toEqual(['c', 'c1', 'c2'])
+})
diff --git a/packages/vite/src/node/ssr/ssrExternal.ts b/packages/vite/src/node/ssr/ssrExternal.ts
@@ -14,6 +14,16 @@ import { createFilter } from '@rollup/pluginutils'
 
 const debug = createDebugger('vite:ssr-external')
 
+/**
+ * Converts "parent > child" syntax to just "child"
+ */
+export function stripNesting(packages: string[]) {
+  return packages.map((s) => {
+    const arr = s.split('>')
+    return arr[arr.length - 1].trim()
+  })
+}
+
 /**
  * Heuristics for determining whether a dependency should be externalized for
  * server-side rendering.
@@ -22,6 +32,10 @@ export function resolveSSRExternal(
   config: ResolvedConfig,
   knownImports: string[]
 ): string[] {
+  // strip nesting since knownImports may be passed in from optimizeDeps which
+  // supports a "parent > child" syntax
+  knownImports = stripNesting(knownImports)
+
   const ssrConfig = config.ssr
   if (ssrConfig?.noExternal === true) {
     return []