Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(turbopack): wrap manifest loading in helper class #62118

Merged
merged 3 commits into from
Feb 19, 2024

Conversation

ForsakenHarmony
Copy link
Member

@ForsakenHarmony ForsakenHarmony commented Feb 15, 2024

What?

All the manifest loading logic now lives in the TurbopackManifestLoader class.
We have to pass way fewer arguments around to the functions now.

I've also cleaned up / restructured the arguments of the bigger functions in turbopack-utils.ts and gave some functions better names.

Best reviewed with hidden whitespace

Closes PACK-2520

@ijjk
Copy link
Member

ijjk commented Feb 15, 2024

Failing test suites

Commit: bf7110a

pnpm test test/integration/prerender-export/test/index.test.js

Expand output

● Test suite failed to run

thrown: "Exceeded timeout of 60000 ms for a hook.
Add a timeout value to this test to increase the timeout, if this is a long-running test. See https://jestjs.io/docs/api#testname-fn-timeout."

  217 |       })
  218 |
> 219 |       afterAll(async () => {
      |       ^
  220 |         if (app) {
  221 |           await stopApp(app)
  222 |         }

  at afterAll (integration/prerender-export/test/index.test.js:219:7)
  at describe (integration/prerender-export/test/index.test.js:209:5)
  at integration/prerender-export/test/index.test.js:208:52
  at Object.describe (integration/prerender-export/test/index.test.js:207:1)

Read more about building and testing Next.js in contributing.md.

pnpm test-dev test/e2e/app-dir/metadata/metadata.test.ts (PPR)

  • app dir - metadata > react cache > should have same title and page value when navigating
Expand output

● app dir - metadata › react cache › should have same title and page value when navigating

expect(received).toBe(expected) // Object.is equality

Expected: "0.27341608066540624"
Received: "0.670080016680461"

  973 |         const obj = JSON.parse(title)
  974 |         // Check `cache()`
> 975 |         expect(obj.val.toString()).toBe(value)
      |                                    ^
  976 |         // Check `fetch()`
  977 |         // TODO-APP: Investigate why fetch deduping doesn't apply but cache() does.
  978 |         if (!isNextDev) {

  at Object.toBe (e2e/app-dir/metadata/metadata.test.ts:975:36)

Read more about building and testing Next.js in contributing.md.

pnpm test-dev test/e2e/app-dir/interception-route-prefetch-cache/interception-route-prefetch-cache.test.ts (PPR)

  • interception-route-prefetch-cache > runtime = edge > should render the correct interception when two distinct layouts share the same path structure
Expand output

● interception-route-prefetch-cache › runtime = edge › should render the correct interception when two distinct layouts share the same path structure

thrown: "Exceeded timeout of 120000 ms for a test.
Add a timeout value to this test to increase the timeout, if this is a long-running test. See https://jestjs.io/docs/api#testname-fn-timeout."

   6 | describe('interception-route-prefetch-cache', () => {
   7 |   function runTests({ next }: ReturnType<typeof nextTestSetup>) {
>  8 |     it('should render the correct interception when two distinct layouts share the same path structure', async () => {
     |     ^
   9 |       const browser = await next.browser('/')
  10 |
  11 |       await browser.elementByCss('[href="/foo"]').click()

  at it (e2e/app-dir/interception-route-prefetch-cache/interception-route-prefetch-cache.test.ts:8:5)
  at runTests (e2e/app-dir/interception-route-prefetch-cache/interception-route-prefetch-cache.test.ts:91:5)
  at describe (e2e/app-dir/interception-route-prefetch-cache/interception-route-prefetch-cache.test.ts:90:3)
  at Object.describe (e2e/app-dir/interception-route-prefetch-cache/interception-route-prefetch-cache.test.ts:6:1)

Read more about building and testing Next.js in contributing.md.

@ijjk
Copy link
Member

ijjk commented Feb 15, 2024

Stats from current PR

Default Build
General
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
buildDuration 14.3s 14.3s N/A
buildDurationCached 7.6s 8.4s ⚠️ +770ms
nodeModulesSize 196 MB 196 MB N/A
nextStartRea..uration (ms) 426ms 443ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
1068-HASH.js gzip 30.3 kB 30.3 kB N/A
3f784ff6-HASH.js gzip 53.5 kB 53.5 kB N/A
4944-HASH.js gzip 5.04 kB 5.03 kB N/A
8423.HASH.js gzip 181 B 181 B
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 241 B 242 B N/A
main-HASH.js gzip 32.1 kB 32.1 kB N/A
webpack-HASH.js gzip 1.7 kB 1.7 kB
Overall change 47.1 kB 47.1 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
_app-HASH.js gzip 196 B 196 B
_error-HASH.js gzip 184 B 183 B N/A
amp-HASH.js gzip 503 B 504 B N/A
css-HASH.js gzip 323 B 324 B N/A
dynamic-HASH.js gzip 2.5 kB 2.51 kB N/A
edge-ssr-HASH.js gzip 258 B 259 B N/A
head-HASH.js gzip 353 B 351 B N/A
hooks-HASH.js gzip 370 B 370 B
image-HASH.js gzip 4.21 kB 4.2 kB N/A
index-HASH.js gzip 259 B 259 B
link-HASH.js gzip 2.68 kB 2.67 kB N/A
routerDirect..HASH.js gzip 313 B 314 B N/A
script-HASH.js gzip 386 B 385 B N/A
withRouter-HASH.js gzip 309 B 311 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 931 B 931 B
Client Build Manifests
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
_buildManifest.js gzip 485 B 484 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
index.html gzip 529 B 528 B N/A
link.html gzip 541 B 540 B N/A
withRouter.html gzip 524 B 522 B N/A
Overall change 0 B 0 B
Edge SSR bundle Size
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
edge-ssr.js gzip 2.29 kB 2.29 kB N/A
page.js gzip 2.98 kB 2.98 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
middleware-b..fest.js gzip 625 B 625 B
middleware-r..fest.js gzip 151 B 151 B
middleware.js gzip 465 B 466 B N/A
edge-runtime..pack.js gzip 839 B 839 B
Overall change 1.61 kB 1.61 kB
Next Runtimes
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
app-page-exp...dev.js gzip 166 kB 166 kB
app-page-exp..prod.js gzip 95.9 kB 95.9 kB
app-page-tur..prod.js gzip 97.6 kB 97.6 kB
app-page-tur..prod.js gzip 92 kB 92 kB
app-page.run...dev.js gzip 136 kB 136 kB
app-page.run..prod.js gzip 90.6 kB 90.6 kB
app-route-ex...dev.js gzip 22 kB 22 kB
app-route-ex..prod.js gzip 14.9 kB 14.9 kB
app-route-tu..prod.js gzip 14.9 kB 14.9 kB
app-route-tu..prod.js gzip 14.6 kB 14.6 kB
app-route.ru...dev.js gzip 21.7 kB 21.7 kB
app-route.ru..prod.js gzip 14.6 kB 14.6 kB
pages-api-tu..prod.js gzip 9.47 kB 9.47 kB
pages-api.ru...dev.js gzip 9.74 kB 9.74 kB
pages-api.ru..prod.js gzip 9.47 kB 9.47 kB
pages-turbo...prod.js gzip 22.1 kB 22.1 kB
pages.runtim...dev.js gzip 22.7 kB 22.7 kB
pages.runtim..prod.js gzip 22.1 kB 22.1 kB
server.runti..prod.js gzip 50.1 kB 50.1 kB
Overall change 927 kB 927 kB
build cache
vercel/next.js canary vercel/next.js hrmny/refactor-manifest-loading Change
0.pack gzip 1.49 MB 1.49 MB N/A
index.pack gzip 104 kB 104 kB N/A
Overall change 0 B 0 B
Commit: bf7110a

@ForsakenHarmony
Copy link
Member Author

ForsakenHarmony commented Feb 15, 2024


export type HandleRequireCacheClearing = (
export type HandleWrittenEndpoint = (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making this more generic is for a PR further down the stack

@ForsakenHarmony ForsakenHarmony enabled auto-merge (squash) February 16, 2024 16:14
@ForsakenHarmony ForsakenHarmony force-pushed the hrmny/refactor-manifest-loading branch 3 times, most recently from ef3960e to 464032f Compare February 16, 2024 23:14
@ForsakenHarmony ForsakenHarmony merged commit 6926688 into canary Feb 19, 2024
120 of 128 checks passed
@ForsakenHarmony ForsakenHarmony deleted the hrmny/refactor-manifest-loading branch February 19, 2024 14:27
@github-actions github-actions bot added the locked label Mar 7, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants