rsbuild-plugin-react-router 0.7.1 → 0.7.2

package/dist/dev-generation.d.ts

@@ -1,11 +1,13 @@
 import type { RsbuildDevServer, Rspack } from '@rsbuild/core';
 import type { ServerBuild } from 'react-router';
-import { type DevGraphChanges, type DevGraphIdentity, type DevRuntimeStats, type ReactRouterDevBuildPlan, type ReactRouterDevManifestSet } from './dev-runtime-artifacts.js';
+import { type DevCompilationIdentity, type DevGraphChanges, type DevGraphIdentity, type DevRuntimeStats, type ReactRouterDevBuildPlan, type ReactRouterDevManifestSet } from './dev-runtime-artifacts.js';
 export type { DevGraphChanges, DevGraphIdentity, ReactRouterDevManifest, } from './dev-runtime-artifacts.js';
 export type ReactRouterDevRuntime = {
     beginAttempt: () => void;
     captureWeb: (compilation: Rspack.Compilation, manifestsByEntryName: ReactRouterDevManifestSet) => void;
     finishAttempt: (stats: DevRuntimeStats, changes: DevGraphChanges, identity: DevGraphIdentity) => Promise<'committed' | 'ignored' | 'retry-node'>;
+    /** Node identity actually retained by the last successful generation. */
+    getCommittedNodeIdentity: () => DevCompilationIdentity | undefined;
     failAttempt: (error: Error) => void;
     load: (entryName?: string) => Promise<ServerBuild>;
     close: (error?: Error) => void;

package/dist/dev-hdr-intent.d.ts

@@ -0,0 +1,5 @@
+/** Tracks unsignaled node edits across compiler retries within one dev session. */
+export declare const createDevHdrIntentTracker: () => {
+    capture(compilation: object, hasRelevantChanges: boolean): void;
+    signalCommitted(compilation: object, signal: () => void): void;
+};

package/dist/index.cjs

@@ -15246,6 +15246,7 @@ export default entryJsFiles;
                 return rejectAttempt(attemptId, normalizeEffectError(cause), !0), 'ignored';
             }
         },
+        getCommittedNodeIdentity: ()=>'ready' === state.kind ? state.committed.nodeIdentity : void 0,
         failAttempt (error) {
             let attemptId = getCurrentAttemptId();
             null !== attemptId && rejectAttempt(attemptId, error, !1);
@@ -15279,6 +15280,17 @@ export default entryJsFiles;
 }, loadReactRouterServerBuild = (server, entryName)=>{
     let runtime = Reflect.get(server, DEV_RUNTIME_KEY);
     return runtime ? runtime.load(entryName) : Promise.reject(Error('[rsbuild-plugin-react-router] This Rsbuild development server is not registered with the React Router plugin. Add pluginReactRouter() before calling loadReactRouterServerBuild().'));
+}, createDevHdrIntentTracker = ()=>{
+    let latestRelevantEditRevision = 0, signaledRevision = 0, revisionByCompilation = new WeakMap();
+    return {
+        capture (compilation, hasRelevantChanges) {
+            hasRelevantChanges && (latestRelevantEditRevision += 1), revisionByCompilation.set(compilation, latestRelevantEditRevision);
+        },
+        signalCommitted (compilation, signal) {
+            let compilationRevision = revisionByCompilation.get(compilation);
+            void 0 === compilationRevision || compilationRevision <= signaledRevision || (signal(), signaledRevision = Math.max(signaledRevision, compilationRevision));
+        }
+    };
 }, createDevRuntimeSessionManager = (closeBinding)=>{
     let state = {
         status: 'idle'
@@ -15384,12 +15396,15 @@ export default entryJsFiles;
         scheduledCssAssetOwnershipReload && (clearTimeout(scheduledCssAssetOwnershipReload), scheduledCssAssetOwnershipReload = void 0), reloadAfterCssAssetOwnershipRemoval = !1;
         let pair = binding.compilers;
         pair && resetDevCompilerPair(pair), binding.compilers = void 0, binding.runtime.close(error), unregisterReactRouterDevRuntime(binding.server, binding.runtime);
-    }, sessions = createDevRuntimeSessionManager(closeBinding), compilationIdentities = createCompilationIdentityTracker(), { getCompilationIdentity } = compilationIdentities, hdrSignaledNodeIdentity = new WeakMap(), finishRuntimeAttempt = async (binding, pair, stats, changes, identity1)=>{
+    }, sessions = createDevRuntimeSessionManager(closeBinding), compilationIdentities = createCompilationIdentityTracker(), { getCompilationIdentity } = compilationIdentities, hdrIntentsByPair = new WeakMap(), finishRuntimeAttempt = async (binding, pair, stats, changes, identity1)=>{
         try {
             let result = await binding.runtime.finishAttempt(stats, changes, identity1);
             if (sessions.getActiveBinding()?.id !== binding.id) return;
             if ('retry-node' === result) return void pair.node.watching?.invalidate();
-            'committed' === result && changes.node.known && void 0 !== identity1.node && hdrSignaledNodeIdentity.get(pair) !== identity1.node && Array.from(changes.node.files).some((file)=>!file.includes('.react-router/hdr-revision.mjs') && !/\.css(?:\.[cm]?[jt]s)?$/.test(file)) && (hdrSignaledNodeIdentity.set(pair, identity1.node), onNodeRebuildCommitted?.());
+            let nodeCompilation = getEnvironmentStats(stats, 'node')?.compilation;
+            'committed' === result && nodeCompilation && identity1.node === binding.runtime.getCommittedNodeIdentity() && hdrIntentsByPair.get(pair)?.signalCommitted(nodeCompilation, ()=>{
+                onNodeRebuildCommitted?.();
+            });
         } catch (cause) {
             sessions.getActiveBinding()?.id === binding.id && binding.runtime.failAttempt(normalizeEffectError(cause));
         }
@@ -15476,6 +15491,8 @@ export default entryJsFiles;
             node
         });
         binding.compilers = pair;
