Skip to content

Commit 823c970

Browse files
authored
chore: port site to tanstack start v1 (#839)
2 parents ab6b9ca + 32e27c8 commit 823c970

36 files changed

Lines changed: 2166 additions & 579 deletions

packages/match/dev/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, createSignal } from "solid-js";
1+
import { type Component, createSignal } from "solid-js";
22
import { MatchTag, MatchValue } from "../src/index.js";
33

44
type AnimalDog = { type: "dog"; breed: string };

packages/mouse/dev/components.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { access, MaybeAccessor } from "@solid-primitives/utils";
1+
import { access, type MaybeAccessor } from "@solid-primitives/utils";
22
import { type Component, For } from "solid-js";
33

44
export const DisplayRecord: Component<{ record: Record<string, MaybeAccessor<any>> }> = props => (

pnpm-lock.yaml

Lines changed: 1469 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/app.config.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

site/package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,23 @@
44
"type": "module",
55
"scripts": {
66
"generate": "node --import=@nothing-but/node-resolve-ts --experimental-transform-types ./scripts/generate.ts",
7-
"dev": "vinxi dev",
8-
"build": "vinxi build",
9-
"start": "vinxi start",
10-
"version": "vinxi version",
7+
"dev": "vite dev",
8+
"build": "vite build",
9+
"start": "node .output/server/index.mjs",
1110
"deploy": "pnpm generate && pnpm build",
12-
"preview": "node .output/server/index.mjs"
11+
"preview": "vite preview"
1312
},
1413
"devDependencies": {
1514
"@tailwindcss/container-queries": "^0.1.1",
1615
"@tailwindcss/typography": "^0.5.10",
1716
"@types/mark.js": "^8.11.12",
1817
"autoprefixer": "^10.4.16",
1918
"postcss": "^8.4.32",
19+
"react": "^19.2.5",
2020
"tailwindcss": "3.3.3",
21-
"tailwindcss-dir": "^4.0.0"
21+
"tailwindcss-dir": "^4.0.0",
22+
"vite": "^8.0.8",
23+
"vite-plugin-solid": "^2.11.12"
2224
},
2325
"dependencies": {
2426
"@solid-primitives/clipboard": "workspace:^",
@@ -37,8 +39,8 @@
3739
"@solid-primitives/scroll": "workspace:^",
3840
"@solid-primitives/tween": "workspace:^",
3941
"@solid-primitives/utils": "workspace:^",
40-
"@solidjs/meta": "^0.29.3",
41-
"@solidjs/router": "^0.13.1",
42+
"@tanstack/solid-router": "^1.168.16",
43+
"@tanstack/solid-start": "^1.167.28",
4244
"clsx": "^2.0.0",
4345
"fuse.js": "^7.0.0",
4446
"rehype-sanitize": "^6.0.0",
@@ -47,10 +49,9 @@
4749
"remark-parse": "^11.0.0",
4850
"remark-rehype": "^11.0.0",
4951
"sass": "^1.72.0",
52+
"@floating-ui/dom": "^1.7.6",
5053
"solid-dismiss": "^1.7.121",
5154
"solid-icons": "^1.1.0",
52-
"solid-tippy": "^0.2.1",
53-
"tippy.js": "^6.3.7",
5455
"undici": "^5.28.2",
5556
"unified": "^11.0.4"
5657
},

site/scripts/generate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ async function generateReadme(module: ModuleData, primitiveData: PrimitiveData)
115115
}
116116
return origin;
117117
});
118-
p2 = `[Live Site](https://primitives.solidjs.community/playground/${module.name}/)\n\n${p2}`;
118+
p2 = `[Live Site](/playground/${module.name}/)\n\n${p2}`;
119119
return `${p1}${p2}`;
120120
}
121121
return _;

site/src/app.tsx

Lines changed: 0 additions & 93 deletions
This file was deleted.
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
// @refresh reload
21
import { debounce } from "@solid-primitives/scheduled";
3-
import { mount, StartClient } from "@solidjs/start/client";
4-
5-
// import "solid-devtools";
2+
import { hydrate } from "solid-js/web";
3+
import { hydrateStart, StartClient } from "@tanstack/solid-start/client";
64

75
// Primitives/Table.tsx produces a lot of hydration warnings in development mode.
6+
// Batch them into a single collapsed group so the dev console stays usable.
87
if (import.meta.env.MODE === "development") {
98
const keys: string[] = [];
109
// eslint-disable-next-line no-console
@@ -26,4 +25,6 @@ if (import.meta.env.MODE === "development") {
2625
}, 1000);
2726
}
2827

29-
mount(() => <StartClient />, document);
28+
hydrateStart().then(router => {
29+
hydrate(() => <StartClient router={router} />, document);
30+
});

site/src/components/BundleSizeModal/BundleSizeModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createVisibilityObserver } from "@solid-primitives/intersection-observe
22
import { isIOS, isSafari } from "@solid-primitives/platform";
33
import { createResizeObserver } from "@solid-primitives/resize-observer";
44
import { type Component, createSignal, For, onMount } from "solid-js";
5-
import { Bundlesize, BundlesizeItem } from "~/types.js";
5+
import type { Bundlesize, BundlesizeItem } from "~/types.js";
66

77
const SHARED_HEADERS = ["Minified", "Minified + GZipped"] as const;
88
const PACKAGE_TH_HEADERS = ["Package", ...SHARED_HEADERS] as const;

site/src/components/Footer/Footer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const Footer: Component = () => {
1010
SolidJS
1111
</a>
1212
,{" "}
13-
<a class="text-link" href="https://start.solidjs.com" target="_blank">
14-
SolidStart
13+
<a class="text-link" href="https://tanstack.com/start/latest/docs/framework/solid/overview" target="_blank">
14+
TanStack Start for Solid
1515
</a>
1616
, and best of all ...{" "}
1717
<span class="whitespace-nowrap">

0 commit comments

Comments
 (0)