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 server data cache key #32506

Merged
merged 2 commits into from Dec 14, 2021
Merged

Fix server data cache key #32506

merged 2 commits into from Dec 14, 2021

Conversation

shuding
Copy link
Member

@shuding shuding commented Dec 14, 2021

Currently we are using location.href which doesn't align with the other flight request's cache key (pathname + search). This fix unifies it.

Bug

  • Related issues linked using fixes #number
  • Integration tests added
  • Errors have helpful link attached, see 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
  • Integration tests added
  • Documentation added
  • Telemetry added. In case of a feature if it's used or not.
  • Errors have helpful link attached, see contributing.md

Documentation / Examples

  • Make sure the linting passes by running yarn lint

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team type: next labels Dec 14, 2021
@ijjk
Copy link
Member

ijjk commented Dec 14, 2021

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary shuding/next.js shu/efeb Change
buildDuration 21.5s 21.4s -67ms
buildDurationCached 4s 4s -25ms
nodeModulesSize 350 MB 350 MB -21 B
Page Load Tests Overall increase ✓
vercel/next.js canary shuding/next.js shu/efeb Change
/ failed reqs 0 0 ✓
/ total time (seconds) 3.545 3.417 -0.13
/ avg req/sec 705.15 731.66 +26.51
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.74 1.576 -0.16
/error-in-render avg req/sec 1436.65 1586.38 +149.73
Client Bundles (main, webpack, commons)
vercel/next.js canary shuding/next.js shu/efeb Change
450.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42.2 kB 42.2 kB ✓
main-HASH.js gzip 30.2 kB 30.2 kB ✓
webpack-HASH.js gzip 1.45 kB 1.45 kB ✓
Overall change 74 kB 74 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary shuding/next.js shu/efeb Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary shuding/next.js shu/efeb Change
_app-HASH.js gzip 1.37 kB 1.37 kB ✓
_error-HASH.js gzip 194 B 194 B ✓
amp-HASH.js gzip 312 B 312 B ✓
css-HASH.js gzip 326 B 326 B ✓
dynamic-HASH.js gzip 2.37 kB 2.37 kB ✓
head-HASH.js gzip 350 B 350 B ✓
hooks-HASH.js gzip 919 B 919 B ✓
image-HASH.js gzip 4.73 kB 4.73 kB ✓
index-HASH.js gzip 263 B 263 B ✓
link-HASH.js gzip 2.13 kB 2.13 kB ✓
routerDirect..HASH.js gzip 321 B 321 B ✓
script-HASH.js gzip 383 B 383 B ✓
withRouter-HASH.js gzip 318 B 318 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 14.1 kB 14.1 kB ✓
Client Build Manifests
vercel/next.js canary shuding/next.js shu/efeb Change
_buildManifest.js gzip 459 B 459 B ✓
Overall change 459 B 459 B ✓
Rendered Page Sizes
vercel/next.js canary shuding/next.js shu/efeb Change
index.html gzip 533 B 533 B ✓
link.html gzip 547 B 547 B ✓
withRouter.html gzip 527 B 527 B ✓
Overall change 1.61 kB 1.61 kB ✓

Diffs

