Skip to content

Commit eb0a7fc

Browse files
committed
Merge remote-tracking branch 'origin/dev' into feat/svelte-query
2 parents 7a2a3bb + 9f530fd commit eb0a7fc

File tree

7 files changed

+496
-25
lines changed

7 files changed

+496
-25
lines changed

packages/clients/tanstack-query/package.json

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@
3333
"default": "./dist/react.cjs"
3434
}
3535
},
36+
"./vue": {
37+
"import": {
38+
"types": "./dist/vue.d.ts",
39+
"default": "./dist/vue.js"
40+
},
41+
"require": {
42+
"types": "./dist/vue.d.cts",
43+
"default": "./dist/vue.cjs"
44+
}
45+
},
3646
"./svelte": {
3747
"import": {
3848
"types": "./dist/svelte.d.ts",
@@ -42,6 +52,10 @@
4252
"types": "./dist/svelte.d.cts",
4353
"default": "./dist/svelte.cjs"
4454
}
55+
},
56+
"./package.json": {
57+
"import": "./package.json",
58+
"require": "./package.json"
4559
}
4660
},
4761
"dependencies": {
@@ -54,6 +68,7 @@
5468
"devDependencies": {
5569
"@tanstack/react-query": "catalog:",
5670
"@tanstack/svelte-query": "5.90.2",
71+
"@tanstack/vue-query": "5.90.6",
5772
"@testing-library/dom": "^10.4.1",
5873
"@testing-library/react": "^16.3.0",
5974
"@types/react": "catalog:",
@@ -65,18 +80,19 @@
6580
"happy-dom": "^20.0.10",
6681
"nock": "^14.0.10",
6782
"react": "catalog:",
83+
"vue": "catalog:",
6884
"svelte": "catalog:"
6985
},
7086
"peerDependencies": {
7187
"@tanstack/react-query": "^5.0.0",
72-
"@tanstack/svelte-query": "^5.0.0",
73-
"react": "^18 || ^19"
88+
"@tanstack/vue-query": "^5.0.0",
89+
"@tanstack/svelte-query": "^5.0.0"
7490
},
7591
"peerDependenciesMeta": {
7692
"@tanstack/react-query": {
7793
"optional": true
7894
},
79-
"react": {
95+
"@tanstack/vue-query": {
8096
"optional": true
8197
},
8298
"@tanstack/svelte-query": {

packages/clients/tanstack-query/src/react.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export const QuerySettingsProvider = QuerySettingsContext.Provider;
7979
/**
8080
* React context provider for configuring query settings.
8181
*
82-
* @deprecated Use `QuerySettingsProvider` instead.
82+
* @deprecated Use {@link QuerySettingsProvider} instead.
8383
*/
8484
export const Provider = QuerySettingsProvider;
8585

@@ -473,7 +473,7 @@ export function useInternalMutation<
473473
options?: Omit<UseMutationOptions<Result, DefaultError, TArgs>, 'mutationFn'> & ExtraMutationOptions,
474474
checkReadBack?: C,
475475
) {
476-
const { endpoint, fetch } = useHooksContext();
476+
const { endpoint, fetch, logging } = useHooksContext();
477477
const queryClient = useQueryClient();
478478
const mutationFn = (data: any) => {
479479
const reqUrl =
@@ -493,7 +493,6 @@ export function useInternalMutation<
493493
const finalOptions = { ...options, mutationFn };
494494
const invalidateQueries = options?.invalidateQueries !== false;
495495
const optimisticUpdate = !!options?.optimisticUpdate;
496-
const { logging } = useContext(QuerySettingsContext);
497496

498497
if (operation) {
499498
if (invalidateQueries) {

packages/clients/tanstack-query/src/utils/common.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ export function unmarshal(value: string) {
208208
}
209209
}
210210

211-
export function makeUrl(url: string, model: string, operation: string, args?: unknown) {
212-
const baseUrl = `${url}/${lowerCaseFirst(model)}/${operation}`;
211+
export function makeUrl(endpoint: string, model: string, operation: string, args?: unknown) {
212+
const baseUrl = `${endpoint}/${lowerCaseFirst(model)}/${operation}`;
213213
if (!args) {
214214
return baseUrl;
215215
}

0 commit comments

Comments
 (0)