+        let hdrIntents = createDevHdrIntentTracker();
+        hdrIntentsByPair.set(pair, hdrIntents);
         let sessionId = binding.id, runtime = binding.runtime, failCurrentAttempt = (side, error)=>{
             sessions.getActiveBinding()?.id === sessionId && ('web' === side ? clearDevCompilerStart(pair, 'latestWebStart') : clearDevCompilerStart(pair, 'latestNodeStart'), runtime.failAttempt(error));
         }, beginCompilerAttempt = (side)=>{
@@ -15497,10 +15514,12 @@ export default entryJsFiles;
                 identity: getCompilationIdentity(compilation)
             }, reloadAfterCssAssetOwnershipRemoval && (reloadAfterCssAssetOwnershipRemoval = !1, scheduleCssAssetOwnershipReload()));
         }), node.hooks.thisCompilation.tap(`${PLUGIN_NAME}:dev-node-web-compilation`, (compilation)=>{
-            sessions.getActiveBinding()?.id === sessionId && (pair.latestNodeStart = {
+            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 = {
                 status: 'started',
                 identity: getCompilationIdentity(compilation)
-            }, pair.currentAttemptIdentity && compilationIdentities.setAttemptIdentityForCompilation(compilation, pair.currentAttemptIdentity), pair.latestCompletedWebIdentity && compilationIdentities.setWebIdentityForNodeCompilation(compilation, pair.latestCompletedWebIdentity));
+            }, pair.currentAttemptIdentity && compilationIdentities.setAttemptIdentityForCompilation(compilation, pair.currentAttemptIdentity), pair.latestCompletedWebIdentity && compilationIdentities.setWebIdentityForNodeCompilation(compilation, pair.latestCompletedWebIdentity);
         });
         let settleCompilation = (stats)=>{
             sessions.getActiveBinding()?.id === sessionId && (pair.settledCompilations.add(stats.compilation), flushSettledAttempt(binding, pair));

package/dist/index.js

@@ -9139,12 +9139,15 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                 setWebIdentityForNodeCompilation (compilation, identity) {
                     webIdentityByNodeCompilation.set(compilation, identity);
                 }
-            }), { getCompilationIdentity } = compilationIdentities, hdrSignaledNodeIdentity = new WeakMap(), finishRuntimeAttempt = async (binding, pair, stats, changes, identity)=>{
+            }), { getCompilationIdentity } = compilationIdentities, hdrIntentsByPair = new WeakMap(), finishRuntimeAttempt = async (binding, pair, stats, changes, identity)=>{
                 try {
                     let result = await binding.runtime.finishAttempt(stats, changes, identity);
                     if (sessions.getActiveBinding()?.id !== binding.id) return;
                     if ('retry-node' === result) return void pair.node.watching?.invalidate();
-                    'committed' === result && changes.node.known && void 0 !== identity.node && hdrSignaledNodeIdentity.get(pair) !== identity.node && Array.from(changes.node.files).some((file)=>!file.includes('.react-router/hdr-revision.mjs') && !/\.css(?:\.[cm]?[jt]s)?$/.test(file)) && (hdrSignaledNodeIdentity.set(pair, identity.node), onNodeRebuildCommitted?.());
+                    let nodeCompilation = getEnvironmentStats(stats, 'node')?.compilation;
+                    'committed' === result && nodeCompilation && identity.node === binding.runtime.getCommittedNodeIdentity() && hdrIntentsByPair.get(pair)?.signalCommitted(nodeCompilation, ()=>{
+                        onNodeRebuildCommitted?.();
+                    });
                 } catch (cause) {
                     sessions.getActiveBinding()?.id === binding.id && binding.runtime.failAttempt(normalizeEffectError(cause));
                 }
@@ -9334,6 +9337,7 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                                     return rejectAttempt(attemptId, normalizeEffectError(cause), !0), 'ignored';
                                 }
                             },
