next 15.0.4-canary.4 → 15.0.4-canary.5

package/dist/esm/build/index.js

@@ -283,7 +283,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
         const nextBuildSpan = trace('next-build', undefined, {
             buildMode: experimentalBuildMode,
             isTurboBuild: String(turboNextBuild),
-            version: "15.0.4-canary.4"
+            version: "15.0.4-canary.5"
         });
         NextBuildContext.nextBuildSpan = nextBuildSpan;
         NextBuildContext.dir = dir;
@@ -684,7 +684,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
             // Files outside of the distDir can be "type": "module"
             await writeFileUtf8(path.join(distDir, 'package.json'), '{"type": "commonjs"}');
             // These are written to distDir, so they need to come after creating and cleaning distDr.
-            await recordFrameworkVersion("15.0.4-canary.4");
+            await recordFrameworkVersion("15.0.4-canary.5");
             await updateBuildDiagnostics({
                 buildStage: 'start'
             });

package/dist/esm/build/swc/index.js

@@ -11,7 +11,7 @@ import { isDeepStrictEqual } from 'util';
 import { getDefineEnv } from '../webpack/plugins/define-env-plugin';
 import { getReactCompilerLoader } from '../get-babel-loader-config';
 import { TurbopackInternalError } from '../../server/dev/turbopack-utils';
-const nextVersion = "15.0.4-canary.4";
+const nextVersion = "15.0.4-canary.5";
 const ArchName = arch();
 const PlatformName = platform();
 function infoLog(...args) {

package/dist/esm/build/webpack-config.js

@@ -1409,7 +1409,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
             isClient && new CopyFilePlugin({
                 // file path to build output of `@next/polyfill-nomodule`
                 filePath: require.resolve('./polyfills/polyfill-nomodule'),
-                cacheKey: "15.0.4-canary.4",
+                cacheKey: "15.0.4-canary.5",
                 name: `static/chunks/polyfills${dev ? '' : '-[hash]'}.js`,
                 minimize: false,
                 info: {
@@ -1637,7 +1637,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
         //  - Next.js location on disk (some loaders use absolute paths and some resolve options depend on absolute paths)
         //  - Next.js version
         //  - next.config.js keys that affect compilation
-        version: `${__dirname}|${"15.0.4-canary.4"}|${configVars}`,
+        version: `${__dirname}|${"15.0.4-canary.5"}|${configVars}`,
         cacheDirectory: path.join(distDir, 'cache', 'webpack'),
         // For production builds, it's more efficient to compress all cache files together instead of compression each one individually.
         // So we disable compression here and allow the build runner to take care of compressing the cache as a whole.

package/dist/esm/client/app-bootstrap.js

@@ -3,7 +3,7 @@
  * sure the following scripts are executed in the correct order:
  * - Polyfills
  * - next/script with `beforeInteractive` strategy
- */ const version = "15.0.4-canary.4";
+ */ const version = "15.0.4-canary.5";
 window.next = {
     version,
     appDir: true

package/dist/esm/client/index.js

@@ -26,7 +26,7 @@ import { SearchParamsContext, PathParamsContext } from '../shared/lib/hooks-clie
 import { onRecoverableError } from './react-client-callbacks/shared';
 import tracer from './tracing/tracer';
 import reportToSocket from './tracing/report-to-socket';
-export const version = "15.0.4-canary.4";
+export const version = "15.0.4-canary.5";
 export let router;
 export const emitter = mitt();
 const looseToArray = (input)=>[].slice.call(input);

package/dist/esm/server/base-server.js

@@ -1917,7 +1917,7 @@ export default class Server {
             addRequestMeta(req, 'notFoundRevalidate', cacheEntry.revalidate);
             // If cache control is already set on the response we don't
             // override it to allow users to customize it via next.config
-            if (cacheEntry.revalidate && !res.getHeader('Cache-Control')) {
+            if (typeof cacheEntry.revalidate !== 'undefined' && !res.getHeader('Cache-Control')) {
                 res.setHeader('Cache-Control', formatRevalidate({
                     revalidate: cacheEntry.revalidate,
                     expireTime: this.nextConfig.expireTime
@@ -1939,7 +1939,7 @@ export default class Server {
         } else if (cachedData.kind === CachedRouteKind.REDIRECT) {
             // If cache control is already set on the response we don't
             // override it to allow users to customize it via next.config
-            if (cacheEntry.revalidate && !res.getHeader('Cache-Control')) {
+            if (typeof cacheEntry.revalidate !== 'undefined' && !res.getHeader('Cache-Control')) {
                 res.setHeader('Cache-Control', formatRevalidate({
                     revalidate: cacheEntry.revalidate,
                     expireTime: this.nextConfig.expireTime
@@ -1957,14 +1957,20 @@ export default class Server {
                 return null;
             }
         } else if (cachedData.kind === CachedRouteKind.APP_ROUTE) {
-            const headers = {
-                ...cachedData.headers
-            };
+            const headers = fromNodeOutgoingHttpHeaders(cachedData.headers);
             if (!(this.minimalMode && isSSG)) {
-                delete headers[NEXT_CACHE_TAGS_HEADER];
+                headers.delete(NEXT_CACHE_TAGS_HEADER);
+            }
+            // If cache control is already set on the response we don't
+            // override it to allow users to customize it via next.config
+            if (typeof cacheEntry.revalidate !== 'undefined' && !res.getHeader('Cache-Control') && !headers.get('Cache-Control')) {
+                headers.set('Cache-Control', formatRevalidate({
+                    revalidate: cacheEntry.revalidate,
+                    expireTime: this.nextConfig.expireTime
+                }));
             }
             await sendResponse(req, res, new Response(cachedData.body, {
-                headers: fromNodeOutgoingHttpHeaders(headers),
+                headers,
                 status: cachedData.status || 200
             }));
             return null;