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

Utilize Promise.withResolvers #56764

Merged
merged 2 commits into from
Oct 12, 2023
Merged

Conversation

wyattjoh
Copy link
Member

This utilizes Promise.withResolvers in a few places where it was done the old way. This also rearranges some imports and typings.

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team. type: next labels Oct 12, 2023
@wyattjoh
Copy link
Member Author

Current dependencies on/for this PR:

This comment was auto-generated by Graphite.

@ijjk
Copy link
Member

ijjk commented Oct 12, 2023

Stats from current PR

Default Build
General
vercel/next.js canary vercel/next.js chore/more-promise-with-resolvers Change
buildDuration 10.5s 10.6s N/A
buildDurationCached 6.4s 6.3s N/A
nodeModulesSize 172 MB 172 MB N/A
nextStartRea..uration (ms) 892ms 893ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js chore/more-promise-with-resolvers Change
199-HASH.js gzip 27.5 kB 27.5 kB N/A
3f784ff6-HASH.js gzip 50.9 kB 50.9 kB
99.HASH.js gzip 182 B 182 B
framework-HASH.js gzip 45.3 kB 45.3 kB
main-app-HASH.js gzip 254 B 252 B N/A
main-HASH.js gzip 32.9 kB 32.9 kB N/A
webpack-HASH.js gzip 1.75 kB 1.75 kB N/A
Overall change 96.4 kB 96.4 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js chore/more-promise-with-resolvers Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary vercel/next.js chore/more-promise-with-resolvers Change
_app-HASH.js gzip 206 B 205 B N/A
_error-HASH.js gzip 182 B 180 B N/A
amp-HASH.js gzip 506 B 505 B N/A
css-HASH.js gzip 322 B 323 B N/A
dynamic-HASH.js gzip 2.57 kB 2.57 kB N/A
edge-ssr-HASH.js gzip 260 B 259 B N/A
head-HASH.js gzip 350 B 350 B
hooks-HASH.js gzip 369 B 369 B
image-HASH.js gzip 4.35 kB 4.35 kB N/A
index-HASH.js gzip 256 B 256 B
link-HASH.js gzip 2.64 kB 2.63 kB N/A
routerDirect..HASH.js gzip 312 B 311 B N/A
script-HASH.js gzip 385 B 384 B N/A
withRouter-HASH.js gzip 307 B 308 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 1.08 kB 1.08 kB
Client Build Manifests
vercel/next.js canary vercel/next.js chore/more-promise-with-resolvers Change
_buildManifest.js gzip 485 B 482 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js chore/more-promise-with-resolvers Change
index.html gzip 528 B 530 B N/A
link.html gzip 540 B 543 B N/A
withRouter.html gzip 524 B 526 B N/A
Overall change 0 B 0 B
Edge SSR bundle Size
vercel/next.js canary vercel/next.js chore/more-promise-with-resolvers Change
edge-ssr.js gzip 93.7 kB 93.8 kB N/A
page.js gzip 152 kB 152 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary vercel/next.js chore/more-promise-with-resolvers Change
middleware-b..fest.js gzip 625 B 623 B N/A
middleware-r..fest.js gzip 150 B 151 B N/A
middleware.js gzip 22.9 kB 22.9 kB
edge-runtime..pack.js gzip 1.92 kB 1.92 kB
Overall change 24.8 kB 24.8 kB
Diff details
Diff for page.js

Diff too large to display

Diff for edge-ssr.js

Diff too large to display

Commit: 632b77e

@wyattjoh wyattjoh marked this pull request as ready for review October 12, 2023 20:16
@wyattjoh wyattjoh requested review from ismaelrumzan and Nutlope and removed request for a team October 12, 2023 20:16
@@ -794,16 +794,3 @@ export async function getImageSize(
const { width, height } = imageSizeOf(buffer)
return { width, height }
}

export class Deferred<T> {
Copy link
Member Author

Choose a reason for hiding this comment

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

Not imported 🤷🏻

Copy link
Member

Choose a reason for hiding this comment

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

I think this was leftover from something long ago, so it can be removed 😅

Comment on lines -44 to -46
let resolver: (cacheEntry: ResponseCacheEntry | null) => void = () => {}
let rejecter: (error: Error) => void = () => {}
const promise: Promise<ResponseCacheEntry | null> = new Promise(
Copy link
Member Author

Choose a reason for hiding this comment

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

Now we can use the types returned by Promise.withResolvers!

this.setDevReady!()

this.ready?.resolve()
this.ready = undefined
Copy link
Member

Choose a reason for hiding this comment

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

Any reason this is set to undefined?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because we didn't want to permit resolving more than once or rejecting after the value was resolved, this setting it to undefined was to act as a signal that the "value isn't of use anymore". Ideally, we'd want to do if (this.ready) await this.ready.promise to improve the performance, as it would allow us to avoid the await and subsequent yielding to the event loop.

@ijjk
Copy link
Member

ijjk commented Oct 12, 2023

Tests Passed

@kodiakhq kodiakhq bot merged commit 961fd01 into canary Oct 12, 2023
56 of 59 checks passed
@kodiakhq kodiakhq bot deleted the chore/more-promise-with-resolvers branch October 12, 2023 21:10
@github-actions github-actions bot added the locked label Nov 2, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 2, 2023
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.

3 participants