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

Fix minimumCacheTTL so it doesn't affect browser caching #27307

Merged
merged 8 commits into from Jul 19, 2021

Conversation

styfle
Copy link
Member

@styfle styfle commented Jul 19, 2021

In a previous PR (#27200), we added minimumCacheTTL to configure the time-to-live for the cached image. However, this was setting the max-age header.

This PR ensures that minimumCacheTTL doesn't affect browser caching, only the upstream header can affect browser caching.

This is a bit safer in case the developer accidentally caches something that shouldn't be and the cache needs to be invalidated. Simply delete the .next/cache/images directory.

@styfle styfle changed the title Adjust max age browser Fix minimumCacheTTL so it doesn't affect browser caching Jul 19, 2021
@styfle styfle changed the title Fix minimumCacheTTL so it doesn't affect browser caching Fix minimumCacheTTL so it doesn't affect browser caching Jul 19, 2021
@ijjk
Copy link
Member

ijjk commented Jul 19, 2021

Failing test suites

Commit: de16391

test/integration/config-devtool-dev/test/index.test.js

  • devtool set in development mode in next config > should warn and revert when a devtool is set in development mode
Expand output

● devtool set in development mode in next config › should warn and revert when a devtool is set in development mode

thrown: "Exceeded timeout of 30000 ms for a test.
Use jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test."

  17 |
  18 | describe('devtool set in development mode in next config', () => {
> 19 |   it('should warn and revert when a devtool is set in development mode', async () => {
     |   ^
  20 |     let stderr = ''
  21 |
  22 |     const appPort = await findPort()

  at integration/config-devtool-dev/test/index.test.js:19:3
  at Object.<anonymous> (integration/config-devtool-dev/test/index.test.js:18:1)

@ijjk

This comment has been minimized.

Co-authored-by: JJ Kasper <jj@jjsweb.site>
@styfle styfle requested a review from ijjk July 19, 2021 21:26
Copy link
Member

@ijjk ijjk left a comment

Choose a reason for hiding this comment

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

Looks good!

@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Jul 19, 2021

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
buildDuration 15.3s 15.5s ⚠️ +207ms
buildDurationCached 3.6s 3.5s -129ms
nodeModulesSize 49.5 MB 49.5 MB -231 B
Page Load Tests Overall increase ✓
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
/ failed reqs 0 0
/ total time (seconds) 2.434 2.464 ⚠️ +0.03
/ avg req/sec 1027.02 1014.69 ⚠️ -12.33
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.356 1.33 -0.03
/error-in-render avg req/sec 1844.22 1879.09 +34.87
Client Bundles (main, webpack, commons)
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
359.HASH.js gzip 2.96 kB 2.96 kB
745.HASH.js gzip 180 B 180 B
framework-HASH.js gzip 42.2 kB 42.2 kB
main-HASH.js gzip 20.9 kB 20.9 kB
webpack-HASH.js gzip 1.53 kB 1.53 kB
Overall change 67.8 kB 67.8 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
polyfills-HASH.js gzip 31.1 kB 31.1 kB
Overall change 31.1 kB 31.1 kB
Client Pages
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
_app-HASH.js gzip 803 B 803 B
_error-HASH.js gzip 3.06 kB 3.06 kB
amp-HASH.js gzip 554 B 554 B
css-HASH.js gzip 329 B 329 B
dynamic-HASH.js gzip 2.52 kB 2.52 kB
head-HASH.js gzip 2.28 kB 2.28 kB
hooks-HASH.js gzip 903 B 903 B
image-HASH.js gzip 5.6 kB 5.6 kB
index-HASH.js gzip 261 B 261 B
link-HASH.js gzip 1.66 kB 1.66 kB
routerDirect..HASH.js gzip 319 B 319 B
script-HASH.js gzip 387 B 387 B
withRouter-HASH.js gzip 320 B 320 B
bb14e60e810b..30f.css gzip 125 B 125 B
Overall change 19.1 kB 19.1 kB
Client Build Manifests
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
_buildManifest.js gzip 489 B 489 B
Overall change 489 B 489 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
index.html gzip 530 B 530 B
link.html gzip 544 B 544 B
withRouter.html gzip 524 B 524 B
Overall change 1.6 kB 1.6 kB

Webpack 4 Mode (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
buildDuration 12.3s 12.3s -27ms
buildDurationCached 4.9s 4.7s -152ms
nodeModulesSize 49.5 MB 49.5 MB -231 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
/ failed reqs 0 0
/ total time (seconds) 2.467 2.524 ⚠️ +0.06
/ avg req/sec 1013.57 990.32 ⚠️ -23.25
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.346 1.38 ⚠️ +0.03
/error-in-render avg req/sec 1857.07 1810.99 ⚠️ -46.08
Client Bundles (main, webpack, commons)
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
17.HASH.js gzip 2.98 kB 2.98 kB
18.HASH.js gzip 185 B 185 B
677f882d2ed8..HASH.js gzip 13.7 kB 13.7 kB
framework.HASH.js gzip 41.9 kB 41.9 kB
main-HASH.js gzip 8.4 kB 8.4 kB
webpack-HASH.js gzip 1.22 kB 1.22 kB
Overall change 68.4 kB 68.4 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
polyfills-HASH.js gzip 31.3 kB 31.3 kB
Overall change 31.3 kB 31.3 kB
Client Pages
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
_app-HASH.js gzip 791 B 791 B
_error-HASH.js gzip 3.76 kB 3.76 kB
amp-HASH.js gzip 552 B 552 B
css-HASH.js gzip 333 B 333 B
dynamic-HASH.js gzip 2.71 kB 2.71 kB
head-HASH.js gzip 2.97 kB 2.97 kB
hooks-HASH.js gzip 911 B 911 B
index-HASH.js gzip 231 B 231 B
link-HASH.js gzip 1.64 kB 1.64 kB
routerDirect..HASH.js gzip 298 B 298 B
script-HASH.js gzip 3.02 kB 3.02 kB
withRouter-HASH.js gzip 294 B 294 B
e025d2764813..52f.css gzip 125 B 125 B
Overall change 17.6 kB 17.6 kB
Client Build Manifests
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
_buildManifest.js gzip 500 B 500 B
Overall change 500 B 500 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js adjust-max-age-browser Change
index.html gzip 577 B 577 B
link.html gzip 588 B 588 B
withRouter.html gzip 569 B 569 B
Overall change 1.73 kB 1.73 kB
Commit: ad31ea3

@kodiakhq kodiakhq bot merged commit b123942 into canary Jul 19, 2021
@kodiakhq kodiakhq bot deleted the adjust-max-age-browser branch July 19, 2021 22:38
flybayer pushed a commit to blitz-js/next.js that referenced this pull request Aug 19, 2021
)

In a previous PR (vercel#27200), we added `minimumCacheTTL` to configure the time-to-live for the cached image. However, this was setting the `max-age` header.

This PR ensures that `minimumCacheTTL` doesn't affect browser caching, only the upstream header can affect browser caching.

This is a bit safer in case the developer accidentally caches something that shouldn't be and the cache needs to be invalidated. Simply delete the `.next/cache/images` directory.

- Related to vercel#19914
- Related to vercel#22319
@vercel vercel locked as resolved and limited conversation to collaborators Jan 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants