Skip to content

Commit 4ab6338

Browse files
committed
Merge branch 'support-lazy-error-component-on-before-load' of https://github.com/beaussan/router into support-lazy-error-component-on-before-load
2 parents 67f589b + d119533 commit 4ab6338

File tree

700 files changed

+9240
-3303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

700 files changed

+9240
-3303
lines changed

docs/start/config.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,14 @@
329329
{
330330
"label": "Cloudflare Vite Plugin",
331331
"to": "framework/solid/examples/start-basic-cloudflare"
332+
},
333+
{
334+
"label": "Netlify Vite Plugin",
335+
"to": "framework/solid/examples/start-basic-netlify"
336+
},
337+
{
338+
"label": "Nitro Vite Plugin",
339+
"to": "framework/solid/examples/start-basic-nitro"
332340
}
333341
]
334342
}

docs/start/framework/react/guide/hosting.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ Add a `netlify.toml` file to your project root:
148148
[build]
149149
command = "vite build"
150150
publish = "dist/client"
151+
[dev]
152+
command = "vite dev"
153+
port = 3000
151154
```
152155

153156
Deploy your application using their one-click deployment process, and you're ready to go!

docs/start/framework/solid/guide/hosting.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ Add a `netlify.toml` file to your project root:
142142
[build]
143143
command = "vite build"
144144
publish = "dist/client"
145+
[dev]
146+
command = "vite dev"
147+
port = 3000
145148
```
146149

147150
Deploy your application using their one-click deployment process, and you're ready to go!

e2e/react-router/basic-file-based-code-splitting/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"test:e2e": "rm -rf port*.txt; pnpm run test:e2e:verbose-routes:true && pnpm run test:e2e:verbose-routes:false"
1414
},
1515
"dependencies": {
16+
"@tailwindcss/postcss": "^4.1.15",
1617
"@tanstack/react-router": "workspace:^",
1718
"@tanstack/react-router-devtools": "workspace:^",
1819
"@tanstack/router-plugin": "workspace:^",
20+
"postcss": "^8.5.1",
1921
"react": "^19.0.0",
2022
"react-dom": "^19.0.0",
21-
"postcss": "^8.5.1",
22-
"autoprefixer": "^10.4.20",
23-
"tailwindcss": "^3.4.17",
23+
"tailwindcss": "^4.1.15",
2424
"zod": "^3.24.2"
2525
},
2626
"devDependencies": {
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export default {
22
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
3+
'@tailwindcss/postcss': {},
54
},
65
}

e2e/react-router/basic-file-based-code-splitting/src/styles.css

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import 'tailwindcss';
2+
3+
@layer base {
4+
*,
5+
::after,
6+
::before,
7+
::backdrop,
8+
::file-selector-button {
9+
border-color: var(--color-gray-200, currentcolor);
10+
}
11+
}
412

513
html {
614
color-scheme: light dark;

e2e/react-router/basic-file-based-code-splitting/tailwind.config.mjs

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

e2e/react-router/basic-file-based/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
1212
},
1313
"dependencies": {
14+
"@tailwindcss/postcss": "^4.1.15",
1415
"@tanstack/react-router": "workspace:^",
1516
"@tanstack/react-router-devtools": "workspace:^",
1617
"@tanstack/router-plugin": "workspace:^",
1718
"@tanstack/zod-adapter": "workspace:^",
19+
"postcss": "^8.5.1",
1820
"react": "^19.0.0",
1921
"react-dom": "^19.0.0",
2022
"redaxios": "^0.5.1",
21-
"postcss": "^8.5.1",
22-
"autoprefixer": "^10.4.20",
23-
"tailwindcss": "^3.4.17",
23+
"tailwindcss": "^4.1.15",
2424
"zod": "^3.24.2"
2525
},
2626
"devDependencies": {
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export default {
22
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
3+
'@tailwindcss/postcss': {},
54
},
65
}

e2e/react-router/basic-file-based/src/routes/anchor.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ function AnchorComponent() {
124124
<label>
125125
<span>Target Anchor</span>
126126
<select
127-
className="border border-opacity-50 rounded p-2 w-full"
127+
className="border border-opacity-50 rounded-sm p-2 w-full"
128128
data-testid="hash-select"
129129
defaultValue={location.hash || anchors[0].id}
130130
name="hash"
@@ -154,7 +154,7 @@ function AnchorComponent() {
154154
<label>
155155
<span>Behavior</span>
156156
<select
157-
className="border border-opacity-50 rounded p-2 w-full"
157+
className="border border-opacity-50 rounded-sm p-2 w-full"
158158
data-testid="behavior-select"
159159
defaultValue="instant"
160160
name="scrollBehavior"
@@ -170,7 +170,7 @@ function AnchorComponent() {
170170
<label>
171171
<span>Block</span>
172172
<select
173-
className="border border-opacity-50 rounded p-2 w-full"
173+
className="border border-opacity-50 rounded-sm p-2 w-full"
174174
data-testid="block-select"
175175
defaultValue="start"
176176
name="scrollBlock"
@@ -187,7 +187,7 @@ function AnchorComponent() {
187187
<label>
188188
<span>Inline</span>
189189
<select
190-
className="border border-opacity-50 rounded p-2 w-full"
190+
className="border border-opacity-50 rounded-sm p-2 w-full"
191191
data-testid="inline-select"
192192
defaultValue="nearest"
193193
name="scrollInline"
@@ -203,7 +203,7 @@ function AnchorComponent() {
203203
) : null}
204204
<div>
205205
<button
206-
className="bg-blue-500 rounded p-2 uppercase text-white font-black disabled:opacity-50"
206+
className="bg-blue-500 rounded-sm p-2 uppercase text-white font-black disabled:opacity-50"
207207
data-testid="navigate-button"
208208
>
209209
Navigate

0 commit comments

Comments
 (0)