Skip to content

Commit 79323be

Browse files
authored
Merge branch 'main' into docs/add-command-to-react-examples
2 parents 4ecee20 + bfbe75c commit 79323be

File tree

600 files changed

+52078
-2532
lines changed

Some content is hidden

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

600 files changed

+52078
-2532
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.4.1
1+
24.8.0

docs/start/framework/react/guide/server-functions.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,14 @@ export default defineConfig({
256256
tanstackStart({
257257
serverFns: {
258258
generateFunctionId: ({ filename, functionName }) => {
259-
// Return a custom ID string. If you return undefined, the default is used.
259+
// Return a custom ID string
260260
return crypto
261261
.createHash('sha1')
262262
.update(`${filename}--${functionName}`)
263263
.digest('hex')
264-
return undefined
264+
265+
// If you return undefined, the default is used
266+
// return undefined
265267
},
266268
},
267269
}),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"postcss": "^8.5.1",
2121
"react": "^19.0.0",
2222
"react-dom": "^19.0.0",
23-
"tailwindcss": "^4.1.15",
23+
"tailwindcss": "^4.1.17",
2424
"zod": "^3.24.2"
2525
},
2626
"devDependencies": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"react": "^19.0.0",
2727
"react-dom": "^19.0.0",
2828
"redaxios": "^0.5.1",
29-
"tailwindcss": "^4.1.15",
29+
"tailwindcss": "^4.1.17",
3030
"zod": "^3.24.2"
3131
},
3232
"devDependencies": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"react": "^19.0.0",
2222
"react-dom": "^19.0.0",
2323
"redaxios": "^0.5.1",
24-
"tailwindcss": "^4.1.15",
24+
"tailwindcss": "^4.1.17",
2525
"zod": "^3.24.2"
2626
},
2727
"devDependencies": {

e2e/react-router/basic-react-query/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"react": "^19.0.0",
2121
"react-dom": "^19.0.0",
2222
"redaxios": "^0.5.1",
23-
"tailwindcss": "^4.1.15"
23+
"tailwindcss": "^4.1.17"
2424
},
2525
"devDependencies": {
2626
"@playwright/test": "^1.50.1",

e2e/react-router/basic-scroll-restoration/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"react": "^19.0.0",
2020
"react-dom": "^19.0.0",
2121
"redaxios": "^0.5.1",
22-
"tailwindcss": "^4.1.15"
22+
"tailwindcss": "^4.1.17"
2323
},
2424
"devDependencies": {
2525
"@playwright/test": "^1.50.1",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"react": "^19.0.0",
2121
"react-dom": "^19.0.0",
2222
"redaxios": "^0.5.1",
23-
"tailwindcss": "^4.1.15",
23+
"tailwindcss": "^4.1.17",
2424
"zod": "^3.24.2"
2525
},
2626
"devDependencies": {

e2e/react-router/basic-virtual-named-export-config-file-based/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"react": "^19.0.0",
2121
"react-dom": "^19.0.0",
2222
"redaxios": "^0.5.1",
23-
"tailwindcss": "^4.1.15",
23+
"tailwindcss": "^4.1.17",
2424
"zod": "^3.24.2"
2525
},
2626
"devDependencies": {

e2e/react-router/basic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"react": "^19.0.0",
1919
"react-dom": "^19.0.0",
2020
"redaxios": "^0.5.1",
21-
"tailwindcss": "^4.1.15"
21+
"tailwindcss": "^4.1.17"
2222
},
2323
"devDependencies": {
2424
"@playwright/test": "^1.50.1",

0 commit comments

Comments
 (0)