Merge branch 'canary' into test/fix-flaky

huozhi · web-flow · commit 07d6686cf8b1 · 2023-10-02T17:37:31.000+02:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -28,7 +28,7 @@
 
 # Tooling & Telemetry
 
-/packages/next/src/build/                                @timneutkens @ijjk @shuding @huozhi @ztanner @vercel/web-tooling
+/packages/next/src/build/                                @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/web-tooling
 /packages/next/src/server/lib/router-utils/setup-dev.ts  @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/web-tooling
 /packages/next/src/telemetry/                            @timneutkens @ijjk @shuding @padmaia
 /packages/next-swc/                                      @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
diff --git a/packages/next/src/build/handle-externals.ts b/packages/next/src/build/handle-externals.ts
@@ -301,10 +301,8 @@ export function makeExternalHandler({
       return resolveResult.localRes
     }
 
-    // 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']
+    if (request === 'styled-jsx/style' && !isAppLayer) {
+      return `commonjs ${defaultOverrides['styled-jsx/style']}`
     }
 
     const { res, isEsm } = resolveResult

Original file line number	Diff line number	Diff line change
`@@ -301,10 +301,8 @@ export function makeExternalHandler({`
`301`	`301`	`return resolveResult.localRes`
`302`	`302`	`}`
`303`	`303`
`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']`
	`304`	`+ if (request === 'styled-jsx/style' && !isAppLayer) {`
	`305`	+ return `commonjs ${defaultOverrides['styled-jsx/style']}`
`308`	`306`	`}`
`309`	`307`
`310`	`308`	`const { res, isEsm } = resolveResult`