@@ -1,6 +1,6 @@
 import { createReactRefreshIgnoredRouteExportsPlugin } from './react-refresh-ignored-route-exports'
-import { createRefreshRouteComponentsPlugin } from './refresh-route-components'
-import { createStableHmrSplitRouteComponentsPlugin } from './stable-hmr-split-route-components'
+import { createReactRefreshRouteComponentsPlugin } from './react-refresh-route-components'
+import { createReactStableHmrSplitRouteComponentsPlugin } from './react-stable-hmr-split-route-components'
 import type { ReferenceRouteCompilerPlugin } from '../plugins'
 import type { Config, HmrStyle } from '../../config'
 
@@ -9,27 +9,19 @@ export function getReferenceRouteCompilerPlugins(opts: {
   addHmr?: boolean
   hmrStyle?: HmrStyle
 }): Array<ReferenceRouteCompilerPlugin> | undefined {
-  if (!opts.addHmr) {
-    return undefined
-  }
-
-  const hmrStyle = opts.hmrStyle ?? 'vite'
-
   switch (opts.targetFramework) {
     case 'react': {
-      return [
-        ...(hmrStyle === 'vite'
-          ? [createReactRefreshIgnoredRouteExportsPlugin()]
-          : []),
-        createRefreshRouteComponentsPlugin(),
-        createStableHmrSplitRouteComponentsPlugin({ hmrStyle }),
-      ]
-    }
-    case 'solid': {
-      return [
-        createRefreshRouteComponentsPlugin(),
-        createStableHmrSplitRouteComponentsPlugin({ hmrStyle }),
-      ]
+      if (opts.addHmr) {
+        const hmrStyle = opts.hmrStyle ?? 'vite'
+        return [
+          ...(hmrStyle === 'vite'
+            ? [createReactRefreshIgnoredRouteExportsPlugin()]
+            : []),
+          createReactRefreshRouteComponentsPlugin(),
+          createReactStableHmrSplitRouteComponentsPlugin({ hmrStyle }),
+        ]
+      }
+      return undefined
     }
     default:
       return undefined
 
@@ -5,7 +5,7 @@ import {
 } from '../../utils'
 import type { ReferenceRouteCompilerPlugin } from '../plugins'
 
-const ROUTE_COMPONENT_OPTION_KEYS = new Set([
+const REACT_REFRESH_ROUTE_COMPONENT_IDENTS = new Set([
   'component',
   'shellComponent',
   'pendingComponent',
@@ -27,7 +27,7 @@ function hoistInlineRouteComponents(ctx: {
 
     const key = getObjectPropertyKeyName(prop)
 
-    if (!key || !ROUTE_COMPONENT_OPTION_KEYS.has(key)) {
+    if (!key || !REACT_REFRESH_ROUTE_COMPONENT_IDENTS.has(key)) {
       return
     }
 
@@ -60,11 +60,11 @@ function hoistInlineRouteComponents(ctx: {
   return true
 }
 
-export function createRefreshRouteComponentsPlugin(): ReferenceRouteCompilerPlugin {
+export function createReactRefreshRouteComponentsPlugin(): ReferenceRouteCompilerPlugin {
   return {
-    name: 'refresh-route-components',
+    name: 'react-refresh-route-components',
     getStableRouteOptionKeys() {
-      return [...ROUTE_COMPONENT_OPTION_KEYS]
+      return [...REACT_REFRESH_ROUTE_COMPONENT_IDENTS]
     },
     onUnsplittableRoute(ctx) {
       if (!ctx.opts.addHmr) {
 
@@ -34,11 +34,11 @@ function hotExpressionAstFor(hmrStyle: HmrStyle): t.Expression {
   )
 }
 
-export function createStableHmrSplitRouteComponentsPlugin(opts: {
+export function createReactStableHmrSplitRouteComponentsPlugin(opts: {
   hmrStyle: HmrStyle
 }): ReferenceRouteCompilerPlugin {
   return {
-    name: 'stable-hmr-split-route-components',
+    name: 'react-stable-hmr-split-route-components',
     onSplitRouteProperty(ctx) {
       if (ctx.splitNodeMeta.splitStrategy !== 'lazyRouteComponent') {
         return
 
@@ -2,17 +2,9 @@ const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=comp
 import { lazyRouteComponent } from '@tanstack/solid-router';
 import { createFileRoute } from '@tanstack/solid-router';
 import { fetchPosts } from '../posts';
-const TSRSplitComponent = (() => {
-  const hot = import.meta.hot;
-  const hotData = hot ? hot.data ??= {} : undefined;
-  return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component");
-})();
-if (import.meta.hot) {
-  (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent;
-}
 export const Route = createFileRoute('/posts')({
   loader: fetchPosts,
-  component: TSRSplitComponent
+  component: lazyRouteComponent($$splitComponentImporter, 'component')
 });
 if (import.meta.hot) {
   const hot = import.meta.hot;
@@ -40,7 +32,7 @@ if (import.meta.hot) {
         const oldHasShellComponent = "shellComponent" in oldRoute.options;
         const newHasShellComponent = "shellComponent" in newRoute.options;
         const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent;
-        const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"];
+        const componentKeys = [];
         if (preserveComponentIdentity) {
           componentKeys.forEach(key => {
             if (key in oldRoute.options && key in newRoute.options) {
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ function hotExpressionAstFor(hmrStyle: HmrStyle): t.Expression {`
`34`	`34`	`)`
`35`	`35`	`}`
`36`	`36`
`37`		`-export function createStableHmrSplitRouteComponentsPlugin(opts: {`
	`37`	`+export function createReactStableHmrSplitRouteComponentsPlugin(opts: {`
`38`	`38`	`hmrStyle: HmrStyle`
`39`	`39`	`}): ReferenceRouteCompilerPlugin {`
`40`	`40`	`return {`
`41`		`- name: 'stable-hmr-split-route-components',`
	`41`	`+ name: 'react-stable-hmr-split-route-components',`
`42`	`42`	`onSplitRouteProperty(ctx) {`
`43`	`43`	`if (ctx.splitNodeMeta.splitStrategy !== 'lazyRouteComponent') {`
`44`	`44`	`return`