Merge branch 'main' into nested-route-escaping

solidjs · Mar 3, 2025 · b9a25a2 · b9a25a2
2 parents 0f35b6d + 75581e0
commit b9a25a2
Show file tree

Hide file tree

Showing 16 changed files with 620 additions and 170 deletions.
diff --git a/.changeset/lovely-comics-hammer.md b/.changeset/lovely-comics-hammer.md
diff --git a/examples/pnpm-lock.yaml b/examples/pnpm-lock.yaml
diff --git a/examples/with-tanstack-router/app.config.ts b/examples/with-tanstack-router/app.config.ts
@@ -2,7 +2,6 @@ import { defineConfig } from "@solidjs/start/config";
 import { TanStackRouterVite } from "@tanstack/router-plugin/vite";
 
 export default defineConfig({
-  ssr: false,
   vite: {
     plugins: [TanStackRouterVite({ target: "solid" })]
   }

diff --git a/examples/with-tanstack-router/package.json b/examples/with-tanstack-router/package.json
@@ -8,9 +8,9 @@
     "version": "vinxi version"
   },
   "dependencies": {
-    "@tanstack/solid-router": "^1.108.0",
-    "@tanstack/router-plugin": "^1.108.0",
-    "@solidjs/start": "^1.1.0",
+    "@tanstack/solid-router": "^1.112.2",
+    "@tanstack/router-plugin": "^1.112.0",
+    "@solidjs/start": "^1.1.2",
     "solid-js": "^1.9.5",
     "vinxi": "^0.5.3"
   },

diff --git a/examples/with-tanstack-router/src/app.tsx b/examples/with-tanstack-router/src/app.tsx
@@ -1,23 +1,8 @@
-import { RouterProvider, createRouter } from "@tanstack/solid-router";
-import { routeTree } from "./routeTree.gen";
+import { router } from "./router";
+import { RouterProvider } from "@tanstack/solid-router";
 
 import "./app.css";
 
-const router = createRouter({
-  defaultErrorComponent: (err) => <div>{err.error.stack}</div>,
-  routeTree,
-  defaultPreload: "intent",
-  defaultStaleTime: 5000,
-  scrollRestoration: true
-});
-
-// Register things for typesafety
-declare module "@tanstack/solid-router" {
-  interface Register {
-    router: typeof router;
-  }
-}
-
 export default function App() {
   return <RouterProvider router={router} />;
 }
diff --git a/examples/with-tanstack-router/src/entry-client.tsx b/examples/with-tanstack-router/src/entry-client.tsx
@@ -1,4 +1,4 @@
 // @refresh reload
-import { mount, StartClient } from "@solidjs/start/client";
+import { mount, StartClientTanstack } from "@solidjs/start/client";
 
-mount(() => <StartClient />, document.getElementById("app")!);
+mount(() => <StartClientTanstack />, document.getElementById("app")!);
diff --git a/examples/with-tanstack-router/src/entry-server.tsx b/examples/with-tanstack-router/src/entry-server.tsx
@@ -1,21 +1,40 @@
 // @refresh reload
-import { createHandler, StartServer } from "@solidjs/start/server";
+import { createHandler, FetchEvent, StartServer } from "@solidjs/start/server";
+import { createMemoryHistory } from "@tanstack/solid-router";
+import { router } from "./router";
 
-export default createHandler(() => (
-  <StartServer
-    document={({ assets, children, scripts }) => (
-      <html lang="en">
-        <head>
-          <meta charset="utf-8" />
-          <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <link rel="icon" href="/favicon.ico" />
-          {assets}
-        </head>
-        <body>
-          <div id="app">{children}</div>
-          {scripts}
-        </body>
-      </html>
-    )}
-  />
-));
+const routerLoad = async (event: FetchEvent) => {
+  const url = new URL(event.request.url);
+  const path = url.href.replace(url.origin, "");
+
+  router.update({
+    history: createMemoryHistory({
+      initialEntries: [path]
+    })
+  });
+
+  await router.load();
+};
+
+export default createHandler(
+  () => (
+    <StartServer
+      document={({ assets, children, scripts }) => (
+        <html lang="en">
+          <head>
+            <meta charset="utf-8" />
+            <meta name="viewport" content="width=device-width, initial-scale=1" />
+            <link rel="icon" href="/favicon.ico" />
+            {assets}
+          </head>
+          <body>
+            <div id="app">{children}</div>
+            {scripts}
+          </body>
+        </html>
+      )}
+    />
+  ),
+  undefined,
+  routerLoad
+);
diff --git a/examples/with-tanstack-router/src/routeTree.gen.ts b/examples/with-tanstack-router/src/routeTree.gen.ts
@@ -89,3 +89,23 @@ const rootRouteChildren: RootRouteChildren = {
 export const routeTree = rootRoute
   ._addFileChildren(rootRouteChildren)
   ._addFileTypes<FileRouteTypes>()
+
+/* ROUTE_MANIFEST_START
+{
+  "routes": {
+    "__root__": {
+      "filePath": "__root.tsx",
+      "children": [
+        "/",
+        "/about"
+      ]
+    },
+    "/": {
+      "filePath": "index.tsx"
+    },
+    "/about": {
+      "filePath": "about.tsx"
+    }
+  }
+}
+ROUTE_MANIFEST_END */
diff --git a/examples/with-tanstack-router/src/router.tsx b/examples/with-tanstack-router/src/router.tsx
@@ -0,0 +1,22 @@
+import { createRouter as createTanstackSolidRouter } from "@tanstack/solid-router";
+import { routeTree } from "./routeTree.gen";
+
+export function createRouter() {
+  const router = createTanstackSolidRouter({
+    defaultErrorComponent: err => <div>{err.error.stack}</div>,
+    routeTree,
+    defaultPreload: "intent",
+    defaultStaleTime: 5000,
+    scrollRestoration: true
+  });
+  return router;
+}
+
+export const router = createRouter();
+
+// Register things for typesafety
+declare module "@tanstack/solid-router" {
+  interface Register {
+    router: ReturnType<typeof createRouter>;
+  }
+}
diff --git a/packages/start/CHANGELOG.md b/packages/start/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @solidjs/start
 
+## 1.1.2
+
+### Patch Changes
+
+- 0c9bc47: Fix issue with anonymous default exports
+- 26e97be: Fix ssr for tanstack router
+
 ## 1.1.1
 
 ### Patch Changes

diff --git a/packages/start/package.json b/packages/start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",

diff --git a/packages/start/src/client/StartClient.tsx b/packages/start/src/client/StartClient.tsx
@@ -24,3 +24,13 @@ export function StartClient() {
     </Dummy>
   );
 }
+
+export function StartClientTanstack() {
+  return (
+    <Dummy>
+      <ErrorBoundary>
+        <App />
+      </ErrorBoundary>
+    </Dummy>
+  );
+}
diff --git a/packages/start/src/client/index.tsx b/packages/start/src/client/index.tsx
@@ -1,5 +1,5 @@
 // @refresh skip
 import "vinxi/client";
-export { StartClient } from "./StartClient";
+export { StartClient, StartClientTanstack } from "./StartClient";
 export { mount } from "./mount";
 
diff --git a/packages/start/src/client/spa/index.tsx b/packages/start/src/client/spa/index.tsx
@@ -7,4 +7,4 @@ export function mount(fn: () => JSX.Element, el: MountableElement) {
   render(fn, el);
 }
 
-export { StartClient } from "../StartClient";
+export { StartClient, StartClientTanstack } from "../StartClient";
diff --git a/packages/start/src/server/handler.ts b/packages/start/src/server/handler.ts
@@ -31,18 +31,24 @@ export function getExpectedRedirectStatus(response: ResponseStub): number {
 export function createBaseHandler(
   fn: (context: PageEvent) => unknown,
   createPageEvent: (event: FetchEvent) => Promise<PageEvent>,
-  options: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>) = {}
+  options: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>) = {},
+  routerLoad?: (event: FetchEvent) => Promise<void>
 ) {
   return eventHandler({
     handler: (e: HTTPEvent) => {
       const event = getFetchEvent(e);
 
       return provideRequestEvent(event, async () => {
+        if (routerLoad) {
+          await routerLoad(event);
+        }
+
         // api
         const match = matchAPIRoute(new URL(event.request.url).pathname, event.request.method);
         if (match) {
           const mod = await match.handler.import();
-          const fn = event.request.method === "HEAD" ? mod["HEAD"] || mod["GET"] : mod[event.request.method];
+          const fn =
+            event.request.method === "HEAD" ? mod["HEAD"] || mod["GET"] : mod[event.request.method];
           (event as APIEvent).params = match.params || {};
           // @ts-ignore
           sharedConfig.context = { event };
@@ -62,6 +68,7 @@ export function createBaseHandler(
         const mode = resolvedOptions.mode || "stream";
         // @ts-ignore
         if (resolvedOptions.nonce) context.nonce = resolvedOptions.nonce;
+
         if (mode === "sync" || !import.meta.env.START_SSR) {
           const html = renderToString(() => {
             (sharedConfig.context as any).event = context;
@@ -130,7 +137,8 @@ function handleStreamCompleteRedirect(context: PageEvent) {
  */
 export function createHandler(
   fn: (context: PageEvent) => unknown,
-  options?: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>)
+  options?: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>),
+  routerLoad?: (event: FetchEvent) => Promise<void>
 ) {
-  return createBaseHandler(fn, createPageEvent, options);
+  return createBaseHandler(fn, createPageEvent, options, routerLoad);
 }
diff --git a/packages/start/src/server/spa/handler.ts b/packages/start/src/server/spa/handler.ts
@@ -7,9 +7,10 @@ import { FetchEvent, HandlerOptions, PageEvent } from "../types";
  */
 export function createHandler(
   fn: (context: PageEvent) => unknown,
-  options?: HandlerOptions | ((context: PageEvent) => HandlerOptions)
+  options?: HandlerOptions | ((context: PageEvent) => HandlerOptions),
+  routerLoad?: (event: FetchEvent) => Promise<void>
 ) {
-  return createBaseHandler(fn, createPageEvent, options);
+  return createBaseHandler(fn, createPageEvent, options, routerLoad);
 }
 
 export async function createPageEvent(ctx: FetchEvent) {