@evoscientist/webui 0.2.5 → 0.2.6

package/dist/node_modules/next/dist/build/swc/index.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", {
     getBindingsSync: null,
     getModuleNamedExports: null,
     getSupportedArchTriples: null,
+    getTurbopackCacheVersion: null,
     initCustomTraceSubscriber: null,
     isReactCompilerRequired: null,
     loadBindings: null,
@@ -45,6 +46,9 @@ _export(exports, {
     getSupportedArchTriples: function() {
         return getSupportedArchTriples;
     },
+    getTurbopackCacheVersion: function() {
+        return getTurbopackCacheVersion;
+    },
     initCustomTraceSubscriber: function() {
         return initCustomTraceSubscriber;
     },
@@ -78,6 +82,7 @@ _export(exports, {
 });
 const _path = /*#__PURE__*/ _interop_require_default(require("path"));
 const _url = require("url");
+const _formatdynamicimportpath = require("../../lib/format-dynamic-import-path");
 const _os = require("os");
 const _triples = require("next/dist/compiled/@napi-rs/triples");
 const _log = /*#__PURE__*/ _interop_require_wildcard(require("../output/log"));
@@ -134,7 +139,7 @@ var HmrTarget = /*#__PURE__*/ function(HmrTarget) {
     HmrTarget["Server"] = "server";
     return HmrTarget;
 }({});
-const nextVersion = "16.2.6";
+const nextVersion = "16.3.3";
 const ArchName = (0, _os.arch)();
 const PlatformName = (0, _os.platform)();
 function infoLog(...args) {
@@ -269,11 +274,6 @@ async function loadBindings(useWasmBinary = false) {
         process.stderr._handle.setBlocking == null ? void 0 : process.stderr._handle.setBlocking.call(process.stderr._handle, true);
     }
     pendingBindings = new Promise(async (resolve, reject)=>{
-        if (!lockfilePatchPromise.cur) {
-            // always run lockfile check once so that it gets patched
-            // even if it doesn't fail to load locally
-            lockfilePatchPromise.cur = require('../../lib/patch-incorrect-lockfile').patchIncorrectLockfile(process.cwd()).catch(console.error);
-        }
         let attempts = [];
         const disableWasmFallback = process.env.NEXT_DISABLE_SWC_WASM;
         const unsupportedPlatform = triples.some((triple)=>!!(triple == null ? void 0 : triple.raw) && knownDefaultWasmFallbackTriples.includes(triple.raw));
@@ -414,7 +414,10 @@ let loggingLoadFailure = false;
         wasm: triedWasm ? 'failed' : undefined,
         nativeBindingsErrorCode: lastNativeBindingsLoadErrorCode
     });
-    await (lockfilePatchPromise.cur || Promise.resolve());
+    if (!lockfilePatchPromise.cur) {
+        lockfilePatchPromise.cur = require('../../lib/patch-incorrect-lockfile').patchIncorrectLockfile(process.cwd()).catch(console.error);
+    }
+    await lockfilePatchPromise.cur;
     _log.error(`Failed to load SWC binary for ${PlatformName}/${ArchName}, see more info here: https://nextjs.org/docs/messages/failed-loading-swc`);
 }
 function createDefineEnv({ isTurbopack, clientRouterFilters, config, dev, distDir, projectPath, fetchCacheKeyPrefix, hasRewrites, middlewareMatchers, rewrites }) {
@@ -565,17 +568,23 @@ function bindingToApi(binding, bindingPath, _wasm) {
             const napiResult = await binding.projectWriteAnalyzeData(this._nativeProject, appDirOnly);
             return napiResult;
         }
+        async getAllCompilationIssues() {
+            const napiResult = await binding.projectGetAllCompilationIssues(this._nativeProject);
+            return napiResult;
+        }
         async writeAllEntrypointsToDisk(appDirOnly) {
             const napiEndpoints = await binding.projectWriteAllEntrypointsToDisk(this._nativeProject, appDirOnly);
             if ('routes' in napiEndpoints) {
                 return napiEntrypointsToRawEntrypoints(napiEndpoints);
             } else {
                 return {
-                    issues: napiEndpoints.issues,
-                    diagnostics: napiEndpoints.diagnostics
+                    issues: napiEndpoints.issues
                 };
             }
         }
+        async featureUsage() {
+            return await binding.projectFeatureUsage(this._nativeProject);
+        }
         entrypointsSubscribe() {
             const subscription = subscribe(false, async (callback)=>binding.projectEntrypointsSubscribe(this._nativeProject, callback));
             return async function*() {
@@ -584,13 +593,17 @@ function bindingToApi(binding, bindingPath, _wasm) {
                         yield napiEntrypointsToRawEntrypoints(entrypoints);
                     } else {
                         yield {
-                            issues: entrypoints.issues,
-                            diagnostics: entrypoints.diagnostics
+                            issues: entrypoints.issues
                         };
                     }
                 }
             }();
         }
+        // Note: only the Server target is implemented in the native binding;
+        // add a Client overload once `all_hmr_update` supports it.
+        allHmrEvents(target) {
+            return subscribe(true, async (callback)=>binding.projectAllHmrEvents(this._nativeProject, target, callback));
+        }
         hmrEvents(chunkName, target) {
             return subscribe(true, async (callback)=>binding.projectHmrEvents(this._nativeProject, chunkName, target, callback));
         }
@@ -650,6 +663,7 @@ function bindingToApi(binding, bindingPath, _wasm) {
         }
     }
     async function serializeNextConfig(nextConfig, projectPath) {
+        var _nextConfigSerializable_experimental;
         // Avoid mutating the existing `nextConfig` object. NOTE: This is only a shallow clone.
         let nextConfigSerializable = {
             ...nextConfig
@@ -679,13 +693,17 @@ function bindingToApi(binding, bindingPath, _wasm) {
         }
         // cacheHandler can be an absolute path, we need it to be relative for turbopack.
         if (nextConfigSerializable.cacheHandler) {
-            nextConfigSerializable.cacheHandler = './' + normalizePathOnWindows(_path.default.isAbsolute(nextConfigSerializable.cacheHandler) ? _path.default.relative(projectPath, nextConfigSerializable.cacheHandler) : nextConfigSerializable.cacheHandler);
+            const resolvedCacheHandler = (0, _formatdynamicimportpath.resolveCacheHandlerPathToFilesystem)(nextConfigSerializable.cacheHandler);
+            nextConfigSerializable.cacheHandler = './' + normalizePathOnWindows(_path.default.isAbsolute(resolvedCacheHandler) ? _path.default.relative(projectPath, resolvedCacheHandler) : resolvedCacheHandler);
         }
         if (nextConfigSerializable.cacheHandlers) {
-            nextConfigSerializable.cacheHandlers = Object.fromEntries(Object.entries(nextConfigSerializable.cacheHandlers).filter(([_, value])=>value != null).map(([key, value])=>[
+            nextConfigSerializable.cacheHandlers = Object.fromEntries(Object.entries(nextConfigSerializable.cacheHandlers).filter(([_, value])=>value != null).map(([key, value])=>{
+                const resolved = (0, _formatdynamicimportpath.resolveCacheHandlerPathToFilesystem)(value);
+                return [
                     key,
-                    './' + normalizePathOnWindows(_path.default.isAbsolute(value) ? _path.default.relative(projectPath, value) : value)
-                ]));
+                    './' + normalizePathOnWindows(_path.default.isAbsolute(resolved) ? _path.default.relative(projectPath, resolved) : resolved)
+                ];
+            }));
         }
         if (nextConfigSerializable.turbopack != null) {
             // clone to allow in-place mutations
@@ -718,6 +736,23 @@ function bindingToApi(binding, bindingPath, _wasm) {
             }
             nextConfigSerializable.turbopack = turbopack;
         }
+        // Serialize `experimental.turbopackChunking` route patterns: convert each RegExp to
+        // {source, flags} since RegExp objects are not JSON-serializable.
+        const chunkingConfig = (_nextConfigSerializable_experimental = nextConfigSerializable.experimental) == null ? void 0 : _nextConfigSerializable_experimental.turbopackChunking;
+        if (chunkingConfig) {
+            var _chunkingConfig_priorityRoutes;
+            const regexComponents = (regex)=>({
+                    source: regex.source,
+                    flags: regex.flags
+                });
+            nextConfigSerializable.experimental = {
+                ...nextConfigSerializable.experimental,
+                turbopackChunking: {
+                    ...chunkingConfig,
+                    priorityRoutes: (_chunkingConfig_priorityRoutes = chunkingConfig.priorityRoutes) == null ? void 0 : _chunkingConfig_priorityRoutes.map(regexComponents)
+                }
+            };
+        }
         return JSON.stringify(nextConfigSerializable, null, 2);
     }
     // converts regexes to a `RegexComponents` object so that it can be JSON-serialized when passed to
@@ -843,7 +878,7 @@ function bindingToApi(binding, bindingPath, _wasm) {
                         pages: nativeRoute.pages.map((page)=>({
                                 originalName: page.originalName,
                                 htmlEndpoint: new EndpointImpl(page.htmlEndpoint),
-                                rscEndpoint: new EndpointImpl(page.rscEndpoint)
+                                rscHmrEndpoint: new EndpointImpl(page.rscHmrEndpoint)
                             }))
                     };
                     break;
@@ -884,12 +919,11 @@ function bindingToApi(binding, bindingPath, _wasm) {
             pagesDocumentEndpoint: new EndpointImpl(entrypoints.pagesDocumentEndpoint),
             pagesAppEndpoint: new EndpointImpl(entrypoints.pagesAppEndpoint),
             pagesErrorEndpoint: new EndpointImpl(entrypoints.pagesErrorEndpoint),
-            issues: entrypoints.issues,
-            diagnostics: entrypoints.diagnostics
+            issues: entrypoints.issues
         };
     }
     return async function createProject(options, turboEngineOptions, callbacks) {
-        return new ProjectImpl(await binding.projectNew(await rustifyProjectOptions(options), turboEngineOptions || {}, {
+        return new ProjectImpl(await binding.projectNew(await rustifyProjectOptions(options), turboEngineOptions, {
             throwTurbopackInternalError: require('../../shared/lib/turbopack/internal-error').throwTurbopackInternalError,
             onBeforeDeferredEntries: callbacks == null ? void 0 : callbacks.onBeforeDeferredEntries
         }));
@@ -1011,6 +1045,9 @@ async function loadWasm(importPath = '') {
         getTargetTriple () {
             return undefined;
         },
+        turbopackCacheVersion () {
+            return undefined;
+        },
         turbo: {
             createProject (_options, _turboEngineOptions, _callbacks) {
                 throw Object.defineProperty(new Error(`Turbopack is not supported on this platform (${PlatformName}/${ArchName}) because native bindings are not available. ` + `Only WebAssembly (WASM) bindings were loaded, and Turbopack requires native bindings. ` + `Use the --webpack flag instead.`), "__NEXT_ERROR_CODE", {
@@ -1019,12 +1056,26 @@ async function loadWasm(importPath = '') {
                     configurable: true
                 });
             },
-            startTurbopackTraceServer (_traceFilePath, _port) {
+            startTurbopackTraceServerHandle (_traceFilePath, _port) {
                 throw Object.defineProperty(new Error(`Turbopack trace server is not supported on this platform (${PlatformName}/${ArchName}) because native bindings are not available. ` + `Only WebAssembly (WASM) bindings were loaded, and Turbopack requires native bindings.`), "__NEXT_ERROR_CODE", {
                     value: "E1051",
                     enumerable: false,
                     configurable: true
                 });
+            },
+            queryTraceSpans (_handle, _options) {
+                throw Object.defineProperty(new Error(`Turbopack trace server is not supported on this platform (${PlatformName}/${ArchName}) because native bindings are not available. ` + `Only WebAssembly (WASM) bindings were loaded, and Turbopack requires native bindings.`), "__NEXT_ERROR_CODE", {
+                    value: "E1051",
+                    enumerable: false,
+                    configurable: true
+                });
+            },
+            databaseCompact (_path, _nextVersion) {
+                throw Object.defineProperty(new Error('Turbopack database compaction is not supported on this platform'), "__NEXT_ERROR_CODE", {
+                    value: "E1147",
+                    enumerable: false,
+                    configurable: true
+                });
             }
         },
         mdx: {
@@ -1203,13 +1254,19 @@ async function loadWasm(importPath = '') {
                 return bindings.parse(src, toBuffer(options ?? {}));
             },
             getTargetTriple: bindings.getTargetTriple,
+            turbopackCacheVersion: bindings.turbopackCacheVersion,
             initCustomTraceSubscriber: bindings.initCustomTraceSubscriber,
             teardownTraceSubscriber: bindings.teardownTraceSubscriber,
             turbo: {
                 createProject: bindingToApi(customBindings ?? bindings, customBindingsPath ?? bindingsPath, false),
-                startTurbopackTraceServer (traceFilePath, port) {
-                    _log.warn(`Turbopack trace server started. View trace at https://trace.nextjs.org${port != null ? `?port=${port}` : ''}`);
-                    (customBindings ?? bindings).startTurbopackTraceServer(traceFilePath, port);
+                startTurbopackTraceServerHandle (traceFilePath, port) {
+                    return (customBindings ?? bindings).startTurbopackTraceServerHandle(traceFilePath, port);
+                },
+                queryTraceSpans (handle, options) {
+                    return (customBindings ?? bindings).queryTraceSpans(handle, options);
+                },
+                databaseCompact (dbPath, dbNextVersion) {
+                    return (customBindings ?? bindings).turbopackDatabaseCompact(dbPath, dbNextVersion);
                 }
             },
             mdx: {
@@ -1312,6 +1369,10 @@ function getBinaryMetadata() {
         target: loadedBindings == null ? void 0 : (_loadedBindings_getTargetTriple = loadedBindings.getTargetTriple) == null ? void 0 : _loadedBindings_getTargetTriple.call(loadedBindings)
     };
 }
+function getTurbopackCacheVersion() {
+    var _loadedBindings_turbopackCacheVersion;
+    return loadedBindings == null ? void 0 : (_loadedBindings_turbopackCacheVersion = loadedBindings.turbopackCacheVersion) == null ? void 0 : _loadedBindings_turbopackCacheVersion.call(loadedBindings, nextVersion);
+}
 function initCustomTraceSubscriber(traceFileName) {
     if (!swcTraceFlushGuard) {
         var _getBindingsSync_initCustomTraceSubscriber, _getBindingsSync;

package/dist/node_modules/next/dist/build/swc/jest-transformer.js

@@ -52,6 +52,7 @@ const createTransformer = (inputOptions)=>({
             const swcTransformOpts = (0, _options.getJestSWCOptions)({
                 isServer: jestConfig.testEnvironment === 'node' || jestConfig.testEnvironment.includes('jest-environment-node'),
                 filename,
+                configDir: inputOptions == null ? void 0 : inputOptions.configDir,
                 jsConfig: inputOptions == null ? void 0 : inputOptions.jsConfig,
                 resolvedBaseUrl: inputOptions == null ? void 0 : inputOptions.resolvedBaseUrl,
                 pagesDir: inputOptions == null ? void 0 : inputOptions.pagesDir,

package/dist/node_modules/next/dist/build/swc/options.js

@@ -63,7 +63,7 @@ function getParserOptions({ filename, jsConfig, ...rest }) {
         importAssertions: true
     };
 }
-function getBaseSWCOptions({ filename, jest, development, hasReactRefresh, globalWindow, esm, modularizeImports, swcPlugins, compilerOptions, resolvedBaseUrl, jsConfig, supportedBrowsers, swcCacheDir, serverComponents, serverReferenceHashSalt, bundleLayer, isCacheComponents, cacheHandlers, useCacheEnabled, taintEnabled, trackDynamicImports, pageExtensions }) {
+function getBaseSWCOptions({ filename, jest, development, hasReactRefresh, globalWindow, esm, configDir, modularizeImports, swcPlugins, compilerOptions, resolvedBaseUrl, jsConfig, supportedBrowsers, swcCacheDir, serverComponents, serverReferenceHashSalt, bundleLayer, isCacheComponents, cacheHandlers, useCacheEnabled, taintEnabled, trackDynamicImports, pageExtensions }) {
     var _jsConfig_compilerOptions, _jsConfig_compilerOptions1, _jsConfig_compilerOptions2, _jsConfig_compilerOptions3, _jsConfig_compilerOptions4, _jsConfig_experimental;
     const isReactServerLayer = (0, _utils.shouldUseReactServerCondition)(bundleLayer);
     const isAppRouterPagesLayer = (0, _utils.isWebpackAppPagesLayer)(bundleLayer);
@@ -76,7 +76,11 @@ function getBaseSWCOptions({ filename, jest, development, hasReactRefresh, globa
     const emitDecoratorMetadata = Boolean(jsConfig == null ? void 0 : (_jsConfig_compilerOptions2 = jsConfig.compilerOptions) == null ? void 0 : _jsConfig_compilerOptions2.emitDecoratorMetadata);
     const useDefineForClassFields = Boolean(jsConfig == null ? void 0 : (_jsConfig_compilerOptions3 = jsConfig.compilerOptions) == null ? void 0 : _jsConfig_compilerOptions3.useDefineForClassFields);
     const plugins = (swcPlugins ?? []).filter(Array.isArray).map(([name, options])=>[
-            require.resolve(name),
+            require.resolve(name, configDir ? {
+                paths: [
+                    configDir
+                ]
+            } : undefined),
             options
         ]);
     return {
@@ -229,12 +233,13 @@ function getEmotionOptions(emotionConfig, development) {
         }
     };
 }
-function getJestSWCOptions({ isServer, filename, esm, modularizeImports, swcPlugins, compilerOptions, jsConfig, resolvedBaseUrl, pagesDir, imageConfig, serverReferenceHashSalt }) {
+function getJestSWCOptions({ isServer, filename, esm, modularizeImports, configDir, swcPlugins, compilerOptions, jsConfig, resolvedBaseUrl, pagesDir, imageConfig, serverReferenceHashSalt }) {
     let baseOptions = getBaseSWCOptions({
         filename,
         jest: true,
         development: false,
         hasReactRefresh: false,
+        configDir,
         globalWindow: !isServer,
         modularizeImports,
         swcPlugins,
@@ -280,12 +285,14 @@ function getJestSWCOptions({ isServer, filename, esm, modularizeImports, swcPlug
 }
 function getLoaderSWCOptions({ // This is not passed yet as "paths" resolving is handled by webpack currently.
 // resolvedBaseUrl,
-filename, development, isServer, pagesDir, appDir, isPageFile, isCacheComponents, hasReactRefresh, modularizeImports, optimizeServerReact, optimizePackageImports, swcPlugins, compilerOptions, jsConfig, supportedBrowsers, swcCacheDir, relativeFilePathFromRoot, serverComponents, serverReferenceHashSalt, bundleLayer, esm, cacheHandlers, useCacheEnabled, taintEnabled, trackDynamicImports, pageExtensions }) {
+filename, development, isServer, pagesDir, appDir, isPageFile, isCacheComponents, hasReactRefresh, // The folder containing the next.config.js, used for resolving relative config paths.
+configDir, modularizeImports, optimizeServerReact, optimizePackageImports, swcPlugins, swcEnvOptions, compilerOptions, jsConfig, supportedBrowsers, swcCacheDir, relativeFilePathFromRoot, serverComponents, serverReferenceHashSalt, bundleLayer, esm, cacheHandlers, useCacheEnabled, taintEnabled, trackDynamicImports, pageExtensions }) {
     let baseOptions = getBaseSWCOptions({
         filename,
         development,
         globalWindow: !isServer,
         hasReactRefresh,
+        configDir,
         modularizeImports,
         swcPlugins,
         compilerOptions,
@@ -374,7 +381,8 @@ filename, development, isServer, pagesDir, appDir, isPageFile, isCacheComponents
             isPageFile,
             ...supportedBrowsers && supportedBrowsers.length > 0 ? {
                 env: {
-                    targets: supportedBrowsers
+                    targets: supportedBrowsers,
+                    ...swcEnvOptions
                 }
             } : {}
         };

package/dist/node_modules/next/dist/build/utils.js

@@ -174,6 +174,7 @@ const _routeregex = require("../shared/lib/router/utils/route-regex");
 const _app1 = require("../shared/lib/router/routes/app");
 const _getmetadataroute = require("../lib/metadata/get-metadata-route");
 const _ismetadataroute = require("../lib/metadata/is-metadata-route");
+const _apppaths = require("../shared/lib/router/utils/app-paths");
 const _getsupportedbrowsers = require("./get-supported-browsers");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -221,30 +222,41 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-// Build a set of static metadata image filenames for quick lookup
-const staticMetadataImageFilenames = new Set(Object.values(_ismetadataroute.STATIC_METADATA_IMAGES).map((meta)=>meta.filename));
 /**
  * Get the display path for build output. For static metadata files under
  * dynamic routes, this normalizes the path to use "-" placeholder.
  * e.g., /dynamic/[id]/icon.png -> /dynamic/-/icon.png
  */ function getTreeViewDisplayPath(pagePath) {
-    // Check if the path contains dynamic segments
-    if (!(0, _isdynamic.isDynamicRoute)(pagePath)) {
-        return pagePath;
+    const prerenderPathname = (0, _getmetadataroute.getStaticMetadataPrerenderPathname)(pagePath.startsWith('/') ? pagePath : `/${pagePath}`);
+    return prerenderPathname ?? pagePath;
+}
+function buildStaticMetadataStaticPaths(page) {
+    let pathname = (0, _apppaths.normalizeAppPath)(page);
+    if (pathname.endsWith('/route')) {
+        pathname = pathname.slice(0, -'/route'.length);
     }
-    // Check if the filename is a static metadata image
-    const lastSlash = pagePath.lastIndexOf('/');
-    const filename = pagePath.slice(lastSlash + 1);
-    const dotIndex = filename.lastIndexOf('.');
-    const baseName = dotIndex > 0 ? filename.slice(0, dotIndex) : filename;
-    // Check against known static metadata image filenames (e.g., icon, apple-icon, opengraph-image)
-    if (!staticMetadataImageFilenames.has(baseName)) {
-        return pagePath;
+    const prerenderPathname = (0, _getmetadataroute.getStaticMetadataPrerenderPathname)(pathname);
+    if (!prerenderPathname) {
+        throw Object.defineProperty(new Error(`Invariant: expected static metadata route to have a prerender pathname (${page})`), "__NEXT_ERROR_CODE", {
+            value: "E1280",
+            enumerable: false,
+            configurable: true
+        });
     }
-    // Transform using fillMetadataSegment with isStatic=true
-    const segment = pagePath.slice(0, lastSlash);
-    const lastSegment = filename;
-    return (0, _getmetadataroute.fillMetadataSegment)(segment, {}, lastSegment, true);
+    return {
+        fallbackMode: undefined,
+        prerenderedRoutes: [
+            {
+                params: {},
+                pathname: prerenderPathname,
+                encodedPathname: prerenderPathname,
+                fallbackRouteParams: undefined,
+                fallbackMode: undefined,
+                fallbackRootParams: undefined,
+                throwOnEmptyStaticShell: undefined
+            }
+        ]
+    };
 }
 // Use `print()` for expected console output
 const print = console.log;
@@ -286,6 +298,34 @@ const filterAndSortList = (list, routeType, hasCustomApp)=>{
     }
     return pages.sort((a, b)=>a.localeCompare(b));
 };
+function getTreeViewSymbol(item, pageInfo) {
+    if (item === '/_app' || item === '/_app.server') {
+        return ' ';
+    }
+    if ((0, _isedgeruntime.isEdgeRuntime)(pageInfo == null ? void 0 : pageInfo.runtime)) {
+        return 'ƒ';
+    }
+    if (pageInfo == null ? void 0 : pageInfo.isRoutePPREnabled) {
+        if (// If the page has an empty static shell, then it's equivalent to a
+        // dynamic page
+        (pageInfo == null ? void 0 : pageInfo.hasEmptyStaticShell) || // ensure we don't mark dynamic paths that postponed as being dynamic
+        // since in this case we're able to partially prerender it
+        pageInfo.isDynamicAppRoute && !pageInfo.hasPostponed) {
+            return 'ƒ';
+        }
+        if (!(pageInfo == null ? void 0 : pageInfo.hasPostponed)) {
+            return '○';
+        }
+        return '◐';
+    }
+    if (pageInfo == null ? void 0 : pageInfo.isStatic) {
+        return '○';
+    }
+    if (pageInfo == null ? void 0 : pageInfo.isSSG) {
+        return '●';
+    }
+    return 'ƒ';
+}
 function collectRoutesUsingEdgeRuntime(input) {
     const routesUsingEdgeRuntime = {};
     for (const [route, info] of input.entries()){
@@ -342,34 +382,12 @@ async function printTreeView(lists, pageInfos, { pagesDir, pageExtensions, middl
             showExpire ? 'Expire' : ''
         ].filter((entry)=>entry !== '').map((entry)=>(0, _picocolors.underline)(entry)));
         filteredPages.forEach((item, i, arr)=>{
-            var _pageInfo_ssgPageDurations, _pageInfo_ssgPageRoutes;
+            var _pageInfo_ssgPageDurations, _pageInfo_ssgPageRoutes, _pageInfo_ssgPageRoutes1;
             const border = i === 0 ? arr.length === 1 ? '─' : '┌' : i === arr.length - 1 ? '└' : '├';
             const pageInfo = pageInfos.get(item);
             const totalDuration = ((pageInfo == null ? void 0 : pageInfo.pageDuration) || 0) + ((pageInfo == null ? void 0 : (_pageInfo_ssgPageDurations = pageInfo.ssgPageDurations) == null ? void 0 : _pageInfo_ssgPageDurations.reduce((a, b)=>a + (b || 0), 0)) || 0);
-            let symbol;
-            if (item === '/_app' || item === '/_app.server') {
-                symbol = ' ';
-            } else if ((0, _isedgeruntime.isEdgeRuntime)(pageInfo == null ? void 0 : pageInfo.runtime)) {
-                symbol = 'ƒ';
-            } else if (pageInfo == null ? void 0 : pageInfo.isRoutePPREnabled) {
-                if (// If the page has an empty static shell, then it's equivalent to a
-                // dynamic page
-                (pageInfo == null ? void 0 : pageInfo.hasEmptyStaticShell) || // ensure we don't mark dynamic paths that postponed as being dynamic
-                // since in this case we're able to partially prerender it
-                pageInfo.isDynamicAppRoute && !pageInfo.hasPostponed) {
-                    symbol = 'ƒ';
-                } else if (!(pageInfo == null ? void 0 : pageInfo.hasPostponed)) {
-                    symbol = '○';
-                } else {
-                    symbol = '◐';
-                }
-            } else if (pageInfo == null ? void 0 : pageInfo.isStatic) {
-                symbol = '○';
-            } else if (pageInfo == null ? void 0 : pageInfo.isSSG) {
-                symbol = '●';
-            } else {
-                symbol = 'ƒ';
-            }
+            const symbol = getTreeViewSymbol(item, pageInfo);
+            const hasChildRoutes = Boolean(pageInfo == null ? void 0 : (_pageInfo_ssgPageRoutes = pageInfo.ssgPageRoutes) == null ? void 0 : _pageInfo_ssgPageRoutes.length);
             const displayPath = getTreeViewDisplayPath(item);
             if (hasGSPAndRevalidateZero.has(item)) {
                 usedSymbols.add('ƒ');
@@ -379,13 +397,17 @@ async function printTreeView(lists, pageInfos, { pagesDir, pageExtensions, middl
                     showExpire && (pageInfo == null ? void 0 : pageInfo.initialCacheControl) ? (0, _format.formatExpire)(pageInfo.initialCacheControl) : ''
                 ]);
             }
-            usedSymbols.add(symbol);
+            // Grouped rows act as headers for the generated outputs below them. The
+            // child rows carry the concrete route symbols instead.
+            if (!hasChildRoutes) {
+                usedSymbols.add(symbol);
+            }
             messages.push([
-                `${border} ${symbol} ${displayPath}${totalDuration > MIN_DURATION ? ` (${getPrettyDuration(totalDuration)})` : ''}`,
+                `${border} ${hasChildRoutes ? ' ' : symbol} ${displayPath}${totalDuration > MIN_DURATION ? ` (${getPrettyDuration(totalDuration)})` : ''}`,
                 showRevalidate && (pageInfo == null ? void 0 : pageInfo.initialCacheControl) ? (0, _format.formatRevalidate)(pageInfo.initialCacheControl) : '',
                 showExpire && (pageInfo == null ? void 0 : pageInfo.initialCacheControl) ? (0, _format.formatExpire)(pageInfo.initialCacheControl) : ''
             ]);
-            if (pageInfo == null ? void 0 : (_pageInfo_ssgPageRoutes = pageInfo.ssgPageRoutes) == null ? void 0 : _pageInfo_ssgPageRoutes.length) {
+            if (pageInfo == null ? void 0 : (_pageInfo_ssgPageRoutes1 = pageInfo.ssgPageRoutes) == null ? void 0 : _pageInfo_ssgPageRoutes1.length) {
                 var _pageInfo_ssgPageDurations1;
                 const totalRoutes = pageInfo.ssgPageRoutes.length;
                 const contSymbol = i === arr.length - 1 ? ' ' : '│';
@@ -427,9 +449,14 @@ async function printTreeView(lists, pageInfos, { pagesDir, pageExtensions, middl
                 routes.forEach(({ route, duration, avgDuration }, index, { length })=>{
                     var _pageInfos_get;
                     const innerSymbol = index === length - 1 ? '└' : '├';
+                    // Generated child paths can have more precise metadata than the
+                    // parent route pattern, so prefer the child entry when present.
+                    const routePageInfo = pageInfos.get(route) ?? pageInfo;
+                    const routeSymbol = getTreeViewSymbol(route, routePageInfo);
+                    usedSymbols.add(routeSymbol);
                     const initialCacheControl = (_pageInfos_get = pageInfos.get(route)) == null ? void 0 : _pageInfos_get.initialCacheControl;
                     messages.push([
-                        `${contSymbol} ${innerSymbol} ${route}${duration > MIN_DURATION ? ` (${getPrettyDuration(duration)})` : ''}${avgDuration && avgDuration > MIN_DURATION ? ` (avg ${getPrettyDuration(avgDuration)})` : ''}`,
+                        `${contSymbol} ${innerSymbol} ${routeSymbol} ${route}${duration > MIN_DURATION ? ` (${getPrettyDuration(duration)})` : ''}${avgDuration && avgDuration > MIN_DURATION ? ` (avg ${getPrettyDuration(avgDuration)})` : ''}`,
                         showRevalidate && initialCacheControl ? (0, _format.formatRevalidate)(initialCacheControl) : '',
                         showExpire && initialCacheControl ? (0, _format.formatExpire)(initialCacheControl) : ''
                     ]);
@@ -565,7 +592,7 @@ function printCustomRoutes({ redirects, rewrites, headers, onMatchHeaders }) {
         printRoutes(combinedRewrites, 'Rewrites');
     }
 }
-async function isPageStatic({ dir, page, distDir, configFileName, httpAgentOptions, locales, defaultLocale, parentId, pageRuntime, edgeInfo, pageType, cacheComponents, authInterrupts, originalAppPath, isrFlushToDisk, cacheMaxMemorySize, nextConfigOutput, cacheHandler, cacheHandlers, cacheLifeProfiles, pprConfig, partialFallbacksEnabled, buildId, deploymentId, clientAssetToken, sriEnabled }) {
+async function isPageStatic({ dir, page, distDir, configFileName, httpAgentOptions, locales, defaultLocale, parentId, pageRuntime, edgeInfo, pageType, cacheComponents, authInterrupts, useCacheTimeout, staticPageGenerationTimeout, originalAppPath, isrFlushToDisk, cacheMaxMemorySize, nextConfigOutput, cacheHandler, cacheHandlers, cacheLifeProfiles, pprConfig, buildId, deploymentId, clientAssetToken, sriEnabled }) {
     // Skip page data collection for synthetic _global-error routes
     if (page === _constants1.UNDERSCORE_GLOBAL_ERROR_ROUTE) {
         return {
@@ -676,33 +703,43 @@ async function isPageStatic({ dir, page, distDir, configFileName, httpAgentOptio
             if (appConfig.dynamic === 'force-dynamic' && !isRoutePPREnabled) {
                 appConfig.revalidate = 0;
             }
-            const route = (0, _app1.parseAppRoute)(page, true);
+            const route = (0, _app1.parseNormalizedAppRoute)(page);
             // If the page is dynamic and we're not in edge runtime, then we need to
             // build the static paths. The edge runtime doesn't support static
             // paths.
             if (route.dynamicSegments.length > 0 && !pathIsEdgeRuntime) {
-                ;
-                ({ prerenderedRoutes, fallbackMode: prerenderFallbackMode } = await (0, _app.buildAppStaticPaths)({
-                    dir,
-                    page,
-                    route,
-                    cacheComponents,
-                    authInterrupts,
-                    segments,
-                    distDir,
-                    requestHeaders: {},
-                    isrFlushToDisk,
-                    cacheMaxMemorySize,
-                    cacheHandler,
-                    cacheLifeProfiles,
-                    ComponentMod,
-                    nextConfigOutput,
-                    isRoutePPREnabled,
-                    partialFallbacksEnabled,
-                    buildId,
-                    deploymentId,
-                    rootParamKeys
-                }));
+                let pathname = (0, _apppaths.normalizeAppPath)(page);
+                if (pathname.endsWith('/route')) {
+                    pathname = pathname.slice(0, -'/route'.length);
+                }
+                if (routeModule.definition.kind === _routekind.RouteKind.APP_ROUTE && (0, _ismetadataroute.isStaticMetadataFile)(pathname)) {
+                    ;
+                    ({ prerenderedRoutes, fallbackMode: prerenderFallbackMode } = buildStaticMetadataStaticPaths(page));
+                } else {
+                    ;
+                    ({ prerenderedRoutes, fallbackMode: prerenderFallbackMode } = await (0, _app.buildAppStaticPaths)({
+                        dir,
+                        page,
+                        route,
+                        cacheComponents,
+                        authInterrupts,
+                        useCacheTimeout,
+                        staticPageGenerationTimeout,
+                        segments,
+                        distDir,
+                        requestHeaders: {},
+                        isrFlushToDisk,
+                        cacheMaxMemorySize,
+                        cacheHandler,
+                        cacheLifeProfiles,
+                        ComponentMod,
+                        nextConfigOutput,
+                        isRoutePPREnabled,
+                        buildId,
+                        deploymentId,
+                        rootParamKeys
+                    }));
+                }
             }
         } else {
             if (!Comp || !(0, _reactis.isValidElementType)(Comp) || typeof Comp === 'string') {
@@ -1150,6 +1187,11 @@ function getPossibleMiddlewareFilenames(folder, extensions) {
 class NestedMiddlewareError extends Error {
     constructor(nestedFileNames, mainDir, pagesOrAppDir){
         super(`Nested Middleware is not allowed, found:\n` + `${nestedFileNames.map((file)=>`pages${file}`).join('\n')}\n` + `Please move your code to a single file at ${_path.default.join(_path.default.posix.sep, _path.default.relative(mainDir, _path.default.resolve(pagesOrAppDir, '..')), 'middleware')} instead.\n` + `Read More - https://nextjs.org/docs/messages/nested-middleware`);
+        Object.defineProperty(this, "__NEXT_ERROR_CODE", {
+            value: "E1173",
+            enumerable: false,
+            configurable: true
+        });
     }
 }
 function shouldUseReactServerCondition(layer) {

package/dist/node_modules/next/dist/cli/next-test.js

@@ -134,7 +134,8 @@ async function runPlaywright(baseDir, nextConfig, testRunnerArgs) {
             hasAppDir: !!appDir,
             hasPagesDir: !!pagesDir,
             appDir: appDir || undefined,
-            pagesDir: pagesDir || undefined
+            pagesDir: pagesDir || undefined,
+            useTypeScriptCli: Boolean(nextConfig.experimental.useTypeScriptCli)
         });
         const isUsingTypeScript = !!typeScriptVersion;
         const playwrightConfigFilename = isUsingTypeScript ? 'playwright.config.ts' : 'playwright.config.js';

package/dist/node_modules/next/dist/client/components/app-router-headers.js

@@ -8,10 +8,8 @@ Object.defineProperty(exports, "__esModule", {
     NEXT_ACTION_NOT_FOUND_HEADER: null,
     NEXT_ACTION_REVALIDATED_HEADER: null,
     NEXT_DID_POSTPONE_HEADER: null,
-    NEXT_HMR_REFRESH_HASH_COOKIE: null,
     NEXT_HMR_REFRESH_HEADER: null,
     NEXT_HTML_REQUEST_ID_HEADER: null,
-    NEXT_INSTANT_PREFETCH_HEADER: null,
     NEXT_INSTANT_TEST_COOKIE: null,
     NEXT_IS_PRERENDER_HEADER: null,
     NEXT_REQUEST_ID_HEADER: null,
@@ -48,18 +46,12 @@ _export(exports, {
     NEXT_DID_POSTPONE_HEADER: function() {
         return NEXT_DID_POSTPONE_HEADER;
     },
-    NEXT_HMR_REFRESH_HASH_COOKIE: function() {
-        return NEXT_HMR_REFRESH_HASH_COOKIE;
-    },
     NEXT_HMR_REFRESH_HEADER: function() {
         return NEXT_HMR_REFRESH_HEADER;
     },
     NEXT_HTML_REQUEST_ID_HEADER: function() {
         return NEXT_HTML_REQUEST_ID_HEADER;
     },
-    NEXT_INSTANT_PREFETCH_HEADER: function() {
-        return NEXT_INSTANT_PREFETCH_HEADER;
-    },
     NEXT_INSTANT_TEST_COOKIE: function() {
         return NEXT_INSTANT_TEST_COOKIE;
     },
@@ -106,10 +98,8 @@ const NEXT_ROUTER_STATE_TREE_HEADER = 'next-router-state-tree';
 const NEXT_ROUTER_PREFETCH_HEADER = 'next-router-prefetch';
 const NEXT_ROUTER_SEGMENT_PREFETCH_HEADER = 'next-router-segment-prefetch';
 const NEXT_HMR_REFRESH_HEADER = 'next-hmr-refresh';
-const NEXT_HMR_REFRESH_HASH_COOKIE = '__next_hmr_refresh_hash__';
 const NEXT_URL = 'next-url';
 const RSC_CONTENT_TYPE_HEADER = 'text/x-component';
-const NEXT_INSTANT_PREFETCH_HEADER = 'next-instant-navigation-testing-prefetch';
 const NEXT_INSTANT_TEST_COOKIE = 'next-instant-navigation-testing';
 const FLIGHT_HEADERS = [
     RSC_HEADER,