Skip to content

Commit 5cd8471

Browse files
TkDodoTkDodo
committed
Merge branch 'main' into feature/type-narrow-error
2 parents 961e4e8 + 89846b7 commit 5cd8471

File tree

17 files changed

+31
-29
lines changed

17 files changed

+31
-29
lines changed

‎examples/angular/auto-refetching/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.2.4",
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
17-
"@tanstack/angular-query-experimental": "^5.75.0",
17+
"@tanstack/angular-query-experimental": "^5.75.3",
1818
"rxjs": "^7.8.2",
1919
"tslib": "^2.8.1",
2020
"zone.js": "0.15.0"

‎examples/angular/basic-persister/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.2.4",
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
17-
"@tanstack/angular-query-experimental": "^5.75.0",
17+
"@tanstack/angular-query-experimental": "^5.75.3",
1818
"@tanstack/angular-query-persist-client": "^5.62.7",
1919
"@tanstack/query-sync-storage-persister": "^5.75.0",
2020
"rxjs": "^7.8.2",

‎examples/angular/basic/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.2.4",
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
17-
"@tanstack/angular-query-experimental": "^5.75.0",
17+
"@tanstack/angular-query-experimental": "^5.75.3",
1818
"rxjs": "^7.8.2",
1919
"tslib": "^2.8.1",
2020
"zone.js": "0.15.0"

‎examples/angular/devtools-panel/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
1717
"@angular/router": "^19.2.4",
18-
"@tanstack/angular-query-devtools-experimental": "^5.75.0",
19-
"@tanstack/angular-query-experimental": "^5.75.0",
18+
"@tanstack/angular-query-devtools-experimental": "^5.75.3",
19+
"@tanstack/angular-query-experimental": "^5.75.3",
2020
"rxjs": "^7.8.2",
2121
"tslib": "^2.8.1",
2222
"zone.js": "0.15.0"

‎examples/angular/infinite-query-with-max-pages/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.2.4",
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
17-
"@tanstack/angular-query-experimental": "^5.75.0",
17+
"@tanstack/angular-query-experimental": "^5.75.3",
1818
"rxjs": "^7.8.2",
1919
"tslib": "^2.8.1",
2020
"zone.js": "0.15.0"

‎examples/angular/optimistic-updates/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/forms": "^19.2.4",
1616
"@angular/platform-browser": "^19.2.4",
1717
"@angular/platform-browser-dynamic": "^19.2.4",
18-
"@tanstack/angular-query-experimental": "^5.75.0",
18+
"@tanstack/angular-query-experimental": "^5.75.3",
1919
"rxjs": "^7.8.2",
2020
"tslib": "^2.8.1",
2121
"zone.js": "0.15.0"

‎examples/angular/pagination/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.2.4",
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
17-
"@tanstack/angular-query-experimental": "^5.75.0",
17+
"@tanstack/angular-query-experimental": "^5.75.3",
1818
"rxjs": "^7.8.2",
1919
"tslib": "^2.8.1",
2020
"zone.js": "0.15.0"

‎examples/angular/query-options-from-a-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
1717
"@angular/router": "^19.2.4",
18-
"@tanstack/angular-query-experimental": "^5.75.0",
18+
"@tanstack/angular-query-experimental": "^5.75.3",
1919
"rxjs": "^7.8.2",
2020
"tslib": "^2.8.1",
2121
"zone.js": "0.15.0"

‎examples/angular/router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
1717
"@angular/router": "^19.2.4",
18-
"@tanstack/angular-query-experimental": "^5.75.0",
18+
"@tanstack/angular-query-experimental": "^5.75.3",
1919
"rxjs": "^7.8.2",
2020
"tslib": "^2.8.1",
2121
"zone.js": "0.15.0"

‎examples/angular/rxjs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/forms": "^19.2.4",
1616
"@angular/platform-browser": "^19.2.4",
1717
"@angular/platform-browser-dynamic": "^19.2.4",
18-
"@tanstack/angular-query-experimental": "^5.75.0",
18+
"@tanstack/angular-query-experimental": "^5.75.3",
1919
"rxjs": "^7.8.2",
2020
"tslib": "^2.8.1",
2121
"zone.js": "0.15.0"

‎examples/angular/simple/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.2.4",
1515
"@angular/platform-browser": "^19.2.4",
1616
"@angular/platform-browser-dynamic": "^19.2.4",
17-
"@tanstack/angular-query-experimental": "^5.75.0",
17+
"@tanstack/angular-query-experimental": "^5.75.3",
1818
"rxjs": "^7.8.2",
1919
"tslib": "^2.8.1",
2020
"zone.js": "0.15.0"

