next 15.5.1-canary.26 → 15.5.1-canary.27

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

@@ -2,7 +2,6 @@ import { bold, green, magenta, red } from '../../../lib/picocolors';
 import isInternal from '../is-internal';
 import { decodeMagicIdentifier, MAGIC_IDENTIFIER_REGEX } from '../magic-identifier';
 import * as Log from '../../../build/output/log';
-import loadJsConfig from '../../../build/load-jsconfig';
 /**
  * An error generated from emitted Turbopack issues. This can include build
  * errors caused by issues with user code.
@@ -26,12 +25,6 @@ import loadJsConfig from '../../../build/load-jsconfig';
 export function getIssueKey(issue) {
     return issue.severity + "-" + issue.filePath + "-" + JSON.stringify(issue.title) + "-" + JSON.stringify(issue.description);
 }
-export async function getTurbopackJsConfig(dir, nextConfig) {
-    const { jsConfig } = await loadJsConfig(dir, nextConfig);
-    return jsConfig != null ? jsConfig : {
-        compilerOptions: {}
-    };
-}
 export function processIssues(currentEntryIssues, key, result, throwIssue, logErrors) {
     const newIssues = new Map();
     currentEntryIssues.set(key, newIssues);

package/dist/esm/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    // 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":["bold","green","magenta","red","isInternal","decodeMagicIdentifier","MAGIC_IDENTIFIER_REGEX","Log","loadJsConfig","ModuleBuildError","Error","name","isWellKnownError","issue","title","formattedTitle","renderStyledStringToErrorAnsi","includes","getIssueKey","severity","filePath","JSON","stringify","description","getTurbopackJsConfig","dir","nextConfig","jsConfig","compilerOptions","processIssues","currentEntryIssues","key","result","throwIssue","logErrors","newIssues","Map","set","relevantIssues","Set","issues","issueKey","formatted","formatIssue","add","error","size","join","source","importTraces","documentationLink","replace","formattedFilePath","replaceAll","message","range","start","line","column","content","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","isRelevantWarning","isNodeModulesIssue","stage","match","startsWith","string","decodeMagicIdentifiers","str","ident","e","isPersistentCachingEnabled","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'\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 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":["bold","green","magenta","red","isInternal","decodeMagicIdentifier","MAGIC_IDENTIFIER_REGEX","Log","ModuleBuildError","Error","name","isWellKnownError","issue","title","formattedTitle","renderStyledStringToErrorAnsi","includes","getIssueKey","severity","filePath","JSON","stringify","description","processIssues","currentEntryIssues","key","result","throwIssue","logErrors","newIssues","Map","set","relevantIssues","Set","issues","issueKey","formatted","formatIssue","add","error","size","join","source","importTraces","documentationLink","replace","formattedFilePath","replaceAll","message","range","start","line","column","content","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","isRelevantWarning","isNodeModulesIssue","stage","match","startsWith","string","decodeMagicIdentifiers","str","ident","e","isPersistentCachingEnabled","config","experimental","turbopackPersistentCaching"],"mappings":"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","ignoreList":[0]}

package/dist/lib/find-pages-dir.js

@@ -45,6 +45,17 @@ function findPagesDir(dir) {
             configurable: true
         });
     }
+    if (pagesDir && appDir) {
+        const pagesParent = _path.default.dirname(pagesDir);
+        const appParent = _path.default.dirname(appDir);
+        if (pagesParent !== appParent) {
+            throw Object.defineProperty(new Error('> `pages` and `app` directories should be under the same folder'), "__NEXT_ERROR_CODE", {
+                value: "E801",
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
     return {
         pagesDir,
         appDir

package/dist/lib/find-pages-dir.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/find-pages-dir.ts"],"sourcesContent":["import fs from 'fs'\nimport path from 'path'\n\nexport function findDir(dir: string, name: 'pages' | 'app'): string | null {\n  // prioritize ./${name} over ./src/${name}\n  let curDir = path.join(dir, name)\n  if (fs.existsSync(curDir)) return curDir\n\n  curDir = path.join(dir, 'src', name)\n  if (fs.existsSync(curDir)) return curDir\n\n  return null\n}\n\nexport function findPagesDir(dir: string): {\n  pagesDir: string | undefined\n  appDir: string | undefined\n} {\n  const pagesDir = findDir(dir, 'pages') || undefined\n  const appDir = findDir(dir, 'app') || undefined\n\n  if (appDir == null && pagesDir == null) {\n    throw new Error(\n      \"> Couldn't find any `pages` or `app` directory. Please create one under the project root\"\n    )\n  }\n\n  return {\n    pagesDir,\n    appDir,\n  }\n}\n"],"names":["findDir","findPagesDir","dir","name","curDir","path","join","fs","existsSync","pagesDir","undefined","appDir","Error"],"mappings":";;;;;;;;;;;;;;;IAGgBA,OAAO;eAAPA;;IAWAC,YAAY;eAAZA;;;2DAdD;6DACE;;;;;;AAEV,SAASD,QAAQE,GAAW,EAAEC,IAAqB;IACxD,0CAA0C;IAC1C,IAAIC,SAASC,aAAI,CAACC,IAAI,CAACJ,KAAKC;IAC5B,IAAII,WAAE,CAACC,UAAU,CAACJ,SAAS,OAAOA;IAElCA,SAASC,aAAI,CAACC,IAAI,CAACJ,KAAK,OAAOC;IAC/B,IAAII,WAAE,CAACC,UAAU,CAACJ,SAAS,OAAOA;IAElC,OAAO;AACT;AAEO,SAASH,aAAaC,GAAW;IAItC,MAAMO,WAAWT,QAAQE,KAAK,YAAYQ;IAC1C,MAAMC,SAASX,QAAQE,KAAK,UAAUQ;IAEtC,IAAIC,UAAU,QAAQF,YAAY,MAAM;QACtC,MAAM,qBAEL,CAFK,IAAIG,MACR,6FADI,qBAAA;mBAAA;wBAAA;0BAAA;QAEN;IACF;IAEA,OAAO;QACLH;QACAE;IACF;AACF","ignoreList":[0]}
+{"version":3,"sources":["../../src/lib/find-pages-dir.ts"],"sourcesContent":["import fs from 'fs'\nimport path from 'path'\n\nexport function findDir(dir: string, name: 'pages' | 'app'): string | null {\n  // prioritize ./${name} over ./src/${name}\n  let curDir = path.join(dir, name)\n  if (fs.existsSync(curDir)) return curDir\n\n  curDir = path.join(dir, 'src', name)\n  if (fs.existsSync(curDir)) return curDir\n\n  return null\n}\n\nexport function findPagesDir(dir: string): {\n  pagesDir: string | undefined\n  appDir: string | undefined\n} {\n  const pagesDir = findDir(dir, 'pages') || undefined\n  const appDir = findDir(dir, 'app') || undefined\n\n  if (appDir == null && pagesDir == null) {\n    throw new Error(\n      \"> Couldn't find any `pages` or `app` directory. Please create one under the project root\"\n    )\n  }\n\n  if (pagesDir && appDir) {\n    const pagesParent = path.dirname(pagesDir)\n    const appParent = path.dirname(appDir)\n    if (pagesParent !== appParent) {\n      throw new Error(\n        '> `pages` and `app` directories should be under the same folder'\n      )\n    }\n  }\n\n  return {\n    pagesDir,\n    appDir,\n  }\n}\n"],"names":["findDir","findPagesDir","dir","name","curDir","path","join","fs","existsSync","pagesDir","undefined","appDir","Error","pagesParent","dirname","appParent"],"mappings":";;;;;;;;;;;;;;;IAGgBA,OAAO;eAAPA;;IAWAC,YAAY;eAAZA;;;2DAdD;6DACE;;;;;;AAEV,SAASD,QAAQE,GAAW,EAAEC,IAAqB;IACxD,0CAA0C;IAC1C,IAAIC,SAASC,aAAI,CAACC,IAAI,CAACJ,KAAKC;IAC5B,IAAII,WAAE,CAACC,UAAU,CAACJ,SAAS,OAAOA;IAElCA,SAASC,aAAI,CAACC,IAAI,CAACJ,KAAK,OAAOC;IAC/B,IAAII,WAAE,CAACC,UAAU,CAACJ,SAAS,OAAOA;IAElC,OAAO;AACT;AAEO,SAASH,aAAaC,GAAW;IAItC,MAAMO,WAAWT,QAAQE,KAAK,YAAYQ;IAC1C,MAAMC,SAASX,QAAQE,KAAK,UAAUQ;IAEtC,IAAIC,UAAU,QAAQF,YAAY,MAAM;QACtC,MAAM,qBAEL,CAFK,IAAIG,MACR,6FADI,qBAAA;mBAAA;wBAAA;0BAAA;QAEN;IACF;IAEA,IAAIH,YAAYE,QAAQ;QACtB,MAAME,cAAcR,aAAI,CAACS,OAAO,CAACL;QACjC,MAAMM,YAAYV,aAAI,CAACS,OAAO,CAACH;QAC/B,IAAIE,gBAAgBE,WAAW;YAC7B,MAAM,qBAEL,CAFK,IAAIH,MACR,oEADI,qBAAA;uBAAA;4BAAA;8BAAA;YAEN;QACF;IACF;IAEA,OAAO;QACLH;QACAE;IACF;AACF","ignoreList":[0]}

package/dist/lib/verify-root-layout.d.ts

@@ -2,7 +2,7 @@ import type { PageExtensions } from '../build/page-extensions-type';
 export declare function verifyRootLayout({ dir, appDir, tsconfigPath, pagePath, pageExtensions, }: {
     dir: string;
     appDir: string;
-    tsconfigPath: string;
+    tsconfigPath: string | undefined;
     pagePath: string;
     pageExtensions: PageExtensions;
 }): Promise<[boolean, string | undefined]>;

package/dist/lib/verify-root-layout.js

@@ -140,7 +140,8 @@ async function verifyRootLayout({ dir, appDir, tsconfigPath, pagePath, pageExten
             availableDir = '';
         }
         if (typeof availableDir === 'string') {
-            const resolvedTsConfigPath = _path.default.join(dir, tsconfigPath);
+            const tsConfigFileName = tsconfigPath || 'tsconfig.json';
+            const resolvedTsConfigPath = _path.default.join(dir, tsConfigFileName);
             const hasTsConfig = await _fs.promises.access(resolvedTsConfigPath).then(()=>true, ()=>false);
             rootLayoutPath = _path.default.join(appDir, availableDir, `layout.${hasTsConfig ? 'tsx' : 'js'}`);
             await _fs.promises.writeFile(rootLayoutPath, getRootLayout(hasTsConfig));

package/dist/lib/verify-root-layout.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/verify-root-layout.ts"],"sourcesContent":["import path from 'path'\nimport * as Log from '../build/output/log'\nimport { promises as fs } from 'fs'\nimport { bold } from './picocolors'\nimport { APP_DIR_ALIAS } from './constants'\nimport type { PageExtensions } from '../build/page-extensions-type'\n\nconst globOrig =\n  require('next/dist/compiled/glob') as typeof import('next/dist/compiled/glob')\nconst glob = (cwd: string, pattern: string): Promise<string[]> => {\n  return new Promise((resolve, reject) => {\n    globOrig(pattern, { cwd }, (err, files) => {\n      if (err) {\n        return reject(err)\n      }\n      resolve(files)\n    })\n  })\n}\n\nfunction getRootLayout(isTs: boolean) {\n  if (isTs) {\n    return `export const metadata = {\n  title: 'Next.js',\n  description: 'Generated by Next.js',\n}\n\nexport default function RootLayout({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <html lang=\"en\">\n      <body>{children}</body>\n    </html>\n  )\n}\n`\n  }\n\n  return `export const metadata = {\n  title: 'Next.js',\n  description: 'Generated by Next.js',\n}\n\nexport default function RootLayout({ children }) {\n  return (\n    <html lang=\"en\">\n      <body>{children}</body>\n    </html>\n  )\n}\n`\n}\n\nexport async function verifyRootLayout({\n  dir,\n  appDir,\n  tsconfigPath,\n  pagePath,\n  pageExtensions,\n}: {\n  dir: string\n  appDir: string\n  tsconfigPath: string\n  pagePath: string\n  pageExtensions: PageExtensions\n}): Promise<[boolean, string | undefined]> {\n  let rootLayoutPath: string | undefined\n  try {\n    const layoutFiles = await glob(\n      appDir,\n      `**/layout.{${pageExtensions.join(',')}}`\n    )\n    const isFileUnderAppDir = pagePath.startsWith(`${APP_DIR_ALIAS}/`)\n    const normalizedPagePath = pagePath.replace(`${APP_DIR_ALIAS}/`, '')\n    const pagePathSegments = normalizedPagePath.split('/')\n\n    // Find an available dir to place the layout file in, the layout file can't affect any other layout.\n    // Place the layout as close to app/ as possible.\n    let availableDir: string | undefined\n\n    if (isFileUnderAppDir) {\n      if (layoutFiles.length === 0) {\n        // If there's no other layout file we can place the layout file in the app dir.\n        // However, if the page is within a route group directly under app (e.g. app/(routegroup)/page.js)\n        // prefer creating the root layout in that route group.\n        const firstSegmentValue = pagePathSegments[0]\n        availableDir = firstSegmentValue.startsWith('(')\n          ? firstSegmentValue\n          : ''\n      } else {\n        pagePathSegments.pop() // remove the page from segments\n\n        let currentSegments: string[] = []\n        for (const segment of pagePathSegments) {\n          currentSegments.push(segment)\n          // Find the dir closest to app/ where a layout can be created without affecting other layouts.\n          if (\n            !layoutFiles.some((file) =>\n              file.startsWith(currentSegments.join('/'))\n            )\n          ) {\n            availableDir = currentSegments.join('/')\n            break\n          }\n        }\n      }\n    } else {\n      availableDir = ''\n    }\n\n    if (typeof availableDir === 'string') {\n      const resolvedTsConfigPath = path.join(dir, tsconfigPath)\n      const hasTsConfig = await fs.access(resolvedTsConfigPath).then(\n        () => true,\n        () => false\n      )\n\n      rootLayoutPath = path.join(\n        appDir,\n        availableDir,\n        `layout.${hasTsConfig ? 'tsx' : 'js'}`\n      )\n      await fs.writeFile(rootLayoutPath, getRootLayout(hasTsConfig))\n\n      Log.warn(\n        `Your page ${bold(\n          `app/${normalizedPagePath}`\n        )} did not have a root layout. We created ${bold(\n          `app${rootLayoutPath.replace(appDir, '')}`\n        )} for you.`\n      )\n\n      // Created root layout\n      return [true, rootLayoutPath]\n    }\n  } catch (e) {\n    console.error(e)\n  }\n\n  // Didn't create root layout\n  return [false, rootLayoutPath]\n}\n"],"names":["verifyRootLayout","globOrig","require","glob","cwd","pattern","Promise","resolve","reject","err","files","getRootLayout","isTs","dir","appDir","tsconfigPath","pagePath","pageExtensions","rootLayoutPath","layoutFiles","join","isFileUnderAppDir","startsWith","APP_DIR_ALIAS","normalizedPagePath","replace","pagePathSegments","split","availableDir","length","firstSegmentValue","pop","currentSegments","segment","push","some","file","resolvedTsConfigPath","path","hasTsConfig","fs","access","then","writeFile","Log","warn","bold","e","console","error"],"mappings":";;;;+BAwDsBA;;;eAAAA;;;6DAxDL;6DACI;oBACU;4BACV;2BACS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9B,MAAMC,WACJC,QAAQ;AACV,MAAMC,OAAO,CAACC,KAAaC;IACzB,OAAO,IAAIC,QAAQ,CAACC,SAASC;QAC3BP,SAASI,SAAS;YAAED;QAAI,GAAG,CAACK,KAAKC;YAC/B,IAAID,KAAK;gBACP,OAAOD,OAAOC;YAChB;YACAF,QAAQG;QACV;IACF;AACF;AAEA,SAASC,cAAcC,IAAa;IAClC,IAAIA,MAAM;QACR,OAAO,CAAC;;;;;;;;;;;;;;;;AAgBZ,CAAC;IACC;IAEA,OAAO,CAAC;;;;;;;;;;;;AAYV,CAAC;AACD;AAEO,eAAeZ,iBAAiB,EACrCa,GAAG,EACHC,MAAM,EACNC,YAAY,EACZC,QAAQ,EACRC,cAAc,EAOf;IACC,IAAIC;IACJ,IAAI;QACF,MAAMC,cAAc,MAAMhB,KACxBW,QACA,CAAC,WAAW,EAAEG,eAAeG,IAAI,CAAC,KAAK,CAAC,CAAC;QAE3C,MAAMC,oBAAoBL,SAASM,UAAU,CAAC,GAAGC,wBAAa,CAAC,CAAC,CAAC;QACjE,MAAMC,qBAAqBR,SAASS,OAAO,CAAC,GAAGF,wBAAa,CAAC,CAAC,CAAC,EAAE;QACjE,MAAMG,mBAAmBF,mBAAmBG,KAAK,CAAC;QAElD,oGAAoG;QACpG,iDAAiD;QACjD,IAAIC;QAEJ,IAAIP,mBAAmB;YACrB,IAAIF,YAAYU,MAAM,KAAK,GAAG;gBAC5B,+EAA+E;gBAC/E,kGAAkG;gBAClG,uDAAuD;gBACvD,MAAMC,oBAAoBJ,gBAAgB,CAAC,EAAE;gBAC7CE,eAAeE,kBAAkBR,UAAU,CAAC,OACxCQ,oBACA;YACN,OAAO;gBACLJ,iBAAiBK,GAAG,GAAG,gCAAgC;;gBAEvD,IAAIC,kBAA4B,EAAE;gBAClC,KAAK,MAAMC,WAAWP,iBAAkB;oBACtCM,gBAAgBE,IAAI,CAACD;oBACrB,8FAA8F;oBAC9F,IACE,CAACd,YAAYgB,IAAI,CAAC,CAACC,OACjBA,KAAKd,UAAU,CAACU,gBAAgBZ,IAAI,CAAC,QAEvC;wBACAQ,eAAeI,gBAAgBZ,IAAI,CAAC;wBACpC;oBACF;gBACF;YACF;QACF,OAAO;YACLQ,eAAe;QACjB;QAEA,IAAI,OAAOA,iBAAiB,UAAU;YACpC,MAAMS,uBAAuBC,aAAI,CAAClB,IAAI,CAACP,KAAKE;YAC5C,MAAMwB,cAAc,MAAMC,YAAE,CAACC,MAAM,CAACJ,sBAAsBK,IAAI,CAC5D,IAAM,MACN,IAAM;YAGRxB,iBAAiBoB,aAAI,CAAClB,IAAI,CACxBN,QACAc,cACA,CAAC,OAAO,EAAEW,cAAc,QAAQ,MAAM;YAExC,MAAMC,YAAE,CAACG,SAAS,CAACzB,gBAAgBP,cAAc4B;YAEjDK,KAAIC,IAAI,CACN,CAAC,UAAU,EAAEC,IAAAA,gBAAI,EACf,CAAC,IAAI,EAAEtB,oBAAoB,EAC3B,wCAAwC,EAAEsB,IAAAA,gBAAI,EAC9C,CAAC,GAAG,EAAE5B,eAAeO,OAAO,CAACX,QAAQ,KAAK,EAC1C,SAAS,CAAC;YAGd,sBAAsB;YACtB,OAAO;gBAAC;gBAAMI;aAAe;QAC/B;IACF,EAAE,OAAO6B,GAAG;QACVC,QAAQC,KAAK,CAACF;IAChB;IAEA,4BAA4B;IAC5B,OAAO;QAAC;QAAO7B;KAAe;AAChC","ignoreList":[0]}
+{"version":3,"sources":["../../src/lib/verify-root-layout.ts"],"sourcesContent":["import path from 'path'\nimport * as Log from '../build/output/log'\nimport { promises as fs } from 'fs'\nimport { bold } from './picocolors'\nimport { APP_DIR_ALIAS } from './constants'\nimport type { PageExtensions } from '../build/page-extensions-type'\n\nconst globOrig =\n  require('next/dist/compiled/glob') as typeof import('next/dist/compiled/glob')\nconst glob = (cwd: string, pattern: string): Promise<string[]> => {\n  return new Promise((resolve, reject) => {\n    globOrig(pattern, { cwd }, (err, files) => {\n      if (err) {\n        return reject(err)\n      }\n      resolve(files)\n    })\n  })\n}\n\nfunction getRootLayout(isTs: boolean) {\n  if (isTs) {\n    return `export const metadata = {\n  title: 'Next.js',\n  description: 'Generated by Next.js',\n}\n\nexport default function RootLayout({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <html lang=\"en\">\n      <body>{children}</body>\n    </html>\n  )\n}\n`\n  }\n\n  return `export const metadata = {\n  title: 'Next.js',\n  description: 'Generated by Next.js',\n}\n\nexport default function RootLayout({ children }) {\n  return (\n    <html lang=\"en\">\n      <body>{children}</body>\n    </html>\n  )\n}\n`\n}\n\nexport async function verifyRootLayout({\n  dir,\n  appDir,\n  tsconfigPath,\n  pagePath,\n  pageExtensions,\n}: {\n  dir: string\n  appDir: string\n  tsconfigPath: string | undefined\n  pagePath: string\n  pageExtensions: PageExtensions\n}): Promise<[boolean, string | undefined]> {\n  let rootLayoutPath: string | undefined\n  try {\n    const layoutFiles = await glob(\n      appDir,\n      `**/layout.{${pageExtensions.join(',')}}`\n    )\n    const isFileUnderAppDir = pagePath.startsWith(`${APP_DIR_ALIAS}/`)\n    const normalizedPagePath = pagePath.replace(`${APP_DIR_ALIAS}/`, '')\n    const pagePathSegments = normalizedPagePath.split('/')\n\n    // Find an available dir to place the layout file in, the layout file can't affect any other layout.\n    // Place the layout as close to app/ as possible.\n    let availableDir: string | undefined\n\n    if (isFileUnderAppDir) {\n      if (layoutFiles.length === 0) {\n        // If there's no other layout file we can place the layout file in the app dir.\n        // However, if the page is within a route group directly under app (e.g. app/(routegroup)/page.js)\n        // prefer creating the root layout in that route group.\n        const firstSegmentValue = pagePathSegments[0]\n        availableDir = firstSegmentValue.startsWith('(')\n          ? firstSegmentValue\n          : ''\n      } else {\n        pagePathSegments.pop() // remove the page from segments\n\n        let currentSegments: string[] = []\n        for (const segment of pagePathSegments) {\n          currentSegments.push(segment)\n          // Find the dir closest to app/ where a layout can be created without affecting other layouts.\n          if (\n            !layoutFiles.some((file) =>\n              file.startsWith(currentSegments.join('/'))\n            )\n          ) {\n            availableDir = currentSegments.join('/')\n            break\n          }\n        }\n      }\n    } else {\n      availableDir = ''\n    }\n\n    if (typeof availableDir === 'string') {\n      const tsConfigFileName = tsconfigPath || 'tsconfig.json'\n      const resolvedTsConfigPath = path.join(dir, tsConfigFileName)\n      const hasTsConfig = await fs.access(resolvedTsConfigPath).then(\n        () => true,\n        () => false\n      )\n\n      rootLayoutPath = path.join(\n        appDir,\n        availableDir,\n        `layout.${hasTsConfig ? 'tsx' : 'js'}`\n      )\n      await fs.writeFile(rootLayoutPath, getRootLayout(hasTsConfig))\n\n      Log.warn(\n        `Your page ${bold(\n          `app/${normalizedPagePath}`\n        )} did not have a root layout. We created ${bold(\n          `app${rootLayoutPath.replace(appDir, '')}`\n        )} for you.`\n      )\n\n      // Created root layout\n      return [true, rootLayoutPath]\n    }\n  } catch (e) {\n    console.error(e)\n  }\n\n  // Didn't create root layout\n  return [false, rootLayoutPath]\n}\n"],"names":["verifyRootLayout","globOrig","require","glob","cwd","pattern","Promise","resolve","reject","err","files","getRootLayout","isTs","dir","appDir","tsconfigPath","pagePath","pageExtensions","rootLayoutPath","layoutFiles","join","isFileUnderAppDir","startsWith","APP_DIR_ALIAS","normalizedPagePath","replace","pagePathSegments","split","availableDir","length","firstSegmentValue","pop","currentSegments","segment","push","some","file","tsConfigFileName","resolvedTsConfigPath","path","hasTsConfig","fs","access","then","writeFile","Log","warn","bold","e","console","error"],"mappings":";;;;+BAwDsBA;;;eAAAA;;;6DAxDL;6DACI;oBACU;4BACV;2BACS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9B,MAAMC,WACJC,QAAQ;AACV,MAAMC,OAAO,CAACC,KAAaC;IACzB,OAAO,IAAIC,QAAQ,CAACC,SAASC;QAC3BP,SAASI,SAAS;YAAED;QAAI,GAAG,CAACK,KAAKC;YAC/B,IAAID,KAAK;gBACP,OAAOD,OAAOC;YAChB;YACAF,QAAQG;QACV;IACF;AACF;AAEA,SAASC,cAAcC,IAAa;IAClC,IAAIA,MAAM;QACR,OAAO,CAAC;;;;;;;;;;;;;;;;AAgBZ,CAAC;IACC;IAEA,OAAO,CAAC;;;;;;;;;;;;AAYV,CAAC;AACD;AAEO,eAAeZ,iBAAiB,EACrCa,GAAG,EACHC,MAAM,EACNC,YAAY,EACZC,QAAQ,EACRC,cAAc,EAOf;IACC,IAAIC;IACJ,IAAI;QACF,MAAMC,cAAc,MAAMhB,KACxBW,QACA,CAAC,WAAW,EAAEG,eAAeG,IAAI,CAAC,KAAK,CAAC,CAAC;QAE3C,MAAMC,oBAAoBL,SAASM,UAAU,CAAC,GAAGC,wBAAa,CAAC,CAAC,CAAC;QACjE,MAAMC,qBAAqBR,SAASS,OAAO,CAAC,GAAGF,wBAAa,CAAC,CAAC,CAAC,EAAE;QACjE,MAAMG,mBAAmBF,mBAAmBG,KAAK,CAAC;QAElD,oGAAoG;QACpG,iDAAiD;QACjD,IAAIC;QAEJ,IAAIP,mBAAmB;YACrB,IAAIF,YAAYU,MAAM,KAAK,GAAG;gBAC5B,+EAA+E;gBAC/E,kGAAkG;gBAClG,uDAAuD;gBACvD,MAAMC,oBAAoBJ,gBAAgB,CAAC,EAAE;gBAC7CE,eAAeE,kBAAkBR,UAAU,CAAC,OACxCQ,oBACA;YACN,OAAO;gBACLJ,iBAAiBK,GAAG,GAAG,gCAAgC;;gBAEvD,IAAIC,kBAA4B,EAAE;gBAClC,KAAK,MAAMC,WAAWP,iBAAkB;oBACtCM,gBAAgBE,IAAI,CAACD;oBACrB,8FAA8F;oBAC9F,IACE,CAACd,YAAYgB,IAAI,CAAC,CAACC,OACjBA,KAAKd,UAAU,CAACU,gBAAgBZ,IAAI,CAAC,QAEvC;wBACAQ,eAAeI,gBAAgBZ,IAAI,CAAC;wBACpC;oBACF;gBACF;YACF;QACF,OAAO;YACLQ,eAAe;QACjB;QAEA,IAAI,OAAOA,iBAAiB,UAAU;YACpC,MAAMS,mBAAmBtB,gBAAgB;YACzC,MAAMuB,uBAAuBC,aAAI,CAACnB,IAAI,CAACP,KAAKwB;YAC5C,MAAMG,cAAc,MAAMC,YAAE,CAACC,MAAM,CAACJ,sBAAsBK,IAAI,CAC5D,IAAM,MACN,IAAM;YAGRzB,iBAAiBqB,aAAI,CAACnB,IAAI,CACxBN,QACAc,cACA,CAAC,OAAO,EAAEY,cAAc,QAAQ,MAAM;YAExC,MAAMC,YAAE,CAACG,SAAS,CAAC1B,gBAAgBP,cAAc6B;YAEjDK,KAAIC,IAAI,CACN,CAAC,UAAU,EAAEC,IAAAA,gBAAI,EACf,CAAC,IAAI,EAAEvB,oBAAoB,EAC3B,wCAAwC,EAAEuB,IAAAA,gBAAI,EAC9C,CAAC,GAAG,EAAE7B,eAAeO,OAAO,CAACX,QAAQ,KAAK,EAC1C,SAAS,CAAC;YAGd,sBAAsB;YACtB,OAAO;gBAAC;gBAAMI;aAAe;QAC/B;IACF,EAAE,OAAO8B,GAAG;QACVC,QAAQC,KAAK,CAACF;IAChB;IAEA,4BAA4B;IAC5B,OAAO;QAAC;QAAO9B;KAAe;AAChC","ignoreList":[0]}

