Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions solid-start-v2/with-tanstack-router/src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { router } from "./router";
import { RouterProvider } from "@tanstack/solid-router";
import { router } from './router';
import { RouterProvider } from '@tanstack/solid-router';
import { getRequestEvent } from 'solid-js/web';

import "./app.css";
import './app.css';

export default function App() {
return <RouterProvider router={router} />;
const event = getRequestEvent();
const requestRouter = event?.locals.router as typeof router | undefined;

return <RouterProvider router={requestRouter ?? router} />;
}
26 changes: 16 additions & 10 deletions solid-start-v2/with-tanstack-router/src/entry-server.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
// @refresh reload
import { createHandler, FetchEvent, StartServer } from "@solidjs/start/server";
import { createMemoryHistory } from "@tanstack/solid-router";
import { router } from "./router";
import { createHandler, FetchEvent, StartServer } from '@solidjs/start/server';
import { createMemoryHistory } from '@tanstack/solid-router';
import { createRouter } from './router';

const routerLoad = async (event: FetchEvent) => {
const url = new URL(event.request.url);
const path = url.href.replace(url.origin, "");
const path = url.href.replace(url.origin, '');

router.update({
const requestRouter = createRouter();
event.locals.router = requestRouter;

requestRouter.update({
history: createMemoryHistory({
initialEntries: [path]
})
initialEntries: [path],
}),
});

await router.load();
await requestRouter.load();
};

export default createHandler(
Expand All @@ -23,7 +26,10 @@ export default createHandler(
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta
name="viewport"
content="width=device-width, initial-scale=1"
/>
<link rel="icon" href="/favicon.ico" />
{assets}
</head>
Expand All @@ -36,5 +42,5 @@ export default createHandler(
/>
),
undefined,
routerLoad
routerLoad,
);