Skip to content

Commit e5e5ec1

Browse files
riccardoperrariccardoperra
committed
Merge remote-tracking branch 'origin/main' into feat/angular-adapter
2 parents efa3afd + c6bbb90 commit e5e5ec1

File tree

42 files changed

+3986
-7051
lines changed

Some content is hidden

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

42 files changed

+3986
-7051
lines changed

‎examples/react/basic/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@tanstack/devtools-client": "0.0.6",
1313
"@tanstack/devtools-event-client": "0.4.1",
14-
"@tanstack/react-devtools": "^0.9.9",
14+
"@tanstack/react-devtools": "^0.9.10",
1515
"@tanstack/react-form": "^1.23.7",
1616
"@tanstack/react-query": "^5.90.1",
1717
"@tanstack/react-query-devtools": "^5.90.1",

‎examples/react/bundling-repro/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"@tanstack/react-router-devtools": "^1.132.0",
3131
"@tanstack/react-router-ssr-query": "^1.131.7",
3232
"@tanstack/react-start": "^1.132.0",
33-
"@tanstack/react-store": "^0.8.0",
33+
"@tanstack/react-store": "^0.9.0",
3434
"@tanstack/router-plugin": "^1.132.0",
35-
"@tanstack/store": "^0.8.0",
35+
"@tanstack/store": "^0.9.0",
3636
"class-variance-authority": "^0.7.1",
3737
"clsx": "^2.1.1",
3838
"highlight.js": "^11.11.1",

‎examples/react/bundling-repro/src/components/demo-AIAssistant.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function Messages({ messages }: { messages: ChatMessages }) {
7979
}
8080