package/dist/lib/verify-typescript-setup.d.ts

@@ -3,7 +3,7 @@ export declare function verifyTypeScriptSetup({ dir, distDir, cacheDir, intentDi
     dir: string;
     distDir: string;
     cacheDir?: string;
-    tsconfigPath: string;
+    tsconfigPath: string | undefined;
     intentDirs: string[];
     typeCheckPreflight: boolean;
     disableStaticImages: boolean;

package/dist/lib/verify-typescript-setup.js

@@ -84,11 +84,12 @@ const requiredPackages = [
     }
 ];
 async function verifyTypeScriptSetup({ dir, distDir, cacheDir, intentDirs, tsconfigPath, typeCheckPreflight, disableStaticImages, hasAppDir, hasPagesDir }) {
-    const resolvedTsConfigPath = _path.default.join(dir, tsconfigPath);
+    const tsConfigFileName = tsconfigPath || 'tsconfig.json';
+    const resolvedTsConfigPath = _path.default.join(dir, tsConfigFileName);
     try {
         var _deps_missing;
         // Check if the project uses TypeScript:
-        const intent = await (0, _getTypeScriptIntent.getTypeScriptIntent)(dir, intentDirs, tsconfigPath);
+        const intent = await (0, _getTypeScriptIntent.getTypeScriptIntent)(dir, intentDirs, tsConfigFileName);
         if (!intent) {
             return {
                 version: null

package/dist/lib/verify-typescript-setup.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/verify-typescript-setup.ts"],"sourcesContent":["import { bold, cyan, red, yellow } from './picocolors'\nimport path from 'path'\n\nimport { hasNecessaryDependencies } from './has-necessary-dependencies'\nimport type { NecessaryDependencies } from './has-necessary-dependencies'\nimport semver from 'next/dist/compiled/semver'\nimport { CompileError } from './compile-error'\nimport * as log from '../build/output/log'\n\nimport { getTypeScriptIntent } from './typescript/getTypeScriptIntent'\nimport type { TypeCheckResult } from './typescript/runTypeCheck'\nimport { writeAppTypeDeclarations } from './typescript/writeAppTypeDeclarations'\nimport { writeConfigurationDefaults } from './typescript/writeConfigurationDefaults'\nimport { installDependencies } from './install-dependencies'\nimport { isCI } from '../server/ci-info'\nimport { missingDepsError } from './typescript/missingDependencyError'\n\nconst requiredPackages = [\n  {\n    file: 'typescript/lib/typescript.js',\n    pkg: 'typescript',\n    exportsRestrict: true,\n  },\n  {\n    file: '@types/react/index.d.ts',\n    pkg: '@types/react',\n    exportsRestrict: true,\n  },\n  {\n    file: '@types/node/index.d.ts',\n    pkg: '@types/node',\n    exportsRestrict: true,\n  },\n]\n\nexport async function verifyTypeScriptSetup({\n  dir,\n  distDir,\n  cacheDir,\n  intentDirs,\n  tsconfigPath,\n  typeCheckPreflight,\n  disableStaticImages,\n  hasAppDir,\n  hasPagesDir,\n}: {\n  dir: string\n  distDir: string\n  cacheDir?: string\n  tsconfigPath: string\n  intentDirs: string[]\n  typeCheckPreflight: boolean\n  disableStaticImages: boolean\n  hasAppDir: boolean\n  hasPagesDir: boolean\n}): Promise<{ result?: TypeCheckResult; version: string | null }> {\n  const resolvedTsConfigPath = path.join(dir, tsconfigPath)\n\n  try {\n    // Check if the project uses TypeScript:\n    const intent = await getTypeScriptIntent(dir, intentDirs, tsconfigPath)\n    if (!intent) {\n      return { version: null }\n    }\n\n    // Ensure TypeScript and necessary `@types/*` are installed:\n    let deps: NecessaryDependencies = await hasNecessaryDependencies(\n      dir,\n      requiredPackages\n    )\n\n    if (deps.missing?.length > 0) {\n      if (isCI) {\n        // we don't attempt auto install in CI to avoid side-effects\n        // and instead log the error for installing needed packages\n        missingDepsError(dir, deps.missing)\n      }\n      console.log(\n        bold(\n          yellow(\n            `It looks like you're trying to use TypeScript but do not have the required package(s) installed.`\n          )\n        ) +\n          '\\n' +\n          'Installing dependencies' +\n          '\\n\\n' +\n          bold(\n            'If you are not trying to use TypeScript, please remove the ' +\n              cyan('tsconfig.json') +\n              ' file from your package root (and any TypeScript files in your app and pages directories).'\n          ) +\n          '\\n'\n      )\n      await installDependencies(dir, deps.missing, true).catch((err) => {\n        if (err && typeof err === 'object' && 'command' in err) {\n          console.error(\n            `Failed to install required TypeScript dependencies, please install them manually to continue:\\n` +\n              (err as any).command +\n              '\\n'\n          )\n        }\n        throw err\n      })\n      deps = await hasNecessaryDependencies(dir, requiredPackages)\n    }\n\n    // Load TypeScript after we're sure it exists:\n    const tsPath = deps.resolved.get('typescript')!\n    const ts = (await Promise.resolve(\n      require(tsPath)\n    )) as typeof import('typescript')\n\n    if (semver.lt(ts.version, '4.5.2')) {\n      log.warn(\n        `Minimum recommended TypeScript version is v4.5.2, older versions can potentially be incompatible with Next.js. Detected: ${ts.version}`\n      )\n    }\n\n    // Reconfigure (or create) the user's `tsconfig.json` for them:\n    await writeConfigurationDefaults(\n      ts,\n      resolvedTsConfigPath,\n      intent.firstTimeSetup,\n      hasAppDir,\n      distDir,\n      hasPagesDir\n    )\n    // Write out the necessary `next-env.d.ts` file to correctly register\n    // Next.js' types:\n    await writeAppTypeDeclarations({\n      baseDir: dir,\n      distDir,\n      imageImportsEnabled: !disableStaticImages,\n      hasPagesDir,\n      hasAppDir,\n    })\n\n    let result\n    if (typeCheckPreflight) {\n      const { runTypeCheck } =\n        require('./typescript/runTypeCheck') as typeof import('./typescript/runTypeCheck')\n\n      // Verify the project passes type-checking before we go to webpack phase:\n      result = await runTypeCheck(\n        ts,\n        dir,\n        distDir,\n        resolvedTsConfigPath,\n        cacheDir,\n        hasAppDir\n      )\n    }\n    return { result, version: ts.version }\n  } catch (err) {\n    // These are special errors that should not show a stack trace:\n    if (err instanceof CompileError) {\n      console.error(red('Failed to compile.\\n'))\n      console.error(err.message)\n      process.exit(1)\n    }\n\n    /**\n     * verifyTypeScriptSetup can be either invoked directly in the main thread (during next dev / next lint)\n     * or run in a worker (during next build). In the latter case, we need to print the error message, as the\n     * parent process will only receive an `Jest worker encountered 1 child process exceptions, exceeding retry limit`.\n     */\n\n    // we are in a worker, print the error message and exit the process\n    if (process.env.IS_NEXT_WORKER) {\n      if (err instanceof Error) {\n        console.error(err.message)\n      } else {\n        console.error(err)\n      }\n      process.exit(1)\n    }\n    // we are in the main thread, throw the error and it will be handled by the caller\n    throw err\n  }\n}\n"],"names":["verifyTypeScriptSetup","requiredPackages","file","pkg","exportsRestrict","dir","distDir","cacheDir","intentDirs","tsconfigPath","typeCheckPreflight","disableStaticImages","hasAppDir","hasPagesDir","resolvedTsConfigPath","path","join","deps","intent","getTypeScriptIntent","version","hasNecessaryDependencies","missing","length","isCI","missingDepsError","console","log","bold","yellow","cyan","installDependencies","catch","err","error","command","tsPath","resolved","get","ts","Promise","resolve","require","semver","lt","warn","writeConfigurationDefaults","firstTimeSetup","writeAppTypeDeclarations","baseDir","imageImportsEnabled","result","runTypeCheck","CompileError","red","message","process","exit","env","IS_NEXT_WORKER","Error"],"mappings":"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","ignoreList":[0]}
+{"version":3,"sources":["../../src/lib/verify-typescript-setup.ts"],"sourcesContent":["import { bold, cyan, red, yellow } from './picocolors'\nimport path from 'path'\n\nimport { hasNecessaryDependencies } from './has-necessary-dependencies'\nimport type { NecessaryDependencies } from './has-necessary-dependencies'\nimport semver from 'next/dist/compiled/semver'\nimport { CompileError } from './compile-error'\nimport * as log from '../build/output/log'\n\nimport { getTypeScriptIntent } from './typescript/getTypeScriptIntent'\nimport type { TypeCheckResult } from './typescript/runTypeCheck'\nimport { writeAppTypeDeclarations } from './typescript/writeAppTypeDeclarations'\nimport { writeConfigurationDefaults } from './typescript/writeConfigurationDefaults'\nimport { installDependencies } from './install-dependencies'\nimport { isCI } from '../server/ci-info'\nimport { missingDepsError } from './typescript/missingDependencyError'\n\nconst requiredPackages = [\n  {\n    file: 'typescript/lib/typescript.js',\n    pkg: 'typescript',\n    exportsRestrict: true,\n  },\n  {\n    file: '@types/react/index.d.ts',\n    pkg: '@types/react',\n    exportsRestrict: true,\n  },\n  {\n    file: '@types/node/index.d.ts',\n    pkg: '@types/node',\n    exportsRestrict: true,\n  },\n]\n\nexport async function verifyTypeScriptSetup({\n  dir,\n  distDir,\n  cacheDir,\n  intentDirs,\n  tsconfigPath,\n  typeCheckPreflight,\n  disableStaticImages,\n  hasAppDir,\n  hasPagesDir,\n}: {\n  dir: string\n  distDir: string\n  cacheDir?: string\n  tsconfigPath: string | undefined\n  intentDirs: string[]\n  typeCheckPreflight: boolean\n  disableStaticImages: boolean\n  hasAppDir: boolean\n  hasPagesDir: boolean\n}): Promise<{ result?: TypeCheckResult; version: string | null }> {\n  const tsConfigFileName = tsconfigPath || 'tsconfig.json'\n  const resolvedTsConfigPath = path.join(dir, tsConfigFileName)\n\n  try {\n    // Check if the project uses TypeScript:\n    const intent = await getTypeScriptIntent(dir, intentDirs, tsConfigFileName)\n    if (!intent) {\n      return { version: null }\n    }\n\n    // Ensure TypeScript and necessary `@types/*` are installed:\n    let deps: NecessaryDependencies = await hasNecessaryDependencies(\n      dir,\n      requiredPackages\n    )\n\n    if (deps.missing?.length > 0) {\n      if (isCI) {\n        // we don't attempt auto install in CI to avoid side-effects\n        // and instead log the error for installing needed packages\n        missingDepsError(dir, deps.missing)\n      }\n      console.log(\n        bold(\n          yellow(\n            `It looks like you're trying to use TypeScript but do not have the required package(s) installed.`\n          )\n        ) +\n          '\\n' +\n          'Installing dependencies' +\n          '\\n\\n' +\n          bold(\n            'If you are not trying to use TypeScript, please remove the ' +\n              cyan('tsconfig.json') +\n              ' file from your package root (and any TypeScript files in your app and pages directories).'\n          ) +\n          '\\n'\n      )\n      await installDependencies(dir, deps.missing, true).catch((err) => {\n        if (err && typeof err === 'object' && 'command' in err) {\n          console.error(\n            `Failed to install required TypeScript dependencies, please install them manually to continue:\\n` +\n              (err as any).command +\n              '\\n'\n          )\n        }\n        throw err\n      })\n      deps = await hasNecessaryDependencies(dir, requiredPackages)\n    }\n\n    // Load TypeScript after we're sure it exists:\n    const tsPath = deps.resolved.get('typescript')!\n    const ts = (await Promise.resolve(\n      require(tsPath)\n    )) as typeof import('typescript')\n\n    if (semver.lt(ts.version, '4.5.2')) {\n      log.warn(\n        `Minimum recommended TypeScript version is v4.5.2, older versions can potentially be incompatible with Next.js. Detected: ${ts.version}`\n      )\n    }\n\n    // Reconfigure (or create) the user's `tsconfig.json` for them:\n    await writeConfigurationDefaults(\n      ts,\n      resolvedTsConfigPath,\n      intent.firstTimeSetup,\n      hasAppDir,\n      distDir,\n      hasPagesDir\n    )\n    // Write out the necessary `next-env.d.ts` file to correctly register\n    // Next.js' types:\n    await writeAppTypeDeclarations({\n      baseDir: dir,\n      distDir,\n      imageImportsEnabled: !disableStaticImages,\n      hasPagesDir,\n      hasAppDir,\n    })\n\n    let result\n    if (typeCheckPreflight) {\n      const { runTypeCheck } =\n        require('./typescript/runTypeCheck') as typeof import('./typescript/runTypeCheck')\n\n      // Verify the project passes type-checking before we go to webpack phase:\n      result = await runTypeCheck(\n        ts,\n        dir,\n        distDir,\n        resolvedTsConfigPath,\n        cacheDir,\n        hasAppDir\n      )\n    }\n    return { result, version: ts.version }\n  } catch (err) {\n    // These are special errors that should not show a stack trace:\n    if (err instanceof CompileError) {\n      console.error(red('Failed to compile.\\n'))\n      console.error(err.message)\n      process.exit(1)\n    }\n\n    /**\n     * verifyTypeScriptSetup can be either invoked directly in the main thread (during next dev / next lint)\n     * or run in a worker (during next build). In the latter case, we need to print the error message, as the\n     * parent process will only receive an `Jest worker encountered 1 child process exceptions, exceeding retry limit`.\n     */\n\n    // we are in a worker, print the error message and exit the process\n    if (process.env.IS_NEXT_WORKER) {\n      if (err instanceof Error) {\n        console.error(err.message)\n      } else {\n        console.error(err)\n      }\n      process.exit(1)\n    }\n    // we are in the main thread, throw the error and it will be handled by the caller\n    throw err\n  }\n}\n"],"names":["verifyTypeScriptSetup","requiredPackages","file","pkg","exportsRestrict","dir","distDir","cacheDir","intentDirs","tsconfigPath","typeCheckPreflight","disableStaticImages","hasAppDir","hasPagesDir","tsConfigFileName","resolvedTsConfigPath","path","join","deps","intent","getTypeScriptIntent","version","hasNecessaryDependencies","missing","length","isCI","missingDepsError","console","log","bold","yellow","cyan","installDependencies","catch","err","error","command","tsPath","resolved","get","ts","Promise","resolve","require","semver","lt","warn","writeConfigurationDefaults","firstTimeSetup","writeAppTypeDeclarations","baseDir","imageImportsEnabled","result","runTypeCheck","CompileError","red","message","process","exit","env","IS_NEXT_WORKER","Error"],"mappings":";;;;+BAmCsBA;;;eAAAA;;;4BAnCkB;6DACvB;0CAEwB;+DAEtB;8BACU;6DACR;qCAEe;0CAEK;4CACE;qCACP;wBACf;wCACY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEjC,MAAMC,mBAAmB;IACvB;QACEC,MAAM;QACNC,KAAK;QACLC,iBAAiB;IACnB;IACA;QACEF,MAAM;QACNC,KAAK;QACLC,iBAAiB;IACnB;IACA;QACEF,MAAM;QACNC,KAAK;QACLC,iBAAiB;IACnB;CACD;AAEM,eAAeJ,sBAAsB,EAC1CK,GAAG,EACHC,OAAO,EACPC,QAAQ,EACRC,UAAU,EACVC,YAAY,EACZC,kBAAkB,EAClBC,mBAAmB,EACnBC,SAAS,EACTC,WAAW,EAWZ;IACC,MAAMC,mBAAmBL,gBAAgB;IACzC,MAAMM,uBAAuBC,aAAI,CAACC,IAAI,CAACZ,KAAKS;IAE5C,IAAI;YAaEI;QAZJ,wCAAwC;QACxC,MAAMC,SAAS,MAAMC,IAAAA,wCAAmB,EAACf,KAAKG,YAAYM;QAC1D,IAAI,CAACK,QAAQ;YACX,OAAO;gBAAEE,SAAS;YAAK;QACzB;QAEA,4DAA4D;QAC5D,IAAIH,OAA8B,MAAMI,IAAAA,kDAAwB,EAC9DjB,KACAJ;QAGF,IAAIiB,EAAAA,gBAAAA,KAAKK,OAAO,qBAAZL,cAAcM,MAAM,IAAG,GAAG;YAC5B,IAAIC,YAAI,EAAE;gBACR,4DAA4D;gBAC5D,2DAA2D;gBAC3DC,IAAAA,wCAAgB,EAACrB,KAAKa,KAAKK,OAAO;YACpC;YACAI,QAAQC,GAAG,CACTC,IAAAA,gBAAI,EACFC,IAAAA,kBAAM,EACJ,CAAC,gGAAgG,CAAC,KAGpG,OACA,4BACA,SACAD,IAAAA,gBAAI,EACF,gEACEE,IAAAA,gBAAI,EAAC,mBACL,gGAEJ;YAEJ,MAAMC,IAAAA,wCAAmB,EAAC3B,KAAKa,KAAKK,OAAO,EAAE,MAAMU,KAAK,CAAC,CAACC;gBACxD,IAAIA,OAAO,OAAOA,QAAQ,YAAY,aAAaA,KAAK;oBACtDP,QAAQQ,KAAK,CACX,CAAC,+FAA+F,CAAC,GAC/F,AAACD,IAAYE,OAAO,GACpB;gBAEN;gBACA,MAAMF;YACR;YACAhB,OAAO,MAAMI,IAAAA,kDAAwB,EAACjB,KAAKJ;QAC7C;QAEA,8CAA8C;QAC9C,MAAMoC,SAASnB,KAAKoB,QAAQ,CAACC,GAAG,CAAC;QACjC,MAAMC,KAAM,MAAMC,QAAQC,OAAO,CAC/BC,QAAQN;QAGV,IAAIO,eAAM,CAACC,EAAE,CAACL,GAAGnB,OAAO,EAAE,UAAU;YAClCO,KAAIkB,IAAI,CACN,CAAC,yHAAyH,EAAEN,GAAGnB,OAAO,EAAE;QAE5I;QAEA,+DAA+D;QAC/D,MAAM0B,IAAAA,sDAA0B,EAC9BP,IACAzB,sBACAI,OAAO6B,cAAc,EACrBpC,WACAN,SACAO;QAEF,qEAAqE;QACrE,kBAAkB;QAClB,MAAMoC,IAAAA,kDAAwB,EAAC;YAC7BC,SAAS7C;YACTC;YACA6C,qBAAqB,CAACxC;YACtBE;YACAD;QACF;QAEA,IAAIwC;QACJ,IAAI1C,oBAAoB;YACtB,MAAM,EAAE2C,YAAY,EAAE,GACpBV,QAAQ;YAEV,yEAAyE;YACzES,SAAS,MAAMC,aACbb,IACAnC,KACAC,SACAS,sBACAR,UACAK;QAEJ;QACA,OAAO;YAAEwC;YAAQ/B,SAASmB,GAAGnB,OAAO;QAAC;IACvC,EAAE,OAAOa,KAAK;QACZ,+DAA+D;QAC/D,IAAIA,eAAeoB,0BAAY,EAAE;YAC/B3B,QAAQQ,KAAK,CAACoB,IAAAA,eAAG,EAAC;YAClB5B,QAAQQ,KAAK,CAACD,IAAIsB,OAAO;YACzBC,QAAQC,IAAI,CAAC;QACf;QAEA;;;;KAIC,GAED,mEAAmE;QACnE,IAAID,QAAQE,GAAG,CAACC,cAAc,EAAE;YAC9B,IAAI1B,eAAe2B,OAAO;gBACxBlC,QAAQQ,KAAK,CAACD,IAAIsB,OAAO;YAC3B,OAAO;gBACL7B,QAAQQ,KAAK,CAACD;YAChB;YACAuB,QAAQC,IAAI,CAAC;QACf;QACA,kFAAkF;QAClF,MAAMxB;IACR;AACF","ignoreList":[0]}

package/dist/server/config-shared.d.ts

@@ -14,7 +14,7 @@ import type { AdapterOutputType } from '../shared/lib/constants';
 import type { MiddlewareMatcher } from '../build/analysis/get-page-static-info';
 export type NextConfigComplete = Required<NextConfig> & {
     images: Required<ImageConfigComplete>;
-    typescript: Required<TypeScriptConfig>;
+    typescript: TypeScriptConfig;
     configOrigin?: string;
     configFile?: string;
     configFileName: string;
@@ -1168,7 +1168,7 @@ export declare const defaultConfig: Readonly<{
     };
     typescript: {
         ignoreBuildErrors: false;
-        tsconfigPath: string;
+        tsconfigPath: undefined;
     };
     typedRoutes: false;
     distDir: string;

package/dist/server/config-shared.js

@@ -37,7 +37,7 @@ const defaultConfig = Object.freeze({
     },
     typescript: {
         ignoreBuildErrors: false,
-        tsconfigPath: 'tsconfig.json'
+        tsconfigPath: undefined
     },
     typedRoutes: false,
     distDir: '.next',