Skip to content

Commit bdeb1da

Browse files
committed
Merge branch 'main' into beta
# Conflicts: # .github/workflows/ci.yml # .github/workflows/pr.yml # packages/eslint-plugin-query/package.json # packages/query-async-storage-persister/package.json # packages/query-broadcast-client-experimental/package.json # packages/query-core/package.json # packages/query-persist-client-core/package.json # packages/query-sync-storage-persister/package.json # packages/react-query-devtools/package.json # packages/react-query-persist-client/package.json # packages/react-query/package.json # packages/solid-query/package.json # packages/svelte-query/package.json # packages/vue-query/package.json # packages/vue-query/src/__tests__/useMutation.test.ts # packages/vue-query/src/__tests__/useQuery.test.ts # packages/vue-query/src/useBaseQuery.ts # packages/vue-query/src/useIsFetching.ts # packages/vue-query/src/useIsMutating.ts # packages/vue-query/src/useMutation.ts # packages/vue-query/src/useQueries.ts # packages/vue-query/src/utils.ts # scripts/publish.js # scripts/validate-packages.ts RELEASE_ALL
2 parents b20f1f7 + 9b8b5f0 commit bdeb1da

File tree

20 files changed

+85
-40
lines changed

20 files changed

+85
-40
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*/**/build

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ jobs:
3434
version: 8
3535
- uses: actions/setup-node@v3
3636
with:
37-
node-version: 18.16.0
3837
registry-url: https://registry.npmjs.org/
39-
cache: 'pnpm'
38+
node-version-file: .nvmrc
39+
cache: pnpm
40+
cache-dependency-path: pnpm-lock.yaml
4041
- name: Install dependencies
4142
run: pnpm --filter "./packages/**" --filter query --prefer-offline install
4243
- name: Run Tests

.github/workflows/pr.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ jobs:
2727
- name: Setup Node
2828
uses: actions/setup-node@v3
2929
with:
30-
node-version: 18.16.0
31-
cache: 'pnpm'
30+
node-version-file: .nvmrc
31+
cache: pnpm
32+
cache-dependency-path: pnpm-lock.yaml
3233
- name: Install dependencies
3334
run: pnpm --filter "./packages/**" --filter query --prefer-offline install
3435
- name: Get appropriate base and head commits for `nx affected` commands
@@ -68,8 +69,9 @@ jobs:
6869
- name: Setup Node
6970
uses: actions/setup-node@v3
7071
with:
71-
node-version: 18.16.0
72-
cache: 'pnpm'
72+
node-version-file: .nvmrc
73+
cache: pnpm
74+
cache-dependency-path: pnpm-lock.yaml
7375
- name: Install dependencies
7476
run: pnpm --filter "./packages/**" --filter query --prefer-offline install
7577
- name: Start Nx Agent ${{ matrix.agent }}
@@ -88,8 +90,9 @@ jobs:
8890
- name: Setup Node
8991
uses: actions/setup-node@v3
9092
with:
91-
node-version: 18.16.0
92-
cache: 'pnpm'
93+
node-version-file: .nvmrc
94+
cache: pnpm
95+
cache-dependency-path: pnpm-lock.yaml
9396
- name: Install dependencies
9497
run: pnpm --filter "./packages/**" --filter query --prefer-offline install
9598
- name: Run prettier

.gitignore

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ yarn.lock
88

99
# builds
1010
types
11-
build
12-
*/build
13-
dist
14-
lib
15-
es
11+
*/**/build
12+
*/**/dist
13+
*/**/lib
14+
*/**/es
1615
artifacts
1716
.rpt2_cache
1817
coverage
@@ -39,9 +38,7 @@ stats.html
3938

4039
*.log
4140
.DS_Store
42-
node_modules
4341
.cache
44-
dist
4542
.idea
4643

4744
nx-cloud.env

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"name": "query",
3-
"repository": "https://github.com/tanstack/query.git",
3+
"repository": {
4+
"type": "git",
5+
"url": "https://github.com/TanStack/query.git"
6+
},
47
"packageManager": "[email protected]",
58
"type": "module",
69
"scripts": {

packages/eslint-plugin-query/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
"description": "ESLint plugin for TanStack Query",
55
"author": "Eliya Cohen",
66
"license": "MIT",
7-
"repository": "tanstack/query",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/TanStack/query.git",
10+
"directory": "packages/eslint-plugin-query"
11+
},
812
"homepage": "https://tanstack.com/query",
913
"funding": {
1014
"type": "github",

packages/query-async-storage-persister/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
"description": "A persister for asynchronous storages, to be used with TanStack/Query",
55
"author": "tannerlinsley",
66
"license": "MIT",
7-
"repository": "tanstack/query",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/TanStack/query.git",
10+
"directory": "packages/query-async-storage-persister"
11+
},
812
"homepage": "https://tanstack.com/query",
913
"funding": {
1014
"type": "github",

packages/query-broadcast-client-experimental/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
"description": "An experimental plugin to for broadcasting the state of your queryClient between browser tabs/windows",
55
"author": "tannerlinsley",
66
"license": "MIT",
7-
"repository": "tanstack/query",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/TanStack/query.git",
10+
"directory": "packages/query-broadcast-client-experimental"
11+
},
812
"homepage": "https://tanstack.com/query",
913
"funding": {
1014
"type": "github",

packages/query-core/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
"description": "The framework agnostic core that powers TanStack Query",
55
"author": "tannerlinsley",
66
"license": "MIT",
7-
"repository": "tanstack/query",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/TanStack/query.git",
10+
"directory": "packages/query-core"
11+
},
812
"homepage": "https://tanstack.com/query",
913
"funding": {
1014
"type": "github",

packages/query-persist-client-core/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
"description": "Set of utilities for interacting with persisters, which can save your queryClient for later use",
55
"author": "tannerlinsley",
66
"license": "MIT",
7-
"repository": "tanstack/query",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/TanStack/query.git",
10+
"directory": "packages/query-persist-client-core"
11+
},
812
"homepage": "https://tanstack.com/query",
913
"funding": {
1014
"type": "github",

0 commit comments

Comments
 (0)