Merge branch 'alpha' into feat/vue-shallow-ref

Author: DamianOsipiuk

.codesandbox/ci.json

@@ -1,5 +1,6 @@
 {
   "installCommand": "install:csb",
+  "buildCommand": "build:all",
   "sandboxes": [
     "/examples/react/basic-typescript",
     "/examples/solid/basic-typescript",

.eslintrc.cjs

@@ -4,20 +4,22 @@
 const config = {
   root: true,
   parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint', 'import'],
+  plugins: ['@typescript-eslint', 'compat', 'import'],
   extends: [
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
+    'plugin:compat/recommended',
     'plugin:import/recommended',
     'plugin:import/typescript',
     'prettier',
   ],
   env: {
     browser: true,
+    es2020: true,
   },
   parserOptions: {
     tsconfigRootDir: __dirname,
-    project: './tsconfig.base.json',
+    project: './tsconfig.json',
     sourceType: 'module',
     ecmaVersion: 2020,
   },
@@ -45,6 +47,7 @@ const config = {
     '@typescript-eslint/no-non-null-assertion': 'off',
     '@typescript-eslint/no-unnecessary-condition': 'error',
     '@typescript-eslint/no-unnecessary-type-assertion': 'error',
+    '@typescript-eslint/no-unused-vars': 'off',
     '@typescript-eslint/no-inferrable-types': [
       'error',
       { ignoreParameters: true },

.github/workflows/ci.yml

@@ -1,7 +1,5 @@
 name: ci
-concurrency:
-  group: publish-${{ github.github.base_ref }}
-  cancel-in-progress: true
+
 on:
   workflow_dispatch:
     inputs:
@@ -13,9 +11,15 @@ on:
       - 'main'
       - 'alpha'
       - 'beta'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
+  cancel-in-progress: true
+
 env:
-  NX_DAEMON: false
   NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+  NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
+
 jobs:
   test-and-publish:
     if: github.repository == 'TanStack/query' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/alpha' || github.ref == 'refs/heads/beta')
@@ -38,7 +42,7 @@ jobs:
       - name: Run Tests
         uses: nick-fields/[email protected]
         with:
-          command: pnpm run test:ci --base=${{ github.event.before || 'origin/main' }}
+          command: pnpm run test:ci
           timeout_minutes: 10
           max_attempts: 3
       - name: Publish

.github/workflows/pr.yml

@@ -1,86 +1,96 @@
 name: pr
+
 on: [pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
+  cancel-in-progress: true
+
 env:
-  NX_DAEMON: false
+  NX_CLOUD_DISTRIBUTED_EXECUTION: true
+  NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT: 3
   NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+  NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
+
 jobs:
-  agent:
-    name: 'Nx Cloud Agents'
+  main:
+    name: Nx Cloud - Main Job
     runs-on: ubuntu-latest
-    timeout-minutes: 20
-    strategy:
-      matrix:
-        agent: [1, 2, 3, 4]
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          ref: ${{ github.head_ref }}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-      - uses: pnpm/[email protected]
+      - name: Setup pnpm
+        uses: pnpm/[email protected]
         with:
           version: 8
-      - uses: actions/setup-node@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
           node-version: 18.16.0
           cache: 'pnpm'
       - name: Install dependencies
         run: pnpm --filter "./packages/**" --filter query --prefer-offline install
-      - name: Start Nx Agent ${{ matrix.agent }}
-        run: npx nx-cloud start-agent
-  orchestrator:
-    name: 'Nx Cloud Orchestrator'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ github.head_ref }}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-      - uses: pnpm/[email protected]
-        with:
-          version: 8
-      - uses: actions/setup-node@v3
+      - name: Get appropriate base and head commits for `nx affected` commands
+        uses: nrwl/nx-set-shas@v3
         with:
-          node-version: 18.16.0
-          cache: 'pnpm'
-      - name: Install dependencies
-        run: pnpm --filter "./packages/**" --filter query --prefer-offline install
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
+          main-branch-name: 'alpha'
       - run: |
           echo "BASE: ${{ env.NX_BASE }}"
           echo "HEAD: ${{ env.NX_HEAD }}"
       - name: Start CI Orchestrator
         run: npx nx-cloud start-ci-run
-      - name: Run All Checks
+      - name: Run Tests
         uses: nick-fields/[email protected]
-        env:
-          BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
         with:
           timeout_minutes: 5
           max_attempts: 3
-          command: npx nx affected --targets=test:eslint,test:types,test:build,test:lib --base=${{ github.event.pull_request.base.sha }}
+          command: npx nx affected --targets=test:eslint,test:lib,test:types,test:build
       - name: Stop Agents
         run: npx nx-cloud stop-all-agents
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
+  agents:
+    name: Nx Cloud - Agents
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      matrix:
+        agent: [1, 2, 3]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup pnpm
+        uses: pnpm/[email protected]
+        with:
+          version: 8
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.16.0
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm --filter "./packages/**" --filter query --prefer-offline install
+      - name: Start Nx Agent ${{ matrix.agent }}
+        run: npx nx-cloud start-agent
   format:
-    name: 'Format'
+    name: Format
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          ref: ${{ github.head_ref }}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-      - uses: pnpm/[email protected]
+      - name: Setup pnpm
+        uses: pnpm/[email protected]
         with:
           version: 8
-      - uses: actions/setup-node@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
           node-version: 18.16.0
           cache: 'pnpm'
       - name: Install dependencies
         run: pnpm --filter "./packages/**" --filter query --prefer-offline install
-      - run: pnpm run test:format --base=${{ github.event.pull_request.base.sha }}
+      - name: Run prettier
+        run: pnpm run test:format

.prettierignore

@@ -3,4 +3,4 @@
 **/build
 **/coverage
 **/dist
-/packages/codemods/**/__testfixtures__
+**/codemods/**/__testfixtures__

babel.config.js renamed to babel.config.cjs

@@ -34,16 +34,15 @@ module.exports = {
   ].filter(Boolean),
   overrides: [
     {
-      exclude: [
-        './packages/solid-query/**',
-        './packages/query-devtools/**',
-        './packages/svelte-query/**',
-        './packages/vue-query/**',
+      include: [
+        './packages/react-query/**',
+        './packages/react-query-devtools/**',
+        './packages/react-query-persist-client/**',
       ],
       presets: ['@babel/react'],
     },
     {
-      include: ['./packages/solid-query/**', './packages/query-devtools/**'],
+      include: ['./packages/query-devtools/**', './packages/solid-query/**'],
       presets: ['babel-preset-solid'],
     },
   ],

docs/react/community/suspensive-react-query.md

@@ -3,21 +3,22 @@ id: suspensive-react-query
 title: Suspensive React Query
 ---
 
-Typesafe useQuery, useInfiniteQuery with default suspense option.
+Typesafe useQuery, useQueries, useInfiniteQuery with default suspense option.
 
-Use @suspensive/react-query, delegate loading and error handling to the outside of the component with useSuspenseQuery and useSuspenseInfiniteQuery, and focus on success inside the component.
+Use @suspensive/react-query, delegate loading and error handling to the outside of the component with [useSuspenseQuery](https://suspensive.org/docs/react-query/src/useSuspenseQuery.i18n), [useSuspenseQueries](https://suspensive.org/docs/react-query/src/useSuspenseQueries.i18n) and [useSuspenseInfiniteQuery](https://suspensive.org/docs/react-query/src/useSuspenseInfiniteQuery.i18n), and focus on success inside the component.
 
 You don't even need to use the isSuccess flag.
 
 ## Installation
+
 You can install @suspensive/react-query via [NPM](https://www.npmjs.com/package/@suspensive/react-query).
 
 ```bash
-$ npm i @suspensive/react @suspensive/react-query
+$ npm i @suspensive/react-query
 # or
-$ pnpm add @suspensive/react @suspensive/react-query
+$ pnpm add @suspensive/react-query
 # or
-$ yarn add @suspensive/react @suspensive/react-query
+$ yarn add @suspensive/react-query
 ```
 
 ### Motivation
@@ -28,7 +29,9 @@ If you turn suspense mode on in @tanstack/react-query, You can use useQuery with
 import { useQuery } from '@tanstack/react-query'
 
 const Example = () => {
-  const query = useQuery(queryKey, queryFn, {
+  const query = useQuery({
+    queryKey,
+    queryFn,
     suspense: true,
   })
 
@@ -55,7 +58,10 @@ In addition, this hook's options have default suspense: true. and you can provid
 import { useSuspenseQuery } from '@suspensive/react-query'
 
 const Example = () => {
-  const query = useSuspenseQuery(queryKey, queryFn, options) // suspense:true is default.
+  const query = useSuspenseQuery({
+    queryKey,
+    queryFn,
+  }) // suspense:true is default.
 
   // No need to do type narrowing by isSuccess
   query.data // TData
@@ -66,4 +72,6 @@ const Example = () => {
 
 Now, we can concentrate component as any fetching will be always success in component.
 
-Check the complete documentation on [GitHub](https://github.com/suspensive/react).
+### More Information
+
+Check the complete documentation on [Suspensive Official Docs Site](https://suspensive.org/) and also welcome Pull Request on [Suspensive GitHub](https://github.com/suspensive/react)