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.

Sign up for GitHub

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

Jump to bottom

Fix source mapping of generated cache wrapper calls #74987

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Fix source mapping of generated cache wrapper calls #74987

merged 1 commit into from
Jan 23, 2025

Conversation

unstubbable
Copy link
Contributor

@unstubbable unstubbable commented Jan 16, 2025 •
edited
Loading

In the SWC transform we're now using the span of the original "use cache" function for the generated cache wrapper call, e.g. so that the captured timeout error stack can be source mapped correctly.

This also fixes the wrongly placed /*#__TURBOPACK_DISABLE_EXPORT_MERGING__*/ marker for the generated cache wrapper statements.

Before:
404215955-c354d1f5-4aeb-4f35-9385-a9531219dc4c

After:
404215977-a0157fad-a1f8-409a-b9b9-9709e07f7c05

Closes NDX-675

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team. tests Turbopack Related to Turbopack with Next.js. labels Jan 16, 2025
@unstubbable unstubbable mentioned this pull request Jan 16, 2025
Merged
@unstubbable Graphite App
Copy link
Contributor Author

unstubbable commented Jan 16, 2025 •
edited
Loading

This stack of pull requests is managed by Graphite. Learn more about stacking.

@unstubbable unstubbable mentioned this pull request Jan 16, 2025
Merged
@ijjk
Copy link
Member

ijjk commented Jan 16, 2025 •
edited
Loading

Tests Passed

@ijjk
Copy link
Member

ijjk commented Jan 16, 2025 •
edited
Loading

Stats from current PR

Default Build (Increase detected ⚠️)
General
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
buildDuration 18.4s 16.9s N/A
buildDurationCached 15.9s 13.6s N/A
nodeModulesSize 419 MB 419 MB N/A
nextStartRea..uration (ms) 435ms 428ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
5306-HASH.js gzip 54.1 kB 54 kB N/A
8276.HASH.js gzip 169 B 168 B N/A
8377-HASH.js gzip 5.46 kB 5.46 kB N/A
bccd1874-HASH.js gzip 52.9 kB 52.9 kB N/A
framework-HASH.js gzip 57.5 kB 57.5 kB N/A
main-app-HASH.js gzip 240 B 242 B N/A
main-HASH.js gzip 34.6 kB 34.6 kB N/A
webpack-HASH.js gzip 1.71 kB 1.71 kB N/A
Overall change 0 B 0 B ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
polyfills-HASH.js gzip 39.4 kB 39.4 kB ✓
Overall change 39.4 kB 39.4 kB ✓
Client Pages
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
_app-HASH.js gzip 193 B 193 B ✓
_error-HASH.js gzip 193 B 193 B ✓
amp-HASH.js gzip 512 B 510 B N/A
css-HASH.js gzip 343 B 342 B N/A
dynamic-HASH.js gzip 1.84 kB 1.84 kB ✓
edge-ssr-HASH.js gzip 265 B 265 B ✓
head-HASH.js gzip 363 B 362 B N/A
hooks-HASH.js gzip 393 B 392 B N/A
image-HASH.js gzip 4.59 kB 4.58 kB N/A
index-HASH.js gzip 268 B 268 B ✓
link-HASH.js gzip 2.35 kB 2.35 kB N/A
routerDirect..HASH.js gzip 328 B 328 B ✓
script-HASH.js gzip 397 B 397 B ✓
withRouter-HASH.js gzip 323 B 326 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B ✓
Overall change 3.59 kB 3.59 kB ✓
Client Build Manifests
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
_buildManifest.js gzip 748 B 747 B N/A
Overall change 0 B 0 B ✓
Rendered Page Sizes
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
index.html gzip 523 B 522 B N/A
link.html gzip 538 B 537 B N/A
withRouter.html gzip 520 B 520 B ✓
Overall change 520 B 520 B ✓
Edge SSR bundle Size
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
edge-ssr.js gzip 129 kB 129 kB N/A
page.js gzip 209 kB 209 kB N/A
Overall change 0 B 0 B ✓
Middleware size
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
middleware-b..fest.js gzip 669 B 667 B N/A
middleware-r..fest.js gzip 155 B 156 B N/A
middleware.js gzip 31.3 kB 31.3 kB N/A
edge-runtime..pack.js gzip 844 B 844 B ✓
Overall change 844 B 844 B ✓
Next Runtimes
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
274-experime...dev.js gzip 322 B 322 B ✓
274.runtime.dev.js gzip 314 B 314 B ✓
app-page-exp...dev.js gzip 376 kB 376 kB ✓
app-page-exp..prod.js gzip 131 kB 131 kB ✓
app-page-tur..prod.js gzip 144 kB 144 kB ✓
app-page-tur..prod.js gzip 140 kB 140 kB ✓
app-page.run...dev.js gzip 364 kB 364 kB ✓
app-page.run..prod.js gzip 127 kB 127 kB ✓
app-route-ex...dev.js gzip 37.6 kB 37.6 kB ✓
app-route-ex..prod.js gzip 25.6 kB 25.6 kB ✓
app-route-tu..prod.js gzip 25.6 kB 25.6 kB ✓
app-route-tu..prod.js gzip 25.4 kB 25.4 kB ✓
app-route.ru...dev.js gzip 39.2 kB 39.2 kB ✓
app-route.ru..prod.js gzip 25.4 kB 25.4 kB ✓
pages-api-tu..prod.js gzip 9.69 kB 9.69 kB ✓
pages-api.ru...dev.js gzip 11.6 kB 11.6 kB ✓
pages-api.ru..prod.js gzip 9.68 kB 9.68 kB ✓
pages-turbo...prod.js gzip 21.9 kB 21.9 kB ✓
pages.runtim...dev.js gzip 27.7 kB 27.7 kB ✓
pages.runtim..prod.js gzip 21.9 kB 21.9 kB ✓
server.runti..prod.js gzip 916 kB 916 kB ✓
Overall change 2.48 MB 2.48 MB ✓
build cache Overall increase ⚠️
vercel/next.js canary vercel/next.js hl/fix-use-cache-wrapper-source-mapping Change
0.pack gzip 2.1 MB 2.1 MB N/A
index.pack gzip 75.2 kB 75.5 kB ⚠️ +290 B
Overall change 75.2 kB 75.5 kB ⚠️ +290 B
Diff details
Diff for main-HASH.js

