rsbuild-plugin-react-router 0.7.3 → 0.8.0

package/dist/index.js

@@ -1,26 +1,69 @@
 let globalStore, previousPrepareStackTrace, o, origin, bigint1e6, characters, charactersLength, O, quoteValue, options, f, fiber, scoped;
-import { existsSync, mkdirSync, readFileSync, realpathSync, statSync, watch, writeFileSync } from "node:fs";
-import fs_extra from "fs-extra";
 import { rspack } from "@rsbuild/core";
-import { dirname, isAbsolute, join as external_pathe_join, relative, resolve as external_pathe_resolve } from "pathe";
+import { dirname, isAbsolute, join, relative, resolve as external_pathe_resolve } from "pathe";
+import { createHash, randomUUID } from "node:crypto";
+import { existsSync, readFileSync, realpathSync, statSync, watch } from "node:fs";
+import fs_extra from "fs-extra";
 import { availableParallelism, cpus } from "node:os";
+import { SourceMap, createRequire } from "node:module";
 import { matchRoutes } from "react-router";
 import { access, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
-import { createHash } from "node:crypto";
-import { fileURLToPath, fileURLToPath as __rspack_fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL, fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { Worker } from "node:worker_threads";
 import jsesc from "jsesc";
-import { SourceMap, createRequire } from "node:module";
 import { dirname as external_node_path_dirname, isAbsolute as external_node_path_isAbsolute, join as external_node_path_join, relative as external_node_path_relative, resolve as external_node_path_resolve, sep as external_node_path_sep, dirname as __rspack_dirname } from "node:path";
 import { createJiti } from "jiti";
 import { createRequestListener as node_fetch_server_createRequestListener } from "@remix-run/node-fetch-server";
-import { SERVER_ONLY_ROUTE_EXPORTS, SERVER_EXPORTS, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_EXPORTS, JS_EXTENSIONS, BUILD_CLIENT_ROUTE_QUERY_STRING, SPA_FALLBACK_HTML_FILE, PLUGIN_NAME, DEFAULT_JS_DIST_PATH } from "./468.js";
+import { SERVER_ONLY_ROUTE_EXPORTS, BROWSER_MANIFEST_ENTRY_NAME, SPA_FALLBACK_HTML_FILE, JS_EXTENSIONS, SERVER_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, CLIENT_EXPORTS, CLIENT_NON_COMPONENT_EXPORTS, PLUGIN_NAME, DEFAULT_JS_DIST_PATH } from "./468.js";
 import { analyzeRouteModuleCode, combineURLs, generate as yuku_generate, executeRouteTransformTask, generateWithProps, resolveAppPackagePath, validateRouteChunks, roundMs, resolveEffectiveAssetPrefix, removeUnusedImports, getProgram, detectRouteChunks, getPatternIdentifierNames, getExportedName, createRouteId, removeExports, HMR_PATCHABLE_ROUTE_FLAGS, getExportNames, escapeHtml, getRouteModuleAnalysis, parseVersionMajorMinor, getRouteChunkNameFromModuleId, createEmptyRouteChunkByExportName, findEntryFile, yuku_parse, routeChunkExportNames, buildManifestChunkValidity, createReactRouterPerformanceProfiler, getRouteChunkEntryName, getRouteChunkModuleId, normalizeAssetPrefix, detectRouteChunksIfEnabled, validateSpaModeRouteExports, createBundlerRouteExportResolver, getPackageVersion, getRouteEntryBaseName, collectReferencedNames } from "./511.js";
 import { resolveServerBuildModule, headerEntries } from "./819.js";
 var effect, description, __rspack_import_meta_dirname__ = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
-let getAvailableCpuCount = ()=>'function' == typeof availableParallelism ? availableParallelism() : cpus().length, getDefaultConcurrency = (cpuCount = getAvailableCpuCount())=>Math.max(0, Math.floor(cpuCount) - 2), getCappedPluginConcurrency = (cap = 16)=>Math.max(1, Math.min(cap, getDefaultConcurrency() || 1)), createReactRouterHydrationModuleTest = (entryClientPath)=>{
+let createReactRouterManifestSnapshot = ({ manifest, sri, moduleExportsByRouteId, serverBuildPlan, routesByServerBundleId })=>{
+    let { server, moduleExportsByRouteId: detachedModuleExports } = structuredClone({
+        server: {
+            ...manifest,
+            sri
+        },
+        moduleExportsByRouteId
+    }), browser = {
+        ...server,
+        sri: void 0
+    }, bundles = serverBuildPlan.serverBundleEntries.flatMap(({ bundleId, entryName })=>{
+        let bundleRoutes = routesByServerBundleId[bundleId];
+        return bundleRoutes ? [
+            {
+                bundleId,
+                entryName,
+                manifest: {
+                    ...server,
+                    routes: Object.fromEntries(Object.entries(server.routes).filter(([routeId])=>Object.hasOwn(bundleRoutes, routeId)))
+                }
+            }
+        ] : [];
+    });
+    return {
+        browser,
+        moduleExportsByRouteId: detachedModuleExports,
+        server,
+        serverByBundleId: Object.fromEntries(bundles.map(({ bundleId, manifest })=>[
+                bundleId,
+                manifest
+            ])),
+        serverByEntryName: Object.fromEntries([
+            [
+                serverBuildPlan.defaultEntryName,
+                server
+            ],
+            ...bundles.map(({ entryName, manifest })=>[
+                    entryName,
+                    manifest
+                ])
+        ])
+    };
+}, getAvailableCpuCount = ()=>'function' == typeof availableParallelism ? availableParallelism() : cpus().length, getDefaultConcurrency = (cpuCount = getAvailableCpuCount())=>Math.max(0, Math.floor(cpuCount) - 2), getCappedPluginConcurrency = (cap = 16)=>Math.max(1, Math.min(cap, getDefaultConcurrency() || 1)), DEV_HDR_UPDATE_EVENT = 'react-router:hdr-update', DEV_HMR_RUNTIME_MODULE_ID = 'virtual/react-router/hmr-runtime', DEV_MANIFEST_UPDATE_EVENT = 'react-router:manifest-update', dev_hmr_isObject = (value)=>null !== value && 'object' == typeof value, isSwcLoader = (loader)=>'string' == typeof loader && loader.includes('builtin:swc-loader'), readSwcLoaderRefresh = (value)=>Array.isArray(value) ? value.some(readSwcLoaderRefresh) : !!dev_hmr_isObject(value) && (isSwcLoader(value.loader) ? value.options?.jsc?.transform?.react?.refresh === !0 : Object.values(value).some(readSwcLoaderRefresh)), readRuleSwcRefresh = (rule)=>!!dev_hmr_isObject(rule) && (isSwcLoader(rule.loader) ? readSwcLoaderRefresh(rule) : readSwcLoaderRefresh(rule.use) || readRuleSetSwcRefresh(rule.oneOf) || readRuleSetSwcRefresh(rule.rules)), readRuleSetSwcRefresh = (rules)=>Array.isArray(rules) && rules.some(readRuleSwcRefresh), isRspackSwcReactRefreshEnabled = (rspackConfig)=>readRuleSetSwcRefresh(rspackConfig.module?.rules), createReactRouterHydrationModuleTest = (entryClientPath)=>{
     let eagerPatterns = [
-        'virtual/react-router/browser-manifest',
+        BROWSER_MANIFEST_ENTRY_NAME,
+        DEV_HMR_RUNTIME_MODULE_ID,
         ...entryClientPath ? [
             entryClientPath.replace(/\\/g, '/'),
             BUILD_CLIENT_ROUTE_QUERY_STRING,
@@ -824,7 +867,7 @@ let isEqual = (u)=>Predicate_hasProperty(u, Equal_symbol), Inspectable_NodeInspe
         return out;
     }
     return [];
-}), Array_dedupe = (self)=>dedupeWith(self, equals), join = Function_dual(2, (self, sep)=>Array_fromIterable(self).join(sep)), Chunk_TypeId = Symbol.for("effect/Chunk"), emptyArray = [], Chunk_equivalence = Equivalence_make((self, that)=>self.length === that.length && toReadonlyArray(self).every((value, i)=>equals(value, Chunk_unsafeGet(that, i)))), ChunkProto = {
+}), Array_dedupe = (self)=>dedupeWith(self, equals), Array_join = Function_dual(2, (self, sep)=>Array_fromIterable(self).join(sep)), Chunk_TypeId = Symbol.for("effect/Chunk"), emptyArray = [], Chunk_equivalence = Equivalence_make((self, that)=>self.length === that.length && toReadonlyArray(self).every((value, i)=>equals(value, Chunk_unsafeGet(that, i)))), ChunkProto = {
     [Chunk_TypeId]: {
         _A: (_)=>_
     },
@@ -3140,7 +3183,7 @@ let OP_INVALID_DATA = "InvalidData", OP_MISSING_DATA = "MissingData", OP_SOURCE_
     return error._op = OP_INVALID_DATA, error.path = path, error.message = message, Object.defineProperty(error, "toString", {
         enumerable: !1,
         value () {
-            let path = Function_pipe(this.path, join(options.pathDelim));
+            let path = Function_pipe(this.path, Array_join(options.pathDelim));
             return `(Invalid data at ${path}: "${this.message}")`;
         }
     }), error;
@@ -3151,7 +3194,7 @@ let OP_INVALID_DATA = "InvalidData", OP_MISSING_DATA = "MissingData", OP_SOURCE_
     return error._op = OP_MISSING_DATA, error.path = path, error.message = message, Object.defineProperty(error, "toString", {
         enumerable: !1,
         value () {
-            let path = Function_pipe(this.path, join(options.pathDelim));
+            let path = Function_pipe(this.path, Array_join(options.pathDelim));
             return `(Missing data at ${path}: "${this.message}")`;
         }
     }), error;
@@ -3162,7 +3205,7 @@ let OP_INVALID_DATA = "InvalidData", OP_MISSING_DATA = "MissingData", OP_SOURCE_
     return error._op = OP_SOURCE_UNAVAILABLE, error.path = path, error.message = message, error.cause = cause, Object.defineProperty(error, "toString", {
         enumerable: !1,
         value () {
-            let path = Function_pipe(this.path, join(options.pathDelim));
+            let path = Function_pipe(this.path, Array_join(options.pathDelim));
             return `(Source unavailable at ${path}: "${this.message}")`;
         }
     }), error;
@@ -3173,7 +3216,7 @@ let OP_INVALID_DATA = "InvalidData", OP_MISSING_DATA = "MissingData", OP_SOURCE_
     return error._op = OP_UNSUPPORTED, error.path = path, error.message = message, Object.defineProperty(error, "toString", {
         enumerable: !1,
         value () {
-            let path = Function_pipe(this.path, join(options.pathDelim));
+            let path = Function_pipe(this.path, Array_join(options.pathDelim));
             return `(Unsupported operation at ${path}: "${this.message}")`;
         }
     }), error;
@@ -3346,7 +3389,7 @@ let OP_INVALID_DATA = "InvalidData", OP_MISSING_DATA = "MissingData", OP_SOURCE_
                         if (isRight(left) && isLeft(right)) return core_fail(right.left);
                         if (isRight(left) && isRight(right)) {
                             var left1, right1;
-                            let leftPad, rightPad, path = Function_pipe(prefix, join(".")), fail = fromFlatLoopFail(prefix, path), [lefts, rights] = (left1 = Function_pipe(left.right, Array_map(either_right)), right1 = Function_pipe(right.right, Array_map(either_right)), leftPad = Array_unfold(left1.length, (index)=>index >= right1.length ? Option_none() : option_some([
+                            let leftPad, rightPad, path = Function_pipe(prefix, Array_join(".")), fail = fromFlatLoopFail(prefix, path), [lefts, rights] = (left1 = Function_pipe(left.right, Array_map(either_right)), right1 = Function_pipe(right.right, Array_map(either_right)), leftPad = Array_unfold(left1.length, (index)=>index >= right1.length ? Option_none() : option_some([
                                     fail(index),
                                     index + 1
                                 ])), rightPad = Array_unfold(right1.length, (index)=>index >= left1.length ? Option_none() : option_some([
@@ -3521,7 +3564,7 @@ let nativeTracer = {
         [FlatConfigProviderTypeId]: FlatConfigProviderTypeId,
         patch: (options = {
             load: (path, primitive, split = !0)=>{
-                let pathString = Function_pipe(path, join(pathDelim)), current = getEnv();
+                let pathString = Function_pipe(path, Array_join(pathDelim)), current = getEnv();
                 return Function_pipe(pathString in current ? option_some(current[pathString]) : Option_none(), mapError(()=>MissingData(path, `Expected ${pathString} to exist in the process context`)), core_flatMap((value)=>{
                     var text, path1, primitive1, delimiter;
                     let text1, delim;
@@ -7175,7 +7218,54 @@ class CacheImpl {
                 handle
             })), timeToLive = ()=>Duration_seconds(60), new CacheImpl(65536, _empty, fiberId_none, lookup, (exit)=>decode(timeToLive()))));
 }, ()=>fiberRefUnsafeMake(!1);
-let FiberSet_TypeId = Symbol.for("effect/FiberSet"), FiberSet_Proto = {
+let getManifestAssetType = (name, assetTypesByName)=>{
+    if (/\.hot-update\.[cm]?js(?:[?#]|$)/.test(name)) return;
+    let assetType = assetTypesByName?.[name];
+    if (void 0 !== assetType) return 'extract-css' === assetType ? 'css' : assetType;
+    let path = name.replace(/[?#].*$/, '');
+    return /\.[cm]?js$/.test(path) ? "javascript" : path.endsWith('.css') ? 'css' : void 0;
+}, orderChunkFiles = (chunkName, files, assetTypesByName)=>{
+    let ownFileIndex = files.findIndex((file)=>"javascript" === getManifestAssetType(file, assetTypesByName) && file.replace(/[?#].*$/, '').replace(/\.[^.]+$/, '').endsWith(chunkName));
+    return ownFileIndex <= 0 ? files : [
+        files[ownFileIndex],
+        ...files.slice(0, ownFileIndex),
+        ...files.slice(ownFileIndex + 1)
+    ];
+}, collectManifestFilesByName = (items, names, getFiles)=>{
+    let filesByName = {};
+    if (!names) {
+        for (let [name, item] of items)null != item && (filesByName[name] = getFiles(item));
+        return filesByName;
+    }
+    let missingNames = new Set(names);
+    if ('function' == typeof items.get) for (let name of names){
+        let item = items.get(name);
+        item && null != item && (filesByName[name] = getFiles(item), missingNames.delete(name));
+    }
+    if (0 === missingNames.size) return filesByName;
+    for (let [name, item] of items)if (missingNames.has(name) && null != item && (filesByName[name] = getFiles(item), missingNames.delete(name), 0 === missingNames.size)) break;
+    return filesByName;
+}, createReactRouterManifestStats = (compilation, chunkNames)=>{
+    if (!compilation) return;
+    let assetsByChunkName = collectManifestFilesByName(compilation.namedChunks, chunkNames, (chunk)=>Array.from(chunk.files ?? [])), entrypointFilesByName = compilation.entrypoints ? collectManifestFilesByName(compilation.entrypoints, chunkNames, (entrypoint)=>Array.from(entrypoint.getFiles?.() ?? [])) : {}, assetTypesByName = {};
+    if (compilation.getAsset) for (let file of new Set([
+        ...Object.values(assetsByChunkName).flat(),
+        ...Object.values(entrypointFilesByName).flat()
+    ])){
+        let info = compilation.getAsset(file)?.info, assetType = info?.assetType ?? ('boolean' == typeof info?.javascriptModule ? "javascript" : void 0);
+        void 0 !== assetType && (assetTypesByName[file] = assetType);
+    }
+    for (let [chunkName, files] of Object.entries(assetsByChunkName))assetsByChunkName[chunkName] = orderChunkFiles(chunkName, files, assetTypesByName);
+    return {
+        assetsByChunkName,
+        ...Object.keys(entrypointFilesByName).length > 0 ? {
+            entrypointFilesByName
+        } : {},
+        ...Object.keys(assetTypesByName).length > 0 ? {
+            assetTypesByName
+        } : {}
+    };
+}, FiberSet_TypeId = Symbol.for("effect/FiberSet"), FiberSet_Proto = {
     [FiberSet_TypeId]: FiberSet_TypeId,
     [Symbol.iterator] () {
         return "Closed" === this.state._tag ? constEmpty : this.state.backing[Symbol.iterator]();
@@ -7306,32 +7396,9 @@ let createReactRouterManifestOptions = ({ routeChunks, routeModuleAnalysis })=>{
             routeModuleAnalysis
         } : {}
     };
-}, isManifestJsAsset = (asset)=>/(?<!\.hot-update)\.[cm]?js(?:\?.*)?$/.test(asset), isManifestCssAsset = (asset)=>/\.css(?:\?.*)?$/.test(asset), hasSome = (iterable)=>{
+}, isManifestJsAsset = (asset)=>/(?<!\.hot-update)\.[cm]?js(?:\?.*)?$/.test(asset), hasSome = (iterable)=>{
     for (let _ of iterable)return !0;
     return !1;
-}, collectManifestFilesByName = (items, names, getFiles)=>{
-    let filesByName = {};
-    if (!names) {
-        for (let [name, item] of items)null != item && (filesByName[name] = getFiles(name, item));
-        return filesByName;
-    }
-    let missingNames = new Set(names);
-    if ('function' == typeof items.get) for (let name of names){
-        let item = items.get(name);
-        null != item && (filesByName[name] = getFiles(name, item), missingNames.delete(name));
-    }
-    if (0 === missingNames.size) return filesByName;
-    for (let [name, item] of items)if (missingNames.has(name) && null != item && (filesByName[name] = getFiles(name, item), missingNames.delete(name), 0 === missingNames.size)) break;
-    return filesByName;
-}, createReactRouterManifestStats = (compilation, chunkNames)=>{
-    if (!compilation) return;
-    let assetsByChunkName = collectManifestFilesByName(compilation.namedChunks, chunkNames, (_chunkName, chunk)=>Array.from(chunk.files ?? [])), entrypointFilesByName = compilation.entrypoints ? collectManifestFilesByName(compilation.entrypoints, chunkNames, (_name, entrypoint)=>Array.from(entrypoint.getFiles?.() ?? [])) : {};
-    return Object.keys(entrypointFilesByName).length > 0 ? {
-        assetsByChunkName,
-        entrypointFilesByName
-    } : {
-        assetsByChunkName
-    };
 }, CSS_IMPORT_RE = /\.(?:css|less|sass|scss)(?:\?[^'"`]+)?['"`]/, getReactRouterManifestPath = ({ version, isBuild, entryModulePath })=>{
     if (!isBuild) return 'static/js/virtual/react-router/browser-manifest.js';
     let dir = ((entryModulePath)=>{
@@ -7343,11 +7410,11 @@ let createReactRouterManifestOptions = ({ routeChunks, routeModuleAnalysis })=>{
 };
 async function generateReactRouterManifestForDev(routes, _options, clientStats, context, assetPrefix = '/', manifestOptions) {
     return runPluginEffect(core_gen(function*() {
-        let chunkAssetsByName, result = {}, splitRouteModules = manifestOptions?.splitRouteModules ?? !1, enforceSplitRouteModules = 'enforce' === splitRouteModules, isBuild = manifestOptions?.isBuild ?? !1, routeChunkConfig = splitRouteModules && manifestOptions?.rootRouteFile ? {
+        let chunkAssetsByName, getAssetType, result = {}, splitRouteModules = manifestOptions?.splitRouteModules ?? !1, enforceSplitRouteModules = 'enforce' === splitRouteModules, isBuild = manifestOptions?.isBuild ?? !1, routeChunkConfig = splitRouteModules && manifestOptions?.rootRouteFile ? {
             splitRouteModules,
             appDirectory: context,
             rootRouteFile: manifestOptions.rootRouteFile
-        } : null, getAssetsForChunk = (chunkAssetsByName = new Map(), (chunkName)=>{
+        } : null, getAssetsForChunk = (chunkAssetsByName = new Map(), getAssetType = (name)=>getManifestAssetType(name, clientStats?.assetTypesByName), (chunkName)=>{
             let cached = chunkAssetsByName.get(chunkName);
             if (cached) return cached;
             let assets = clientStats?.assetsByChunkName?.[chunkName];
@@ -7360,13 +7427,19 @@ async function generateReactRouterManifestForDev(routes, _options, clientStats,
                 };
                 return chunkAssetsByName.set(chunkName, result), result;
             }
-            let cssAssets = new Set(), jsAssets = new Set();
-            for (let asset of assets)isManifestCssAsset(asset) ? cssAssets.add(asset) : isManifestJsAsset(asset) && jsAssets.add(asset);
-            for (let asset of clientStats?.entrypointFilesByName?.[chunkName] ?? [])isManifestCssAsset(asset) ? cssAssets.add(asset) : isBuild && isManifestJsAsset(asset) && jsAssets.add(asset);
-            if (0 === jsAssets.size) throw Error(`[react-router] Chunk "${chunkName}" emitted no JavaScript asset the browser manifest can reference (files: ${assets.join(', ') || 'none'}). Check the web \`output.filename.js\` scheme.`);
+            let cssAssets = new Set(), jsAssets = [];
+            for (let asset of assets){
+                let assetType = getAssetType(asset);
+                'css' === assetType ? cssAssets.add(asset) : "javascript" === assetType && jsAssets.push(asset);
+            }
+            if (0 === jsAssets.length) throw Error(`[react-router] Chunk "${chunkName}" emitted no JavaScript asset the browser manifest can reference (files: ${assets.join(', ') || 'none'}). Check the web \`output.filename.js\` scheme.`);
+            for (let asset of clientStats?.entrypointFilesByName?.[chunkName] ?? []){
+                let assetType = getAssetType(asset);
+                'css' === assetType ? cssAssets.add(asset) : isBuild && "javascript" === assetType && jsAssets.push(asset);
+            }
             let result = {
                 js: [
-                    ...jsAssets
+                    ...new Set(jsAssets)
                 ],
                 css: [
                     ...cssAssets
@@ -7465,12 +7538,12 @@ async function generateReactRouterManifestForDev(routes, _options, clientStats,
         }, version = createHash('sha256').update(JSON.stringify(fingerprintedValues)).digest('hex').slice(0, 8), manifestPath = getReactRouterManifestPath({
             version,
             isBuild,
-            entryModulePath: entryJsAssets[0]
-        });
+            entryModulePath: (entryJsAssets[0] ?? '').replace(/[?#].*$/, '')
+        }), browserManifestPath = clientStats?.assetsByChunkName?.[BROWSER_MANIFEST_ENTRY_NAME]?.find((name)=>"javascript" === getManifestAssetType(name, clientStats.assetTypesByName)) ?? manifestPath;
         return {
             manifest: {
                 version,
-                url: combineURLs(assetPrefix, isBuild ? manifestPath : `${manifestPath}?v=${version}`),
+                url: combineURLs(assetPrefix, isBuild ? manifestPath : `${browserManifestPath}${browserManifestPath.includes('?') ? '&' : '?'}v=${version}`),
                 hmr: void 0,
                 entry: fingerprintedValues.entry,
                 sri: void 0,
@@ -7962,8 +8035,8 @@ let defaultWorkerPath = fileURLToPath(new URL('./server-build-worker.js', import
             unstable_subResourceIntegrity: subResourceIntegrity
         }
     };
-}, BROWSER_MANIFEST_ASSET = 'static/js/virtual/react-router/browser-manifest.js', ABSOLUTE_URL_RE = /^[a-zA-Z][a-zA-Z\d+\-.]*:/, addIntegrity = (sri, assetPrefix, assetName, integrity)=>{
-    'string' == typeof assetName && isManifestJsAsset(assetName) && 'string' == typeof integrity && (sri[ABSOLUTE_URL_RE.test(assetName) || assetName.startsWith('//') || assetName.startsWith('/') ? assetName : combineURLs(assetPrefix, assetName)] = integrity);
+}, ABSOLUTE_URL_RE = /^[a-zA-Z][a-zA-Z\d+\-.]*:/, addIntegrity = (sri, assetPrefix, assetName, integrity)=>{
+    'string' == typeof integrity && (sri[ABSOLUTE_URL_RE.test(assetName) || assetName.startsWith('//') || assetName.startsWith('/') ? assetName : combineURLs(assetPrefix, assetName)] = integrity);
 }, computeSubresourceIntegrity = (source)=>{
     if (source) return `sha384-${createHash('sha384').update(source.source()).digest('base64')}`;
 };
@@ -7988,7 +8061,7 @@ let isRelocatableServerAsset = (info)=>!!info?.sourceFilename && !info?.javascri
         return collected.sort((a, b)=>a.name < b.name ? -1 : +(a.name > b.name)), collected;
     })(compilation), written = [], skipped = [];
     for (let asset of assets){
-        let destination = external_pathe_join(outputClientPath, asset.name), sourceBuffer = asset.source.buffer(), sourceDigest = digestBuffer(sourceBuffer);
+        let destination = join(outputClientPath, asset.name), sourceBuffer = asset.source.buffer(), sourceDigest = digestBuffer(sourceBuffer);
         if (relocatedDestinations?.get(destination) === sourceDigest || existsSyncFn(destination) && digestBuffer(await readFileFn(destination)) === sourceDigest) skipped.push(asset.name);
         else {
             await mkdirFn(dirname(destination));
@@ -8066,7 +8139,7 @@ let VIRTUAL_MODULE_PREFIX = 'virtual/react-router/', getVirtualModuleFilePath =
     let relativeId = moduleId.slice(VIRTUAL_MODULE_PREFIX.length), segments = relativeId.split('/');
     if (!relativeId || segments.some((segment)=>!segment || '.' === segment || '..' === segment)) throw Error(`Invalid virtual module id: ${moduleId}`);
     return `node_modules/${moduleId}.js`;
-}, DEV_MANIFEST_UPDATE_EVENT = 'react-router:manifest-update', dev_hmr_isObject = (value)=>null !== value && 'object' == typeof value, isSwcLoader = (loader)=>'string' == typeof loader && loader.includes('builtin:swc-loader'), readSwcLoaderRefresh = (value)=>Array.isArray(value) ? value.some(readSwcLoaderRefresh) : !!dev_hmr_isObject(value) && (isSwcLoader(value.loader) ? value.options?.jsc?.transform?.react?.refresh === !0 : Object.values(value).some(readSwcLoaderRefresh)), readRuleSwcRefresh = (rule)=>!!dev_hmr_isObject(rule) && (isSwcLoader(rule.loader) ? readSwcLoaderRefresh(rule) : readSwcLoaderRefresh(rule.use) || readRuleSetSwcRefresh(rule.oneOf) || readRuleSetSwcRefresh(rule.rules)), readRuleSetSwcRefresh = (rules)=>Array.isArray(rules) && rules.some(readRuleSwcRefresh), isRspackSwcReactRefreshEnabled = (rspackConfig)=>readRuleSetSwcRefresh(rspackConfig.module?.rules), REACT_ROUTER_EXTERNALS = [
+}, REACT_ROUTER_EXTERNALS = [
     'react-router',
     'react-router-dom',
     '@react-router/architect',
@@ -9080,7 +9153,7 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
     });
     return {
         buildManifest,
-        devRuntime: (({ api, isBuild, buildPlan, clientPatchesRouteMetadata, onNodeRebuildCommitted })=>{
+        devRuntime: (({ api, isBuild, buildPlan, clientPatchesRouteMetadata })=>{
             let scheduledCssAssetOwnershipReload, state, nextSessionId, closeObservationByServer, isCurrentBinding, applyCloseOutcome, observeClose, identityByCompilation, webIdentityByNodeCompilation, attemptIdentityByCompilation;
             if (isBuild) return {
                 captureWeb () {},
@@ -9097,8 +9170,8 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                 scheduledCssAssetOwnershipReload = setTimeout(()=>{
                     scheduledCssAssetOwnershipReload = void 0, lastCssAssetOwnershipReloadAt > scheduledAt || sendCssAssetOwnershipReload();
                 }, 1000);
-            }, closeBinding = (binding, error)=>{
-                scheduledCssAssetOwnershipReload && (clearTimeout(scheduledCssAssetOwnershipReload), scheduledCssAssetOwnershipReload = void 0), reloadAfterCssAssetOwnershipRemoval = !1;
+            }, hdrChannels = new WeakMap(), isHmrEnabled = ()=>'function' == typeof clientPatchesRouteMetadata ? clientPatchesRouteMetadata() : !0 === clientPatchesRouteMetadata, closeBinding = (binding, error)=>{
+                hdrChannels.get(binding)?.close(), hdrChannels.delete(binding), scheduledCssAssetOwnershipReload && (clearTimeout(scheduledCssAssetOwnershipReload), scheduledCssAssetOwnershipReload = void 0), reloadAfterCssAssetOwnershipRemoval = !1;
                 let pair = binding.compilers;
                 pair && (pair.pendingAttempt = void 0, pair.currentAttemptIdentity = void 0, pair.latestCompletedWebIdentity = void 0, pair.latestCompletedWebStats = void 0, pair.latestCompletedNodeStats = void 0, pair.latestWebStart = void 0, pair.latestNodeStart = void 0), binding.compilers = void 0, binding.runtime.close(error);
                 var server = binding.server, runtime = binding.runtime;
@@ -9206,7 +9279,7 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                     if ('retry-node' === result) return void pair.node.watching?.invalidate();
                     let nodeCompilation = getEnvironmentStats(stats, 'node')?.compilation;
                     'committed' === result && nodeCompilation && identity.node === binding.runtime.getCommittedNodeIdentity() && hdrIntentsByPair.get(pair)?.signalCommitted(nodeCompilation, ()=>{
-                        onNodeRebuildCommitted?.();
+                        hdrChannels.get(binding)?.publish();
                     });
                 } catch (cause) {
                     sessions.getActiveBinding()?.id === binding.id && binding.runtime.failAttempt(normalizeEffectError(cause));
@@ -9435,7 +9508,7 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                             sessions.getActiveBinding()?.runtime === runtime && (reloadAfterCssAssetOwnershipRemoval = 'removed' === change, sendCssAssetOwnershipReload());
                         },
                         onRouteManifestChanged (manifest) {
-                            sessions.getActiveBinding()?.runtime !== runtime || (('function' == typeof clientPatchesRouteMetadata ? clientPatchesRouteMetadata() : clientPatchesRouteMetadata) ? server.sockWrite('custom', {
+                            sessions.getActiveBinding()?.runtime === runtime && (isHmrEnabled() ? server.sockWrite('custom', {
                                 event: DEV_MANIFEST_UPDATE_EVENT,
                                 data: manifest.routes
                             }) : server.sockWrite('full-reload', {
@@ -9444,7 +9517,28 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                         },
                         onWarning: (message)=>api.logger.warn(message)
                     }), binding = sessions.createBinding(server, runtime);
-                    Object.defineProperty(server, DEV_RUNTIME_KEY, {
+                    hdrChannels.set(binding, (({ hot, isEnabled })=>{
+                        let sessionId = randomUUID(), revision = 0, closed = !1, payload = ()=>({
+                                event: DEV_HDR_UPDATE_EVENT,
+                                data: {
+                                    sessionId,
+                                    revision
+                                }
+                            }), unsubscribe = hot.onConnect((client)=>{
+                            !closed && isEnabled() && revision > 0 && client.send('custom', payload());
+                        });
+                        return {
+                            publish () {
+                                !closed && isEnabled() && (revision += 1, hot.send('custom', payload()));
+                            },
+                            close () {
+                                closed || (closed = !0, unsubscribe());
+                            }
+                        };
+                    })({
+                        hot: server.environments.web.hot,
+                        isEnabled: ()=>sessions.getActiveBinding() === binding && isHmrEnabled()
+                    })), Object.defineProperty(server, DEV_RUNTIME_KEY, {
                         configurable: !0,
                         enumerable: !1,
                         value: runtime
@@ -9516,7 +9610,7 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                 }), node.hooks.thisCompilation.tap(`${PLUGIN_NAME}:dev-node-web-compilation`, (compilation)=>{
                     if (sessions.getActiveBinding()?.id !== sessionId) return;
                     let changes = snapshotDevChangedFiles(pair.node);
-                    hdrIntents.capture(compilation, changes.known && Array.from(changes.files).some((file)=>!file.includes('.react-router/hdr-revision.mjs') && !/\.css(?:\.[cm]?[jt]s)?$/.test(file))), pair.latestNodeStart = {
+                    hdrIntents.capture(compilation, changes.known && Array.from(changes.files).some((file)=>!/\.css(?:\.[cm]?[jt]s)?$/.test(file))), pair.latestNodeStart = {
                         status: 'started',
                         identity: getCompilationIdentity(compilation)
                     }, pair.currentAttemptIdentity && compilationIdentities.setAttemptIdentityForCompilation(compilation, pair.currentAttemptIdentity), pair.latestCompletedWebIdentity && compilationIdentities.setWebIdentityForNodeCompilation(compilation, pair.latestCompletedWebIdentity);
@@ -9570,8 +9664,7 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
             api,
             isBuild,
             buildPlan: serverBuildPlan,
-            clientPatchesRouteMetadata: devHmr?.isEnabled,
-            onNodeRebuildCommitted: devHmr?.onNodeRebuildCommitted
+            clientPatchesRouteMetadata: devHmr?.isEnabled
         }),
         prerenderPaths,
         routesByServerBundleId,
@@ -9858,7 +9951,7 @@ export {
         nodeDependencies: {}
     };
 }, createClassicModePlan = async ({ api, allowedActionOriginsForBuild, appDirectory, assetsBuildDirectory, basename, customServer, defaultEntryName, devHmr, entryServerPath, finalEntryClientPath, future, hasServerApp, isBuild, isSpaMode, prerenderConfig, reactRouterConfig, routeChunkCache, routeConfig, routeDiscovery, routes, rootRouteFile, serverAppPath, shouldDependOnWebCompiler, splitRouteModules, ssr })=>{
-    var rootDirectory;
+    var rootPath, rootDirectory;
     let reactRouterPath, reactRouterDomPath, { manifestChunkNames, webRouteEntries } = (({ appDirectory, isBuild, routes, splitRouteModules })=>{
         let manifestChunkNames = new Set([
             'entry.client'
@@ -9907,7 +10000,7 @@ export {
         rootDirectory: process.cwd(),
         ssr,
         devHmr
-    }), reactRouterAliases = (reactRouterPath = resolveAppPackagePath('react-router'), reactRouterDomPath = resolveAppPackagePath('react-router/dom'), {
+    }), reactRouterAliases = (reactRouterPath = resolveAppPackagePath('react-router', rootPath = api.context.rootPath), reactRouterDomPath = resolveAppPackagePath('react-router/dom', rootPath), {
         ...reactRouterPath ? {
             'react-router$': reactRouterPath
         } : {},
@@ -9988,7 +10081,7 @@ export {
                     ...bundleManifestModules,
                     'virtual/react-router/with-props': generateWithProps(),
                     ...void 0 !== devHmrRuntimeModule ? {
-                        'virtual/react-router/hmr-runtime': devHmrRuntimeModule
+                        [DEV_HMR_RUNTIME_MODULE_ID]: devHmrRuntimeModule
                     } : {}
                 };
             })({
@@ -10012,14 +10105,21 @@ export {
             }),
         server: customServer ? void 0 : {
             setup: [
-                (({ loadBuild })=>function(context) {
+                (({ loadBuild, rootPath })=>function(context) {
                         if ('dev' === context.action) return ()=>{
                             var dependencies;
                             let listenerPromise, getListener;
                             installDevServerSourceMapSupport(), context.server.middlewares.use((dependencies = {
-                                loadBuild
+                                loadBuild,
+                                rootPath
                             }, (getListener = ()=>listenerPromise ??= (async ()=>{
-                                    let createRequestHandler = dependencies.createRequestHandler ?? (await import("react-router")).createRequestHandler, createRequestListener = dependencies.createRequestListener ?? (await import("@remix-run/node-fetch-server")).createRequestListener, requestHandler = createRequestHandler(dependencies.loadBuild, 'development');
+                                    let createRequestHandler = dependencies.createRequestHandler;
+                                    if (!createRequestHandler) {
+                                        let reactRouterPath = resolveAppPackagePath('react-router', dependencies.rootPath);
+                                        if (!reactRouterPath) throw Error('Cannot resolve react-router from the application.');
+                                        createRequestHandler = (await import(pathToFileURL(reactRouterPath).href)).createRequestHandler;
+                                    }
+                                    let createRequestListener = dependencies.createRequestListener ?? (await import("@remix-run/node-fetch-server")).createRequestListener, requestHandler = createRequestHandler(dependencies.loadBuild, 'development');
                                     return createRequestListener((request)=>requestHandler(request));
                                 })())().catch(()=>{
                                 listenerPromise = void 0;
@@ -10033,7 +10133,8 @@ export {
                             }));
                         };
                     })({
-                    loadBuild: artifacts.devRuntime.createBuildLoader()
+                    loadBuild: artifacts.devRuntime.createBuildLoader(),
+                    rootPath: api.context.rootPath
                 })
             ]
         },
@@ -10113,7 +10214,7 @@ export {
         name: PLUGIN_NAME,
         async setup (api) {
             var memoMap;
-            let sendRscDevUpdate, scheduledRscDevUpdate, clientStats, fiberRunFork, disposePromise, buildFiber, scope, runtimeEffect, self, runtime, reactRouterUserConfig, effectRuntime = (memoMap = memoMap ?? unsafeMakeMemoMap(), scope = unsafeRunSyncEffect(fiberRuntime_scopeMake()), runtimeEffect = core_suspend(()=>{
+            let sendRscDevUpdate, scheduledRscDevUpdate, persistedSnapshotError, clientStats, fiberRunFork, disposePromise, buildFiber, scope, runtimeEffect, self, runtime, reactRouterUserConfig, effectRuntime = (memoMap = memoMap ?? unsafeMakeMemoMap(), scope = unsafeRunSyncEffect(fiberRuntime_scopeMake()), runtimeEffect = core_suspend(()=>{
                 if (!buildFiber) {
                     let scheduler = new SyncScheduler();
                     buildFiber = unsafeForkEffect(core_tap(scopeExtend(toRuntimeWithMemoMap(PluginRuntimeLive, memoMap), scope), (rt)=>{
@@ -10210,7 +10311,7 @@ export {
                     (isSourceMapEnabled(sourceMapSetting) || !0 === devtoolSetting || ('string' == typeof devtoolSetting ? devtoolSetting.includes('source-map') : null !== devtoolSetting && 'object' == typeof devtoolSetting)) && warn("\n  WARNING: Source maps are enabled in production\n  This makes your server code publicly visible in the browser.\n  This is highly discouraged! If you insist, ensure that you are using\n  environment variables for secrets and not hard-coding them in your source code.\n");
                 }(api.getNormalizedConfig(), (msg)=>api.logger.warn(msg), 'web');
             }), api.onBeforeCreateCompiler(()=>{
-                let root = api.getNormalizedConfig(), web = root.environments.web;
+                let root = api.getNormalizedConfig(), web = root.environments.web ?? api.getRsbuildConfig().environments?.web;
                 assetPrefix = resolveEffectiveAssetPrefix({
                     dev: web?.dev,
                     output: web?.output,
@@ -10300,7 +10401,7 @@ export {
                     hasConfiguredServerModuleFormat: void 0 !== userAndPresetConfigs.serverModuleFormat
                 };
             }))), { appDirectory, basename, buildDirectory, future, allowedActionOrigins, routeDiscovery: userRouteDiscovery, ssr, prerender: prerenderConfig, serverBuildFile, serverBundles, serverModuleFormat, splitRouteModules, subResourceIntegrity, buildEnd } = resolvedConfig;
-            await registerReactRouterTypegen(api, {
+            !1 !== pluginOptions.typegen && await registerReactRouterTypegen(api, {
                 runtime: effectRuntime,
                 appDirectory
             });
@@ -10556,42 +10657,59 @@ export {
                 routeConfigWatchPaths,
                 routeRestartMarkerPath,
                 onRouteTopologyChange: pluginOptions.onRouteTopologyChange
-            }), latestBrowserManifest = null, latestBrowserManifestModuleExports = {}, latestServerManifest = null, latestServerManifestsByBundleId = {}, serverManifestStampPath = external_pathe_resolve(api.context.cachePath, 'react-router', 'server-manifest.json'), routeByFilePath = new Map(Object.values(routes).map((route)=>[
+            }), serverManifestStampPath = external_pathe_resolve(api.context.cachePath, 'react-router', createHash('sha256').update(JSON.stringify([
+                appDirectory,
+                outputClientPath
+            ])).digest('hex'), 'server-manifest.json'), writeServerManifestStamp = (snapshot)=>{
+                let previous, stamp = JSON.stringify({
+                    schema: 1,
+                    isBuild,
+                    appDirectory,
+                    outputClientPath,
+                    routes,
+                    assetPrefix,
+                    snapshot
+                });
+                try {
+                    previous = readFileSync(serverManifestStampPath, 'utf8');
+                } catch (error) {
+                    if ('ENOENT' !== error.code) throw error;
+                }
+                stamp !== previous && fs_extra.outputFileSync(serverManifestStampPath, stamp);
+            }, routeByFilePath = new Map(Object.values(routes).map((route)=>[
                     external_pathe_resolve(appDirectory, route.file),
                     route
                 ])), devHmrRefreshRuntimePath = isBuild || isRscMode ? void 0 : ((rootPath)=>{
-                let resolveFrom = (base, request)=>createRequire(base).resolve(request), rootPackageJson = external_pathe_join(rootPath, 'package.json');
+                let resolveFrom = (base, request)=>createRequire(base).resolve(request), rootPackageJson = join(rootPath, 'package.json');
                 try {
                     let pluginReactEntry = resolveFrom(rootPackageJson, '@rsbuild/plugin-react'), refreshPluginEntry = resolveFrom(pluginReactEntry, '@rspack/plugin-react-refresh');
                     return resolveFrom(refreshPluginEntry, 'react-refresh/runtime');
                 } catch  {
                     return;
                 }
-            })(api.context.rootPath), devHdrSignal = devHmrRefreshRuntimePath ? (({ filePath, onError })=>{
-                let revision = 0, dirEnsured = !1, write = ()=>{
-                    try {
-                        let revision1;
-                        dirEnsured || (mkdirSync(dirname(filePath), {
-                            recursive: !0
-                        }), dirEnsured = !0), writeFileSync(filePath, (revision1 = revision, `export default ${revision1};\n`));
-                    } catch (error) {
-                        onError?.(error instanceof Error ? error : Error(String(error)));
-                    }
-                };
-                return {
-                    filePath,
-                    ensure: write,
-                    bump () {
-                        revision += 1, write();
-                    }
-                };
-            })({
-                filePath: external_pathe_join(api.context.rootPath, '.react-router', 'hdr-revision.mjs'),
-                onError: (error)=>api.logger.debug(`[${PLUGIN_NAME}] Failed to signal hot data revalidation: ${error.message}`)
-            }) : void 0, devHmrEnabled = !1;
-            devHmrRefreshRuntimePath && devHdrSignal && api.modifyEnvironmentConfig(async (environmentConfig, { name, mergeEnvironmentConfig })=>'web' !== name ? environmentConfig : mergeEnvironmentConfig(environmentConfig, {
+            })(api.context.rootPath), devHmrEnabled = !1;
+            devHmrRefreshRuntimePath && api.modifyEnvironmentConfig(async (environmentConfig, { name, mergeEnvironmentConfig })=>'web' !== name ? environmentConfig : mergeEnvironmentConfig(environmentConfig, {
                     tools: {
-                        rspack: (rspackConfig)=>((devHmrEnabled = isRspackSwcReactRefreshEnabled(rspackConfig)) && devHdrSignal.ensure(), rspackConfig)
+                        rspack: (rspackConfig)=>{
+                            if (devHmrEnabled = isRspackSwcReactRefreshEnabled(rspackConfig)) {
+                                let entries = rspackConfig.entry;
+                                if (entries && 'object' == typeof entries && !Array.isArray(entries)) for (let [name, entry] of Object.entries(entries)){
+                                    let description = 'string' == typeof entry || Array.isArray(entry) ? {
+                                        import: entry
+                                    } : entry;
+                                    entries[name] = {
+                                        ...description,
+                                        import: [
+                                            DEV_HMR_RUNTIME_MODULE_ID,
+                                            ...[
+                                                description.import ?? []
+                                            ].flat()
+                                        ]
+                                    };
+                                }
+                            }
+                            return rspackConfig;
+                        }
                     }
                 }));
             let commonModeOptions = {
@@ -10632,18 +10750,10 @@ export {
                 routeChunkCache,
                 serverAppPath,
                 shouldDependOnWebCompiler,
-                devHmr: devHmrRefreshRuntimePath && devHdrSignal ? {
+                devHmr: devHmrRefreshRuntimePath ? {
                     isEnabled: ()=>devHmrEnabled,
-                    runtimeModule: (({ reactRefreshRuntimePath, hdrRevisionFilePath })=>`
+                    runtimeModule: (({ reactRefreshRuntimePath })=>`
 import * as __refreshRuntimeModule from ${JSON.stringify(reactRefreshRuntimePath)};
-// Read revision so the import survives sideEffects: false tree-shaking.
-import __hdrRevision from ${JSON.stringify(hdrRevisionFilePath)};
-
-let latestHdrRevision = __hdrRevision;
-
-export function getReactRouterHdrRevision() {
-  return latestHdrRevision;
-}
 
 const RefreshRuntime =
   __refreshRuntimeModule && __refreshRuntimeModule.performReactRefresh
@@ -10653,7 +10763,24 @@ const RefreshRuntime =
 const pendingRouteUpdates = new Map();
 let flushTimeout;
 let pendingRevalidation = false;
-let pendingComponentRouteRevalidation = false;
+let flushing = false;
+let hdrSession;
+let latestHdrRevision = 0;
+const retiredHdrSessions = new Set();
+
+function receiveHdrRevision(message) {
+  if (!message || typeof message.sessionId !== 'string' ||
+      !Number.isSafeInteger(message.revision) || message.revision < 1 ||
+      retiredHdrSessions.has(message.sessionId)) return;
+  if (hdrSession !== message.sessionId) {
+    if (hdrSession) retiredHdrSessions.add(hdrSession);
+    hdrSession = message.sessionId;
+    latestHdrRevision = 0;
+  }
+  if (message.revision <= latestHdrRevision) return;
+  latestHdrRevision = message.revision;
+  scheduleReactRouterRevalidation();
+}
 
 function getCurrentRouterPath(router) {
   const basename = router.basename || '/';
@@ -10694,7 +10821,7 @@ export function scheduleReactRouterRouteUpdate(
   scheduleFlush();
 }
 
-export function scheduleReactRouterRevalidation() {
+function scheduleReactRouterRevalidation() {
   pendingRevalidation = true;
   scheduleFlush();
 }
@@ -10893,45 +11020,50 @@ function applyManifestUpdate(nextRoutes) {
 }
 
 async function flush() {
+  if (flushing) return;
+  if (import.meta.webpackHot && import.meta.webpackHot.status() !== 'idle') {
+    scheduleFlush();
+    return;
+  }
   const router = window.__reactRouterDataRouter;
   const routeModules = window.__reactRouterRouteModules;
   const manifest = window.__reactRouterManifest;
   const context = window.__reactRouterContext;
   if (!router || !routeModules || !manifest || !context) {
+    scheduleFlush();
     return;
   }
-
-  let shouldRevalidate = pendingRevalidation;
-  pendingRevalidation = false;
-  const { nextManifest, hmrRoutes, shouldRefreshRouteState } =
-    applyPendingRouteUpdates(router, routeModules, manifest, context);
-  // Loader updates must be visible during revalidation. Component-only routes
-  // stay staged until revalidation completes, matching React Router's HMR flow.
-  if (nextManifest && shouldRefreshRouteState) {
-    pendingComponentRouteRevalidation = false;
-    if (hmrRoutes) {
-      patchCurrentRouteMatches(router, hmrRoutes);
-    }
-    Object.assign(manifest, nextManifest);
-    await refreshRouteState(router);
-    shouldRevalidate = false;
-  } else if (nextManifest) {
-    if (hmrRoutes) {
-      patchCurrentRouteMatches(router, hmrRoutes);
-    }
-    Object.assign(manifest, nextManifest);
-    // The node compiler also emits an HDR revision for this route edit. If it
-    // did not arrive in this flush, consume that redundant revalidation later.
-    pendingComponentRouteRevalidation = !shouldRevalidate;
-    shouldRevalidate = false;
-  } else if (shouldRevalidate) {
-    if (pendingComponentRouteRevalidation) {
-      pendingComponentRouteRevalidation = false;
-    } else {
+  flushing = true;
+  try {
+    let shouldRevalidate = pendingRevalidation;
+    pendingRevalidation = false;
+    const { nextManifest, hmrRoutes, shouldRefreshRouteState } =
+      applyPendingRouteUpdates(router, routeModules, manifest, context);
+    // Loader updates must be visible during revalidation. Component-only routes
+    // stay staged until revalidation completes, matching React Router's HMR flow.
+    if (nextManifest && shouldRefreshRouteState) {
+      if (hmrRoutes) {
+        patchCurrentRouteMatches(router, hmrRoutes);
+      }
+      Object.assign(manifest, nextManifest);
+      await refreshRouteState(router);
+      shouldRevalidate = false;
+    } else if (nextManifest) {
+      if (hmrRoutes) {
+        patchCurrentRouteMatches(router, hmrRoutes);
+      }
+      Object.assign(manifest, nextManifest);
+    }
+    // A replay may represent several server edits, not just the component
+    // update in this batch. Only an actual data revalidation can consume it.
+    if (shouldRevalidate) {
       await revalidateRouter(router);
     }
+    performReactRefresh();
+  } finally {
+    flushing = false;
+    if (pendingRevalidation || pendingRouteUpdates.size > 0) scheduleFlush();
   }
-  performReactRefresh();
 }
 
 if (typeof window !== 'undefined' && import.meta.webpackHot) {
@@ -10939,21 +11071,14 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
     ${JSON.stringify(DEV_MANIFEST_UPDATE_EVENT)},
     applyManifestUpdate
   );
-  import.meta.webpackHot.accept(
-    ${JSON.stringify(hdrRevisionFilePath)},
-    () => {
-      latestHdrRevision = __hdrRevision;
-      scheduleReactRouterRevalidation();
-    }
+  import.meta.webpackHot.on(
+    ${JSON.stringify(DEV_HDR_UPDATE_EVENT)},
+    receiveHdrRevision
   );
 }
 `)({
-                        reactRefreshRuntimePath: devHmrRefreshRuntimePath,
-                        hdrRevisionFilePath: devHdrSignal.filePath
-                    }),
-                    onNodeRebuildCommitted: ()=>{
-                        devHmrEnabled && devHdrSignal.bump();
-                    }
+                        reactRefreshRuntimePath: devHmrRefreshRuntimePath
+                    })
                 } : void 0
             })), { manifestChunkNames } = modePlan, hasPendingRscNodeUpdate = !1, pendingRscNodeFiles = new Set();
             isRscMode && !isBuild && (api.onBeforeStartDevServer(({ server })=>{
@@ -10996,8 +11121,81 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                 getRouteTopology: routeTopology.getRouteTopology,
                 initialRouteTopology: routeTopology.initialRouteTopology,
                 onRouteTopologyChange: pluginOptions.onRouteTopologyChange
+            }), manifestState = (({ api, isBuild, onPublish })=>{
+                let latest = null, pending = new WeakMap();
+                return isBuild && api.onBeforeEnvironmentCompile(({ environment })=>{
+                    'web' === environment.name && (latest = null);
+                }), api.onAfterEnvironmentCompile(({ environment, stats })=>{
+                    if ('web' !== environment.name) return;
+                    let snapshot = stats && !stats.hasErrors() ? pending.get(stats.compilation) : void 0;
+                    if (stats && pending.delete(stats.compilation), snapshot && stats) {
+                        var compilation;
+                        compilation = stats.compilation, latest = snapshot, onPublish(compilation, snapshot);
+                    } else isBuild && (latest = null);
+                }), {
+                    stage (compilation, snapshot) {
+                        pending.set(compilation, snapshot);
+                    },
+                    read: ()=>latest
+                };
+            })({
+                api,
+                isBuild,
+                onPublish: (compilation, snapshot)=>{
+                    writeServerManifestStamp(snapshot), devBackgroundResources.setManifest(snapshot.browser), isBuild || 'classic' !== modePlan.kind || modePlan.artifacts.devRuntime.captureWeb(compilation, snapshot.serverByEntryName);
+                }
+            }), persistedSnapshot = null;
+            api.onBeforeCreateCompiler(()=>{
+                if (!isBuild || 'classic' !== modePlan.kind || api.getNormalizedConfig().environments.web) return;
+                let rebuildMessage = `[${PLUGIN_NAME}] Run a full build before building only the node environment; no compatible finalized browser manifest is available.`;
+                try {
+                    let stamp = JSON.parse(readFileSync(serverManifestStampPath, 'utf8'));
+                    if (1 !== stamp.schema || !0 !== stamp.isBuild || stamp.appDirectory !== appDirectory || stamp.outputClientPath !== outputClientPath || stamp.assetPrefix !== assetPrefix || JSON.stringify(stamp.routes) !== JSON.stringify(routes) || 'string' != typeof stamp.snapshot?.server?.version || !stamp.snapshot?.serverByBundleId || !stamp.snapshot?.browser) throw Error(rebuildMessage);
+                    persistedSnapshot = createReactRouterManifestSnapshot({
+                        manifest: stamp.snapshot.browser,
+                        sri: stamp.snapshot.server.sri,
+                        moduleExportsByRouteId: stamp.snapshot.moduleExportsByRouteId,
+                        serverBuildPlan: {
+                            defaultEntryName: devServerBuildEntryName,
+                            serverBundleEntries: modePlan.artifacts.serverBundleEntries
+                        },
+                        routesByServerBundleId: modePlan.artifacts.routesByServerBundleId
+                    }), writeServerManifestStamp(persistedSnapshot);
+                } catch (cause) {
+                    persistedSnapshotError = Error(rebuildMessage, {
+                        cause
+                    });
+                }
             });
-            if (api.onAfterEnvironmentCompile(({ stats, environment })=>{
+            let readManifestSnapshot = ()=>{
+                if (persistedSnapshotError) throw persistedSnapshotError;
+                return manifestState.read() ?? persistedSnapshot;
+            };
+            if (isBuild && 'classic' === modePlan.kind && (({ api, routeByFilePath, getSnapshot })=>{
+                api.modifyRspackConfig((config, { environment })=>{
+                    'node' === environment.name && (config.plugins ??= [], config.plugins.push({
+                        apply (compiler) {
+                            let name = 'ReactRouterNodeOnlyManifestValidation';
+                            compiler.hooks.thisCompilation.tap(name, (compilation)=>{
+                                compilation.hooks.afterOptimizeModules.tap(name, (modules)=>{
+                                    let snapshot = getSnapshot();
+                                    if (snapshot) for (let module of modules){
+                                        if (!(module instanceof rspack.NormalModule)) continue;
+                                        let route = routeByFilePath.get(external_pathe_resolve(module.resource.split('?')[0]));
+                                        if (!route) continue;
+                                        let exports = compilation.moduleGraph.getProvidedExports(module), saved = snapshot.browser.routes[route.id];
+                                        if (!Array.isArray(exports) || !saved || exports.includes('loader') !== saved.hasLoader || exports.includes('action') !== saved.hasAction) throw Error(`Run a full build before building only the node environment: loader/action exports changed for route "${route.id}".`);
+                                    }
+                                });
+                            });
+                        }
+                    }));
+                });
+            })({
+                api,
+                routeByFilePath,
+                getSnapshot: ()=>persistedSnapshot
+            }), api.onAfterEnvironmentCompile(({ stats, environment })=>{
                 if ('web' === environment.name && (clientStats = createReactRouterManifestStats(stats?.compilation, manifestChunkNames), isRscMode && stats)) {
                     let unsupported = ((compilation)=>{
                         let unsupported = new Set();
@@ -11027,7 +11225,7 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                 logPerformance && performanceProfiler.flush(environment.name, {
                     compilerLifecycleMs: roundMs(performance.now() - setupStartMs)
                 });
-            }), 'classic' === modePlan.kind ? api.onAfterBuild(({ environments })=>effectRuntime.runPromise(tryPluginPromise(()=>runReactRouterPrerenderBuild({
+            }), 'classic' === modePlan.kind ? api.onAfterBuild(({ environments, stats })=>stats?.hasErrors() ? void 0 : effectRuntime.runPromise(tryPluginPromise(()=>runReactRouterPrerenderBuild({
                         api,
                         hasWebEnvironment: !!environments.web,
                         buildDirectory,
@@ -11039,8 +11237,8 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                         basename,
                         future,
                         routes,
-                        latestBrowserManifest,
-                        latestBrowserManifestModuleExports,
+                        latestBrowserManifest: readManifestSnapshot()?.browser ?? null,
+                        latestBrowserManifestModuleExports: readManifestSnapshot()?.moduleExportsByRouteId ?? {},
                         clientStats,
                         pluginOptions,
                         appDirectory,
@@ -11050,7 +11248,7 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                         buildManifest: modePlan.artifacts.buildManifest,
                         buildEndReactRouterConfig: resolvedConfigWithRoutes,
                         buildEnd
-                    })))) : api.onAfterBuild(({ environments })=>effectRuntime.runPromise(tryPluginPromise(()=>runReactRouterRscPrerenderBuild({
+                    })))) : api.onAfterBuild(({ environments, stats })=>stats?.hasErrors() ? void 0 : effectRuntime.runPromise(tryPluginPromise(()=>runReactRouterRscPrerenderBuild({
                         api,
                         hasWebEnvironment: !!environments.web,
                         buildDirectory,
@@ -11417,7 +11615,7 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                 outputClientPath,
                 performanceProfiler
             })) : (!function(api, routes, pluginOptions, appDirectory, assetPrefix = '/', routeChunkOptions, options) {
-                let getAssetPrefix = 'function' == typeof assetPrefix ? assetPrefix : ()=>assetPrefix, manifestChunkNames = options?.manifestChunkNames ?? ((routes, appDirectory, splitRouteModules = !1)=>{
+                let getAssetPrefix = 'function' == typeof assetPrefix ? assetPrefix : ()=>assetPrefix, manifestChunkNames = new Set(options?.manifestChunkNames ?? ((routes, appDirectory, splitRouteModules = !1)=>{
                     let chunkNames = new Set([
                         'entry.client'
                     ]);
@@ -11426,7 +11624,10 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                         if (chunkNames.add(routeEntryName), splitRouteModules && 'root' !== route.id) for (let exportName of routeChunkExportNames)chunkNames.add(getRouteChunkEntryName(routeEntryName, exportName));
                     }
                     return chunkNames;
-                })(routes, appDirectory, routeChunkOptions?.splitRouteModules), isBuild = !!routeChunkOptions?.isBuild, finalizeSri = !!(isBuild && (options?.subResourceIntegrity ?? options?.future?.unstable_subResourceIntegrity)), buildAndEmitManifest = async ({ assets, sources, compilation }, { withSri })=>{
+                })(routes, appDirectory, routeChunkOptions?.splitRouteModules));
+                manifestChunkNames.add(BROWSER_MANIFEST_ENTRY_NAME);
+                let isBuild = !!routeChunkOptions?.isBuild, finalizeSri = !!(isBuild && (options?.subResourceIntegrity ?? options?.future?.unstable_subResourceIntegrity)), buildAndEmitManifest = async ({ assets, sources, compilation }, { withSri })=>{
+                    if (compilation.errors?.length) return;
                     let currentAssetPrefix = getAssetPrefix(), stats = createReactRouterManifestStats(compilation, manifestChunkNames), { manifest, moduleExportsByRouteId } = await generateReactRouterManifestForDev(routes, pluginOptions, stats, appDirectory, currentAssetPrefix, createReactRouterManifestOptions({
                         routeChunks: routeChunkOptions,
                         routeModuleAnalysis: options?.routeModuleAnalysis
@@ -11434,18 +11635,22 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                         ...manifest
                     };
                     delete browserManifest.sri;
-                    let browserManifestAsset = assets[BROWSER_MANIFEST_ASSET];
-                    if (browserManifestAsset) {
+                    let browserManifestPaths = stats?.assetsByChunkName?.[BROWSER_MANIFEST_ENTRY_NAME]?.filter((name)=>"javascript" === getManifestAssetType(name, stats.assetTypesByName)) ?? [
+                        'static/js/virtual/react-router/browser-manifest.js'
+                    ];
+                    for (let browserManifestPath of isBuild ? [] : browserManifestPaths){
+                        let browserManifestAsset = assets[browserManifestPath];
+                        if (!browserManifestAsset) continue;
                         let originalSource = browserManifestAsset.source().toString(), serializedManifest = jsesc(browserManifest, {
                             es6: !0
                         }), newSource = originalSource.replace(/["'`]PLACEHOLDER["'`]/, ()=>serializedManifest);
-                        compilation.updateAsset(BROWSER_MANIFEST_ASSET, new sources.RawSource(newSource));
+                        compilation.updateAsset(browserManifestPath, new sources.RawSource(newSource));
                     }
                     if (isBuild) {
-                        let entryAssets = stats?.assetsByChunkName?.['entry.client'], entryJsAssets = entryAssets?.filter(isManifestJsAsset) || [], manifestPath = getReactRouterManifestPath({
+                        let entryAssets = stats?.assetsByChunkName?.['entry.client'], entryJsAssets = entryAssets?.filter((name)=>"javascript" === getManifestAssetType(name, stats?.assetTypesByName)) || [], manifestPath = getReactRouterManifestPath({
                             version: manifest.version,
                             isBuild: !0,
-                            entryModulePath: entryJsAssets[0]
+                            entryModulePath: (entryJsAssets[0] ?? '').replace(/[?#].*$/, '')
                         }), manifestSource = `window.__reactRouterManifest=${jsesc(browserManifest, {
                             es6: !0
                         })};`, source = new sources.RawSource(manifestSource);
@@ -11453,8 +11658,13 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                     }
                     let sri = withSri ? ((stats, compilation, assetPrefix = '/')=>{
                         let sri = {};
-                        for (let asset of stats?.assets ?? [])addIntegrity(sri, assetPrefix, asset.name, asset.integrity);
-                        if ('function' == typeof compilation?.getAssets) for (let asset of compilation.getAssets())isManifestJsAsset(asset.name) && addIntegrity(sri, assetPrefix, asset.name, computeSubresourceIntegrity(asset.source) ?? asset.info?.integrity);
+                        for (let asset of stats?.assets ?? [])'string' == typeof asset.name && isManifestJsAsset(asset.name) && addIntegrity(sri, assetPrefix, asset.name, asset.integrity);
+                        if ('function' == typeof compilation?.getAssets) for (let asset of compilation.getAssets()){
+                            let assetType = asset.info?.assetType ?? ('boolean' == typeof asset.info?.javascriptModule ? "javascript" : void 0);
+                            "javascript" === getManifestAssetType(asset.name, void 0 === assetType ? void 0 : {
+                                [asset.name]: assetType
+                            }) && addIntegrity(sri, assetPrefix, asset.name, computeSubresourceIntegrity(asset.source) ?? asset.info?.integrity);
+                        }
                         return Object.keys(sri).length > 0 ? sri : void 0;
                     })(compilation.getStats().toJson({
                         all: !1,
@@ -11478,36 +11688,16 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                 future,
                 manifestChunkNames,
                 routeModuleAnalysis,
-                onManifest: (manifest, sri, moduleExportsByRouteId, context)=>{
-                    var compilation;
-                    return compilation = context.compilation, void performanceProfiler.recordSync('web', 'manifest:stage', 'virtual/react-router/browser-manifest', ()=>{
-                        latestBrowserManifest = manifest, devBackgroundResources.setManifest(manifest), latestBrowserManifestModuleExports = moduleExportsByRouteId;
-                        let baseServerManifest = {
-                            ...manifest,
-                            sri: sri
-                        };
-                        latestServerManifest = baseServerManifest;
-                        let manifestsByEntryName = {
-                            [devServerBuildEntryName]: baseServerManifest
-                        };
-                        if ('classic' === modePlan.kind) {
-                            let stamp;
-                            for (let { bundleId, entryName } of modePlan.artifacts.serverBundleEntries){
-                                let bundleRoutes = modePlan.artifacts.routesByServerBundleId[bundleId];
-                                if (!bundleRoutes) continue;
-                                let routeIds = new Set(Object.keys(bundleRoutes)), filteredRoutes = Object.fromEntries(Object.entries(manifest.routes).filter(([routeId])=>routeIds.has(routeId))), bundleManifest = {
-                                    ...baseServerManifest,
-                                    routes: filteredRoutes
-                                };
-                                latestServerManifestsByBundleId[bundleId] = bundleManifest, manifestsByEntryName[entryName] = bundleManifest;
-                            }
-                            (stamp = JSON.stringify({
-                                manifest: latestServerManifest,
-                                bundles: latestServerManifestsByBundleId
-                            })) !== (existsSync(serverManifestStampPath) ? readFileSync(serverManifestStampPath, 'utf8') : void 0) && fs_extra.outputFileSync(serverManifestStampPath, stamp), isBuild || modePlan.artifacts.devRuntime.captureWeb(compilation, manifestsByEntryName);
-                        }
-                    });
-                }
+                onManifest: (manifest, sri, moduleExportsByRouteId, context)=>performanceProfiler.recordSync('web', 'manifest:stage', 'virtual/react-router/browser-manifest', ()=>manifestState.stage(context.compilation, createReactRouterManifestSnapshot({
+                            manifest,
+                            sri,
+                            moduleExportsByRouteId,
+                            serverBuildPlan: {
+                                defaultEntryName: devServerBuildEntryName,
+                                serverBundleEntries: modePlan.artifacts.serverBundleEntries
+                            },
+                            routesByServerBundleId: modePlan.artifacts.routesByServerBundleId
+                        })))
             }), (({ api, resolvedServerOutput, performanceProfiler, getLatestServerManifest, serverManifestStampPath, getLatestServerManifestByBundleId, routes, pluginOptions, getClientStats, appDirectory, getAssetPrefix, routeChunkOptions, routeModuleAnalysis, routeTransformRunner, routeByFilePath, routeChunkConfig, isBuild, splitRouteModules, useRouteModuleTransformApi, ssr, isSpaMode, rootRoutePath, outputClientPath, isDevHmrEnabled = ()=>!1, onRouteModuleAnalysis })=>{
                 let transformRouteModule = async (args)=>performanceProfiler.record(args.environment?.name, 'route:module', args.resource, async ()=>routeTransformRunner({
                             kind: 'routeModule',
@@ -11543,7 +11733,9 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                         if (existsSync(serverManifestStampPath) ? args.addDependency(serverManifestStampPath) : args.addMissingDependency(serverManifestStampPath), args.resource.includes('virtual/react-router/server-build')) return {
                             code: args.code
                         };
-                        let bundleMatch = args.resource.match(/virtual\/react-router\/server-manifest(?:-([^?]+))?/), bundleId = bundleMatch?.[1]?.replace(/\.js$/, ''), latestServerManifest = getLatestServerManifest(), manifest = (latestServerManifest ? (bundleId && getLatestServerManifestByBundleId(bundleId)) ?? latestServerManifest : null) ?? await getReactRouterManifestForDev(routes, pluginOptions, getClientStats(), appDirectory, getAssetPrefix(), createReactRouterManifestOptions({
+                        let bundleMatch = args.resource.match(/virtual\/react-router\/server-manifest(?:-([^?]+))?/), bundleId = bundleMatch?.[1]?.replace(/\.js$/, ''), latestServerManifest = getLatestServerManifest();
+                        if (isBuild && !latestServerManifest) throw Error(`[${PLUGIN_NAME}] Production server manifest requested before the browser manifest was finalized.`);
+                        let manifest = (latestServerManifest ? (bundleId && getLatestServerManifestByBundleId(bundleId)) ?? latestServerManifest : null) ?? await getReactRouterManifestForDev(routes, pluginOptions, getClientStats(), appDirectory, getAssetPrefix(), createReactRouterManifestOptions({
                             routeChunks: routeChunkOptions,
                             routeModuleAnalysis
                         }));
@@ -11646,9 +11838,9 @@ if (typeof window !== 'undefined' && import.meta.webpackHot) {
                 api,
                 resolvedServerOutput,
                 performanceProfiler,
-                getLatestServerManifest: ()=>latestServerManifest,
+                getLatestServerManifest: ()=>readManifestSnapshot()?.server ?? null,
                 serverManifestStampPath,
-                getLatestServerManifestByBundleId: (bundleId)=>latestServerManifestsByBundleId[bundleId],
+                getLatestServerManifestByBundleId: (bundleId)=>readManifestSnapshot()?.serverByBundleId[bundleId],
                 routes,
                 pluginOptions,
                 getClientStats: ()=>clientStats,