fix: make route HMR handling robust against route deletion (#4291)

schiller-manuel · web-flow · commit 7c2bc2f334d2 · 2025-06-01T18:14:56.000+02:00
fixes #4289
diff --git a/packages/router-plugin/src/core/route-hmr-statement.ts b/packages/router-plugin/src/core/route-hmr-statement.ts
@@ -4,7 +4,7 @@ export const routeHmrStatement = template.statement(
   `
 if (import.meta.hot) {
   import.meta.hot.accept((newModule) => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route)
     }
    })
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/posts')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx
@@ -10,7 +10,7 @@ interface DemoProps {
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx
@@ -10,7 +10,7 @@ export const Route = createFileRoute('/posts')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx
@@ -8,7 +8,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/export-default-component-and-normal-notFound.tsx
@@ -14,7 +14,7 @@ export default function Home() {
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/posts')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx
@@ -6,7 +6,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx
@@ -8,7 +8,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx
@@ -6,7 +6,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx
@@ -8,14 +8,14 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx
@@ -8,14 +8,14 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx
@@ -8,7 +8,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx
@@ -8,7 +8,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx
@@ -9,7 +9,7 @@ Route.addChildren([]);
 export const test = 'test';
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx
@@ -32,7 +32,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx
@@ -8,7 +8,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx
@@ -8,7 +8,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx
@@ -16,7 +16,7 @@ export const SIDEBAR_MINI_WIDTH = '80px';
 const ASIDE_WIDTH = '250px';
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx
@@ -10,7 +10,7 @@ export const Route = createFileRoute('/posts')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx
@@ -10,7 +10,7 @@ interface DemoProps {
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/posts')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/export-default-component-and-normal-notFound.tsx
@@ -14,7 +14,7 @@ export default function Home() {
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx
@@ -10,7 +10,7 @@ export const Route = createFileRoute('/posts')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx
@@ -6,7 +6,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx
@@ -6,7 +6,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx
@@ -8,14 +8,14 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx
@@ -8,14 +8,14 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx
@@ -8,14 +8,14 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx
@@ -9,7 +9,7 @@ Route.addChildren([]);
 export const test = 'test';
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx
@@ -28,7 +28,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx
@@ -16,7 +16,7 @@ export const SIDEBAR_MINI_WIDTH = '80px';
 const ASIDE_WIDTH = '250px';
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx
@@ -10,7 +10,7 @@ export const Route = createFileRoute('/posts')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx
@@ -10,7 +10,7 @@ interface DemoProps {
 }
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx
@@ -9,7 +9,7 @@ export const Route = createFileRoute('/posts')({
 });
 if (import.meta.hot) {
   import.meta.hot.accept(newModule => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route);
     }
   });
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/export-default-component-and-normal-notFound.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx
diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ export const routeHmrStatement = template.statement(`
`4`	`4`	`
`5`	`5`	`if (import.meta.hot) {`
`6`	`6`	`import.meta.hot.accept((newModule) => {`
`7`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`7`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`8`	`8`	`newModule.Route.clone(Route)`
`9`	`9`	`}`
`10`	`10`	`})`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export const Route = createFileRoute('/posts')({`
`9`	`9`	`});`
`10`	`10`	`if (import.meta.hot) {`
`11`	`11`	`import.meta.hot.accept(newModule => {`
`12`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`12`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`13`	`13`	`newModule.Route.clone(Route);`
`14`	`14`	`}`
`15`	`15`	`});`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ interface DemoProps {`
`10`	`10`	`}`
`11`	`11`	`if (import.meta.hot) {`
`12`	`12`	`import.meta.hot.accept(newModule => {`
`13`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`13`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`14`	`14`	`newModule.Route.clone(Route);`
`15`	`15`	`}`
`16`	`16`	`});`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export const Route = createFileRoute('/posts')({`
`10`	`10`	`});`
`11`	`11`	`if (import.meta.hot) {`
`12`	`12`	`import.meta.hot.accept(newModule => {`
`13`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`13`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`14`	`14`	`newModule.Route.clone(Route);`
`15`	`15`	`}`
`16`	`16`	`});`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export const Route = createFileRoute('/')({`
`8`	`8`	`});`
`9`	`9`	`if (import.meta.hot) {`
`10`	`10`	`import.meta.hot.accept(newModule => {`
`11`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`11`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`12`	`12`	`newModule.Route.clone(Route);`
`13`	`13`	`}`
`14`	`14`	`});`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export default function Home() {`
`14`	`14`	`}`
`15`	`15`	`if (import.meta.hot) {`
`16`	`16`	`import.meta.hot.accept(newModule => {`
`17`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`17`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`18`	`18`	`newModule.Route.clone(Route);`
`19`	`19`	`}`
`20`	`20`	`});`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export const Route = createFileRoute('/')({`
`6`	`6`	`});`
`7`	`7`	`if (import.meta.hot) {`
`8`	`8`	`import.meta.hot.accept(newModule => {`
`9`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`9`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`10`	`10`	`newModule.Route.clone(Route);`
`11`	`11`	`}`
`12`	`12`	`});`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,14 @@ export const Route = createFileRoute('/')({`
`8`	`8`	`});`
`9`	`9`	`if (import.meta.hot) {`
`10`	`10`	`import.meta.hot.accept(newModule => {`
`11`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`11`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`12`	`12`	`newModule.Route.clone(Route);`
`13`	`13`	`}`
`14`	`14`	`});`
`15`	`15`	`}`
`16`	`16`	`if (import.meta.hot) {`
`17`	`17`	`import.meta.hot.accept(newModule => {`
`18`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`18`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`19`	`19`	`newModule.Route.clone(Route);`
`20`	`20`	`}`
`21`	`21`	`});`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ Route.addChildren([]);`
`9`	`9`	`export const test = 'test';`
`10`	`10`	`if (import.meta.hot) {`
`11`	`11`	`import.meta.hot.accept(newModule => {`
`12`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`12`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`13`	`13`	`newModule.Route.clone(Route);`
`14`	`14`	`}`
`15`	`15`	`});`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export const Route = createFileRoute('/')({`
`32`	`32`	`});`
`33`	`33`	`if (import.meta.hot) {`
`34`	`34`	`import.meta.hot.accept(newModule => {`
`35`		`- if (newModule.Route && typeof newModule.Route.clone === 'function') {`
	`35`	`+ if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {`
`36`	`36`	`newModule.Route.clone(Route);`
`37`	`37`	`}`
`38`	`38`	`});`