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

package/dist/esm/server/config.js

@@ -155,7 +155,7 @@ function assignDefaults(dir, userConfig, silent) {
     if (((_result_experimental = result.experimental) == null ? void 0 : _result_experimental.allowDevelopmentBuild) && process.env.NODE_ENV !== 'development') {
         throw new Error(`The experimental.allowDevelopmentBuild option requires NODE_ENV to be explicitly set to 'development'.`);
     }
-    if (!((_process_env___NEXT_VERSION = "15.0.4-canary.4") == null ? void 0 : _process_env___NEXT_VERSION.includes('canary')) && !process.env.__NEXT_TEST_MODE && !process.env.NEXT_PRIVATE_SKIP_CANARY_CHECK) {
+    if (!((_process_env___NEXT_VERSION = "15.0.4-canary.5") == null ? void 0 : _process_env___NEXT_VERSION.includes('canary')) && !process.env.__NEXT_TEST_MODE && !process.env.NEXT_PRIVATE_SKIP_CANARY_CHECK) {
         var _result_experimental7, _result_experimental8, _result_experimental_turbo3, _result_experimental9;
         // Prevents usage of certain experimental features outside of canary
         if ((_result_experimental7 = result.experimental) == null ? void 0 : _result_experimental7.ppr) {

package/dist/esm/server/dev/hot-reloader-turbopack.js

@@ -48,7 +48,7 @@ export async function createHotReloaderTurbopack(opts, serverFields, distDir, re
     }
     const hasRewrites = opts.fsChecker.rewrites.afterFiles.length > 0 || opts.fsChecker.rewrites.beforeFiles.length > 0 || opts.fsChecker.rewrites.fallback.length > 0;
     const hotReloaderSpan = trace('hot-reloader', undefined, {
-        version: "15.0.4-canary.4"
+        version: "15.0.4-canary.5"
     });
     // Ensure the hotReloaderSpan is flushed immediately as it's the parentSpan for all processing
     // of the current `next dev` invocation.

package/dist/esm/server/dev/hot-reloader-webpack.js

@@ -184,7 +184,7 @@ export default class HotReloaderWebpack {
         this.previewProps = previewProps;
         this.rewrites = rewrites;
         this.hotReloaderSpan = trace('hot-reloader', undefined, {
-            version: "15.0.4-canary.4"
+            version: "15.0.4-canary.5"
         });
         // Ensure the hotReloaderSpan is flushed immediately as it's the parentSpan for all processing
         // of the current `next dev` invocation.

package/dist/esm/server/lib/app-info-log.js

@@ -4,7 +4,7 @@ import { bold, purple } from '../../lib/picocolors';
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from '../../shared/lib/constants';
 import loadConfig, { getEnabledExperimentalFeatures } from '../config';
 export function logStartInfo({ networkUrl, appUrl, envInfo, expFeatureInfo, maxExperimentalFeatures = Infinity }) {
-    Log.bootstrap(`${bold(purple(`${Log.prefixes.ready} Next.js ${"15.0.4-canary.4"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
+    Log.bootstrap(`${bold(purple(`${Log.prefixes.ready} Next.js ${"15.0.4-canary.5"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
     if (appUrl) {
         Log.bootstrap(`- Local:        ${appUrl}`);
     }

package/dist/esm/server/lib/start-server.js

@@ -40,7 +40,7 @@ export async function getRequestHandlers({ dir, port, isDev, onCleanup, server,
 export async function startServer(serverOptions) {
     const { dir, isDev, hostname, minimalMode, allowRetry, keepAliveTimeout, selfSignedCertificate } = serverOptions;
     let { port } = serverOptions;
-    process.title = `next-server (v${"15.0.4-canary.4"})`;
+    process.title = `next-server (v${"15.0.4-canary.5"})`;
     let handlersReady = ()=>{};
     let handlersError = ()=>{};
     let handlersPromise = new Promise((resolve, reject)=>{

package/dist/server/base-server.js

@@ -1986,7 +1986,7 @@ class Server {
             (0, _requestmeta.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', (0, _revalidate.formatRevalidate)({
                     revalidate: cacheEntry.revalidate,
                     expireTime: this.nextConfig.expireTime
@@ -2008,7 +2008,7 @@ class Server {
         } else if (cachedData.kind === _responsecache.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', (0, _revalidate.formatRevalidate)({
                     revalidate: cacheEntry.revalidate,
                     expireTime: this.nextConfig.expireTime
@@ -2026,14 +2026,20 @@ class Server {
                 return null;
             }
         } else if (cachedData.kind === _responsecache.CachedRouteKind.APP_ROUTE) {
-            const headers = {
-                ...cachedData.headers
-            };
+            const headers = (0, _utils3.fromNodeOutgoingHttpHeaders)(cachedData.headers);
             if (!(this.minimalMode && isSSG)) {
-                delete headers[_constants2.NEXT_CACHE_TAGS_HEADER];
+                headers.delete(_constants2.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', (0, _revalidate.formatRevalidate)({
+                    revalidate: cacheEntry.revalidate,
+                    expireTime: this.nextConfig.expireTime
+                }));
             }
             await (0, _sendresponse.sendResponse)(req, res, new Response(cachedData.body, {
-                headers: (0, _utils3.fromNodeOutgoingHttpHeaders)(headers),
+                headers,
                 status: cachedData.status || 200
             }));
             return null;