Merge branch 'canary' into static-metadata-type

vercel · Sep 13, 2023 · 74131dc · 74131dc
2 parents c910391 + f94d4f9
commit 74131dc
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/bench/vercel/package.json b/bench/vercel/package.json
@@ -15,7 +15,7 @@
     "commander": "2.20.0",
     "dotenv": "10.0.0",
     "downsample-lttb": "0.0.1",
-    "listr2": "5.0.5",
+    "listr2": "5.0.8",
     "p-queue": "7.3.0",
     "term-size": "3.0.2",
     "webpack-bundle-analyzer": "^4.6.1",

diff --git a/...1-building-your-application/02-rendering/03-incremental-static-regeneration.mdx b/...1-building-your-application/02-rendering/03-incremental-static-regeneration.mdx
@@ -181,7 +181,7 @@ To disable in-memory caching, set `isrMemoryCacheSize` to `0` in your `next.conf
 module.exports = {
   experimental: {
     // Defaults to 50MB
-    isrMemoryCacheSize: 0,
+    isrMemoryCacheSize: 0, // cache size in bytes
   },
 }
 ```

diff --git a/...ilding-your-application/03-data-fetching/04-incremental-static-regeneration.mdx b/...ilding-your-application/03-data-fetching/04-incremental-static-regeneration.mdx
@@ -181,7 +181,7 @@ To disable in-memory caching, set `isrMemoryCacheSize` to `0` in your `next.conf
 module.exports = {
   experimental: {
     // Defaults to 50MB
-    isrMemoryCacheSize: 0,
+    isrMemoryCacheSize: 0, // cache size in bytes
   },
 }
 ```

diff --git a/packages/next/src/server/config-shared.ts b/packages/next/src/server/config-shared.ts
@@ -194,6 +194,11 @@ export interface ExperimentalConfig {
   gzipSize?: boolean
   craCompat?: boolean
   esmExternals?: boolean | 'loose'
+  /**
+   * In-memory cache size in bytes.
+   *
+   * If `isrMemoryCacheSize: 0` disables in-memory caching.
+   */
   isrMemoryCacheSize?: number
   fullySpecified?: boolean
   urlImports?: NonNullable<webpack.Configuration['experiments']>['buildHttp']

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml