Revert "misc: shortcut styled-jsx in external resolution (#56291)"

ijjk · web-flow · commit eab4047344e9 · 2023-10-02T17:03:39.000-07:00
This reverts commit dba978f.
diff --git a/packages/next/src/build/handle-externals.ts b/packages/next/src/build/handle-externals.ts
@@ -301,8 +301,10 @@ export function makeExternalHandler({
       return resolveResult.localRes
     }
 
-    if (request === 'styled-jsx/style' && !isAppLayer) {
-      return `commonjs ${defaultOverrides['styled-jsx/style']}`
+    // Forcedly resolve the styled-jsx installed by next.js,
+    // since `resolveExternal` cannot find the styled-jsx dep with pnpm
+    if (request === 'styled-jsx/style') {
+      resolveResult.res = defaultOverrides['styled-jsx/style']
     }
 
     const { res, isEsm } = resolveResult

Original file line number	Diff line number	Diff line change
`@@ -301,8 +301,10 @@ export function makeExternalHandler({`
`301`	`301`	`return resolveResult.localRes`
`302`	`302`	`}`
`303`	`303`
`304`		`- if (request === 'styled-jsx/style' && !isAppLayer) {`
`305`		- return `commonjs ${defaultOverrides['styled-jsx/style']}`
	`304`	`+ // Forcedly resolve the styled-jsx installed by next.js,`
	`305`	+ // since `resolveExternal` cannot find the styled-jsx dep with pnpm
	`306`	`+ if (request === 'styled-jsx/style') {`
	`307`	`+ resolveResult.res = defaultOverrides['styled-jsx/style']`
`306`	`308`	`}`
`307`	`309`
`308`	`310`	`const { res, isEsm } = resolveResult`