+                            getCommittedNodeIdentity: ()=>'ready' === state.kind ? state.committed.nodeIdentity : void 0,
                             failAttempt (error) {
                                 let attemptId = getCurrentAttemptId();
                                 null !== attemptId && rejectAttempt(attemptId, error, !1);
@@ -9399,6 +9403,7 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                     !(!binding || !pair || hasPendingCompilation(pair)) && (pair.pendingAttempt = void 0, pair.currentAttemptIdentity = Symbol(), binding.runtime.beginAttempt());
                 }
             }), api.onAfterCreateCompiler(({ compiler })=>{
+                let latestRelevantEditRevision, signaledRevision, revisionByCompilation;
                 if (!('compilers' in compiler)) return void rejectUnsupportedCompiler('Rsbuild did not create a multi-compiler');
                 let web = compiler.compilers.find((item)=>'web' === item.name), node = compiler.compilers.find((item)=>'node' === item.name);
                 if (!web || !node) return void rejectUnsupportedCompiler('the web or node compiler was missing');
@@ -9413,6 +9418,16 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                     node
                 });
                 binding.compilers = pair;
+                let hdrIntents = (latestRelevantEditRevision = 0, signaledRevision = 0, revisionByCompilation = new WeakMap(), {
+                    capture (compilation, hasRelevantChanges) {
+                        hasRelevantChanges && (latestRelevantEditRevision += 1), revisionByCompilation.set(compilation, latestRelevantEditRevision);
+                    },
+                    signalCommitted (compilation, signal) {
+                        let compilationRevision = revisionByCompilation.get(compilation);
+                        void 0 === compilationRevision || compilationRevision <= signaledRevision || (signal(), signaledRevision = Math.max(signaledRevision, compilationRevision));
+                    }
+                });
+                hdrIntentsByPair.set(pair, hdrIntents);
                 let sessionId = binding.id, runtime = binding.runtime, failCurrentAttempt = (side, error)=>{
                     sessions.getActiveBinding()?.id === sessionId && ('web' === side ? clearDevCompilerStart(pair, 'latestWebStart') : clearDevCompilerStart(pair, 'latestNodeStart'), runtime.failAttempt(error));
                 }, beginCompilerAttempt = (side)=>{
@@ -9439,10 +9454,12 @@ export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRoute
                         identity: getCompilationIdentity(compilation)
                     }, reloadAfterCssAssetOwnershipRemoval && (reloadAfterCssAssetOwnershipRemoval = !1, scheduleCssAssetOwnershipReload()));
                 }), node.hooks.thisCompilation.tap(`${PLUGIN_NAME}:dev-node-web-compilation`, (compilation)=>{
-                    sessions.getActiveBinding()?.id === sessionId && (pair.latestNodeStart = {
+                    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 = {
                         status: 'started',
                         identity: getCompilationIdentity(compilation)
-                    }, pair.currentAttemptIdentity && compilationIdentities.setAttemptIdentityForCompilation(compilation, pair.currentAttemptIdentity), pair.latestCompletedWebIdentity && compilationIdentities.setWebIdentityForNodeCompilation(compilation, pair.latestCompletedWebIdentity));
+                    }, pair.currentAttemptIdentity && compilationIdentities.setAttemptIdentityForCompilation(compilation, pair.currentAttemptIdentity), pair.latestCompletedWebIdentity && compilationIdentities.setWebIdentityForNodeCompilation(compilation, pair.latestCompletedWebIdentity);
                 });
                 let settleCompilation = (stats)=>{
                     sessions.getActiveBinding()?.id === sessionId && (pair.settledCompilations.add(stats.compilation), flushSettledAttempt(binding, pair));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-react-router",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "React Router plugin for Rsbuild",
   "repository": {
     "type": "git",

package/src/dev-generation.ts

@@ -61,6 +61,8 @@ export type ReactRouterDevRuntime = {
     changes: DevGraphChanges,
     identity: DevGraphIdentity
   ) => Promise<'committed' | 'ignored' | 'retry-node'>;
+  /** Node identity actually retained by the last successful generation. */
+  getCommittedNodeIdentity: () => DevCompilationIdentity | undefined;
   failAttempt: (error: Error) => void;
   load: (entryName?: string) => Promise<ServerBuild>;
   close: (error?: Error) => void;
@@ -615,6 +617,10 @@ export const createReactRouterDevRuntime = ({
       }
     },
 
+    getCommittedNodeIdentity() {
+      return state.kind === 'ready' ? state.committed.nodeIdentity : undefined;
+    },
+
     failAttempt(error): void {
       const attemptId = getCurrentAttemptId();
       if (attemptId !== null) {

package/src/dev-hdr-intent.ts

@@ -0,0 +1,27 @@
+/** Tracks unsignaled node edits across compiler retries within one dev session. */
+export const createDevHdrIntentTracker = () => {
+  let latestRelevantEditRevision = 0;
+  let signaledRevision = 0;
+  const revisionByCompilation = new WeakMap<object, number>();
+
+  return {
+    capture(compilation: object, hasRelevantChanges: boolean): void {
+      if (hasRelevantChanges) {
+        latestRelevantEditRevision += 1;
+      }
+      revisionByCompilation.set(compilation, latestRelevantEditRevision);
+    },
+
+    signalCommitted(compilation: object, signal: () => void): void {
+      const compilationRevision = revisionByCompilation.get(compilation);
+      if (
+        compilationRevision === undefined ||
+        compilationRevision <= signaledRevision
+      ) {
+        return;
+      }
+      signal();
+      signaledRevision = Math.max(signaledRevision, compilationRevision);
+    },
+  };
+};

package/src/dev-runtime-controller.ts

@@ -19,6 +19,7 @@ import {
   registerReactRouterDevRuntime,
   unregisterReactRouterDevRuntime,
 } from './dev-generation.js';
+import { createDevHdrIntentTracker } from './dev-hdr-intent.js';
 import { DEV_MANIFEST_UPDATE_EVENT } from './dev-hmr.js';
 import {
   getEnvironmentStats,
@@ -140,12 +141,10 @@ export const createReactRouterDevRuntimeController = ({
   const compilationIdentities = createCompilationIdentityTracker();
   const { getCompilationIdentity } = compilationIdentities;
 
-  // Web-only commits reuse the node compiler's stale `modifiedFiles`
-  // snapshot, and every HDR bump itself triggers a web rebuild — so signal
-  // once per node compilation identity or the bump loop self-sustains.
-  const hdrSignaledNodeIdentity = new WeakMap<
+  // Pending node-edit intent until a coherent commit retains that compilation.
+  const hdrIntentsByPair = new WeakMap<
     DevCompilerPair,
-    NonNullable<DevGraphIdentity['node']>
+    ReturnType<typeof createDevHdrIntentTracker>
   >();
 
   const finishRuntimeAttempt = async (
@@ -168,17 +167,15 @@ export const createReactRouterDevRuntimeController = ({
         pair.node.watching?.invalidate();
         return;
       }
+      const nodeCompilation = getEnvironmentStats(stats, 'node')?.compilation;
       if (
         result === 'committed' &&
-        changes.node.known &&
-        identity.node !== undefined &&
-        hdrSignaledNodeIdentity.get(pair) !== identity.node &&
-        Array.from(changes.node.files).some(
-          file => !isHdrRevisionFile(file) && !isCssSourceFile(file)
-        )
+        nodeCompilation &&
+        identity.node === binding.runtime.getCommittedNodeIdentity()
       ) {
-        hdrSignaledNodeIdentity.set(pair, identity.node);
-        onNodeRebuildCommitted?.();
+        hdrIntentsByPair.get(pair)?.signalCommitted(nodeCompilation, () => {
+          onNodeRebuildCommitted?.();
+        });
       }
     } catch (cause) {
       if (sessions.getActiveBinding()?.id === binding.id) {
@@ -344,6 +341,8 @@ export const createReactRouterDevRuntimeController = ({
     }
     const pair: DevCompilerPair = createDevCompilerPair({ web, node });
     binding.compilers = pair;
+    const hdrIntents = createDevHdrIntentTracker();
+    hdrIntentsByPair.set(pair, hdrIntents);
     const sessionId = binding.id;
     const runtime = binding.runtime;
     const failCurrentAttempt = (side: 'web' | 'node', error: Error): void => {
@@ -427,6 +426,14 @@ export const createReactRouterDevRuntimeController = ({
         if (sessions.getActiveBinding()?.id !== sessionId) {
           return;
         }
+        const changes = snapshotDevChangedFiles(pair.node);
+        hdrIntents.capture(
+          compilation,
+          changes.known &&
+            Array.from(changes.files).some(
+              file => !isHdrRevisionFile(file) && !isCssSourceFile(file)
+            )
+        );
         pair.latestNodeStart = {
           status: 'started',
           identity: getCompilationIdentity(compilation),