next 15.0.4-canary.37 → 15.0.4-canary.38

package/dist/esm/build/index.js

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

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.37",
+                cacheKey: "15.0.4-canary.38",
                 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.37"}|${configVars}`,
+        version: `${__dirname}|${"15.0.4-canary.38"}|${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.37";
+ */ const version = "15.0.4-canary.38";
 window.next = {
     version,
     appDir: true

package/dist/esm/client/components/react-dev-overlay/server/middleware-turbopack.js

@@ -3,6 +3,7 @@ import fs, { constants as FS } from 'fs/promises';
 import path from 'path';
 import url from 'url';
 import { launchEditor } from '../internal/helpers/launchEditor';
+import { SourceMapConsumer } from 'next/dist/compiled/source-map08';
 import { getSourceMapFromFile } from '../internal/helpers/get-source-map-from-file';
 import { findSourceMap } from 'node:module';
 function shouldIgnorePath(modulePath) {
@@ -76,8 +77,87 @@ function createStackFrame(searchParams) {
         isServer: searchParams.get('isServer') === 'true'
     };
 }
+/**
+ * Finds the sourcemap payload applicable to a given frame.
+ * Equal to the input unless an Index Source Map is used.
+ */ function findApplicableSourceMapPayload(frame, payload) {
+    if ('sections' in payload) {
+        var _frame_line;
+        const frameLine = (_frame_line = frame.line) != null ? _frame_line : 0;
+        var _frame_column;
+        const frameColumn = (_frame_column = frame.column) != null ? _frame_column : 0;
+        // Sections must not overlap and must be sorted: https://tc39.es/source-map/#section-object
+        // Therefore the last section that has an offset less than or equal to the frame is the applicable one.
+        // TODO(veil): Binary search
+        let section = payload.sections[0];
+        for(let i = 0; i < payload.sections.length && payload.sections[i].offset.line <= frameLine && payload.sections[i].offset.column <= frameColumn; i++){
+            section = payload.sections[i];
+        }
+        return section === undefined ? undefined : section.map;
+    } else {
+        return payload;
+    }
+}
+async function nativeTraceSource(frame) {
+    const sourceMap = findSourceMap(// TODO(veil): Why are the frames sent encoded?
+    decodeURIComponent(frame.file));
+    if (sourceMap !== undefined) {
+        const traced = await SourceMapConsumer.with(sourceMap.payload, null, async (consumer)=>{
+            var _frame_line, _frame_column;
+            const originalPosition = consumer.originalPositionFor({
+                line: (_frame_line = frame.line) != null ? _frame_line : 1,
+                column: (_frame_column = frame.column) != null ? _frame_column : 1
+            });
+            if (originalPosition.source === null) {
+                return null;
+            }
+            var _consumer_sourceContentFor;
+            const sourceContent = (_consumer_sourceContentFor = consumer.sourceContentFor(originalPosition.source, /* returnNullOnMissing */ true)) != null ? _consumer_sourceContentFor : null;
+            return {
+                originalPosition,
+                sourceContent
+            };
+        });
+        if (traced !== null) {
+            var // default is not a valid identifier in JS so webpack uses a custom variable when it's an unnamed default export
+            // Resolve it back to `default` for the method name if the source position didn't have the method.
+            _frame_methodName_replace, _frame_methodName, _originalPosition_source;
+            const { originalPosition, sourceContent } = traced;
+            const applicableSourceMap = findApplicableSourceMapPayload(frame, sourceMap.payload);
+            // TODO(veil): Upstream a method to sourcemap consumer that immediately says if a frame is ignored or not.
+            let ignored = false;
+            if (applicableSourceMap === undefined) {
+                console.error('No applicable source map found in sections for frame', frame);
+            } else {
+                var _applicableSourceMap_ignoreList;
+                // TODO: O(n^2). Consider moving `ignoreList` into a Set
+                const sourceIndex = applicableSourceMap.sources.indexOf(originalPosition.source);
+                var _applicableSourceMap_ignoreList_includes;
+                ignored = (_applicableSourceMap_ignoreList_includes = (_applicableSourceMap_ignoreList = applicableSourceMap.ignoreList) == null ? void 0 : _applicableSourceMap_ignoreList.includes(sourceIndex)) != null ? _applicableSourceMap_ignoreList_includes : false;
+            }
+            var _originalPosition_column, _originalPosition_line;
+            const originalStackFrame = {
+                methodName: originalPosition.name || ((_frame_methodName = frame.methodName) == null ? void 0 : (_frame_methodName_replace = _frame_methodName.replace('__WEBPACK_DEFAULT_EXPORT__', 'default')) == null ? void 0 : _frame_methodName_replace.replace('__webpack_exports__.', '')) || '<unknown>',
+                column: ((_originalPosition_column = originalPosition.column) != null ? _originalPosition_column : 0) + 1,
+                file: ((_originalPosition_source = originalPosition.source) == null ? void 0 : _originalPosition_source.startsWith('file://')) ? path.relative(process.cwd(), url.fileURLToPath(originalPosition.source)) : originalPosition.source,
+                lineNumber: (_originalPosition_line = originalPosition.line) != null ? _originalPosition_line : 0,
+                // TODO: c&p from async createOriginalStackFrame but why not frame.arguments?
+                arguments: [],
+                ignored
+            };
+            return {
+                frame: originalStackFrame,
+                source: sourceContent
+            };
+        }
+    }
+    return undefined;
+}
 export async function createOriginalStackFrame(project, frame) {
-    const traced = await batchedTraceSource(project, frame);
+    var _ref;
+    const traced = (_ref = await nativeTraceSource(frame)) != null ? _ref : // TODO(veil): When would the bundler know more than native?
+    // If it's faster, try the bundler first and fall back to native later.
+    await batchedTraceSource(project, frame);
     if (!traced) {
         return null;
     }
@@ -131,6 +211,8 @@ export function getSourceMapMiddleware(project) {
         if (!filename) {
             return badRequest(res);
         }
+        // TODO(veil): Always try the native version first.
+        // Externals could also be files that aren't bundled via Webpack.
         if (filename.startsWith('webpack://') || filename.startsWith('webpack-internal:///')) {
             const sourceMap = findSourceMap(filename);
             if (sourceMap) {

package/dist/esm/client/components/react-dev-overlay/server/middleware-turbopack.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/client/components/react-dev-overlay/server/middleware-turbopack.ts"],"sourcesContent":["import type { IncomingMessage, ServerResponse } from 'http'\nimport {\n  badRequest,\n  getOriginalCodeFrame,\n  internalServerError,\n  json,\n  jsonString,\n  noContent,\n  type OriginalStackFrameResponse,\n} from './shared'\n\nimport fs, { constants as FS } from 'fs/promises'\nimport path from 'path'\nimport url from 'url'\nimport { launchEditor } from '../internal/helpers/launchEditor'\nimport type { StackFrame } from 'next/dist/compiled/stacktrace-parser'\nimport type { Project, TurbopackStackFrame } from '../../../../build/swc/types'\nimport { getSourceMapFromFile } from '../internal/helpers/get-source-map-from-file'\nimport { findSourceMap } from 'node:module'\n\nfunction shouldIgnorePath(modulePath: string): boolean {\n  return (\n    modulePath.includes('node_modules') ||\n    // Only relevant for when Next.js is symlinked e.g. in the Next.js monorepo\n    modulePath.includes('next/dist')\n  )\n}\n\ntype IgnorableStackFrame = StackFrame & { ignored: boolean }\n\nconst currentSourcesByFile: Map<string, Promise<string | null>> = new Map()\nexport async function batchedTraceSource(\n  project: Project,\n  frame: TurbopackStackFrame\n): Promise<{ frame: IgnorableStackFrame; source: string | null } | undefined> {\n  const file = frame.file ? decodeURIComponent(frame.file) : undefined\n  if (!file) return\n\n  const sourceFrame = await project.traceSource(frame)\n  if (!sourceFrame) {\n    return {\n      frame: {\n        file,\n        lineNumber: frame.line ?? 0,\n        column: frame.column ?? 0,\n        methodName: frame.methodName ?? '<unknown>',\n        ignored: shouldIgnorePath(frame.file),\n        arguments: [],\n      },\n      source: null,\n    }\n  }\n\n  let source = null\n  // Don't look up source for node_modules or internals. These can often be large bundled files.\n  const ignored =\n    shouldIgnorePath(sourceFrame.file) ||\n    // isInternal means resource starts with turbopack://[turbopack]\n    !!sourceFrame.isInternal\n  if (sourceFrame && sourceFrame.file && !ignored) {\n    let sourcePromise = currentSourcesByFile.get(sourceFrame.file)\n    if (!sourcePromise) {\n      sourcePromise = project.getSourceForAsset(sourceFrame.file)\n      currentSourcesByFile.set(sourceFrame.file, sourcePromise)\n      setTimeout(() => {\n        // Cache file reads for 100ms, as frames will often reference the same\n        // files and can be large.\n        currentSourcesByFile.delete(sourceFrame.file!)\n      }, 100)\n    }\n    source = await sourcePromise\n  }\n\n  // TODO: get ignoredList from turbopack source map\n  const ignorableFrame = {\n    file: sourceFrame.file,\n    lineNumber: sourceFrame.line ?? 0,\n    column: sourceFrame.column ?? 0,\n    methodName: sourceFrame.methodName ?? frame.methodName ?? '<unknown>',\n    ignored,\n    arguments: [],\n  }\n\n  return {\n    frame: ignorableFrame,\n    source,\n  }\n}\n\nfunction createStackFrame(searchParams: URLSearchParams) {\n  const fileParam = searchParams.get('file')\n\n  if (!fileParam) {\n    return undefined\n  }\n\n  // rsc://React/Server/file://<filename>?42 => file://<filename>\n  const file = fileParam\n    .replace(/^rsc:\\/\\/React\\/[^/]+\\//, '')\n    .replace(/\\?\\d+$/, '')\n\n  return {\n    file,\n    methodName: searchParams.get('methodName') ?? '<unknown>',\n    line: parseInt(searchParams.get('lineNumber') ?? '0', 10) || 0,\n    column: parseInt(searchParams.get('column') ?? '0', 10) || 0,\n    isServer: searchParams.get('isServer') === 'true',\n  } satisfies TurbopackStackFrame\n}\n\nexport async function createOriginalStackFrame(\n  project: Project,\n  frame: TurbopackStackFrame\n): Promise<OriginalStackFrameResponse | null> {\n  const traced = await batchedTraceSource(project, frame)\n  if (!traced) {\n    return null\n  }\n\n  return {\n    originalStackFrame: traced.frame,\n    originalCodeFrame: getOriginalCodeFrame(traced.frame, traced.source),\n  }\n}\n\nexport function getOverlayMiddleware(project: Project) {\n  return async function (\n    req: IncomingMessage,\n    res: ServerResponse,\n    next: () => void\n  ): Promise<void> {\n    const { pathname, searchParams } = new URL(req.url!, 'http://n')\n\n    if (pathname === '/__nextjs_original-stack-frame') {\n      const frame = createStackFrame(searchParams)\n\n      if (!frame) return badRequest(res)\n\n      let originalStackFrame: OriginalStackFrameResponse | null\n      try {\n        originalStackFrame = await createOriginalStackFrame(project, frame)\n      } catch (e: any) {\n        return internalServerError(res, e.message)\n      }\n\n      if (!originalStackFrame) {\n        res.statusCode = 404\n        res.end('Unable to resolve sourcemap')\n        return\n      }\n\n      return json(res, originalStackFrame)\n    } else if (pathname === '/__nextjs_launch-editor') {\n      const frame = createStackFrame(searchParams)\n\n      if (!frame) return badRequest(res)\n\n      const fileExists = await fs.access(frame.file, FS.F_OK).then(\n        () => true,\n        () => false\n      )\n      if (!fileExists) return noContent(res)\n\n      try {\n        launchEditor(frame.file, frame.line ?? 1, frame.column ?? 1)\n      } catch (err) {\n        console.log('Failed to launch editor:', err)\n        return internalServerError(res)\n      }\n\n      noContent(res)\n    }\n\n    return next()\n  }\n}\n\nexport function getSourceMapMiddleware(project: Project) {\n  return async function (\n    req: IncomingMessage,\n    res: ServerResponse,\n    next: () => void\n  ): Promise<void> {\n    const { pathname, searchParams } = new URL(req.url!, 'http://n')\n\n    if (pathname !== '/__nextjs_source-map') {\n      return next()\n    }\n\n    let filename = searchParams.get('filename')\n\n    if (!filename) {\n      return badRequest(res)\n    }\n\n    if (\n      filename.startsWith('webpack://') ||\n      filename.startsWith('webpack-internal:///')\n    ) {\n      const sourceMap = findSourceMap(filename)\n\n      if (sourceMap) {\n        return json(res, sourceMap.payload)\n      }\n\n      return noContent(res)\n    }\n\n    try {\n      // Turbopack chunk filenames might be URL-encoded.\n      filename = decodeURI(filename)\n\n      if (path.isAbsolute(filename)) {\n        filename = url.pathToFileURL(filename).href\n      }\n\n      const sourceMapString = await project.getSourceMap(filename)\n\n      if (sourceMapString) {\n        return jsonString(res, sourceMapString)\n      }\n\n      if (filename.startsWith('file:')) {\n        const sourceMap = await getSourceMapFromFile(filename)\n\n        if (sourceMap) {\n          return json(res, sourceMap)\n        }\n      }\n    } catch (error) {\n      console.error('Failed to get source map:', error)\n    }\n\n    noContent(res)\n  }\n}\n"],"names":["badRequest","getOriginalCodeFrame","internalServerError","json","jsonString","noContent","fs","constants","FS","path","url","launchEditor","getSourceMapFromFile","findSourceMap","shouldIgnorePath","modulePath","includes","currentSourcesByFile","Map","batchedTraceSource","project","frame","file","decodeURIComponent","undefined","sourceFrame","traceSource","lineNumber","line","column","methodName","ignored","arguments","source","isInternal","sourcePromise","get","getSourceForAsset","set","setTimeout","delete","ignorableFrame","createStackFrame","searchParams","fileParam","replace","parseInt","isServer","createOriginalStackFrame","traced","originalStackFrame","originalCodeFrame","getOverlayMiddleware","req","res","next","pathname","URL","e","message","statusCode","end","fileExists","access","F_OK","then","err","console","log","getSourceMapMiddleware","filename","startsWith","sourceMap","payload","decodeURI","isAbsolute","pathToFileURL","href","sourceMapString","getSourceMap","error"],"mappings":"AACA,SACEA,UAAU,EACVC,oBAAoB,EACpBC,mBAAmB,EACnBC,IAAI,EACJC,UAAU,EACVC,SAAS,QAEJ,WAAU;AAEjB,OAAOC,MAAMC,aAAaC,EAAE,QAAQ,cAAa;AACjD,OAAOC,UAAU,OAAM;AACvB,OAAOC,SAAS,MAAK;AACrB,SAASC,YAAY,QAAQ,mCAAkC;AAG/D,SAASC,oBAAoB,QAAQ,+CAA8C;AACnF,SAASC,aAAa,QAAQ,cAAa;AAE3C,SAASC,iBAAiBC,UAAkB;IAC1C,OACEA,WAAWC,QAAQ,CAAC,mBACpB,2EAA2E;IAC3ED,WAAWC,QAAQ,CAAC;AAExB;AAIA,MAAMC,uBAA4D,IAAIC;AACtE,OAAO,eAAeC,mBACpBC,OAAgB,EAChBC,KAA0B;IAE1B,MAAMC,OAAOD,MAAMC,IAAI,GAAGC,mBAAmBF,MAAMC,IAAI,IAAIE;IAC3D,IAAI,CAACF,MAAM;IAEX,MAAMG,cAAc,MAAML,QAAQM,WAAW,CAACL;IAC9C,IAAI,CAACI,aAAa;YAIAJ,aACJA,eACIA;QALhB,OAAO;YACLA,OAAO;gBACLC;gBACAK,YAAYN,CAAAA,cAAAA,MAAMO,IAAI,YAAVP,cAAc;gBAC1BQ,QAAQR,CAAAA,gBAAAA,MAAMQ,MAAM,YAAZR,gBAAgB;gBACxBS,YAAYT,CAAAA,oBAAAA,MAAMS,UAAU,YAAhBT,oBAAoB;gBAChCU,SAASjB,iBAAiBO,MAAMC,IAAI;gBACpCU,WAAW,EAAE;YACf;YACAC,QAAQ;QACV;IACF;IAEA,IAAIA,SAAS;IACb,8FAA8F;IAC9F,MAAMF,UACJjB,iBAAiBW,YAAYH,IAAI,KACjC,gEAAgE;IAChE,CAAC,CAACG,YAAYS,UAAU;IAC1B,IAAIT,eAAeA,YAAYH,IAAI,IAAI,CAACS,SAAS;QAC/C,IAAII,gBAAgBlB,qBAAqBmB,GAAG,CAACX,YAAYH,IAAI;QAC7D,IAAI,CAACa,eAAe;YAClBA,gBAAgBf,QAAQiB,iBAAiB,CAACZ,YAAYH,IAAI;YAC1DL,qBAAqBqB,GAAG,CAACb,YAAYH,IAAI,EAAEa;YAC3CI,WAAW;gBACT,sEAAsE;gBACtE,0BAA0B;gBAC1BtB,qBAAqBuB,MAAM,CAACf,YAAYH,IAAI;YAC9C,GAAG;QACL;QACAW,SAAS,MAAME;IACjB;QAKcV,mBACJA,qBACIA,yBAAAA;IALd,kDAAkD;IAClD,MAAMgB,iBAAiB;QACrBnB,MAAMG,YAAYH,IAAI;QACtBK,YAAYF,CAAAA,oBAAAA,YAAYG,IAAI,YAAhBH,oBAAoB;QAChCI,QAAQJ,CAAAA,sBAAAA,YAAYI,MAAM,YAAlBJ,sBAAsB;QAC9BK,YAAYL,CAAAA,OAAAA,CAAAA,0BAAAA,YAAYK,UAAU,YAAtBL,0BAA0BJ,MAAMS,UAAU,YAA1CL,OAA8C;QAC1DM;QACAC,WAAW,EAAE;IACf;IAEA,OAAO;QACLX,OAAOoB;QACPR;IACF;AACF;AAEA,SAASS,iBAAiBC,YAA6B;IACrD,MAAMC,YAAYD,aAAaP,GAAG,CAAC;IAEnC,IAAI,CAACQ,WAAW;QACd,OAAOpB;IACT;IAEA,+DAA+D;IAC/D,MAAMF,OAAOsB,UACVC,OAAO,CAAC,2BAA2B,IACnCA,OAAO,CAAC,UAAU;QAIPF,mBACGA,oBACEA;IAJnB,OAAO;QACLrB;QACAQ,YAAYa,CAAAA,oBAAAA,aAAaP,GAAG,CAAC,yBAAjBO,oBAAkC;QAC9Cf,MAAMkB,SAASH,CAAAA,qBAAAA,aAAaP,GAAG,CAAC,yBAAjBO,qBAAkC,KAAK,OAAO;QAC7Dd,QAAQiB,SAASH,CAAAA,qBAAAA,aAAaP,GAAG,CAAC,qBAAjBO,qBAA8B,KAAK,OAAO;QAC3DI,UAAUJ,aAAaP,GAAG,CAAC,gBAAgB;IAC7C;AACF;AAEA,OAAO,eAAeY,yBACpB5B,OAAgB,EAChBC,KAA0B;IAE1B,MAAM4B,SAAS,MAAM9B,mBAAmBC,SAASC;IACjD,IAAI,CAAC4B,QAAQ;QACX,OAAO;IACT;IAEA,OAAO;QACLC,oBAAoBD,OAAO5B,KAAK;QAChC8B,mBAAmBlD,qBAAqBgD,OAAO5B,KAAK,EAAE4B,OAAOhB,MAAM;IACrE;AACF;AAEA,OAAO,SAASmB,qBAAqBhC,OAAgB;IACnD,OAAO,eACLiC,GAAoB,EACpBC,GAAmB,EACnBC,IAAgB;QAEhB,MAAM,EAAEC,QAAQ,EAAEb,YAAY,EAAE,GAAG,IAAIc,IAAIJ,IAAI3C,GAAG,EAAG;QAErD,IAAI8C,aAAa,kCAAkC;YACjD,MAAMnC,QAAQqB,iBAAiBC;YAE/B,IAAI,CAACtB,OAAO,OAAOrB,WAAWsD;YAE9B,IAAIJ;YACJ,IAAI;gBACFA,qBAAqB,MAAMF,yBAAyB5B,SAASC;YAC/D,EAAE,OAAOqC,GAAQ;gBACf,OAAOxD,oBAAoBoD,KAAKI,EAAEC,OAAO;YAC3C;YAEA,IAAI,CAACT,oBAAoB;gBACvBI,IAAIM,UAAU,GAAG;gBACjBN,IAAIO,GAAG,CAAC;gBACR;YACF;YAEA,OAAO1D,KAAKmD,KAAKJ;QACnB,OAAO,IAAIM,aAAa,2BAA2B;YACjD,MAAMnC,QAAQqB,iBAAiBC;YAE/B,IAAI,CAACtB,OAAO,OAAOrB,WAAWsD;YAE9B,MAAMQ,aAAa,MAAMxD,GAAGyD,MAAM,CAAC1C,MAAMC,IAAI,EAAEd,GAAGwD,IAAI,EAAEC,IAAI,CAC1D,IAAM,MACN,IAAM;YAER,IAAI,CAACH,YAAY,OAAOzD,UAAUiD;YAElC,IAAI;oBACuBjC,aAAiBA;gBAA1CV,aAAaU,MAAMC,IAAI,EAAED,CAAAA,cAAAA,MAAMO,IAAI,YAAVP,cAAc,GAAGA,CAAAA,gBAAAA,MAAMQ,MAAM,YAAZR,gBAAgB;YAC5D,EAAE,OAAO6C,KAAK;gBACZC,QAAQC,GAAG,CAAC,4BAA4BF;gBACxC,OAAOhE,oBAAoBoD;YAC7B;YAEAjD,UAAUiD;QACZ;QAEA,OAAOC;IACT;AACF;AAEA,OAAO,SAASc,uBAAuBjD,OAAgB;IACrD,OAAO,eACLiC,GAAoB,EACpBC,GAAmB,EACnBC,IAAgB;QAEhB,MAAM,EAAEC,QAAQ,EAAEb,YAAY,EAAE,GAAG,IAAIc,IAAIJ,IAAI3C,GAAG,EAAG;QAErD,IAAI8C,aAAa,wBAAwB;YACvC,OAAOD;QACT;QAEA,IAAIe,WAAW3B,aAAaP,GAAG,CAAC;QAEhC,IAAI,CAACkC,UAAU;YACb,OAAOtE,WAAWsD;QACpB;QAEA,IACEgB,SAASC,UAAU,CAAC,iBACpBD,SAASC,UAAU,CAAC,yBACpB;YACA,MAAMC,YAAY3D,cAAcyD;YAEhC,IAAIE,WAAW;gBACb,OAAOrE,KAAKmD,KAAKkB,UAAUC,OAAO;YACpC;YAEA,OAAOpE,UAAUiD;QACnB;QAEA,IAAI;YACF,kDAAkD;YAClDgB,WAAWI,UAAUJ;YAErB,IAAI7D,KAAKkE,UAAU,CAACL,WAAW;gBAC7BA,WAAW5D,IAAIkE,aAAa,CAACN,UAAUO,IAAI;YAC7C;YAEA,MAAMC,kBAAkB,MAAM1D,QAAQ2D,YAAY,CAACT;YAEnD,IAAIQ,iBAAiB;gBACnB,OAAO1E,WAAWkD,KAAKwB;YACzB;YAEA,IAAIR,SAASC,UAAU,CAAC,UAAU;gBAChC,MAAMC,YAAY,MAAM5D,qBAAqB0D;gBAE7C,IAAIE,WAAW;oBACb,OAAOrE,KAAKmD,KAAKkB;gBACnB;YACF;QACF,EAAE,OAAOQ,OAAO;YACdb,QAAQa,KAAK,CAAC,6BAA6BA;QAC7C;QAEA3E,UAAUiD;IACZ;AACF"}
+{"version":3,"sources":["../../../../../src/client/components/react-dev-overlay/server/middleware-turbopack.ts"],"sourcesContent":["import type { IncomingMessage, ServerResponse } from 'http'\nimport {\n  badRequest,\n  getOriginalCodeFrame,\n  internalServerError,\n  json,\n  jsonString,\n  noContent,\n  type OriginalStackFrameResponse,\n} from './shared'\n\nimport fs, { constants as FS } from 'fs/promises'\nimport path from 'path'\nimport url from 'url'\nimport { launchEditor } from '../internal/helpers/launchEditor'\nimport type { StackFrame } from 'next/dist/compiled/stacktrace-parser'\nimport { SourceMapConsumer } from 'next/dist/compiled/source-map08'\nimport type { Project, TurbopackStackFrame } from '../../../../build/swc/types'\nimport { getSourceMapFromFile } from '../internal/helpers/get-source-map-from-file'\nimport { findSourceMap, type SourceMapPayload } from 'node:module'\n\nfunction shouldIgnorePath(modulePath: string): boolean {\n  return (\n    modulePath.includes('node_modules') ||\n    // Only relevant for when Next.js is symlinked e.g. in the Next.js monorepo\n    modulePath.includes('next/dist')\n  )\n}\n\ntype IgnorableStackFrame = StackFrame & { ignored: boolean }\n\nconst currentSourcesByFile: Map<string, Promise<string | null>> = new Map()\nexport async function batchedTraceSource(\n  project: Project,\n  frame: TurbopackStackFrame\n): Promise<{ frame: IgnorableStackFrame; source: string | null } | undefined> {\n  const file = frame.file\n    ? // TODO(veil): Why are the frames sent encoded?\n      decodeURIComponent(frame.file)\n    : undefined\n  if (!file) return\n\n  const sourceFrame = await project.traceSource(frame)\n  if (!sourceFrame) {\n    return {\n      frame: {\n        file,\n        lineNumber: frame.line ?? 0,\n        column: frame.column ?? 0,\n        methodName: frame.methodName ?? '<unknown>',\n        ignored: shouldIgnorePath(frame.file),\n        arguments: [],\n      },\n      source: null,\n    }\n  }\n\n  let source = null\n  // Don't look up source for node_modules or internals. These can often be large bundled files.\n  const ignored =\n    shouldIgnorePath(sourceFrame.file) ||\n    // isInternal means resource starts with turbopack://[turbopack]\n    !!sourceFrame.isInternal\n  if (sourceFrame && sourceFrame.file && !ignored) {\n    let sourcePromise = currentSourcesByFile.get(sourceFrame.file)\n    if (!sourcePromise) {\n      sourcePromise = project.getSourceForAsset(sourceFrame.file)\n      currentSourcesByFile.set(sourceFrame.file, sourcePromise)\n      setTimeout(() => {\n        // Cache file reads for 100ms, as frames will often reference the same\n        // files and can be large.\n        currentSourcesByFile.delete(sourceFrame.file!)\n      }, 100)\n    }\n    source = await sourcePromise\n  }\n\n  // TODO: get ignoredList from turbopack source map\n  const ignorableFrame = {\n    file: sourceFrame.file,\n    lineNumber: sourceFrame.line ?? 0,\n    column: sourceFrame.column ?? 0,\n    methodName: sourceFrame.methodName ?? frame.methodName ?? '<unknown>',\n    ignored,\n    arguments: [],\n  }\n\n  return {\n    frame: ignorableFrame,\n    source,\n  }\n}\n\nfunction createStackFrame(searchParams: URLSearchParams) {\n  const fileParam = searchParams.get('file')\n\n  if (!fileParam) {\n    return undefined\n  }\n\n  // rsc://React/Server/file://<filename>?42 => file://<filename>\n  const file = fileParam\n    .replace(/^rsc:\\/\\/React\\/[^/]+\\//, '')\n    .replace(/\\?\\d+$/, '')\n\n  return {\n    file,\n    methodName: searchParams.get('methodName') ?? '<unknown>',\n    line: parseInt(searchParams.get('lineNumber') ?? '0', 10) || 0,\n    column: parseInt(searchParams.get('column') ?? '0', 10) || 0,\n    isServer: searchParams.get('isServer') === 'true',\n  } satisfies TurbopackStackFrame\n}\n\n/**\n * https://tc39.es/source-map/#index-map\n */\ninterface IndexSourceMapSection {\n  offset: {\n    line: number\n    column: number\n  }\n  map: ModernRawSourceMap\n}\n\n// TODO(veil): Upstream types\ninterface IndexSourceMap {\n  version: number\n  file: string\n  sections: IndexSourceMapSection[]\n}\n\ninterface ModernRawSourceMap extends SourceMapPayload {\n  ignoreList?: number[]\n}\n\ntype ModernSourceMapPayload = ModernRawSourceMap | IndexSourceMap\n\n/**\n * Finds the sourcemap payload applicable to a given frame.\n * Equal to the input unless an Index Source Map is used.\n */\nfunction findApplicableSourceMapPayload(\n  frame: TurbopackStackFrame,\n  payload: ModernSourceMapPayload\n): ModernRawSourceMap | undefined {\n  if ('sections' in payload) {\n    const frameLine = frame.line ?? 0\n    const frameColumn = frame.column ?? 0\n    // Sections must not overlap and must be sorted: https://tc39.es/source-map/#section-object\n    // Therefore the last section that has an offset less than or equal to the frame is the applicable one.\n    // TODO(veil): Binary search\n    let section: IndexSourceMapSection | undefined = payload.sections[0]\n    for (\n      let i = 0;\n      i < payload.sections.length &&\n      payload.sections[i].offset.line <= frameLine &&\n      payload.sections[i].offset.column <= frameColumn;\n      i++\n    ) {\n      section = payload.sections[i]\n    }\n\n    return section === undefined ? undefined : section.map\n  } else {\n    return payload\n  }\n}\n\nasync function nativeTraceSource(\n  frame: TurbopackStackFrame\n): Promise<{ frame: IgnorableStackFrame; source: string | null } | undefined> {\n  const sourceMap = findSourceMap(\n    // TODO(veil): Why are the frames sent encoded?\n    decodeURIComponent(frame.file)\n  )\n  if (sourceMap !== undefined) {\n    const traced = await SourceMapConsumer.with(\n      sourceMap.payload,\n      null,\n      async (consumer) => {\n        const originalPosition = consumer.originalPositionFor({\n          line: frame.line ?? 1,\n          column: frame.column ?? 1,\n        })\n\n        if (originalPosition.source === null) {\n          return null\n        }\n\n        const sourceContent: string | null =\n          consumer.sourceContentFor(\n            originalPosition.source,\n            /* returnNullOnMissing */ true\n          ) ?? null\n\n        return { originalPosition, sourceContent }\n      }\n    )\n\n    if (traced !== null) {\n      const { originalPosition, sourceContent } = traced\n      const applicableSourceMap = findApplicableSourceMapPayload(\n        frame,\n        sourceMap.payload\n      )\n\n      // TODO(veil): Upstream a method to sourcemap consumer that immediately says if a frame is ignored or not.\n      let ignored = false\n      if (applicableSourceMap === undefined) {\n        console.error(\n          'No applicable source map found in sections for frame',\n          frame\n        )\n      } else {\n        // TODO: O(n^2). Consider moving `ignoreList` into a Set\n        const sourceIndex = applicableSourceMap.sources.indexOf(\n          originalPosition.source!\n        )\n        ignored = applicableSourceMap.ignoreList?.includes(sourceIndex) ?? false\n      }\n\n      const originalStackFrame: IgnorableStackFrame = {\n        methodName:\n          originalPosition.name ||\n          // default is not a valid identifier in JS so webpack uses a custom variable when it's an unnamed default export\n          // Resolve it back to `default` for the method name if the source position didn't have the method.\n          frame.methodName\n            ?.replace('__WEBPACK_DEFAULT_EXPORT__', 'default')\n            ?.replace('__webpack_exports__.', '') ||\n          '<unknown>',\n        column: (originalPosition.column ?? 0) + 1,\n        file: originalPosition.source?.startsWith('file://')\n          ? path.relative(\n              process.cwd(),\n              url.fileURLToPath(originalPosition.source)\n            )\n          : originalPosition.source,\n        lineNumber: originalPosition.line ?? 0,\n        // TODO: c&p from async createOriginalStackFrame but why not frame.arguments?\n        arguments: [],\n        ignored,\n      }\n\n      return {\n        frame: originalStackFrame,\n        source: sourceContent,\n      }\n    }\n  }\n\n  return undefined\n}\n\nexport async function createOriginalStackFrame(\n  project: Project,\n  frame: TurbopackStackFrame\n): Promise<OriginalStackFrameResponse | null> {\n  const traced =\n    (await nativeTraceSource(frame)) ??\n    // TODO(veil): When would the bundler know more than native?\n    // If it's faster, try the bundler first and fall back to native later.\n    (await batchedTraceSource(project, frame))\n  if (!traced) {\n    return null\n  }\n\n  return {\n    originalStackFrame: traced.frame,\n    originalCodeFrame: getOriginalCodeFrame(traced.frame, traced.source),\n  }\n}\n\nexport function getOverlayMiddleware(project: Project) {\n  return async function (\n    req: IncomingMessage,\n    res: ServerResponse,\n    next: () => void\n  ): Promise<void> {\n    const { pathname, searchParams } = new URL(req.url!, 'http://n')\n\n    if (pathname === '/__nextjs_original-stack-frame') {\n      const frame = createStackFrame(searchParams)\n\n      if (!frame) return badRequest(res)\n\n      let originalStackFrame: OriginalStackFrameResponse | null\n      try {\n        originalStackFrame = await createOriginalStackFrame(project, frame)\n      } catch (e: any) {\n        return internalServerError(res, e.message)\n      }\n\n      if (!originalStackFrame) {\n        res.statusCode = 404\n        res.end('Unable to resolve sourcemap')\n        return\n      }\n\n      return json(res, originalStackFrame)\n    } else if (pathname === '/__nextjs_launch-editor') {\n      const frame = createStackFrame(searchParams)\n\n      if (!frame) return badRequest(res)\n\n      const fileExists = await fs.access(frame.file, FS.F_OK).then(\n        () => true,\n        () => false\n      )\n      if (!fileExists) return noContent(res)\n\n      try {\n        launchEditor(frame.file, frame.line ?? 1, frame.column ?? 1)\n      } catch (err) {\n        console.log('Failed to launch editor:', err)\n        return internalServerError(res)\n      }\n\n      noContent(res)\n    }\n\n    return next()\n  }\n}\n\nexport function getSourceMapMiddleware(project: Project) {\n  return async function (\n    req: IncomingMessage,\n    res: ServerResponse,\n    next: () => void\n  ): Promise<void> {\n    const { pathname, searchParams } = new URL(req.url!, 'http://n')\n\n    if (pathname !== '/__nextjs_source-map') {\n      return next()\n    }\n\n    let filename = searchParams.get('filename')\n\n    if (!filename) {\n      return badRequest(res)\n    }\n\n    // TODO(veil): Always try the native version first.\n    // Externals could also be files that aren't bundled via Webpack.\n    if (\n      filename.startsWith('webpack://') ||\n      filename.startsWith('webpack-internal:///')\n    ) {\n      const sourceMap = findSourceMap(filename)\n\n      if (sourceMap) {\n        return json(res, sourceMap.payload)\n      }\n\n      return noContent(res)\n    }\n\n    try {\n      // Turbopack chunk filenames might be URL-encoded.\n      filename = decodeURI(filename)\n\n      if (path.isAbsolute(filename)) {\n        filename = url.pathToFileURL(filename).href\n      }\n\n      const sourceMapString = await project.getSourceMap(filename)\n\n      if (sourceMapString) {\n        return jsonString(res, sourceMapString)\n      }\n\n      if (filename.startsWith('file:')) {\n        const sourceMap = await getSourceMapFromFile(filename)\n\n        if (sourceMap) {\n          return json(res, sourceMap)\n        }\n      }\n    } catch (error) {\n      console.error('Failed to get source map:', error)\n    }\n\n    noContent(res)\n  }\n}\n"],"names":["badRequest","getOriginalCodeFrame","internalServerError","json","jsonString","noContent","fs","constants","FS","path","url","launchEditor","SourceMapConsumer","getSourceMapFromFile","findSourceMap","shouldIgnorePath","modulePath","includes","currentSourcesByFile","Map","batchedTraceSource","project","frame","file","decodeURIComponent","undefined","sourceFrame","traceSource","lineNumber","line","column","methodName","ignored","arguments","source","isInternal","sourcePromise","get","getSourceForAsset","set","setTimeout","delete","ignorableFrame","createStackFrame","searchParams","fileParam","replace","parseInt","isServer","findApplicableSourceMapPayload","payload","frameLine","frameColumn","section","sections","i","length","offset","map","nativeTraceSource","sourceMap","traced","with","consumer","originalPosition","originalPositionFor","sourceContent","sourceContentFor","applicableSourceMap","console","error","sourceIndex","sources","indexOf","ignoreList","originalStackFrame","name","startsWith","relative","process","cwd","fileURLToPath","createOriginalStackFrame","originalCodeFrame","getOverlayMiddleware","req","res","next","pathname","URL","e","message","statusCode","end","fileExists","access","F_OK","then","err","log","getSourceMapMiddleware","filename","decodeURI","isAbsolute","pathToFileURL","href","sourceMapString","getSourceMap"],"mappings":"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"}

package/dist/esm/client/index.js

@@ -27,7 +27,7 @@ import { onRecoverableError } from './react-client-callbacks/shared';
 import tracer from './tracing/tracer';
 import reportToSocket from './tracing/report-to-socket';
 import { isNextRouterError } from './components/is-next-router-error';
-export const version = "15.0.4-canary.37";
+export const version = "15.0.4-canary.38";
 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.37") == 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.38") == 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.37"
+        version: "15.0.4-canary.38"
     });
     // 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.37"
+            version: "15.0.4-canary.38"
         });
         // 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.37"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
+    Log.bootstrap(`${bold(purple(`${Log.prefixes.ready} Next.js ${"15.0.4-canary.38"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
     if (appUrl) {
         Log.bootstrap(`- Local:        ${appUrl}`);
     }

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

@@ -43,7 +43,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.0.4-canary.37"})`;
+    process.title = `next-server (v${"15.0.4-canary.38"})`;
     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.37") == 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.38") == 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.37"
+        version: "15.0.4-canary.38"
     });
     // 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.37"
