next 15.0.4-canary.25 → 15.0.4-canary.26

package/dist/esm/build/index.js

@@ -284,7 +284,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.25"
+            version: "15.0.4-canary.26"
         });
         NextBuildContext.nextBuildSpan = nextBuildSpan;
         NextBuildContext.dir = dir;
@@ -686,7 +686,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.25");
+            await recordFrameworkVersion("15.0.4-canary.26");
             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.25";
+const nextVersion = "15.0.4-canary.26";
 const ArchName = arch();
 const PlatformName = platform();
 function infoLog(...args) {

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

@@ -1,6 +1,6 @@
 import * as Log from '../output/log';
 import { NextBuildContext } from '../build-context';
-import { Worker } from '../../lib/worker';
+import { Worker } from 'next/dist/compiled/jest-worker';
 import origDebug from 'next/dist/compiled/debug';
 import path from 'path';
 import { exportTraceState, recordTraceEvents } from '../../trace';
@@ -28,25 +28,39 @@ async function webpackBuildWithWorker(compilerNamesArg) {
     const compilerNames = compilerNamesArg || ORDERED_COMPILER_NAMES;
     const { nextBuildSpan, ...prunedBuildContext } = NextBuildContext;
     prunedBuildContext.pluginState = pluginState;
-    const worker = new Worker(path.join(__dirname, 'impl.js'), {
-        exposedMethods: [
-            'workerMain'
-        ],
-        numWorkers: 1,
-        maxRetries: 0,
-        forkOptions: {
-            env: {
-                ...process.env,
-                NEXT_PRIVATE_BUILD_WORKER: '1'
+    const getWorker = (compilerName)=>{
+        var _worker__workerPool;
+        const _worker = new Worker(path.join(__dirname, 'impl.js'), {
+            exposedMethods: [
+                'workerMain'
+            ],
+            numWorkers: 1,
+            maxRetries: 0,
+            forkOptions: {
+                env: {
+                    ...process.env,
+                    NEXT_PRIVATE_BUILD_WORKER: '1'
+                }
             }
+        });
+        _worker.getStderr().pipe(process.stderr);
+        _worker.getStdout().pipe(process.stdout);
+        for (const worker of ((_worker__workerPool = _worker._workerPool) == null ? void 0 : _worker__workerPool._workers) || []){
+            worker._child.on('exit', (code, signal)=>{
+                if (code || signal && signal !== 'SIGINT') {
+                    debug(`Compiler ${compilerName} unexpectedly exited with code: ${code} and signal: ${signal}`);
+                }
+            });
         }
-    });
+        return _worker;
+    };
     const combinedResult = {
         duration: 0,
         buildTraceContext: {}
     };
     for (const compilerName of compilerNames){
         var _curResult_buildTraceContext;
+        const worker = getWorker(compilerName);
         const curResult = await worker.workerMain({
             buildContext: prunedBuildContext,
             compilerName,
@@ -59,6 +73,8 @@ async function webpackBuildWithWorker(compilerNamesArg) {
         if (nextBuildSpan && curResult.debugTraceEvents) {
             recordTraceEvents(curResult.debugTraceEvents);
         }
+        // destroy worker so it's not sticking around using memory
+        await worker.end();
         // Update plugin state
         pluginState = deepMerge(pluginState, curResult.pluginState);
         prunedBuildContext.pluginState = pluginState;
@@ -82,8 +98,6 @@ async function webpackBuildWithWorker(compilerNamesArg) {
             }
         }
     }
-    // destroy worker so it's not sticking around using memory
-    worker.end();
     if (compilerNames.length === 3) {
         Log.event('Compiled successfully');
     }

package/dist/esm/build/webpack-build/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/build/webpack-build/index.ts"],"sourcesContent":["import type { COMPILER_INDEXES } from '../../shared/lib/constants'\nimport * as Log from '../output/log'\nimport { NextBuildContext } from '../build-context'\nimport type { BuildTraceContext } from '../webpack/plugins/next-trace-entrypoints-plugin'\nimport { Worker } from '../../lib/worker'\nimport origDebug from 'next/dist/compiled/debug'\nimport path from 'path'\nimport { exportTraceState, recordTraceEvents } from '../../trace'\n\nconst debug = origDebug('next:build:webpack-build')\n\nconst ORDERED_COMPILER_NAMES = [\n  'server',\n  'edge-server',\n  'client',\n] as (keyof typeof COMPILER_INDEXES)[]\n\nlet pluginState: Record<any, any> = {}\n\nfunction deepMerge(target: any, source: any) {\n  const result = { ...target, ...source }\n  for (const key of Object.keys(result)) {\n    result[key] = Array.isArray(target[key])\n      ? (target[key] = [...target[key], ...(source[key] || [])])\n      : typeof target[key] == 'object' && typeof source[key] == 'object'\n        ? deepMerge(target[key], source[key])\n        : result[key]\n  }\n  return result\n}\n\nasync function webpackBuildWithWorker(\n  compilerNamesArg: typeof ORDERED_COMPILER_NAMES | null\n) {\n  const compilerNames = compilerNamesArg || ORDERED_COMPILER_NAMES\n  const { nextBuildSpan, ...prunedBuildContext } = NextBuildContext\n\n  prunedBuildContext.pluginState = pluginState\n\n  const worker = new Worker(path.join(__dirname, 'impl.js'), {\n    exposedMethods: ['workerMain'],\n    numWorkers: 1,\n    maxRetries: 0,\n    forkOptions: {\n      env: {\n        ...process.env,\n        NEXT_PRIVATE_BUILD_WORKER: '1',\n      },\n    },\n  }) as Worker & typeof import('./impl')\n\n  const combinedResult = {\n    duration: 0,\n    buildTraceContext: {} as BuildTraceContext,\n  }\n\n  for (const compilerName of compilerNames) {\n    const curResult = await worker.workerMain({\n      buildContext: prunedBuildContext,\n      compilerName,\n      traceState: {\n        ...exportTraceState(),\n        defaultParentSpanId: nextBuildSpan?.getId(),\n        shouldSaveTraceEvents: true,\n      },\n    })\n    if (nextBuildSpan && curResult.debugTraceEvents) {\n      recordTraceEvents(curResult.debugTraceEvents)\n    }\n\n    // Update plugin state\n    pluginState = deepMerge(pluginState, curResult.pluginState)\n    prunedBuildContext.pluginState = pluginState\n\n    if (curResult.telemetryState) {\n      NextBuildContext.telemetryState = curResult.telemetryState\n    }\n\n    combinedResult.duration += curResult.duration\n\n    if (curResult.buildTraceContext?.entriesTrace) {\n      const { entryNameMap } = curResult.buildTraceContext.entriesTrace!\n\n      if (entryNameMap) {\n        combinedResult.buildTraceContext.entriesTrace =\n          curResult.buildTraceContext.entriesTrace\n        combinedResult.buildTraceContext.entriesTrace!.entryNameMap =\n          entryNameMap\n      }\n\n      if (curResult.buildTraceContext?.chunksTrace) {\n        const { entryNameFilesMap } = curResult.buildTraceContext.chunksTrace!\n\n        if (entryNameFilesMap) {\n          combinedResult.buildTraceContext.chunksTrace =\n            curResult.buildTraceContext.chunksTrace!\n\n          combinedResult.buildTraceContext.chunksTrace!.entryNameFilesMap =\n            entryNameFilesMap\n        }\n      }\n    }\n  }\n\n  // destroy worker so it's not sticking around using memory\n  worker.end()\n\n  if (compilerNames.length === 3) {\n    Log.event('Compiled successfully')\n  }\n\n  return combinedResult\n}\n\nexport function webpackBuild(\n  withWorker: boolean,\n  compilerNames: typeof ORDERED_COMPILER_NAMES | null\n): ReturnType<typeof webpackBuildWithWorker> {\n  if (withWorker) {\n    debug('using separate compiler workers')\n    return webpackBuildWithWorker(compilerNames)\n  } else {\n    debug('building all compilers in same process')\n    const webpackBuildImpl = require('./impl').webpackBuildImpl\n    return webpackBuildImpl(null, null)\n  }\n}\n"],"names":["Log","NextBuildContext","Worker","origDebug","path","exportTraceState","recordTraceEvents","debug","ORDERED_COMPILER_NAMES","pluginState","deepMerge","target","source","result","key","Object","keys","Array","isArray","webpackBuildWithWorker","compilerNamesArg","compilerNames","nextBuildSpan","prunedBuildContext","worker","join","__dirname","exposedMethods","numWorkers","maxRetries","forkOptions","env","process","NEXT_PRIVATE_BUILD_WORKER","combinedResult","duration","buildTraceContext","compilerName","curResult","workerMain","buildContext","traceState","defaultParentSpanId","getId","shouldSaveTraceEvents","debugTraceEvents","telemetryState","entriesTrace","entryNameMap","chunksTrace","entryNameFilesMap","end","length","event","webpackBuild","withWorker","webpackBuildImpl","require"],"mappings":"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"}
+{"version":3,"sources":["../../../src/build/webpack-build/index.ts"],"sourcesContent":["import type { COMPILER_INDEXES } from '../../shared/lib/constants'\nimport * as Log from '../output/log'\nimport { NextBuildContext } from '../build-context'\nimport type { BuildTraceContext } from '../webpack/plugins/next-trace-entrypoints-plugin'\nimport { Worker } from 'next/dist/compiled/jest-worker'\nimport origDebug from 'next/dist/compiled/debug'\nimport type { ChildProcess } from 'child_process'\nimport path from 'path'\nimport { exportTraceState, recordTraceEvents } from '../../trace'\n\nconst debug = origDebug('next:build:webpack-build')\n\nconst ORDERED_COMPILER_NAMES = [\n  'server',\n  'edge-server',\n  'client',\n] as (keyof typeof COMPILER_INDEXES)[]\n\nlet pluginState: Record<any, any> = {}\n\nfunction deepMerge(target: any, source: any) {\n  const result = { ...target, ...source }\n  for (const key of Object.keys(result)) {\n    result[key] = Array.isArray(target[key])\n      ? (target[key] = [...target[key], ...(source[key] || [])])\n      : typeof target[key] == 'object' && typeof source[key] == 'object'\n        ? deepMerge(target[key], source[key])\n        : result[key]\n  }\n  return result\n}\n\nasync function webpackBuildWithWorker(\n  compilerNamesArg: typeof ORDERED_COMPILER_NAMES | null\n) {\n  const compilerNames = compilerNamesArg || ORDERED_COMPILER_NAMES\n  const { nextBuildSpan, ...prunedBuildContext } = NextBuildContext\n\n  prunedBuildContext.pluginState = pluginState\n\n  const getWorker = (compilerName: string) => {\n    const _worker = new Worker(path.join(__dirname, 'impl.js'), {\n      exposedMethods: ['workerMain'],\n      numWorkers: 1,\n      maxRetries: 0,\n      forkOptions: {\n        env: {\n          ...process.env,\n          NEXT_PRIVATE_BUILD_WORKER: '1',\n        },\n      },\n    }) as Worker & typeof import('./impl')\n    _worker.getStderr().pipe(process.stderr)\n    _worker.getStdout().pipe(process.stdout)\n\n    for (const worker of ((_worker as any)._workerPool?._workers || []) as {\n      _child: ChildProcess\n    }[]) {\n      worker._child.on('exit', (code, signal) => {\n        if (code || (signal && signal !== 'SIGINT')) {\n          debug(\n            `Compiler ${compilerName} unexpectedly exited with code: ${code} and signal: ${signal}`\n          )\n        }\n      })\n    }\n\n    return _worker\n  }\n\n  const combinedResult = {\n    duration: 0,\n    buildTraceContext: {} as BuildTraceContext,\n  }\n\n  for (const compilerName of compilerNames) {\n    const worker = getWorker(compilerName)\n\n    const curResult = await worker.workerMain({\n      buildContext: prunedBuildContext,\n      compilerName,\n      traceState: {\n        ...exportTraceState(),\n        defaultParentSpanId: nextBuildSpan?.getId(),\n        shouldSaveTraceEvents: true,\n      },\n    })\n    if (nextBuildSpan && curResult.debugTraceEvents) {\n      recordTraceEvents(curResult.debugTraceEvents)\n    }\n    // destroy worker so it's not sticking around using memory\n    await worker.end()\n\n    // Update plugin state\n    pluginState = deepMerge(pluginState, curResult.pluginState)\n    prunedBuildContext.pluginState = pluginState\n\n    if (curResult.telemetryState) {\n      NextBuildContext.telemetryState = curResult.telemetryState\n    }\n\n    combinedResult.duration += curResult.duration\n\n    if (curResult.buildTraceContext?.entriesTrace) {\n      const { entryNameMap } = curResult.buildTraceContext.entriesTrace!\n\n      if (entryNameMap) {\n        combinedResult.buildTraceContext.entriesTrace =\n          curResult.buildTraceContext.entriesTrace\n        combinedResult.buildTraceContext.entriesTrace!.entryNameMap =\n          entryNameMap\n      }\n\n      if (curResult.buildTraceContext?.chunksTrace) {\n        const { entryNameFilesMap } = curResult.buildTraceContext.chunksTrace!\n\n        if (entryNameFilesMap) {\n          combinedResult.buildTraceContext.chunksTrace =\n            curResult.buildTraceContext.chunksTrace!\n\n          combinedResult.buildTraceContext.chunksTrace!.entryNameFilesMap =\n            entryNameFilesMap\n        }\n      }\n    }\n  }\n\n  if (compilerNames.length === 3) {\n    Log.event('Compiled successfully')\n  }\n\n  return combinedResult\n}\n\nexport function webpackBuild(\n  withWorker: boolean,\n  compilerNames: typeof ORDERED_COMPILER_NAMES | null\n): ReturnType<typeof webpackBuildWithWorker> {\n  if (withWorker) {\n    debug('using separate compiler workers')\n    return webpackBuildWithWorker(compilerNames)\n  } else {\n    debug('building all compilers in same process')\n    const webpackBuildImpl = require('./impl').webpackBuildImpl\n    return webpackBuildImpl(null, null)\n  }\n}\n"],"names":["Log","NextBuildContext","Worker","origDebug","path","exportTraceState","recordTraceEvents","debug","ORDERED_COMPILER_NAMES","pluginState","deepMerge","target","source","result","key","Object","keys","Array","isArray","webpackBuildWithWorker","compilerNamesArg","compilerNames","nextBuildSpan","prunedBuildContext","getWorker","compilerName","_worker","join","__dirname","exposedMethods","numWorkers","maxRetries","forkOptions","env","process","NEXT_PRIVATE_BUILD_WORKER","getStderr","pipe","stderr","getStdout","stdout","worker","_workerPool","_workers","_child","on","code","signal","combinedResult","duration","buildTraceContext","curResult","workerMain","buildContext","traceState","defaultParentSpanId","getId","shouldSaveTraceEvents","debugTraceEvents","end","telemetryState","entriesTrace","entryNameMap","chunksTrace","entryNameFilesMap","length","event","webpackBuild","withWorker","webpackBuildImpl","require"],"mappings":"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"}

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

@@ -1403,7 +1403,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.25",
+                cacheKey: "15.0.4-canary.26",
                 name: `static/chunks/polyfills${dev ? '' : '-[hash]'}.js`,
                 minimize: false,
                 info: {
@@ -1632,7 +1632,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.25"}|${configVars}`,
+        version: `${__dirname}|${"15.0.4-canary.26"}|${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.25";
+ */ const version = "15.0.4-canary.26";
 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.25";
+export const version = "15.0.4-canary.26";
 export let router;
 export const emitter = mitt();
 const looseToArray = (input)=>[].slice.call(input);

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.25") == 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.26") == 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, _result_experimental10;
         // 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.25"
+        version: "15.0.4-canary.26"
     });
     // 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.25"
+            version: "15.0.4-canary.26"
         });
         // 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.25"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
+    Log.bootstrap(`${bold(purple(`${Log.prefixes.ready} Next.js ${"15.0.4-canary.26"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
     if (appUrl) {
         Log.bootstrap(`- Local:        ${appUrl}`);
     }

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

@@ -42,7 +42,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.25"})`;
+    process.title = `next-server (v${"15.0.4-canary.26"})`;
     let handlersReady = ()=>{};
     let handlersError = ()=>{};
     let handlersPromise = new Promise((resolve, reject)=>{

package/dist/server/config.js

@@ -234,7 +234,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.25") == 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.26") == 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, _result_experimental10;
         // Prevents usage of certain experimental features outside of canary
         if ((_result_experimental7 = result.experimental) == null ? void 0 : _result_experimental7.ppr) {

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

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

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

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

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

@@ -67,7 +67,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 function logStartInfo({ networkUrl, appUrl, envInfo, expFeatureInfo, maxExperimentalFeatures = Infinity }) {
-    _log.bootstrap(`${(0, _picocolors.bold)((0, _picocolors.purple)(`${_log.prefixes.ready} Next.js ${"15.0.4-canary.25"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
+    _log.bootstrap(`${(0, _picocolors.bold)((0, _picocolors.purple)(`${_log.prefixes.ready} Next.js ${"15.0.4-canary.26"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
     if (appUrl) {
         _log.bootstrap(`- Local:        ${appUrl}`);
     }

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

@@ -110,7 +110,7 @@ async function getRequestHandlers({ dir, port, isDev, onCleanup, server, hostnam
 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.25"})`;
+    process.title = `next-server (v${"15.0.4-canary.26"})`;
     let handlersReady = ()=>{};
     let handlersError = ()=>{};
     let handlersPromise = new Promise((resolve, reject)=>{

package/dist/telemetry/anonymous-meta.js

@@ -81,7 +81,7 @@ function getAnonymousMeta() {
         isWsl: _iswsl.default,
         isCI: _ciinfo.isCI,
         ciName: _ciinfo.isCI && _ciinfo.name || null,
-        nextVersion: "15.0.4-canary.25"
+        nextVersion: "15.0.4-canary.26"
     };
     return traits;
 }

package/dist/telemetry/events/session-stopped.js

@@ -11,11 +11,11 @@ Object.defineProperty(exports, "eventCliSessionStopped", {
 const EVENT_VERSION = 'NEXT_CLI_SESSION_STOPPED';
 function eventCliSessionStopped(event) {
     // This should be an invariant, if it fails our build tooling is broken.
-    if (typeof "15.0.4-canary.25" !== 'string') {
+    if (typeof "15.0.4-canary.26" !== 'string') {
         return [];
     }
     const payload = {
-        nextVersion: "15.0.4-canary.25",
+        nextVersion: "15.0.4-canary.26",
         nodeVersion: process.version,
         cliCommand: event.cliCommand,
         durationMilliseconds: event.durationMilliseconds,

package/dist/telemetry/events/version.js

@@ -36,12 +36,12 @@ function hasBabelConfig(dir) {
 function eventCliSession(dir, nextConfig, event) {
     var _nextConfig_experimental_staleTimes, _nextConfig_experimental_staleTimes1, _nextConfig_experimental_reactCompiler, _nextConfig_experimental_reactCompiler1;
     // This should be an invariant, if it fails our build tooling is broken.
-    if (typeof "15.0.4-canary.25" !== 'string') {
+    if (typeof "15.0.4-canary.26" !== 'string') {
         return [];
     }
     const { images, i18n } = nextConfig || {};
     const payload = {
-        nextVersion: "15.0.4-canary.25",
+        nextVersion: "15.0.4-canary.26",
         nodeVersion: process.version,
         cliCommand: event.cliCommand,
         isSrcDir: event.isSrcDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "15.0.4-canary.25",
+  "version": "15.0.4-canary.26",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -97,7 +97,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.0.4-canary.25",
+    "@next/env": "15.0.4-canary.26",
     "@swc/counter": "0.1.3",
     "@swc/helpers": "0.5.13",
     "busboy": "1.6.0",
@@ -129,14 +129,14 @@
   },
   "optionalDependencies": {
     "sharp": "^0.33.5",
-    "@next/swc-darwin-arm64": "15.0.4-canary.25",
-    "@next/swc-darwin-x64": "15.0.4-canary.25",
-    "@next/swc-linux-arm64-gnu": "15.0.4-canary.25",
-    "@next/swc-linux-arm64-musl": "15.0.4-canary.25",
-    "@next/swc-linux-x64-gnu": "15.0.4-canary.25",
-    "@next/swc-linux-x64-musl": "15.0.4-canary.25",
-    "@next/swc-win32-arm64-msvc": "15.0.4-canary.25",
-    "@next/swc-win32-x64-msvc": "15.0.4-canary.25"
+    "@next/swc-darwin-arm64": "15.0.4-canary.26",
+    "@next/swc-darwin-x64": "15.0.4-canary.26",
+    "@next/swc-linux-arm64-gnu": "15.0.4-canary.26",
+    "@next/swc-linux-arm64-musl": "15.0.4-canary.26",
+    "@next/swc-linux-x64-gnu": "15.0.4-canary.26",
+    "@next/swc-linux-x64-musl": "15.0.4-canary.26",
+    "@next/swc-win32-arm64-msvc": "15.0.4-canary.26",
+    "@next/swc-win32-x64-msvc": "15.0.4-canary.26"
   },
   "devDependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
@@ -169,11 +169,11 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "15.0.4-canary.25",
-    "@next/polyfill-module": "15.0.4-canary.25",
-    "@next/polyfill-nomodule": "15.0.4-canary.25",
-    "@next/react-refresh-utils": "15.0.4-canary.25",
-    "@next/swc": "15.0.4-canary.25",
+    "@next/font": "15.0.4-canary.26",
+    "@next/polyfill-module": "15.0.4-canary.26",
+    "@next/polyfill-nomodule": "15.0.4-canary.26",
+    "@next/react-refresh-utils": "15.0.4-canary.26",
+    "@next/swc": "15.0.4-canary.26",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@swc/core": "1.9.2-nightly-20241111.1",