Diff for main-HASH.js 
@@ -1247,14 +1247,14 @@
       var RSCComponent;
       if (false) {
         var ServerRoot,
-          getCacheKey,
           rscCache,
           nextServerDataLoadingGlobal,
-          ssrCacheKey,
+          serverDataCacheKey,
           serverDataWriter,
           serverDataBuffer,
           encoder,
           createFromFetch,
+          getCacheKey,
           useServerResponse,
           fetchFlight,
           createResponseCache,
Diff for index.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-c7a83088536f247d.js"
+      src="/_next/static/chunks/main-2115eccd80a7ec6c.js"
       defer=""
     ></script>
     <script
Diff for link.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-c7a83088536f247d.js"
+      src="/_next/static/chunks/main-2115eccd80a7ec6c.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-c7a83088536f247d.js"
+      src="/_next/static/chunks/main-2115eccd80a7ec6c.js"
       defer=""
     ></script>
     <script
Default Build with SWC (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary shuding/next.js shu/efeb Change
buildDuration 23.2s 23.2s ⚠️ +65ms
buildDurationCached 4.1s 4.2s ⚠️ +91ms
nodeModulesSize 350 MB 350 MB -21 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary shuding/next.js shu/efeb Change
/ failed reqs 0 0 ✓
/ total time (seconds) 3.437 3.481 ⚠️ +0.04
/ avg req/sec 727.39 718.24 ⚠️ -9.15
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.532 1.585 ⚠️ +0.05
/error-in-render avg req/sec 1631.94 1577.78 ⚠️ -54.16
Client Bundles (main, webpack, commons)
vercel/next.js canary shuding/next.js shu/efeb Change
450.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42.3 kB 42.3 kB ✓
main-HASH.js gzip 30.3 kB 30.3 kB ✓
webpack-HASH.js gzip 1.44 kB 1.44 kB ✓
Overall change 74.2 kB 74.2 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary shuding/next.js shu/efeb Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary shuding/next.js shu/efeb Change
_app-HASH.js gzip 1.35 kB 1.35 kB ✓
_error-HASH.js gzip 180 B 180 B ✓
amp-HASH.js gzip 305 B 305 B ✓
css-HASH.js gzip 321 B 321 B ✓
dynamic-HASH.js gzip 2.36 kB 2.36 kB ✓
head-HASH.js gzip 342 B 342 B ✓
hooks-HASH.js gzip 906 B 906 B ✓
image-HASH.js gzip 4.75 kB 4.75 kB ✓
index-HASH.js gzip 256 B 256 B ✓
link-HASH.js gzip 2.19 kB 2.19 kB ✓
routerDirect..HASH.js gzip 314 B 314 B ✓
script-HASH.js gzip 375 B 375 B ✓
withRouter-HASH.js gzip 309 B 309 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 14.1 kB 14.1 kB ✓
Client Build Manifests
vercel/next.js canary shuding/next.js shu/efeb Change
_buildManifest.js gzip 459 B 459 B ✓
Overall change 459 B 459 B ✓
Rendered Page Sizes
vercel/next.js canary shuding/next.js shu/efeb Change
index.html gzip 531 B 531 B ✓
link.html gzip 544 B 544 B ✓
withRouter.html gzip 524 B 524 B ✓
Overall change 1.6 kB 1.6 kB ✓

Diffs

Diff for main-HASH.js 
@@ -1247,14 +1247,14 @@
       var RSCComponent;
       if (false) {
         var ServerRoot,
-          getCacheKey,
           rscCache,
           nextServerDataLoadingGlobal,
-          ssrCacheKey,
+          serverDataCacheKey,
           serverDataWriter,
           serverDataBuffer,
           encoder,
           createFromFetch,
+          getCacheKey,
           useServerResponse,
           fetchFlight,
           createResponseCache,
Diff for index.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-c7a83088536f247d.js"
+      src="/_next/static/chunks/main-2115eccd80a7ec6c.js"
       defer=""
     ></script>
     <script
Diff for link.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-c7a83088536f247d.js"
+      src="/_next/static/chunks/main-2115eccd80a7ec6c.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-c7a83088536f247d.js"
+      src="/_next/static/chunks/main-2115eccd80a7ec6c.js"
       defer=""
     ></script>
     <script
Commit: 0637788

@kodiakhq kodiakhq bot merged commit e75361f into vercel:canary Dec 14, 2021
@shuding shuding deleted the shu/efeb branch December 14, 2021 19:57
@vercel vercel locked as resolved and limited conversation to collaborators Jan 27, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@huozhi huozhi huozhi approved these changes

@ijjk ijjk Awaiting requested review from ijjk ijjk is a code owner

@timneutkens timneutkens Awaiting requested review from timneutkens timneutkens is a code owner

Assignees
No one assigned
Labels
created-by: Next.js team PRs by the Next.js team type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@shuding @ijjk @huozhi