+            version: "15.0.4-canary.38"
         });
         // 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.37"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
+    _log.bootstrap(`${(0, _picocolors.bold)((0, _picocolors.purple)(`${_log.prefixes.ready} Next.js ${"15.0.4-canary.38"}`))}${process.env.TURBOPACK ? ' (Turbopack)' : ''}`);
     if (appUrl) {
         _log.bootstrap(`- Local:        ${appUrl}`);
     }

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

@@ -111,7 +111,7 @@ async function getRequestHandlers({ dir, port, isDev, onDevServerCleanup, server
 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.37"})`;
+    process.title = `next-server (v${"15.0.4-canary.38"})`;
     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.37"
+        nextVersion: "15.0.4-canary.38"
     };
     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.37" !== 'string') {
+    if (typeof "15.0.4-canary.38" !== 'string') {
         return [];
     }
     const payload = {
-        nextVersion: "15.0.4-canary.37",
+        nextVersion: "15.0.4-canary.38",
         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.37" !== 'string') {
+    if (typeof "15.0.4-canary.38" !== 'string') {
         return [];
     }
     const { images, i18n } = nextConfig || {};
     const payload = {
-        nextVersion: "15.0.4-canary.37",
+        nextVersion: "15.0.4-canary.38",
         nodeVersion: process.version,
         cliCommand: event.cliCommand,
         isSrcDir: event.isSrcDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "15.0.4-canary.37",
+  "version": "15.0.4-canary.38",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -97,7 +97,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.0.4-canary.37",
+    "@next/env": "15.0.4-canary.38",
     "@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.37",
-    "@next/swc-darwin-x64": "15.0.4-canary.37",
-    "@next/swc-linux-arm64-gnu": "15.0.4-canary.37",
-    "@next/swc-linux-arm64-musl": "15.0.4-canary.37",
-    "@next/swc-linux-x64-gnu": "15.0.4-canary.37",
-    "@next/swc-linux-x64-musl": "15.0.4-canary.37",
-    "@next/swc-win32-arm64-msvc": "15.0.4-canary.37",
-    "@next/swc-win32-x64-msvc": "15.0.4-canary.37"
+    "@next/swc-darwin-arm64": "15.0.4-canary.38",
+    "@next/swc-darwin-x64": "15.0.4-canary.38",
+    "@next/swc-linux-arm64-gnu": "15.0.4-canary.38",
+    "@next/swc-linux-arm64-musl": "15.0.4-canary.38",
+    "@next/swc-linux-x64-gnu": "15.0.4-canary.38",
+    "@next/swc-linux-x64-musl": "15.0.4-canary.38",
+    "@next/swc-win32-arm64-msvc": "15.0.4-canary.38",
+    "@next/swc-win32-x64-msvc": "15.0.4-canary.38"
   },
   "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.37",
-    "@next/polyfill-module": "15.0.4-canary.37",
-    "@next/polyfill-nomodule": "15.0.4-canary.37",
-    "@next/react-refresh-utils": "15.0.4-canary.37",
-    "@next/swc": "15.0.4-canary.37",
+    "@next/font": "15.0.4-canary.38",
+    "@next/polyfill-module": "15.0.4-canary.38",
+    "@next/polyfill-nomodule": "15.0.4-canary.38",
+    "@next/react-refresh-utils": "15.0.4-canary.38",
+    "@next/swc": "15.0.4-canary.38",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@swc/core": "1.9.3",