‎examples/react/nextjs-suspense-streaming/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"@tanstack/react-query": "^5.75.2",
1212
"@tanstack/react-query-devtools": "^5.75.2",
13-
"@tanstack/react-query-next-experimental": "^5.75.2",
13+
"@tanstack/react-query-next-experimental": "^5.75.3",
1414
"next": "^15.3.1",
1515
"react": "^18.2.0",
1616
"react-dom": "^18.2.0"

‎packages/angular-query-devtools-experimental/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/angular-query-devtools-experimental",
3-
"version": "5.75.0",
3+
"version": "5.75.3",
44
"description": "Developer tools to interact with and visualize the TanStack/angular-query cache",
55
"author": "Arnoud de Vries",
66
"license": "MIT",

‎packages/angular-query-experimental/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/angular-query-experimental",
3-
"version": "5.75.0",
3+
"version": "5.75.3",
44
"description": "Signals for managing, caching and syncing asynchronous and remote data in Angular",
55
"author": "Arnoud de Vries",
66
"license": "MIT",

‎packages/angular-query-experimental/src/inject-is-restoring.ts

+13-11
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@ import {
22
InjectionToken,
33
Injector,
44
assertInInjectionContext,
5-
computed,
65
inject,
6+
signal,
77
} from '@angular/core'
88
import type { Provider, Signal } from '@angular/core'
99

10-
const IS_RESTORING = new InjectionToken<Signal<boolean>>('')
10+
const IS_RESTORING = new InjectionToken(
11+
typeof ngDevMode === 'undefined' || ngDevMode
12+
? 'TANSTACK_QUERY_IS_RESTORING'
13+
: '',
14+
{
15+
// Default value when not provided
16+
factory: () => signal(false).asReadonly(),
17+
},
18+
)
1119

1220
/**
1321
* The `Injector` in which to create the isRestoring signal.
@@ -19,21 +27,15 @@ interface InjectIsRestoringOptions {
1927
}
2028

2129
/**
22-
* Injects a signal that tracks whether a restore is currently in progress. {@link injectQuery} and friends also check this internally to avoid race conditions between the restore and mounting queries.
30+
* Injects a signal that tracks whether a restore is currently in progress. {@link injectQuery} and friends also check this internally to avoid race conditions between the restore and initializing queries.
2331
* @param options - Options for injectIsRestoring.
2432
* @returns signal with boolean that indicates whether a restore is in progress.
2533
* @public
2634
*/
27-
export function injectIsRestoring(
28-
options?: InjectIsRestoringOptions,
29-
): Signal<boolean> {
35+
export function injectIsRestoring(options?: InjectIsRestoringOptions) {
3036
!options?.injector && assertInInjectionContext(injectIsRestoring)
3137
const injector = options?.injector ?? inject(Injector)
32-
return injector.get(
33-
IS_RESTORING,
34-
computed(() => false),
35-
{ optional: true },
36-
)
38+
return injector.get(IS_RESTORING)
3739
}
3840

3941
/**

‎packages/angular-query-persist-client/src/with-persist-query-client.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ type PersistQueryClientOptions = {
5555
export function withPersistQueryClient(
5656
persistQueryClientOptions: PersistQueryClientOptions,
5757
): PersistQueryClientFeature {
58-
const isRestoring = signal(false)
58+
const isRestoring = signal(true)
5959
const providers = [
6060
provideIsRestoring(isRestoring.asReadonly()),
6161
{
62+
// Do not use provideEnvironmentInitializer while Angular < v19 is supported
6263
provide: ENVIRONMENT_INITIALIZER,
6364
multi: true,
6465
useValue: () => {
6566
if (!isPlatformBrowser(inject(PLATFORM_ID))) return
6667
const destroyRef = inject(DestroyRef)
6768
const queryClient = inject(QueryClient)
6869

69-
isRestoring.set(true)
7070
const { onSuccess, onError, persistOptions } = persistQueryClientOptions
7171
const options = { queryClient, ...persistOptions }
7272
persistQueryClientRestore(options)

‎packages/react-query-next-experimental/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/react-query-next-experimental",
3-
"version": "5.75.2",
3+
"version": "5.75.3",
44
"description": "Hydration utils for React Query in the NextJs app directory",
55
"author": "tannerlinsley",
66
"license": "MIT",

0 commit comments

Comments
 (0)