Diff too large to display

Commit: 7a14af1

@unstubbable unstubbable marked this pull request as ready for review January 16, 2025 14:57
@unstubbable unstubbable force-pushed the hl/use-cache-hanging-inputs-error-handling-bound-args branch from 4a21ed5 to b2f94fd Compare January 17, 2025 08:17
@unstubbable unstubbable force-pushed the hl/fix-use-cache-wrapper-source-mapping branch from 9c9e181 to 6f0c10b Compare January 17, 2025 08:18
@unstubbable unstubbable requested review from eps1lon and kdy1 January 17, 2025 08:22
eps1lon
eps1lon approved these changes Jan 17, 2025
View reviewed changes
Copy link
Member

@eps1lon eps1lon left a comment

Choose a reason for hiding this comment

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

Nice, thank you!

@unstubbable unstubbable force-pushed the hl/use-cache-hanging-inputs-error-handling-bound-args branch from b2f94fd to db1901a Compare January 18, 2025 18:39
@unstubbable unstubbable force-pushed the hl/fix-use-cache-wrapper-source-mapping branch from 6f0c10b to 89f3303 Compare January 18, 2025 18:39
@unstubbable unstubbable force-pushed the hl/use-cache-hanging-inputs-error-handling-bound-args branch from db1901a to 2973c5a Compare January 18, 2025 19:35
@unstubbable unstubbable force-pushed the hl/fix-use-cache-wrapper-source-mapping branch from 89f3303 to deabf24 Compare January 18, 2025 19:35
@unstubbable unstubbable force-pushed the hl/fix-use-cache-wrapper-source-mapping branch from deabf24 to 740ea0d Compare January 18, 2025 19:37
@unstubbable unstubbable force-pushed the hl/use-cache-hanging-inputs-error-handling-bound-args branch from 2973c5a to 1ac8aa4 Compare January 18, 2025 22:22
@unstubbable unstubbable force-pushed the hl/fix-use-cache-wrapper-source-mapping branch from 740ea0d to a6075ff Compare January 18, 2025 22:22
@unstubbable unstubbable force-pushed the hl/use-cache-hanging-inputs-error-handling-bound-args branch from 1ac8aa4 to 1bce2cb Compare January 21, 2025 11:12
@unstubbable unstubbable force-pushed the hl/fix-use-cache-wrapper-source-mapping branch from a6075ff to fc2ebbb Compare January 21, 2025 11:12
@unstubbable unstubbable mentioned this pull request Jan 21, 2025
Draft
@unstubbable unstubbable force-pushed the hl/use-cache-hanging-inputs-error-handling-bound-args branch 2 times, most recently from 7ddb06b to fe8dbbd Compare January 22, 2025 21:40
@unstubbable unstubbable force-pushed the hl/fix-use-cache-wrapper-source-mapping branch from fc2ebbb to e31ef97 Compare January 22, 2025 21:40
Base automatically changed from hl/use-cache-hanging-inputs-error-handling-bound-args to canary January 22, 2025 23:38
@unstubbable
Fix source mapping of generated cache wrapper calls
7a14af1 
In the SWC transform we're now using the span of the original `"use
cache"` function for the generated cache wrapper call, e.g. so that the
captured timeout error stack can be source mapped correctly.

This also fixes the wrongly placed
`/*#__TURBOPACK_DISABLE_EXPORT_MERGING__*/` marker for the generated
cache wrapper statements.
@unstubbable unstubbable force-pushed the hl/fix-use-cache-wrapper-source-mapping branch from e31ef97 to 7a14af1 Compare January 22, 2025 23:41
@unstubbable unstubbable enabled auto-merge (squash) January 22, 2025 23:42
@unstubbable unstubbable disabled auto-merge January 22, 2025 23:57
@unstubbable unstubbable merged commit 5f97eb9 into canary Jan 23, 2025
133 checks passed
@unstubbable Graphite App
Copy link
Contributor Author

Merge activity

  • Jan 22, 7:08 PM EST: A user merged this pull request with Graphite.

@unstubbable unstubbable deleted the hl/fix-use-cache-wrapper-source-mapping branch January 23, 2025 00:08
@github-actions github-actions bot added the locked label Feb 6, 2025
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 6, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@eps1lon eps1lon eps1lon approved these changes

@kdy1 kdy1 Awaiting requested review from kdy1

Assignees
No one assigned
Labels
created-by: Next.js team PRs by the Next.js team. locked tests Turbopack Related to Turbopack with Next.js. type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@unstubbable @ijjk @eps1lon