next 15.6.0-canary.5 → 15.6.0-canary.7

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

@@ -90,7 +90,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.6.0-canary.5"
+        version: "15.6.0-canary.7"
     });
     // 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

@@ -158,7 +158,7 @@ export default class HotReloaderWebpack {
         this.previewProps = previewProps;
         this.rewrites = rewrites;
         this.hotReloaderSpan = trace('hot-reloader', undefined, {
-            version: "15.6.0-canary.5"
+            version: "15.6.0-canary.7"
         });
         // 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

@@ -14,7 +14,7 @@ export function logStartInfo({ networkUrl, appUrl, envInfo, experimentalFeatures
             bundlerSuffix = ' (webpack)';
         }
     }
-    Log.bootstrap(`${bold(purple(`${Log.prefixes.ready} Next.js ${"15.6.0-canary.5"}`))}${bundlerSuffix}`);
+    Log.bootstrap(`${bold(purple(`${Log.prefixes.ready} Next.js ${"15.6.0-canary.7"}`))}${bundlerSuffix}`);
     if (appUrl) {
         Log.bootstrap(`- Local:        ${appUrl}`);
     }

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

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

package/dist/esm/server/route-matcher-managers/dev-route-matcher-manager.js

@@ -26,9 +26,6 @@ export class DevRouteMatcherManager extends DefaultRouteMatcherManager {
         return match;
     }
     async *matchAll(pathname, options) {
-        // Compile the development routes.
-        // TODO: we may want to only run this during testing, users won't be fast enough to require this many dir scans
-        await super.reload();
         // Iterate over the development matches to see if one of them match the
         // request path.
         for await (const developmentMatch of super.matchAll(pathname, options)){

package/dist/esm/server/route-matcher-managers/dev-route-matcher-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/server/route-matcher-managers/dev-route-matcher-manager.ts"],"sourcesContent":["import { RouteKind } from '../route-kind'\nimport type { RouteMatch } from '../route-matches/route-match'\nimport type { RouteDefinition } from '../route-definitions/route-definition'\nimport { DefaultRouteMatcherManager } from './default-route-matcher-manager'\nimport type { MatchOptions, RouteMatcherManager } from './route-matcher-manager'\nimport path from '../../shared/lib/isomorphic/path'\nimport * as Log from '../../build/output/log'\nimport { cyan } from '../../lib/picocolors'\nimport type { RouteMatcher } from '../route-matchers/route-matcher'\n\nexport interface RouteEnsurer {\n  ensure(match: RouteMatch, pathname: string): Promise<void>\n}\n\nexport class DevRouteMatcherManager extends DefaultRouteMatcherManager {\n  constructor(\n    private readonly production: RouteMatcherManager,\n    private readonly ensurer: RouteEnsurer,\n    private readonly dir: string\n  ) {\n    super()\n  }\n\n  public async test(pathname: string, options: MatchOptions): Promise<boolean> {\n    // Try to find a match within the developer routes.\n    const match = await super.match(pathname, options)\n\n    // Return if the match wasn't null. Unlike the implementation of `match`\n    // which uses `matchAll` here, this does not call `ensure` on the match\n    // found via the development matches.\n    return match !== null\n  }\n\n  protected validate(\n    pathname: string,\n    matcher: RouteMatcher,\n    options: MatchOptions\n  ): RouteMatch | null {\n    const match = super.validate(pathname, matcher, options)\n\n    // If a match was found, check to see if there were any conflicting app or\n    // pages files.\n    // TODO: maybe expand this to _any_ duplicated routes instead?\n    if (\n      match &&\n      matcher.duplicated &&\n      matcher.duplicated.some(\n        (duplicate) =>\n          duplicate.definition.kind === RouteKind.APP_PAGE ||\n          duplicate.definition.kind === RouteKind.APP_ROUTE\n      ) &&\n      matcher.duplicated.some(\n        (duplicate) =>\n          duplicate.definition.kind === RouteKind.PAGES ||\n          duplicate.definition.kind === RouteKind.PAGES_API\n      )\n    ) {\n      return null\n    }\n\n    return match\n  }\n\n  public async *matchAll(\n    pathname: string,\n    options: MatchOptions\n  ): AsyncGenerator<RouteMatch<RouteDefinition<RouteKind>>, null, undefined> {\n    // Compile the development routes.\n    // TODO: we may want to only run this during testing, users won't be fast enough to require this many dir scans\n    await super.reload()\n\n    // Iterate over the development matches to see if one of them match the\n    // request path.\n    for await (const developmentMatch of super.matchAll(pathname, options)) {\n      // We're here, which means that we haven't seen this match yet, so we\n      // should try to ensure it and recompile the production matcher.\n      await this.ensurer.ensure(developmentMatch, pathname)\n      await this.production.reload()\n\n      // Iterate over the production matches again, this time we should be able\n      // to match it against the production matcher unless there's an error.\n      for await (const productionMatch of this.production.matchAll(\n        pathname,\n        options\n      )) {\n        yield productionMatch\n      }\n    }\n\n    // We tried direct matching against the pathname and against all the dynamic\n    // paths, so there was no match.\n    return null\n  }\n\n  public async reload(): Promise<void> {\n    // Compile the production routes again.\n    await this.production.reload()\n\n    // Compile the development routes.\n    await super.reload()\n\n    // Check for and warn of any duplicates.\n    for (const [pathname, matchers] of Object.entries(\n      this.matchers.duplicates\n    )) {\n      // We only want to warn about matchers resolving to the same path if their\n      // identities are different.\n      const identity = matchers[0].identity\n      if (matchers.slice(1).some((matcher) => matcher.identity !== identity)) {\n        continue\n      }\n\n      Log.warn(\n        `Duplicate page detected. ${matchers\n          .map((matcher) =>\n            cyan(path.relative(this.dir, matcher.definition.filename))\n          )\n          .join(' and ')} resolve to ${cyan(pathname)}`\n      )\n    }\n  }\n}\n"],"names":["RouteKind","DefaultRouteMatcherManager","path","Log","cyan","DevRouteMatcherManager","constructor","production","ensurer","dir","test","pathname","options","match","validate","matcher","duplicated","some","duplicate","definition","kind","APP_PAGE","APP_ROUTE","PAGES","PAGES_API","matchAll","reload","developmentMatch","ensure","productionMatch","matchers","Object","entries","duplicates","identity","slice","warn","map","relative","filename","join"],"mappings":"AAAA,SAASA,SAAS,QAAQ,gBAAe;AAGzC,SAASC,0BAA0B,QAAQ,kCAAiC;AAE5E,OAAOC,UAAU,mCAAkC;AACnD,YAAYC,SAAS,yBAAwB;AAC7C,SAASC,IAAI,QAAQ,uBAAsB;AAO3C,OAAO,MAAMC,+BAA+BJ;IAC1CK,YACE,AAAiBC,UAA+B,EAChD,AAAiBC,OAAqB,EACtC,AAAiBC,GAAW,CAC5B;QACA,KAAK,SAJYF,aAAAA,iBACAC,UAAAA,cACAC,MAAAA;IAGnB;IAEA,MAAaC,KAAKC,QAAgB,EAAEC,OAAqB,EAAoB;QAC3E,mDAAmD;QACnD,MAAMC,QAAQ,MAAM,KAAK,CAACA,MAAMF,UAAUC;QAE1C,wEAAwE;QACxE,uEAAuE;QACvE,qCAAqC;QACrC,OAAOC,UAAU;IACnB;IAEUC,SACRH,QAAgB,EAChBI,OAAqB,EACrBH,OAAqB,EACF;QACnB,MAAMC,QAAQ,KAAK,CAACC,SAASH,UAAUI,SAASH;QAEhD,0EAA0E;QAC1E,eAAe;QACf,8DAA8D;QAC9D,IACEC,SACAE,QAAQC,UAAU,IAClBD,QAAQC,UAAU,CAACC,IAAI,CACrB,CAACC,YACCA,UAAUC,UAAU,CAACC,IAAI,KAAKpB,UAAUqB,QAAQ,IAChDH,UAAUC,UAAU,CAACC,IAAI,KAAKpB,UAAUsB,SAAS,KAErDP,QAAQC,UAAU,CAACC,IAAI,CACrB,CAACC,YACCA,UAAUC,UAAU,CAACC,IAAI,KAAKpB,UAAUuB,KAAK,IAC7CL,UAAUC,UAAU,CAACC,IAAI,KAAKpB,UAAUwB,SAAS,GAErD;YACA,OAAO;QACT;QAEA,OAAOX;IACT;IAEA,OAAcY,SACZd,QAAgB,EAChBC,OAAqB,EACoD;QACzE,kCAAkC;QAClC,+GAA+G;QAC/G,MAAM,KAAK,CAACc;QAEZ,uEAAuE;QACvE,gBAAgB;QAChB,WAAW,MAAMC,oBAAoB,KAAK,CAACF,SAASd,UAAUC,SAAU;YACtE,qEAAqE;YACrE,gEAAgE;YAChE,MAAM,IAAI,CAACJ,OAAO,CAACoB,MAAM,CAACD,kBAAkBhB;YAC5C,MAAM,IAAI,CAACJ,UAAU,CAACmB,MAAM;YAE5B,yEAAyE;YACzE,sEAAsE;YACtE,WAAW,MAAMG,mBAAmB,IAAI,CAACtB,UAAU,CAACkB,QAAQ,CAC1Dd,UACAC,SACC;gBACD,MAAMiB;YACR;QACF;QAEA,4EAA4E;QAC5E,gCAAgC;QAChC,OAAO;IACT;IAEA,MAAaH,SAAwB;QACnC,uCAAuC;QACvC,MAAM,IAAI,CAACnB,UAAU,CAACmB,MAAM;QAE5B,kCAAkC;QAClC,MAAM,KAAK,CAACA;QAEZ,wCAAwC;QACxC,KAAK,MAAM,CAACf,UAAUmB,SAAS,IAAIC,OAAOC,OAAO,CAC/C,IAAI,CAACF,QAAQ,CAACG,UAAU,EACvB;YACD,0EAA0E;YAC1E,4BAA4B;YAC5B,MAAMC,WAAWJ,QAAQ,CAAC,EAAE,CAACI,QAAQ;YACrC,IAAIJ,SAASK,KAAK,CAAC,GAAGlB,IAAI,CAAC,CAACF,UAAYA,QAAQmB,QAAQ,KAAKA,WAAW;gBACtE;YACF;YAEA/B,IAAIiC,IAAI,CACN,CAAC,yBAAyB,EAAEN,SACzBO,GAAG,CAAC,CAACtB,UACJX,KAAKF,KAAKoC,QAAQ,CAAC,IAAI,CAAC7B,GAAG,EAAEM,QAAQI,UAAU,CAACoB,QAAQ,IAEzDC,IAAI,CAAC,SAAS,YAAY,EAAEpC,KAAKO,WAAW;QAEnD;IACF;AACF","ignoreList":[0]}
+{"version":3,"sources":["../../../src/server/route-matcher-managers/dev-route-matcher-manager.ts"],"sourcesContent":["import { RouteKind } from '../route-kind'\nimport type { RouteMatch } from '../route-matches/route-match'\nimport type { RouteDefinition } from '../route-definitions/route-definition'\nimport { DefaultRouteMatcherManager } from './default-route-matcher-manager'\nimport type { MatchOptions, RouteMatcherManager } from './route-matcher-manager'\nimport path from '../../shared/lib/isomorphic/path'\nimport * as Log from '../../build/output/log'\nimport { cyan } from '../../lib/picocolors'\nimport type { RouteMatcher } from '../route-matchers/route-matcher'\n\nexport interface RouteEnsurer {\n  ensure(match: RouteMatch, pathname: string): Promise<void>\n}\n\nexport class DevRouteMatcherManager extends DefaultRouteMatcherManager {\n  constructor(\n    private readonly production: RouteMatcherManager,\n    private readonly ensurer: RouteEnsurer,\n    private readonly dir: string\n  ) {\n    super()\n  }\n\n  public async test(pathname: string, options: MatchOptions): Promise<boolean> {\n    // Try to find a match within the developer routes.\n    const match = await super.match(pathname, options)\n\n    // Return if the match wasn't null. Unlike the implementation of `match`\n    // which uses `matchAll` here, this does not call `ensure` on the match\n    // found via the development matches.\n    return match !== null\n  }\n\n  protected validate(\n    pathname: string,\n    matcher: RouteMatcher,\n    options: MatchOptions\n  ): RouteMatch | null {\n    const match = super.validate(pathname, matcher, options)\n\n    // If a match was found, check to see if there were any conflicting app or\n    // pages files.\n    // TODO: maybe expand this to _any_ duplicated routes instead?\n    if (\n      match &&\n      matcher.duplicated &&\n      matcher.duplicated.some(\n        (duplicate) =>\n          duplicate.definition.kind === RouteKind.APP_PAGE ||\n          duplicate.definition.kind === RouteKind.APP_ROUTE\n      ) &&\n      matcher.duplicated.some(\n        (duplicate) =>\n          duplicate.definition.kind === RouteKind.PAGES ||\n          duplicate.definition.kind === RouteKind.PAGES_API\n      )\n    ) {\n      return null\n    }\n\n    return match\n  }\n\n  public async *matchAll(\n    pathname: string,\n    options: MatchOptions\n  ): AsyncGenerator<RouteMatch<RouteDefinition<RouteKind>>, null, undefined> {\n    // Iterate over the development matches to see if one of them match the\n    // request path.\n    for await (const developmentMatch of super.matchAll(pathname, options)) {\n      // We're here, which means that we haven't seen this match yet, so we\n      // should try to ensure it and recompile the production matcher.\n      await this.ensurer.ensure(developmentMatch, pathname)\n      await this.production.reload()\n\n      // Iterate over the production matches again, this time we should be able\n      // to match it against the production matcher unless there's an error.\n      for await (const productionMatch of this.production.matchAll(\n        pathname,\n        options\n      )) {\n        yield productionMatch\n      }\n    }\n\n    // We tried direct matching against the pathname and against all the dynamic\n    // paths, so there was no match.\n    return null\n  }\n\n  public async reload(): Promise<void> {\n    // Compile the production routes again.\n    await this.production.reload()\n\n    // Compile the development routes.\n    await super.reload()\n\n    // Check for and warn of any duplicates.\n    for (const [pathname, matchers] of Object.entries(\n      this.matchers.duplicates\n    )) {\n      // We only want to warn about matchers resolving to the same path if their\n      // identities are different.\n      const identity = matchers[0].identity\n      if (matchers.slice(1).some((matcher) => matcher.identity !== identity)) {\n        continue\n      }\n\n      Log.warn(\n        `Duplicate page detected. ${matchers\n          .map((matcher) =>\n            cyan(path.relative(this.dir, matcher.definition.filename))\n          )\n          .join(' and ')} resolve to ${cyan(pathname)}`\n      )\n    }\n  }\n}\n"],"names":["RouteKind","DefaultRouteMatcherManager","path","Log","cyan","DevRouteMatcherManager","constructor","production","ensurer","dir","test","pathname","options","match","validate","matcher","duplicated","some","duplicate","definition","kind","APP_PAGE","APP_ROUTE","PAGES","PAGES_API","matchAll","developmentMatch","ensure","reload","productionMatch","matchers","Object","entries","duplicates","identity","slice","warn","map","relative","filename","join"],"mappings":"AAAA,SAASA,SAAS,QAAQ,gBAAe;AAGzC,SAASC,0BAA0B,QAAQ,kCAAiC;AAE5E,OAAOC,UAAU,mCAAkC;AACnD,YAAYC,SAAS,yBAAwB;AAC7C,SAASC,IAAI,QAAQ,uBAAsB;AAO3C,OAAO,MAAMC,+BAA+BJ;IAC1CK,YACE,AAAiBC,UAA+B,EAChD,AAAiBC,OAAqB,EACtC,AAAiBC,GAAW,CAC5B;QACA,KAAK,SAJYF,aAAAA,iBACAC,UAAAA,cACAC,MAAAA;IAGnB;IAEA,MAAaC,KAAKC,QAAgB,EAAEC,OAAqB,EAAoB;QAC3E,mDAAmD;QACnD,MAAMC,QAAQ,MAAM,KAAK,CAACA,MAAMF,UAAUC;QAE1C,wEAAwE;QACxE,uEAAuE;QACvE,qCAAqC;QACrC,OAAOC,UAAU;IACnB;IAEUC,SACRH,QAAgB,EAChBI,OAAqB,EACrBH,OAAqB,EACF;QACnB,MAAMC,QAAQ,KAAK,CAACC,SAASH,UAAUI,SAASH;QAEhD,0EAA0E;QAC1E,eAAe;QACf,8DAA8D;QAC9D,IACEC,SACAE,QAAQC,UAAU,IAClBD,QAAQC,UAAU,CAACC,IAAI,CACrB,CAACC,YACCA,UAAUC,UAAU,CAACC,IAAI,KAAKpB,UAAUqB,QAAQ,IAChDH,UAAUC,UAAU,CAACC,IAAI,KAAKpB,UAAUsB,SAAS,KAErDP,QAAQC,UAAU,CAACC,IAAI,CACrB,CAACC,YACCA,UAAUC,UAAU,CAACC,IAAI,KAAKpB,UAAUuB,KAAK,IAC7CL,UAAUC,UAAU,CAACC,IAAI,KAAKpB,UAAUwB,SAAS,GAErD;YACA,OAAO;QACT;QAEA,OAAOX;IACT;IAEA,OAAcY,SACZd,QAAgB,EAChBC,OAAqB,EACoD;QACzE,uEAAuE;QACvE,gBAAgB;QAChB,WAAW,MAAMc,oBAAoB,KAAK,CAACD,SAASd,UAAUC,SAAU;YACtE,qEAAqE;YACrE,gEAAgE;YAChE,MAAM,IAAI,CAACJ,OAAO,CAACmB,MAAM,CAACD,kBAAkBf;YAC5C,MAAM,IAAI,CAACJ,UAAU,CAACqB,MAAM;YAE5B,yEAAyE;YACzE,sEAAsE;YACtE,WAAW,MAAMC,mBAAmB,IAAI,CAACtB,UAAU,CAACkB,QAAQ,CAC1Dd,UACAC,SACC;gBACD,MAAMiB;YACR;QACF;QAEA,4EAA4E;QAC5E,gCAAgC;QAChC,OAAO;IACT;IAEA,MAAaD,SAAwB;QACnC,uCAAuC;QACvC,MAAM,IAAI,CAACrB,UAAU,CAACqB,MAAM;QAE5B,kCAAkC;QAClC,MAAM,KAAK,CAACA;QAEZ,wCAAwC;QACxC,KAAK,MAAM,CAACjB,UAAUmB,SAAS,IAAIC,OAAOC,OAAO,CAC/C,IAAI,CAACF,QAAQ,CAACG,UAAU,EACvB;YACD,0EAA0E;YAC1E,4BAA4B;YAC5B,MAAMC,WAAWJ,QAAQ,CAAC,EAAE,CAACI,QAAQ;YACrC,IAAIJ,SAASK,KAAK,CAAC,GAAGlB,IAAI,CAAC,CAACF,UAAYA,QAAQmB,QAAQ,KAAKA,WAAW;gBACtE;YACF;YAEA/B,IAAIiC,IAAI,CACN,CAAC,yBAAyB,EAAEN,SACzBO,GAAG,CAAC,CAACtB,UACJX,KAAKF,KAAKoC,QAAQ,CAAC,IAAI,CAAC7B,GAAG,EAAEM,QAAQI,UAAU,CAACoB,QAAQ,IAEzDC,IAAI,CAAC,SAAS,YAAY,EAAEpC,KAAKO,WAAW;QAEnD;IACF;AACF","ignoreList":[0]}

package/dist/esm/shared/lib/canary-only.js

@@ -1,6 +1,6 @@
 export function isStableBuild() {
     var _process_env___NEXT_VERSION;
-    return !((_process_env___NEXT_VERSION = "15.6.0-canary.5") == null ? void 0 : _process_env___NEXT_VERSION.includes('canary')) && !process.env.__NEXT_TEST_MODE && !process.env.NEXT_PRIVATE_LOCAL_DEV;
+    return !((_process_env___NEXT_VERSION = "15.6.0-canary.7") == null ? void 0 : _process_env___NEXT_VERSION.includes('canary')) && !process.env.__NEXT_TEST_MODE && !process.env.NEXT_PRIVATE_LOCAL_DEV;
 }
 export class CanaryOnlyError extends Error {
     constructor(arg){

package/dist/server/base-server.d.ts

@@ -221,6 +221,7 @@ export default abstract class Server<ServerOptions extends Options = Options, Se
      * it's only fully used in dev
      */
     constructor(options: ServerOptions);
+    protected reloadMatchers(): Promise<void>;
     private handleRSCRequest;
     private handleNextDataRequest;
     protected handleNextImageRequest: RouteHandler<ServerRequest, ServerResponse>;

package/dist/server/base-server.js

@@ -422,6 +422,9 @@ class Server {
             dev
         });
     }
+    reloadMatchers() {
+        return this.matchers.reload();
+    }
     getRouteMatchers() {
         // Create a new manifest loader that get's the manifests from the server.
         const manifestLoader = new _servermanifestloader.ServerManifestLoader((name)=>{
@@ -474,7 +477,7 @@ class Server {
         const tracer = (0, _tracer.getTracer)();
         return tracer.withPropagatedContext(req.headers, ()=>{
             return tracer.trace(_constants1.BaseServerSpan.handleRequest, {
-                spanName: `${method} ${req.url}`,
+                spanName: `${method}`,
                 kind: _tracer.SpanKind.SERVER,
                 attributes: {
                     'http.method': method,
@@ -513,7 +516,7 @@ class Server {
                         });
                         span.updateName(name);
                     } else {
-                        span.updateName(isRSCRequest ? `RSC ${method} ${req.url}` : `${method} ${req.url}`);
+                        span.updateName(isRSCRequest ? `RSC ${method}` : `${method}`);
                     }
                 }));
         });