Skip to content

Commit 3bb80cf

Browse files
authored
Improve chunk encoding test to check right path for Turbopack (#56747)
This only fixes the test check, Turbopack wil have to `encodeURI` the files in the FlightManifest. Similar to what the webpack plugin does: https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/plugins/flight-manifest-plugin.ts#L111 <!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # -->
1 parent ebebb6a commit 3bb80cf

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

test/e2e/app-dir/app/index.test.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ createNextDescribe(
1313
? 'pnpm next experimental-compile'
1414
: undefined,
1515
},
16-
({ next, isNextDev: isDev, isNextStart, isNextDeploy }) => {
16+
({ next, isNextDev: isDev, isNextStart, isNextDeploy, isTurbopack }) => {
1717
if (process.env.NEXT_EXPERIMENTAL_COMPILE) {
1818
it('should provide query for getStaticProps page correctly', async () => {
1919
const res = await next.fetch('/ssg?hello=world')
@@ -192,10 +192,13 @@ createNextDescribe(
192192
await check(async () => {
193193
return requests.some(
194194
(req) =>
195-
req.includes(encodeURI('/[category]/[id]')) && req.endsWith('.js')
195+
req.includes(
196+
encodeURI(isTurbopack ? '[category]_[id]' : '/[category]/[id]')
197+
) && req.endsWith('.js')
196198
)
197199
? 'found'
198-
: JSON.stringify(requests)
200+
: // When it fails will log out the paths.
201+
JSON.stringify(requests)
199202
}, 'found')
200203
})
201204

0 commit comments

Comments
 (0)