From f8f934a48af055b5bfdc7c750aab0473e97c3752 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 14 Mar 2022 03:07:01 -0700
Subject: [PATCH] fix: `ssrExternal` should not skip nested dependencies
 (#7154)

---
 .../src/node/ssr/__tests__/ssrExternal.spec.ts     |  5 +++++
 packages/vite/src/node/ssr/ssrExternal.ts          | 14 ++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 packages/vite/src/node/ssr/__tests__/ssrExternal.spec.ts

diff --git a/packages/vite/src/node/ssr/__tests__/ssrExternal.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrExternal.spec.ts
new file mode 100644
index 00000000000000..ad16534b088e2b
--- /dev/null
+++ 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
index 0e2eade85c21f1..800a2307dabae6 100644
--- 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 []