8181
export default function AIAssistant() {
82-
const isOpen = useStore(showAIAssistant)
82+
const isOpen = useStore(showAIAssistant, (state) => state)
8383
const { messages, sendMessage } = useGuitarRecommendationChat()
8484
const [input, setInput] = useState('')
8585

‎examples/react/bundling-repro/src/feat/demo-store-devtools.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { EventClient } from '@tanstack/devtools-event-client'
22
import { useState, useEffect } from 'react'
33

4-
import { store, fullName } from './demo-store'
4+
import { store } from './demo-store'
55

66
type EventMap = {
77
'store-devtools:state': {
@@ -25,15 +25,15 @@ store.subscribe(() => {
2525
sdec.emit('state', {
2626
firstName: store.state.firstName,
2727
lastName: store.state.lastName,
28-
fullName: fullName.state,
28+
fullName: `${store.state.firstName} ${store.state.lastName}`,
2929
})
3030
})
3131

3232
function DevtoolPanel() {
3333
const [state, setState] = useState<EventMap['store-devtools:state']>(() => ({
3434
firstName: store.state.firstName,
3535
lastName: store.state.lastName,
36-
fullName: fullName.state,
36+
fullName: `${store.state.firstName} ${store.state.lastName}`,
3737
}))
3838

3939
useEffect(() => {

‎examples/react/bundling-repro/src/feat/demo-store.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
import { Derived, Store } from '@tanstack/store'
1+
import { Store } from '@tanstack/store'
22

33
export const store = new Store({
44
firstName: 'Jane',
55
lastName: 'Smith',
66
})
7-
8-
export const fullName = new Derived({
9-
fn: () => `${store.state.firstName} ${store.state.lastName}`,
10-
deps: [store],
11-
})
12-
13-
fullName.mount()

‎examples/react/bundling-repro/src/routeTree.gen.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export interface FileRoutesByFullPath {
149149
'/demo/guitars/$guitarId': typeof DemoGuitarsGuitarIdRoute
150150
'/demo/start/api-request': typeof DemoStartApiRequestRoute
151151
'/demo/start/server-funcs': typeof DemoStartServerFuncsRoute
152-
'/demo/guitars': typeof DemoGuitarsIndexRoute
152+
'/demo/guitars/': typeof DemoGuitarsIndexRoute
153153
'/demo/api/ai/chat': typeof DemoApiAiChatRoute
154154
'/demo/api/ai/image': typeof DemoApiAiImageRoute
155155
'/demo/api/ai/structured': typeof DemoApiAiStructuredRoute
@@ -158,7 +158,7 @@ export interface FileRoutesByFullPath {
158158
'/demo/start/ssr/data-only': typeof DemoStartSsrDataOnlyRoute
159159
'/demo/start/ssr/full-ssr': typeof DemoStartSsrFullSsrRoute
160160
'/demo/start/ssr/spa-mode': typeof DemoStartSsrSpaModeRoute
161-
'/demo/start/ssr': typeof DemoStartSsrIndexRoute
161+
'/demo/start/ssr/': typeof DemoStartSsrIndexRoute
162162
}
163163
export interface FileRoutesByTo {
164164
'/': typeof IndexRoute
@@ -221,7 +221,7 @@ export interface FileRouteTypes {
221221
| '/demo/guitars/$guitarId'
222222
| '/demo/start/api-request'
223223
| '/demo/start/server-funcs'
224-
| '/demo/guitars'
224+
| '/demo/guitars/'
225225
| '/demo/api/ai/chat'
226226
| '/demo/api/ai/image'
227227
| '/demo/api/ai/structured'
@@ -230,7 +230,7 @@ export interface FileRouteTypes {
230230
| '/demo/start/ssr/data-only'
231231
| '/demo/start/ssr/full-ssr'
232232
| '/demo/start/ssr/spa-mode'
233-
| '/demo/start/ssr'
233+
| '/demo/start/ssr/'
234234
fileRoutesByTo: FileRoutesByTo
235235
to:
236236
| '/'
@@ -350,7 +350,7 @@ declare module '@tanstack/react-router' {
350350
'/demo/guitars/': {
351351
id: '/demo/guitars/'
352352
path: '/demo/guitars'
353-
fullPath: '/demo/guitars'
353+
fullPath: '/demo/guitars/'
354354
preLoaderRoute: typeof DemoGuitarsIndexRouteImport
355355
parentRoute: typeof rootRouteImport
356356
}
@@ -392,7 +392,7 @@ declare module '@tanstack/react-router' {
392392
'/demo/start/ssr/': {
393393
id: '/demo/start/ssr/'
394394
path: '/demo/start/ssr'
395-
fullPath: '/demo/start/ssr'
395+
fullPath: '/demo/start/ssr/'
396396
preLoaderRoute: typeof DemoStartSsrIndexRouteImport
397397
parentRoute: typeof rootRouteImport
398398
}

‎examples/react/bundling-repro/src/routes/demo/store.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createFileRoute } from '@tanstack/react-router'
22
import { useStore } from '@tanstack/react-store'
33

4-
import { fullName, store } from '@/feat/demo-store'
4+
import { store } from '@/feat/demo-store'
55

66
export const Route = createFileRoute('/demo/store')({
77
component: DemoStore,
@@ -36,10 +36,11 @@ function LastName() {
3636
}
3737

3838
function FullName() {
39-
const fName = useStore(fullName)
39+
const firstName = useStore(store, (state) => state.firstName)
40+
const lastName = useStore(store, (state) => state.lastName)
4041
return (
4142
<div className="bg-white/10 rounded-lg px-4 py-2 outline-none ">
42-
{fName}
43+
{firstName} {lastName}
4344
</div>
4445
)
4546
}

‎examples/react/bundling-repro/vite.config.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ const config = defineConfig({
2424
tailwindcss(),
2525
tanstackStart(),
2626
viteReact({
27-
babel: {
28-
plugins: ['babel-plugin-react-compiler'],
29-
},
27+
babel: {},
3028
}),
3129
],
3230
})

‎examples/react/custom-devtools/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@tanstack/devtools-event-client": "0.4.1",
13-
"@tanstack/react-devtools": "^0.9.9",
13+
"@tanstack/react-devtools": "^0.9.10",
1414
"react": "^19.2.0",
1515
"react-dom": "^19.2.0"
1616
},

‎examples/react/drizzle/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start": "vite start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-devtools": "^0.9.9",
11+
"@tanstack/react-devtools": "^0.9.10",
1212
"@tanstack/react-router": "^1.132.0",
1313
"@tanstack/react-router-devtools": "^1.132.0",
1414
"@tanstack/react-start": "^1.132.0",

0 commit comments

Comments
 (0)