gsd-pi 2.67.0-dev.43b0159 → 2.67.0-dev.a5b1d8f

package/dist/web/standalone/node_modules/next/dist/lib/typescript/writeConfigurationDefaults.js

@@ -27,7 +27,6 @@ const _semver = /*#__PURE__*/ _interop_require_default(require("next/dist/compil
 const _os = /*#__PURE__*/ _interop_require_default(require("os"));
 const _typepaths = require("./type-paths");
 const _log = /*#__PURE__*/ _interop_require_wildcard(require("../../build/output/log"));
-const _configshared = require("../../server/config-shared");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -75,7 +74,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 function getDesiredCompilerOptions(typescriptVersion, userTsConfig) {
-    var _userTsConfig_compilerOptions_module, _userTsConfig_compilerOptions, _userTsConfig_compilerOptions1;
+    var _userTsConfig_compilerOptions, _userTsConfig_compilerOptions_module, _userTsConfig_compilerOptions1, _userTsConfig_compilerOptions2;
     // ModuleKind
     const moduleKindESNext = 'esnext';
     const moduleKindES2020 = 'es2020';
@@ -86,9 +85,12 @@ function getDesiredCompilerOptions(typescriptVersion, userTsConfig) {
     const moduleKindAMD = 'amd';
     // ModuleResolutionKind
     const moduleResolutionKindBundler = 'bundler';
-    const moduleResolutionKindNode10 = 'node10';
+    const moduleResolutionKindNode16 = 'node16';
+    const moduleResolutionKindNodeNext = 'nodenext';
     const moduleResolutionKindNode12 = 'node12';
-    const moduleResolutionKindNodeJs = 'node';
+    const moduleResolutionKindNode = 'node';
+    const configuredModule = typeof (userTsConfig == null ? void 0 : (_userTsConfig_compilerOptions = userTsConfig.compilerOptions) == null ? void 0 : _userTsConfig_compilerOptions.module) === 'string' ? userTsConfig.compilerOptions.module.toLowerCase() : undefined;
+    const preferBundlerResolution = _semver.default.gte(typescriptVersion, '5.0.0') && configuredModule !== moduleKindCommonJS && configuredModule !== moduleKindAMD;
     // Jsx
     const jsxEmitReactJSX = 'react-jsx';
     return {
@@ -139,35 +141,35 @@ function getDesiredCompilerOptions(typescriptVersion, userTsConfig) {
             reason: 'for dynamic import() support'
         },
         // TODO: Semver check not needed once Next.js repo uses 5.4.
-        ..._semver.default.gte(typescriptVersion, '5.4.0') && (userTsConfig == null ? void 0 : (_userTsConfig_compilerOptions = userTsConfig.compilerOptions) == null ? void 0 : (_userTsConfig_compilerOptions_module = _userTsConfig_compilerOptions.module) == null ? void 0 : _userTsConfig_compilerOptions_module.toLowerCase()) === moduleKindPreserve ? {
+        ..._semver.default.gte(typescriptVersion, '5.4.0') && (userTsConfig == null ? void 0 : (_userTsConfig_compilerOptions1 = userTsConfig.compilerOptions) == null ? void 0 : (_userTsConfig_compilerOptions_module = _userTsConfig_compilerOptions1.module) == null ? void 0 : _userTsConfig_compilerOptions_module.toLowerCase()) === moduleKindPreserve ? {
         } : {
             esModuleInterop: {
                 value: true,
                 reason: 'requirement for SWC / babel'
             },
             moduleResolution: {
-                // In TypeScript 5.0, `NodeJs` has renamed to `Node10`
-                parsedValue: moduleResolutionKindBundler,
+                parsedValue: preferBundlerResolution ? moduleResolutionKindBundler : moduleResolutionKindNode,
                 // All of these values work:
-                parsedValues: [
-                    moduleResolutionKindNode10,
-                    moduleResolutionKindNodeJs,
-                    // only newer TypeScript versions have this field, it
-                    // will be filtered for new versions of TypeScript
-                    moduleResolutionKindNode12,
-                    moduleKindNode16,
-                    moduleKindNodeNext,
+                parsedValues: preferBundlerResolution ? [
+                    moduleResolutionKindNode16,
+                    moduleResolutionKindNodeNext,
                     moduleResolutionKindBundler
-                ].filter((val)=>typeof val !== 'undefined'),
-                value: 'node',
-                reason: 'to match webpack resolution'
+                ] : [
+                    moduleResolutionKindNode,
+                    // only older TypeScript versions have this field
+                    moduleResolutionKindNode12,
+                    moduleResolutionKindNode16,
+                    moduleResolutionKindNodeNext
+                ],
+                value: preferBundlerResolution ? moduleResolutionKindBundler : moduleResolutionKindNode,
+                reason: preferBundlerResolution ? 'to match modern bundler resolution' : 'to match webpack resolution'
             },
             resolveJsonModule: {
                 value: true,
                 reason: 'to match webpack resolution'
             }
         },
-        ...(userTsConfig == null ? void 0 : (_userTsConfig_compilerOptions1 = userTsConfig.compilerOptions) == null ? void 0 : _userTsConfig_compilerOptions1.verbatimModuleSyntax) === true ? undefined : {
+        ...(userTsConfig == null ? void 0 : (_userTsConfig_compilerOptions2 = userTsConfig.compilerOptions) == null ? void 0 : _userTsConfig_compilerOptions2.verbatimModuleSyntax) === true ? undefined : {
             isolatedModules: {
                 value: true,
                 reason: 'requirement for SWC / Babel'
@@ -207,9 +209,10 @@ function getRequiredConfiguration(typescript) {
         } else if (optionKey === 'moduleResolution' && typeof value === 'string') {
             const moduleResolutionMap = {
                 bundler: typescript.ModuleResolutionKind.Bundler,
-                node10: typescript.ModuleResolutionKind.Node10,
+                node16: typescript.ModuleResolutionKind.Node16,
+                nodenext: typescript.ModuleResolutionKind.NodeNext,
                 node12: typescript.ModuleResolutionKind.Node12,
-                node: typescript.ModuleResolutionKind.NodeJs
+                node: typescript.ModuleResolutionKind.Node10 ?? typescript.ModuleResolutionKind.NodeJs
             };
             res[optionKey] = moduleResolutionMap[value.toLowerCase()] ?? value;
         } else if (optionKey === 'jsx' && typeof value === 'string') {
@@ -224,14 +227,12 @@ function getRequiredConfiguration(typescript) {
     return res;
 }
 const localDevTestFilesExcludeAction = 'NEXT_PRIVATE_LOCAL_DEV_TEST_FILES_EXCLUDE';
-async function writeConfigurationDefaults(typescriptVersion, tsConfigPath, isFirstTimeSetup, hasAppDir, distDir, hasPagesDir, isolatedDevBuild) {
+async function writeConfigurationDefaults(typescriptVersion, tsConfigPath, isFirstTimeSetup, hasAppDir, distDir, hasPagesDir, strictRouteTypes) {
     var _userTsConfig_compilerOptions;
     if (isFirstTimeSetup) {
         (0, _fs.writeFileSync)(tsConfigPath, '{}' + _os.default.EOL);
     }
-    const userTsConfigContent = (0, _fs.readFileSync)(tsConfigPath, {
-        encoding: 'utf8'
-    });
+    const userTsConfigContent = (0, _fs.readFileSync)(tsConfigPath, 'utf8');
     const userTsConfig = _commentjson.parse(userTsConfigContent);
     // Bail automatic setup when the user has extended or referenced another config
     if ('extends' in userTsConfig || 'references' in userTsConfig) {
@@ -280,14 +281,13 @@ async function writeConfigurationDefaults(typescriptVersion, tsConfigPath, isFir
             const _ = check;
         }
     }
-    const resolvedIsolatedDevBuild = isolatedDevBuild === undefined ? _configshared.defaultConfig.experimental.isolatedDevBuild : isolatedDevBuild;
     // Get type definition glob patterns using shared utility to ensure consistency
     // with other TypeScript infrastructure (e.g., runTypeCheck.ts)
-    const nextAppTypes = (0, _typepaths.getTypeDefinitionGlobPatterns)(distDir, resolvedIsolatedDevBuild);
+    const nextTypes = (0, _typepaths.getTypeDefinitionGlobPatterns)(distDir);
     if (!('include' in userTsConfig)) {
-        userTsConfig.include = hasAppDir ? [
+        const defaultInclude = hasAppDir && !strictRouteTypes ? [
             'next-env.d.ts',
-            ...nextAppTypes,
+            ...nextTypes,
             '**/*.mts',
             '**/*.ts',
             '**/*.tsx'
@@ -297,10 +297,11 @@ async function writeConfigurationDefaults(typescriptVersion, tsConfigPath, isFir
             '**/*.ts',
             '**/*.tsx'
         ];
-        suggestedActions.push((0, _picocolors.cyan)('include') + ' was set to ' + (0, _picocolors.bold)(hasAppDir ? `['next-env.d.ts', ${nextAppTypes.map((type)=>`'${type}'`).join(', ')}, '**/*.mts', '**/*.ts', '**/*.tsx']` : `['next-env.d.ts', '**/*.mts', '**/*.ts', '**/*.tsx']`));
-    } else if (hasAppDir) {
+        userTsConfig.include = defaultInclude;
+        suggestedActions.push((0, _picocolors.cyan)('include') + ' was set to [' + (0, _picocolors.bold)(defaultInclude.map((type)=>`'${type}'`).join(', ')) + ']');
+    } else if (hasAppDir && !strictRouteTypes) {
         const missingFromResolved = [];
-        for (const type of nextAppTypes){
+        for (const type of nextTypes){
             if (!userTsConfig.include.includes(type)) {
                 missingFromResolved.push(type);
             }

package/dist/web/standalone/node_modules/next/dist/lib/verify-typescript-setup.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "verifyTypeScriptSetup", {
+Object.defineProperty(exports, "verifyAndRunTypeScript", {
     enumerable: true,
     get: function() {
-        return verifyTypeScriptSetup;
+        return verifyAndRunTypeScript;
     }
 });
 const _picocolors = require("./picocolors");
@@ -20,6 +20,7 @@ const _writeConfigurationDefaults = require("./typescript/writeConfigurationDefa
 const _installdependencies = require("./install-dependencies");
 const _ciinfo = require("../server/ci-info");
 const _missingDependencyError = require("./typescript/missingDependencyError");
+const _resolvefrom = require("./resolve-from");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -66,12 +67,13 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+const typescriptPackage = {
+    file: 'typescript/lib/typescript.js',
+    pkg: 'typescript',
+    exportsRestrict: true
+};
 const requiredPackages = [
-    {
-        file: 'typescript/lib/typescript.js',
-        pkg: 'typescript',
-        exportsRestrict: true
-    },
+    typescriptPackage,
     {
         file: '@types/react/index.d.ts',
         pkg: '@types/react',
@@ -83,7 +85,19 @@ const requiredPackages = [
         exportsRestrict: true
     }
 ];
-async function verifyTypeScriptSetup({ dir, distDir, cacheDir, tsconfigPath, typeCheckPreflight, disableStaticImages, hasAppDir, hasPagesDir, isolatedDevBuild, appDir, pagesDir, debugBuildPaths }) {
+/**
+ * Check if @typescript/native-preview is installed as an alternative TypeScript compiler.
+ * This is a Go-based native TypeScript compiler that can be used instead of the standard
+ * TypeScript package for faster compilation.
+ */ function hasNativeTypeScriptPreview(dir) {
+    try {
+        (0, _resolvefrom.resolveFrom)(dir, '@typescript/native-preview/package.json');
+        return true;
+    } catch  {
+        return false;
+    }
+}
+async function verifyAndRunTypeScript({ dir, distDir, cacheDir, strictRouteTypes, tsconfigPath, shouldRunTypeCheck, typedRoutes, disableStaticImages, hasAppDir, hasPagesDir, appDir, pagesDir, debugBuildPaths }) {
     const tsConfigFileName = tsconfigPath || 'tsconfig.json';
     const resolvedTsConfigPath = _path.default.join(dir, tsConfigFileName);
     // Construct intentDirs from appDir and pagesDir for getTypeScriptIntent
@@ -92,7 +106,7 @@ async function verifyTypeScriptSetup({ dir, distDir, cacheDir, tsconfigPath, typ
         appDir
     ].filter(Boolean);
     try {
-        var _deps_missing;
+        var _deps_missing, _deps_missing1;
         // Check if the project uses TypeScript:
         const intent = await (0, _getTypeScriptIntent.getTypeScriptIntent)(dir, intentDirs, tsConfigFileName);
         if (!intent) {
@@ -100,9 +114,40 @@ async function verifyTypeScriptSetup({ dir, distDir, cacheDir, tsconfigPath, typ
                 version: null
             };
         }
+        // Check if @typescript/native-preview is installed as an alternative
+        const hasNativePreview = hasNativeTypeScriptPreview(dir);
         // Ensure TypeScript and necessary `@types/*` are installed:
         let deps = (0, _hasnecessarydependencies.hasNecessaryDependencies)(dir, requiredPackages);
-        if (((_deps_missing = deps.missing) == null ? void 0 : _deps_missing.length) > 0) {
+        // If @typescript/native-preview is installed and only the typescript package is missing,
+        // we can skip auto-installing typescript since the native preview provides TS compilation.
+        // However, we still need @types/react and @types/node for type checking.
+        if (hasNativePreview && ((_deps_missing = deps.missing) == null ? void 0 : _deps_missing.length) > 0) {
+            const missingWithoutTypescript = deps.missing.filter((dep)=>dep.pkg !== 'typescript');
+            const onlyTypescriptMissing = deps.missing.length === 1 && deps.missing[0].pkg === 'typescript';
+            if (onlyTypescriptMissing) {
+                // @typescript/native-preview is installed and only typescript is missing
+                // Skip installation and return early - the project can use the native preview
+                _log.info(`Detected ${(0, _picocolors.bold)('@typescript/native-preview')} as TypeScript compiler. ` + `Some Next.js TypeScript features (like type checking during build) require the standard ${(0, _picocolors.bold)('typescript')} package.`);
+                // Still write type declarations since they don't require the typescript package
+                await (0, _writeAppTypeDeclarations.writeAppTypeDeclarations)({
+                    baseDir: dir,
+                    distDir,
+                    imageImportsEnabled: !disableStaticImages,
+                    hasPagesDir,
+                    hasAppDir,
+                    strictRouteTypes,
+                    typedRoutes
+                });
+                return {
+                    version: null
+                };
+            }
+            // If there are other missing deps besides typescript, only install those
+            if (missingWithoutTypescript.length > 0 && missingWithoutTypescript.length < deps.missing.length) {
+                deps.missing = missingWithoutTypescript;
+            }
+        }
+        if (((_deps_missing1 = deps.missing) == null ? void 0 : _deps_missing1.length) > 0) {
             if (_ciinfo.isCI) {
                 // we don't attempt auto install in CI to avoid side-effects
                 // and instead log the error for installing needed packages
@@ -125,7 +170,7 @@ async function verifyTypeScriptSetup({ dir, distDir, cacheDir, tsconfigPath, typ
             _log.warn(`Minimum recommended TypeScript version is v5.1.0, older versions can potentially be incompatible with Next.js. Detected: ${typescriptVersion}`);
         }
         // Reconfigure (or create) the user's `tsconfig.json` for them:
-        await (0, _writeConfigurationDefaults.writeConfigurationDefaults)(typescriptVersion, resolvedTsConfigPath, intent.firstTimeSetup, hasAppDir, distDir, hasPagesDir, isolatedDevBuild);
+        await (0, _writeConfigurationDefaults.writeConfigurationDefaults)(typescriptVersion, resolvedTsConfigPath, intent.firstTimeSetup, hasAppDir, distDir, hasPagesDir, strictRouteTypes);
         // Write out the necessary `next-env.d.ts` file to correctly register
         // Next.js' types:
         await (0, _writeAppTypeDeclarations.writeAppTypeDeclarations)({
@@ -133,15 +178,20 @@ async function verifyTypeScriptSetup({ dir, distDir, cacheDir, tsconfigPath, typ
             distDir,
             imageImportsEnabled: !disableStaticImages,
             hasPagesDir,
-            hasAppDir
+            hasAppDir,
+            strictRouteTypes,
+            typedRoutes
         });
         let result;
-        if (typeCheckPreflight) {
+        if (shouldRunTypeCheck) {
             const { runTypeCheck } = require('./typescript/runTypeCheck');
+            // Install native bindings so that code frame rendering works in the worker
+            const { installBindings } = require('../build/swc/install-bindings');
+            await installBindings();
             const tsPath = deps.resolved.get('typescript');
             const typescript = await Promise.resolve(require(tsPath));
             // Verify the project passes type-checking before we go to webpack phase:
-            result = await runTypeCheck(typescript, dir, distDir, resolvedTsConfigPath, cacheDir, hasAppDir, isolatedDevBuild, {
+            result = await runTypeCheck(typescript, dir, distDir, resolvedTsConfigPath, cacheDir, hasAppDir, {
                 app: appDir,
                 pages: pagesDir
             }, debugBuildPaths);
@@ -153,12 +203,12 @@ async function verifyTypeScriptSetup({ dir, distDir, cacheDir, tsconfigPath, typ
     } catch (err) {
         // These are special errors that should not show a stack trace:
         if (err instanceof _compileerror.CompileError) {
-            console.error((0, _picocolors.red)('Failed to compile.\n'));
+            console.error((0, _picocolors.red)('Failed to type check.\n'));
             console.error(err.message);
             process.exit(1);
         }
         /**
-     * verifyTypeScriptSetup can be either invoked directly in the main thread (during next dev / next lint)
+     * verifyAndRunTypeScript can be either invoked directly in the main thread (during next dev / next lint)
      * or run in a worker (during next build). In the latter case, we need to print the error message, as the
      * parent process will only receive an `Jest worker encountered 1 child process exceptions, exceeding retry limit`.
      */ // we are in a worker, print the error message and exit the process

package/dist/web/standalone/node_modules/next/dist/next-devtools/server/shared.js

@@ -20,9 +20,7 @@ _export(exports, {
         return ignoreListAnonymousStackFramesIfSandwiched;
     }
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _codeframe = require("next/dist/compiled/babel/code-frame");
-const _isinternal = /*#__PURE__*/ _interop_require_default._(require("../../shared/lib/is-internal"));
+const _codeframe = require("../../shared/lib/errors/code-frame");
 const _sourcemaps = require("../../server/lib/source-maps");
 function ignoreListAnonymousStackFramesIfSandwiched(responses) {
     (0, _sourcemaps.ignoreListAnonymousStackFramesIfSandwiched)(responses, (response)=>{
@@ -37,19 +35,17 @@ function ignoreListAnonymousStackFramesIfSandwiched(responses) {
     });
 }
 function getOriginalCodeFrame(frame, source, colors = process.stdout.isTTY) {
-    if (!source || (0, _isinternal.default)(frame.file)) {
+    if (!source || frame.line1 == null) {
         return null;
     }
     return (0, _codeframe.codeFrameColumns)(source, {
         start: {
-            // 1-based, but -1 means start line without highlighting
-            line: frame.line1 ?? -1,
-            // 1-based, but 0 means whole line without column highlighting
-            column: frame.column1 ?? 0
+            line: frame.line1,
+            column: frame.column1 ?? undefined
         }
     }, {
-        forceColor: colors
-    });
+        color: colors
+    }) ?? null;
 }
 
 if ((typeof exports.default === 'function' || (typeof exports.default === 'object' && exports.default !== null)) && typeof exports.default.__esModule === 'undefined') {

package/dist/web/standalone/node_modules/next/dist/next-devtools/shared/webpack-module-path.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 0 && (module.exports = {
-    formatFrameSourceFile: null,
+    formatStackFrameFile: null,
     isWebpackInternalResource: null
 });
 function _export(target, all) {
@@ -13,8 +13,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    formatFrameSourceFile: function() {
-        return formatFrameSourceFile;
+    formatStackFrameFile: function() {
+        return formatStackFrameFile;
     },
     isWebpackInternalResource: function() {
         return isWebpackInternalResource;
@@ -31,7 +31,7 @@ function isWebpackInternalResource(file) {
     }
     return false;
 }
-function formatFrameSourceFile(file) {
+function formatStackFrameFile(file) {
     for (const regex of replacementRegExes){
         file = file.replace(regex, '');
     }

package/dist/web/standalone/node_modules/next/dist/next-devtools/userspace/app/app-dev-overlay-error-boundary.js

@@ -9,14 +9,16 @@ Object.defineProperty(exports, "AppDevOverlayErrorBoundary", {
     }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _jsxruntime = require("react/jsx-runtime");
-const _react = require("react");
+const _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 const _nextdevtools = require("next/dist/compiled/next-devtools");
 const _runtimeerrorhandler = require("../../../client/dev/runtime-error-handler");
 const _errorboundary = require("../../../client/components/error-boundary");
 const _globalerror = /*#__PURE__*/ _interop_require_default._(require("../../../client/components/builtin/global-error"));
 const _segmentexplorernode = require("./segment-explorer-node");
-function ErroredHtml({ globalError: [GlobalError, globalErrorStyles], error }) {
+const _approutercontextsharedruntime = require("../../../shared/lib/app-router-context.shared-runtime");
+function ErroredHtml({ globalError: [GlobalError, globalErrorStyles], error, reset, unstable_retry }) {
     if (!error) {
         return /*#__PURE__*/ (0, _jsxruntime.jsxs)("html", {
             children: [
@@ -30,12 +32,17 @@ function ErroredHtml({ globalError: [GlobalError, globalErrorStyles], error }) {
         children: [
             globalErrorStyles,
             /*#__PURE__*/ (0, _jsxruntime.jsx)(GlobalError, {
-                error: error
+                error: error,
+                reset: reset,
+                unstable_retry: unstable_retry
             })
         ]
     });
 }
 class AppDevOverlayErrorBoundary extends _react.PureComponent {
+    static{
+        this.contextType = _approutercontextsharedruntime.AppRouterContext;
+    }
     static getDerivedStateFromError(error) {
         _runtimeerrorhandler.RuntimeErrorHandler.hadRuntimeError = true;
         return {
@@ -53,13 +60,24 @@ class AppDevOverlayErrorBoundary extends _react.PureComponent {
         const { reactError } = this.state;
         const fallback = /*#__PURE__*/ (0, _jsxruntime.jsx)(ErroredHtml, {
             globalError: globalError,
-            error: reactError
+            error: reactError,
+            reset: this.reset,
+            unstable_retry: this.unstable_retry
         });
         return reactError !== null ? fallback : children;
     }
     constructor(...args){
         super(...args), this.state = {
             reactError: null
+        }, this.unstable_retry = ()=>{
+            (0, _react.startTransition)(()=>{
+                this.context?.refresh();
+                this.reset();
+            });
+        }, this.reset = ()=>{
+            this.setState({
+                reactError: null
+            });
         };
     }
 }

package/dist/web/standalone/node_modules/next/dist/next-devtools/userspace/app/errors/stitched-error.js

@@ -52,7 +52,13 @@ function coerceError(value) {
 function setOwnerStackIfAvailable(error) {
     // React 18 and prod does not have `captureOwnerStack`
     if ('captureOwnerStack' in _react.default) {
-        setOwnerStack(error, _react.default.captureOwnerStack());
+        const ownerStack = _react.default.captureOwnerStack();
+        // Only set if we captured a valid owner stack, or if none exists yet.
+        // This prevents overwriting a valid owner stack captured earlier
+        // (e.g., in onRecoverableError) with null captured later.
+        if (ownerStack || !ownerStacks.has(error)) {
+            setOwnerStack(error, ownerStack);
+        }
     }
 }
 function decorateDevError(thrownValue) {

package/dist/web/standalone/node_modules/next/dist/next-devtools/userspace/app/forward-logs.js

@@ -32,11 +32,11 @@ _export(exports, {
         return logUnhandledRejection;
     }
 });
-const _stitchederror = require("./errors/stitched-error");
 const _errorsource = require("../../../shared/lib/error-source");
 const _terminalloggingconfig = require("./terminal-logging-config");
 const _forwardlogsshared = require("../../shared/forward-logs-shared");
 const _forwardlogsutils = require("./forward-logs-utils");
+const _stitchederror = require("./errors/stitched-error");
 // Client-side file logger for browser logs
 class ClientFileLogger {
     formatTimestamp() {
@@ -289,11 +289,10 @@ const stringifyUserArg = (arg)=>{
     };
 };
 const createErrorArg = (error)=>{
-    const stack = stackWithOwners(error);
     return {
         kind: 'formatted-error-arg',
         prefix: error.message ? `${error.name}: ${error.message}` : `${error.name}`,
-        stack
+        stack: getErrorStackWithOwnerStack(error)
     };
 };
 const createLogEntry = (level, args)=>{
@@ -305,7 +304,7 @@ const createLogEntry = (level, args)=>{
     }
     // do not abstract this, it implicitly relies on which functions call it. forcing the inlined implementation makes you think about callers
     // error capture stack trace maybe
-    const stack = stackWithOwners(new Error());
+    const stack = getErrorStack(new Error());
     const stackLines = stack?.split('\n');
     const cleanStack = stackLines?.slice(3).join('\n') // this is probably ignored anyways
     ;
@@ -326,6 +325,10 @@ const createLogEntry = (level, args)=>{
     logQueue.scheduleLogSend(entry);
 };
 const forwardErrorLog = (args)=>{
+    // Skip React server replayed logs - they were already logged on the server
+    if (isReactServerReplayedLog(args)) {
+        return;
+    }
     // Always log to client file logger with args (formatting done inside log method)
     clientFileLogger.log('error', args);
     // Only forward to terminal if enabled
@@ -344,7 +347,7 @@ const forwardErrorLog = (args)=>{
    * browser shows stack regardless of type of data passed to console.error, so we should do the same
    *
    * do not abstract this, it implicitly relies on which functions call it. forcing the inlined implementation makes you think about callers
-   */ const stack = stackWithOwners(new Error());
+   */ const stack = getErrorStack(new Error());
     const stackLines = stack?.split('\n');
     const cleanStack = stackLines?.slice(3).join('\n');
     const entry = {
@@ -372,12 +375,14 @@ const createUncaughtErrorEntry = (errorName, errorMessage, fullStack)=>{
     };
     logQueue.scheduleLogSend(entry);
 };
-const stackWithOwners = (error)=>{
-    let ownerStack = '';
-    (0, _stitchederror.setOwnerStackIfAvailable)(error);
-    ownerStack = (0, _stitchederror.getOwnerStack)(error) || '';
-    const stack = (error.stack || '') + ownerStack;
-    return stack;
+const getErrorStack = (error)=>{
+    return error.stack || '';
+};
+// Get error stack with owner stack appended for source mapping on the server
+const getErrorStackWithOwnerStack = (error)=>{
+    const errorStack = getErrorStack(error);
+    const ownerStack = (0, _stitchederror.getOwnerStack)(error);
+    return ownerStack ? `${errorStack}\n${ownerStack}` : errorStack;
 };
 function logUnhandledRejection(reason) {
     // Always log to client file logger
@@ -390,7 +395,7 @@ function logUnhandledRejection(reason) {
         return;
     }
     if (reason instanceof Error) {
-        createUnhandledRejectionErrorEntry(reason, stackWithOwners(reason));
+        createUnhandledRejectionErrorEntry(reason, getErrorStackWithOwnerStack(reason));
         return;
     }
     createUnhandledRejectionNonErrorEntry(reason);
@@ -462,7 +467,7 @@ function forwardUnhandledError(error) {
     if (!isTerminalLoggingEnabled) {
         return;
     }
-    createUncaughtErrorEntry(error.name, error.message, stackWithOwners(error));
+    createUncaughtErrorEntry(error.name, error.message, getErrorStackWithOwnerStack(error));
 }
 const initializeDebugLogForwarding = (router)=>{
     // probably don't need this

package/dist/web/standalone/node_modules/next/dist/next-devtools/userspace/app/segment-explorer-node.js

@@ -40,6 +40,7 @@ _export(exports, {
 const _jsxruntime = require("react/jsx-runtime");
 const _react = require("react");
 const _nextdevtools = require("next/dist/compiled/next-devtools");
+const _approutercontextsharedruntime = require("../../../shared/lib/app-router-context.shared-runtime");
 const _notfound = require("../../../client/components/not-found");
 const SEGMENT_EXPLORER_SIMULATED_ERROR_MESSAGE = 'NEXT_DEVTOOLS_SIMULATED_ERROR';
 function SegmentTrieNode({ type, pagePath }) {
@@ -74,7 +75,7 @@ function NotFoundSegmentNode() {
 }
 function ErrorSegmentNode() {
     throw Object.defineProperty(new Error(SEGMENT_EXPLORER_SIMULATED_ERROR_MESSAGE), "__NEXT_ERROR_CODE", {
-        value: "E394",
+        value: "E716",
         enumerable: false,
         configurable: true
     });
@@ -85,13 +86,15 @@ function LoadingSegmentNode() {
     return null;
 }
 function SegmentViewStateNode({ page }) {
+    const { tree } = (0, _react.useContext)(_approutercontextsharedruntime.GlobalLayoutRouterContext);
     (0, _react.useLayoutEffect)(()=>{
-        _nextdevtools.dispatcher.segmentExplorerUpdateRouteState(page);
+        _nextdevtools.dispatcher.segmentExplorerUpdateRouteState(page, tree);
         return ()=>{
-            _nextdevtools.dispatcher.segmentExplorerUpdateRouteState('');
+            _nextdevtools.dispatcher.segmentExplorerUpdateRouteState('', null);
         };
     }, [
-        page
+        page,
+        tree
     ]);
     return null;
 }