Skip to content

Commit e8fd18a

Browse files
author
Hannes Bornö
authored
Get correct chunks in flight-manifest on Windows (vercel#43334)
On Windows `cunkGroup.name` is `app\layout` rather than `app/layout`. This causes it to get the wrong chunks in `flight-manifest.json` for `next/script` in this case: ```json "chunks": ["webpack:webpack", "amp:amp"], ``` After checking for backslash: ```json "chunks":["app\\layout:app\\layout"], ``` fixes vercel#42519 ## Bug - [ ] Related issues linked using `fixes #number` - [ ] Integration tests added - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Feature - [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. - [ ] Related issues linked using `fixes #number` - [ ] [e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) tests added - [ ] Documentation added - [ ] Telemetry added. In case of a feature if it's used or not. - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Documentation / Examples - [ ] Make sure the linting passes by running `pnpm build && pnpm lint` - [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
1 parent e650047 commit e8fd18a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

packages/next/build/webpack/plugins/flight-manifest-plugin.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,10 @@ export class FlightManifestPlugin {
274274
moduleExportedKeys.forEach((name) => {
275275
// If the chunk is from `app/` chunkGroup, use it first.
276276
// This make sure not to load the overlapped chunk from `pages/` chunkGroup
277-
if (!moduleExports[name] || chunkGroup.name?.startsWith('app/')) {
277+
if (
278+
!moduleExports[name] ||
279+
(chunkGroup.name && /^app[\\/]/.test(chunkGroup.name))
280+
) {
278281
const requiredChunks = getAppPathRequiredChunks()
279282

280283
moduleExports[name] = {

0 commit comments

Comments
 (0)