next 15.4.2-canary.22 → 15.4.2-canary.23

package/dist/shared/lib/turbopack/utils.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 0 && (module.exports = {
     ModuleBuildError: null,
-    formatImportTraces: null,
     formatIssue: null,
     getIssueKey: null,
     getTurbopackJsConfig: null,
@@ -24,9 +23,6 @@ _export(exports, {
     ModuleBuildError: function() {
         return ModuleBuildError;
     },
-    formatImportTraces: function() {
-        return formatImportTraces;
-    },
     formatIssue: function() {
         return formatIssue;
     },
@@ -164,41 +160,37 @@ function formatIssue(issue) {
     // }
     if (importTraces == null ? void 0 : importTraces.length) {
         // This is the same logic as in turbopack/crates/turbopack-cli-utils/src/issue.rs
-        message += formatImportTraces(importTraces);
-    }
-    if (documentationLink) {
-        message += documentationLink + '\n\n';
-    }
-    return message;
-}
-function formatImportTraces(importTraces) {
-    // We end up with multiple traces when the file with the error is reachable from multiple
-    // different entry points (e.g. ssr, client)
-    let message = "Import trace" + (importTraces.length > 1 ? 's' : '') + ":\n";
-    const everyTraceHasADistinctRootLayer = new Set(importTraces.map(leafLayerName).filter((l)=>l != null)).size === importTraces.length;
-    for(let i = 0; i < importTraces.length; i++){
-        const trace = importTraces[i];
-        const layer = leafLayerName(trace);
-        let traceIndent = '    ';
-        // If this is true, layer must be present
-        if (everyTraceHasADistinctRootLayer) {
-            message += "  " + layer + ":\n";
-        } else {
-            if (importTraces.length > 1) {
-                // Otherwise use simple 1 based indices to disambiguate
-                message += "  #" + (i + 1);
-                if (layer) {
-                    message += " [" + layer + "]";
-                }
-                message += ':\n';
-            } else if (layer) {
-                message += " [" + layer + "]:\n";
+        // We end up with multiple traces when the file with the error is reachable from multiple
+        // different entry points (e.g. ssr, client)
+        message += "Import trace" + (importTraces.length > 1 ? 's' : '') + ":\n";
+        const everyTraceHasADistinctRootLayer = new Set(importTraces.map(leafLayerName).filter((l)=>l != null)).size === importTraces.length;
+        for(let i = 0; i < importTraces.length; i++){
+            const trace = importTraces[i];
+            const layer = leafLayerName(trace);
+            let traceIndent = '    ';
+            // If this is true, layer must be present
+            if (everyTraceHasADistinctRootLayer) {
+                message += "  " + layer + ":\n";
             } else {
-                // If there is a single trace and no layer name just don't indent it.
-                traceIndent = '  ';
+                if (importTraces.length > 1) {
+                    // Otherwise use simple 1 based indices to disambiguate
+                    message += "  #" + (i + 1);
+                    if (layer) {
+                        message += " [" + layer + "]";
+                    }
+                    message += ':\n';
+                } else if (layer) {
+                    message += " [" + layer + "]:\n";
+                } else {
+                    // If there is a single trace and no layer name just don't indent it.
+                    traceIndent = '  ';
+                }
             }
+            message += formatIssueTrace(trace, traceIndent, !identicalLayers(trace));
         }
-        message += formatIssueTrace(trace, traceIndent, !identicalLayers(trace));
+    }
+    if (documentationLink) {
+        message += documentationLink + '\n\n';
     }
     return message;
 }

package/dist/shared/lib/turbopack/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/shared/lib/turbopack/utils.ts"],"sourcesContent":["import type {\n  Issue,\n  PlainTraceItem,\n  StyledString,\n  TurbopackResult,\n} from '../../../build/swc/types'\n\nimport { bold, green, magenta, red } from '../../../lib/picocolors'\nimport isInternal from '../is-internal'\nimport {\n  decodeMagicIdentifier,\n  MAGIC_IDENTIFIER_REGEX,\n} from '../magic-identifier'\nimport type { EntryKey } from './entry-key'\nimport * as Log from '../../../build/output/log'\nimport type { NextConfigComplete } from '../../../server/config-shared'\nimport loadJsConfig from '../../../build/load-jsconfig'\n\ntype IssueKey = `${Issue['severity']}-${Issue['filePath']}-${string}-${string}`\nexport type IssuesMap = Map<IssueKey, Issue>\nexport type EntryIssuesMap = Map<EntryKey, IssuesMap>\nexport type TopLevelIssuesMap = IssuesMap\n\n/**\n * An error generated from emitted Turbopack issues. This can include build\n * errors caused by issues with user code.\n */\nexport class ModuleBuildError extends Error {\n  name = 'ModuleBuildError'\n}\n\n/**\n * Thin stopgap workaround layer to mimic existing wellknown-errors-plugin in webpack's build\n * to emit certain type of errors into cli.\n */\nexport function isWellKnownError(issue: Issue): boolean {\n  const { title } = issue\n  const formattedTitle = renderStyledStringToErrorAnsi(title)\n  // TODO: add more well known errors\n  if (\n    formattedTitle.includes('Module not found') ||\n    formattedTitle.includes('Unknown module type')\n  ) {\n    return true\n  }\n\n  return false\n}\n\nexport function getIssueKey(issue: Issue): IssueKey {\n  return `${issue.severity}-${issue.filePath}-${JSON.stringify(\n    issue.title\n  )}-${JSON.stringify(issue.description)}`\n}\n\nexport async function getTurbopackJsConfig(\n  dir: string,\n  nextConfig: NextConfigComplete\n) {\n  const { jsConfig } = await loadJsConfig(dir, nextConfig)\n  return jsConfig ?? { compilerOptions: {} }\n}\n\nexport function processIssues(\n  currentEntryIssues: EntryIssuesMap,\n  key: EntryKey,\n  result: TurbopackResult,\n  throwIssue: boolean,\n  logErrors: boolean\n) {\n  const newIssues = new Map<IssueKey, Issue>()\n  currentEntryIssues.set(key, newIssues)\n\n  const relevantIssues = new Set()\n\n  for (const issue of result.issues) {\n    if (\n      issue.severity !== 'error' &&\n      issue.severity !== 'fatal' &&\n      issue.severity !== 'warning'\n    )\n      continue\n\n    const issueKey = getIssueKey(issue)\n    newIssues.set(issueKey, issue)\n\n    if (issue.severity !== 'warning') {\n      if (throwIssue) {\n        const formatted = formatIssue(issue)\n        relevantIssues.add(formatted)\n      }\n      // if we throw the issue it will most likely get handed and logged elsewhere\n      else if (logErrors && isWellKnownError(issue)) {\n        const formatted = formatIssue(issue)\n        Log.error(formatted)\n      }\n    }\n  }\n\n  if (relevantIssues.size && throwIssue) {\n    throw new ModuleBuildError([...relevantIssues].join('\\n\\n'))\n  }\n}\n\nexport function formatIssue(issue: Issue) {\n  const { filePath, title, description, source, importTraces } = issue\n  let { documentationLink } = issue\n  const formattedTitle = renderStyledStringToErrorAnsi(title).replace(\n    /\\n/g,\n    '\\n    '\n  )\n\n  // TODO: Use error codes to identify these\n  // TODO: Generalize adapting Turbopack errors to Next.js errors\n  if (formattedTitle.includes('Module not found')) {\n    // For compatiblity with webpack\n    // TODO: include columns in webpack errors.\n    documentationLink = 'https://nextjs.org/docs/messages/module-not-found'\n  }\n\n  const formattedFilePath = filePath\n    .replace('[project]/', './')\n    .replaceAll('/./', '/')\n    .replace('\\\\\\\\?\\\\', '')\n\n  let message = ''\n\n  if (source?.range) {\n    const { start } = source.range\n    message = `${formattedFilePath}:${start.line + 1}:${\n      start.column + 1\n    }\\n${formattedTitle}`\n  } else if (formattedFilePath) {\n    message = `${formattedFilePath}\\n${formattedTitle}`\n  } else {\n    message = formattedTitle\n  }\n  message += '\\n'\n\n  if (\n    source?.range &&\n    source.source.content &&\n    // ignore Next.js/React internals, as these can often be huge bundled files.\n    !isInternal(filePath)\n  ) {\n    const { start, end } = source.range\n    const { codeFrameColumns } =\n      require('next/dist/compiled/babel/code-frame') as typeof import('next/dist/compiled/babel/code-frame')\n\n    message +=\n      codeFrameColumns(\n        source.source.content,\n        {\n          start: {\n            line: start.line + 1,\n            column: start.column + 1,\n          },\n          end: {\n            line: end.line + 1,\n            column: end.column + 1,\n          },\n        },\n        { forceColor: true }\n      ).trim() + '\\n\\n'\n  }\n\n  if (description) {\n    if (\n      description.type === 'text' &&\n      description.value.includes(`Cannot find module 'sass'`)\n    ) {\n      message +=\n        \"To use Next.js' built-in Sass support, you first need to install `sass`.\\n\"\n      message += 'Run `npm i sass` or `yarn add sass` inside your workspace.\\n'\n      message += '\\nLearn more: https://nextjs.org/docs/messages/install-sass'\n    } else {\n      message += renderStyledStringToErrorAnsi(description) + '\\n\\n'\n    }\n  }\n\n  // TODO: make it possible to enable this for debugging, but not in tests.\n  // if (detail) {\n  //   message += renderStyledStringToErrorAnsi(detail) + '\\n\\n'\n  // }\n\n  if (importTraces?.length) {\n    // This is the same logic as in turbopack/crates/turbopack-cli-utils/src/issue.rs\n    message += formatImportTraces(importTraces)\n  }\n  if (documentationLink) {\n    message += documentationLink + '\\n\\n'\n  }\n  return message\n}\n\nexport function formatImportTraces(importTraces: PlainTraceItem[][]) {\n  // We end up with multiple traces when the file with the error is reachable from multiple\n  // different entry points (e.g. ssr, client)\n  let message = `Import trace${importTraces.length > 1 ? 's' : ''}:\\n`\n  const everyTraceHasADistinctRootLayer =\n    new Set(importTraces.map(leafLayerName).filter((l) => l != null)).size ===\n    importTraces.length\n  for (let i = 0; i < importTraces.length; i++) {\n    const trace = importTraces[i]\n    const layer = leafLayerName(trace)\n    let traceIndent = '    '\n    // If this is true, layer must be present\n    if (everyTraceHasADistinctRootLayer) {\n      message += `  ${layer}:\\n`\n    } else {\n      if (importTraces.length > 1) {\n        // Otherwise use simple 1 based indices to disambiguate\n        message += `  #${i + 1}`\n        if (layer) {\n          message += ` [${layer}]`\n        }\n        message += ':\\n'\n      } else if (layer) {\n        message += ` [${layer}]:\\n`\n      } else {\n        // If there is a single trace and no layer name just don't indent it.\n        traceIndent = '  '\n      }\n    }\n    message += formatIssueTrace(trace, traceIndent, !identicalLayers(trace))\n  }\n  return message\n}\n\n/** Returns the first present layer name in the trace */\nfunction leafLayerName(items: PlainTraceItem[]): string | undefined {\n  for (const item of items) {\n    const layer = item.layer\n    if (layer != null) return layer\n  }\n  return undefined\n}\n\n/**\n * Returns whether or not all items share the same layer.\n * If a layer is absent we ignore it in this analysis\n */\nfunction identicalLayers(items: PlainTraceItem[]): boolean {\n  const firstPresentLayer = items.findIndex((t) => t.layer != null)\n  if (firstPresentLayer === -1) return true // all layers are absent\n  const layer = items[firstPresentLayer].layer\n  for (let i = firstPresentLayer + 1; i < items.length; i++) {\n    const itemLayer = items[i].layer\n    if (itemLayer == null || itemLayer !== layer) {\n      return false\n    }\n  }\n  return true\n}\n\nfunction formatIssueTrace(\n  items: PlainTraceItem[],\n  indent: string,\n  printLayers: boolean\n): string {\n  return `${items\n    .map((item) => {\n      let r = indent\n      if (item.fsName !== 'project') {\n        r += `[${item.fsName}]/`\n      } else {\n        // This is consistent with webpack's output\n        r += './'\n      }\n      r += item.path\n      if (printLayers && item.layer) {\n        r += ` [${item.layer}]`\n      }\n      return r\n    })\n    .join('\\n')}\\n\\n`\n}\n\nexport function isRelevantWarning(issue: Issue): boolean {\n  return issue.severity === 'warning' && !isNodeModulesIssue(issue)\n}\n\nfunction isNodeModulesIssue(issue: Issue): boolean {\n  if (issue.severity === 'warning' && issue.stage === 'config') {\n    // Override for the externalize issue\n    // `Package foo (serverExternalPackages or default list) can't be external`\n    if (\n      renderStyledStringToErrorAnsi(issue.title).includes(\"can't be external\")\n    ) {\n      return false\n    }\n  }\n\n  return (\n    issue.severity === 'warning' &&\n    (issue.filePath.match(/^(?:.*[\\\\/])?node_modules(?:[\\\\/].*)?$/) !== null ||\n      // Ignore Next.js itself when running next directly in the monorepo where it is not inside\n      // node_modules anyway.\n      // TODO(mischnic) prevent matches when this is published to npm\n      issue.filePath.startsWith('[project]/packages/next/'))\n  )\n}\n\nexport function renderStyledStringToErrorAnsi(string: StyledString): string {\n  function decodeMagicIdentifiers(str: string): string {\n    return str.replaceAll(MAGIC_IDENTIFIER_REGEX, (ident) => {\n      try {\n        return magenta(`{${decodeMagicIdentifier(ident)}}`)\n      } catch (e) {\n        return magenta(`{${ident} (decoding failed: ${e})}`)\n      }\n    })\n  }\n\n  switch (string.type) {\n    case 'text':\n      return decodeMagicIdentifiers(string.value)\n    case 'strong':\n      return bold(red(decodeMagicIdentifiers(string.value)))\n    case 'code':\n      return green(decodeMagicIdentifiers(string.value))\n    case 'line':\n      return string.value.map(renderStyledStringToErrorAnsi).join('')\n    case 'stack':\n      return string.value.map(renderStyledStringToErrorAnsi).join('\\n')\n    default:\n      throw new Error('Unknown StyledString type', string)\n  }\n}\n\nexport function isPersistentCachingEnabled(\n  config: NextConfigComplete\n): boolean {\n  return config.experimental?.turbopackPersistentCaching || false\n}\n"],"names":["ModuleBuildError","formatImportTraces","formatIssue","getIssueKey","getTurbopackJsConfig","isPersistentCachingEnabled","isRelevantWarning","isWellKnownError","processIssues","renderStyledStringToErrorAnsi","Error","name","issue","title","formattedTitle","includes","severity","filePath","JSON","stringify","description","dir","nextConfig","jsConfig","loadJsConfig","compilerOptions","currentEntryIssues","key","result","throwIssue","logErrors","newIssues","Map","set","relevantIssues","Set","issues","issueKey","formatted","add","Log","error","size","join","source","importTraces","documentationLink","replace","formattedFilePath","replaceAll","message","range","start","line","column","content","isInternal","end","codeFrameColumns","require","forceColor","trim","type","value","length","everyTraceHasADistinctRootLayer","map","leafLayerName","filter","l","i","trace","layer","traceIndent","formatIssueTrace","identicalLayers","items","item","undefined","firstPresentLayer","findIndex","t","itemLayer","indent","printLayers","r","fsName","path","isNodeModulesIssue","stage","match","startsWith","string","decodeMagicIdentifiers","str","MAGIC_IDENTIFIER_REGEX","ident","magenta","decodeMagicIdentifier","e","bold","red","green","config","experimental","turbopackPersistentCaching"],"mappings":"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","ignoreList":[0]}
+{"version":3,"sources":["../../../../src/shared/lib/turbopack/utils.ts"],"sourcesContent":["import type {\n  Issue,\n  PlainTraceItem,\n  StyledString,\n  TurbopackResult,\n} from '../../../build/swc/types'\n\nimport { bold, green, magenta, red } from '../../../lib/picocolors'\nimport isInternal from '../is-internal'\nimport {\n  decodeMagicIdentifier,\n  MAGIC_IDENTIFIER_REGEX,\n} from '../magic-identifier'\nimport type { EntryKey } from './entry-key'\nimport * as Log from '../../../build/output/log'\nimport type { NextConfigComplete } from '../../../server/config-shared'\nimport loadJsConfig from '../../../build/load-jsconfig'\n\ntype IssueKey = `${Issue['severity']}-${Issue['filePath']}-${string}-${string}`\nexport type IssuesMap = Map<IssueKey, Issue>\nexport type EntryIssuesMap = Map<EntryKey, IssuesMap>\nexport type TopLevelIssuesMap = IssuesMap\n\n/**\n * An error generated from emitted Turbopack issues. This can include build\n * errors caused by issues with user code.\n */\nexport class ModuleBuildError extends Error {\n  name = 'ModuleBuildError'\n}\n\n/**\n * Thin stopgap workaround layer to mimic existing wellknown-errors-plugin in webpack's build\n * to emit certain type of errors into cli.\n */\nexport function isWellKnownError(issue: Issue): boolean {\n  const { title } = issue\n  const formattedTitle = renderStyledStringToErrorAnsi(title)\n  // TODO: add more well known errors\n  if (\n    formattedTitle.includes('Module not found') ||\n    formattedTitle.includes('Unknown module type')\n  ) {\n    return true\n  }\n\n  return false\n}\n\nexport function getIssueKey(issue: Issue): IssueKey {\n  return `${issue.severity}-${issue.filePath}-${JSON.stringify(\n    issue.title\n  )}-${JSON.stringify(issue.description)}`\n}\n\nexport async function getTurbopackJsConfig(\n  dir: string,\n  nextConfig: NextConfigComplete\n) {\n  const { jsConfig } = await loadJsConfig(dir, nextConfig)\n  return jsConfig ?? { compilerOptions: {} }\n}\n\nexport function processIssues(\n  currentEntryIssues: EntryIssuesMap,\n  key: EntryKey,\n  result: TurbopackResult,\n  throwIssue: boolean,\n  logErrors: boolean\n) {\n  const newIssues = new Map<IssueKey, Issue>()\n  currentEntryIssues.set(key, newIssues)\n\n  const relevantIssues = new Set()\n\n  for (const issue of result.issues) {\n    if (\n      issue.severity !== 'error' &&\n      issue.severity !== 'fatal' &&\n      issue.severity !== 'warning'\n    )\n      continue\n\n    const issueKey = getIssueKey(issue)\n    newIssues.set(issueKey, issue)\n\n    if (issue.severity !== 'warning') {\n      if (throwIssue) {\n        const formatted = formatIssue(issue)\n        relevantIssues.add(formatted)\n      }\n      // if we throw the issue it will most likely get handed and logged elsewhere\n      else if (logErrors && isWellKnownError(issue)) {\n        const formatted = formatIssue(issue)\n        Log.error(formatted)\n      }\n    }\n  }\n\n  if (relevantIssues.size && throwIssue) {\n    throw new ModuleBuildError([...relevantIssues].join('\\n\\n'))\n  }\n}\n\nexport function formatIssue(issue: Issue) {\n  const { filePath, title, description, source, importTraces } = issue\n  let { documentationLink } = issue\n  const formattedTitle = renderStyledStringToErrorAnsi(title).replace(\n    /\\n/g,\n    '\\n    '\n  )\n\n  // TODO: Use error codes to identify these\n  // TODO: Generalize adapting Turbopack errors to Next.js errors\n  if (formattedTitle.includes('Module not found')) {\n    // For compatiblity with webpack\n    // TODO: include columns in webpack errors.\n    documentationLink = 'https://nextjs.org/docs/messages/module-not-found'\n  }\n\n  const formattedFilePath = filePath\n    .replace('[project]/', './')\n    .replaceAll('/./', '/')\n    .replace('\\\\\\\\?\\\\', '')\n\n  let message = ''\n\n  if (source?.range) {\n    const { start } = source.range\n    message = `${formattedFilePath}:${start.line + 1}:${\n      start.column + 1\n    }\\n${formattedTitle}`\n  } else if (formattedFilePath) {\n    message = `${formattedFilePath}\\n${formattedTitle}`\n  } else {\n    message = formattedTitle\n  }\n  message += '\\n'\n\n  if (\n    source?.range &&\n    source.source.content &&\n    // ignore Next.js/React internals, as these can often be huge bundled files.\n    !isInternal(filePath)\n  ) {\n    const { start, end } = source.range\n    const { codeFrameColumns } =\n      require('next/dist/compiled/babel/code-frame') as typeof import('next/dist/compiled/babel/code-frame')\n\n    message +=\n      codeFrameColumns(\n        source.source.content,\n        {\n          start: {\n            line: start.line + 1,\n            column: start.column + 1,\n          },\n          end: {\n            line: end.line + 1,\n            column: end.column + 1,\n          },\n        },\n        { forceColor: true }\n      ).trim() + '\\n\\n'\n  }\n\n  if (description) {\n    if (\n      description.type === 'text' &&\n      description.value.includes(`Cannot find module 'sass'`)\n    ) {\n      message +=\n        \"To use Next.js' built-in Sass support, you first need to install `sass`.\\n\"\n      message += 'Run `npm i sass` or `yarn add sass` inside your workspace.\\n'\n      message += '\\nLearn more: https://nextjs.org/docs/messages/install-sass'\n    } else {\n      message += renderStyledStringToErrorAnsi(description) + '\\n\\n'\n    }\n  }\n\n  // TODO: make it possible to enable this for debugging, but not in tests.\n  // if (detail) {\n  //   message += renderStyledStringToErrorAnsi(detail) + '\\n\\n'\n  // }\n\n  if (importTraces?.length) {\n    // This is the same logic as in turbopack/crates/turbopack-cli-utils/src/issue.rs\n    // We end up with multiple traces when the file with the error is reachable from multiple\n    // different entry points (e.g. ssr, client)\n    message += `Import trace${importTraces.length > 1 ? 's' : ''}:\\n`\n    const everyTraceHasADistinctRootLayer =\n      new Set(importTraces.map(leafLayerName).filter((l) => l != null)).size ===\n      importTraces.length\n    for (let i = 0; i < importTraces.length; i++) {\n      const trace = importTraces[i]\n      const layer = leafLayerName(trace)\n      let traceIndent = '    '\n      // If this is true, layer must be present\n      if (everyTraceHasADistinctRootLayer) {\n        message += `  ${layer}:\\n`\n      } else {\n        if (importTraces.length > 1) {\n          // Otherwise use simple 1 based indices to disambiguate\n          message += `  #${i + 1}`\n          if (layer) {\n            message += ` [${layer}]`\n          }\n          message += ':\\n'\n        } else if (layer) {\n          message += ` [${layer}]:\\n`\n        } else {\n          // If there is a single trace and no layer name just don't indent it.\n          traceIndent = '  '\n        }\n      }\n      message += formatIssueTrace(trace, traceIndent, !identicalLayers(trace))\n    }\n  }\n  if (documentationLink) {\n    message += documentationLink + '\\n\\n'\n  }\n  return message\n}\n\n/** Returns the first present layer name in the trace */\nfunction leafLayerName(items: PlainTraceItem[]): string | undefined {\n  for (const item of items) {\n    const layer = item.layer\n    if (layer != null) return layer\n  }\n  return undefined\n}\n\n/**\n * Returns whether or not all items share the same layer.\n * If a layer is absent we ignore it in this analysis\n */\nfunction identicalLayers(items: PlainTraceItem[]): boolean {\n  const firstPresentLayer = items.findIndex((t) => t.layer != null)\n  if (firstPresentLayer === -1) return true // all layers are absent\n  const layer = items[firstPresentLayer].layer\n  for (let i = firstPresentLayer + 1; i < items.length; i++) {\n    const itemLayer = items[i].layer\n    if (itemLayer == null || itemLayer !== layer) {\n      return false\n    }\n  }\n  return true\n}\n\nfunction formatIssueTrace(\n  items: PlainTraceItem[],\n  indent: string,\n  printLayers: boolean\n): string {\n  return `${items\n    .map((item) => {\n      let r = indent\n      if (item.fsName !== 'project') {\n        r += `[${item.fsName}]/`\n      } else {\n        // This is consistent with webpack's output\n        r += './'\n      }\n      r += item.path\n      if (printLayers && item.layer) {\n        r += ` [${item.layer}]`\n      }\n      return r\n    })\n    .join('\\n')}\\n\\n`\n}\n\nexport function isRelevantWarning(issue: Issue): boolean {\n  return issue.severity === 'warning' && !isNodeModulesIssue(issue)\n}\n\nfunction isNodeModulesIssue(issue: Issue): boolean {\n  if (issue.severity === 'warning' && issue.stage === 'config') {\n    // Override for the externalize issue\n    // `Package foo (serverExternalPackages or default list) can't be external`\n    if (\n      renderStyledStringToErrorAnsi(issue.title).includes(\"can't be external\")\n    ) {\n      return false\n    }\n  }\n\n  return (\n    issue.severity === 'warning' &&\n    (issue.filePath.match(/^(?:.*[\\\\/])?node_modules(?:[\\\\/].*)?$/) !== null ||\n      // Ignore Next.js itself when running next directly in the monorepo where it is not inside\n      // node_modules anyway.\n      // TODO(mischnic) prevent matches when this is published to npm\n      issue.filePath.startsWith('[project]/packages/next/'))\n  )\n}\n\nexport function renderStyledStringToErrorAnsi(string: StyledString): string {\n  function decodeMagicIdentifiers(str: string): string {\n    return str.replaceAll(MAGIC_IDENTIFIER_REGEX, (ident) => {\n      try {\n        return magenta(`{${decodeMagicIdentifier(ident)}}`)\n      } catch (e) {\n        return magenta(`{${ident} (decoding failed: ${e})}`)\n      }\n    })\n  }\n\n  switch (string.type) {\n    case 'text':\n      return decodeMagicIdentifiers(string.value)\n    case 'strong':\n      return bold(red(decodeMagicIdentifiers(string.value)))\n    case 'code':\n      return green(decodeMagicIdentifiers(string.value))\n    case 'line':\n      return string.value.map(renderStyledStringToErrorAnsi).join('')\n    case 'stack':\n      return string.value.map(renderStyledStringToErrorAnsi).join('\\n')\n    default:\n      throw new Error('Unknown StyledString type', string)\n  }\n}\n\nexport function isPersistentCachingEnabled(\n  config: NextConfigComplete\n): boolean {\n  return config.experimental?.turbopackPersistentCaching || false\n}\n"],"names":["ModuleBuildError","formatIssue","getIssueKey","getTurbopackJsConfig","isPersistentCachingEnabled","isRelevantWarning","isWellKnownError","processIssues","renderStyledStringToErrorAnsi","Error","name","issue","title","formattedTitle","includes","severity","filePath","JSON","stringify","description","dir","nextConfig","jsConfig","loadJsConfig","compilerOptions","currentEntryIssues","key","result","throwIssue","logErrors","newIssues","Map","set","relevantIssues","Set","issues","issueKey","formatted","add","Log","error","size","join","source","importTraces","documentationLink","replace","formattedFilePath","replaceAll","message","range","start","line","column","content","isInternal","end","codeFrameColumns","require","forceColor","trim","type","value","length","everyTraceHasADistinctRootLayer","map","leafLayerName","filter","l","i","trace","layer","traceIndent","formatIssueTrace","identicalLayers","items","item","undefined","firstPresentLayer","findIndex","t","itemLayer","indent","printLayers","r","fsName","path","isNodeModulesIssue","stage","match","startsWith","string","decodeMagicIdentifiers","str","MAGIC_IDENTIFIER_REGEX","ident","magenta","decodeMagicIdentifier","e","bold","red","green","config","experimental","turbopackPersistentCaching"],"mappings":"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","ignoreList":[0]}

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.4.2-canary.22"
+        nextVersion: "15.4.2-canary.23"
     };
     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.4.2-canary.22" !== 'string') {
+    if (typeof "15.4.2-canary.23" !== 'string') {
         return [];
     }
     const payload = {
-        nextVersion: "15.4.2-canary.22",
+        nextVersion: "15.4.2-canary.23",
         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.4.2-canary.22" !== 'string') {
+    if (typeof "15.4.2-canary.23" !== 'string') {
         return [];
     }
     const { images, i18n } = nextConfig || {};
     const payload = {
-        nextVersion: "15.4.2-canary.22",
+        nextVersion: "15.4.2-canary.23",
         nodeVersion: process.version,
         cliCommand: event.cliCommand,
         isSrcDir: event.isSrcDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "15.4.2-canary.22",
+  "version": "15.4.2-canary.23",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -102,14 +102,13 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.4.2-canary.22",
+    "@next/env": "15.4.2-canary.23",
     "@swc/helpers": "0.5.15",
     "caniuse-lite": "^1.0.30001579",
     "postcss": "8.4.31",
     "styled-jsx": "5.1.6"
   },
   "peerDependencies": {
-    "@modelcontextprotocol/sdk": "^1.15.1",
     "@opentelemetry/api": "^1.1.0",
     "@playwright/test": "^1.51.1",
     "babel-plugin-react-compiler": "*",
@@ -124,9 +123,6 @@
     "sass": {
       "optional": true
     },
-    "@modelcontextprotocol/sdk": {
-      "optional": true
-    },
     "@opentelemetry/api": {
       "optional": true
     },
@@ -136,14 +132,14 @@
   },
   "optionalDependencies": {
     "sharp": "^0.34.3",
-    "@next/swc-darwin-arm64": "15.4.2-canary.22",
-    "@next/swc-darwin-x64": "15.4.2-canary.22",
-    "@next/swc-linux-arm64-gnu": "15.4.2-canary.22",
-    "@next/swc-linux-arm64-musl": "15.4.2-canary.22",
-    "@next/swc-linux-x64-gnu": "15.4.2-canary.22",
-    "@next/swc-linux-x64-musl": "15.4.2-canary.22",
-    "@next/swc-win32-arm64-msvc": "15.4.2-canary.22",
-    "@next/swc-win32-x64-msvc": "15.4.2-canary.22"
+    "@next/swc-darwin-arm64": "15.4.2-canary.23",
+    "@next/swc-darwin-x64": "15.4.2-canary.23",
+    "@next/swc-linux-arm64-gnu": "15.4.2-canary.23",
+    "@next/swc-linux-arm64-musl": "15.4.2-canary.23",
+    "@next/swc-linux-x64-gnu": "15.4.2-canary.23",
+    "@next/swc-linux-x64-musl": "15.4.2-canary.23",
+    "@next/swc-win32-arm64-msvc": "15.4.2-canary.23",
+    "@next/swc-win32-x64-msvc": "15.4.2-canary.23"
   },
   "devDependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
@@ -176,14 +172,13 @@
     "@hapi/accept": "5.0.2",
     "@jest/transform": "29.5.0",
     "@jest/types": "29.5.0",
-    "@modelcontextprotocol/sdk": "1.15.1",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "15.4.2-canary.22",
-    "@next/polyfill-module": "15.4.2-canary.22",
-    "@next/polyfill-nomodule": "15.4.2-canary.22",
-    "@next/react-refresh-utils": "15.4.2-canary.22",
-    "@next/swc": "15.4.2-canary.22",
+    "@next/font": "15.4.2-canary.23",
+    "@next/polyfill-module": "15.4.2-canary.23",
+    "@next/polyfill-nomodule": "15.4.2-canary.23",
+    "@next/react-refresh-utils": "15.4.2-canary.23",
+    "@next/swc": "15.4.2-canary.23",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.51.1",
     "@rspack/core": "1.4.5",

package/server.d.ts

@@ -12,7 +12,7 @@ export { userAgentFromString } from 'next/dist/server/web/spec-extension/user-ag
 export { userAgent } from 'next/dist/server/web/spec-extension/user-agent'
 export { URLPattern } from 'next/dist/compiled/@edge-runtime/primitives/url'
 export { ImageResponse } from 'next/dist/server/web/spec-extension/image-response'
-export type { ImageResponseOptions } from 'next/dist/compiled/@vercel/og'
+export type { ImageResponseOptions } from 'next/dist/compiled/@vercel/og/types'
 export { after } from 'next/dist/server/after'
 export { unstable_rootParams } from 'next/dist/server/request/root-params'
 export { connection } from 'next/dist/server/request/connection'

package/dist/compiled/@vercel/og/types-d38469ff.d.ts

@@ -1,74 +0,0 @@
-import { SatoriOptions } from "next/dist/compiled/@vercel/og/satori";
-import { OutgoingHttpHeader } from 'http';
-
-declare const apis: {
-    twemoji: (code: any) => string;
-    openmoji: string;
-    blobmoji: string;
-    noto: string;
-    fluent: (code: any) => string;
-    fluentFlat: (code: any) => string;
-};
-type EmojiType = keyof typeof apis;
-
-type ImageOptions = {
-    /**
-     * The width of the image.
-     *
-     * @type {number}
-     * @default 1200
-     */
-    width?: number;
-    /**
-     * The height of the image.
-     *
-     * @type {number}
-     * @default 630
-     */
-    height?: number;
-    /**
-     * Display debug information on the image.
-     *
-     * @type {boolean}
-     * @default false
-     */
-    debug?: boolean;
-    /**
-     * A list of fonts to use.
-     *
-     * @type {{ data: ArrayBuffer; name: string; weight?: 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900; style?: 'normal' | 'italic' }[]}
-     * @default Noto Sans Latin Regular.
-     */
-    fonts?: SatoriOptions['fonts'];
-    /**
-     * Using a specific Emoji style. Defaults to `twemoji`.
-     *
-     * @type {EmojiType}
-     * @default 'twemoji'
-     */
-    emoji?: EmojiType;
-};
-type ImageResponseNodeOptions = ImageOptions & {
-    status?: number;
-    statusText?: string;
-    headers?: OutgoingHttpHeader[];
-};
-type ImageResponseOptions = ImageOptions & ConstructorParameters<typeof Response>[1];
-declare module 'react' {
-    interface HTMLAttributes<T> {
-        /**
-         * Specify styles using Tailwind CSS classes. This feature is currently experimental.
-         * If `style` prop is also specified, styles generated with `tw` prop will be overridden.
-         *
-         * Example:
-         * - `tw='w-full h-full bg-blue-200'`
-         * - `tw='text-9xl'`
-         * - `tw='text-[80px]'`
-         *
-         * @type {string}
-         */
-        tw?: string;
-    }
-}
-
-export { ImageResponseOptions as I, ImageResponseNodeOptions as a };