diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a17c146bc..7ceebdcfc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: version: 7 - uses: actions/setup-node@v3 with: - node-version: 16.19.0 + node-version: 18.16.0 registry-url: https://registry.npmjs.org/ cache: 'pnpm' - name: Install dependencies diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 24d63190cf..f7b4dbb2e1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,7 +22,7 @@ jobs: version: 7 - uses: actions/setup-node@v3 with: - node-version: 16.14.2 + node-version: 18.16.0 cache: 'pnpm' - name: Install dependencies run: pnpm --filter "./packages/**" --filter query --prefer-offline install @@ -42,7 +42,7 @@ jobs: version: 7 - uses: actions/setup-node@v3 with: - node-version: 16.19.0 + node-version: 18.16.0 cache: 'pnpm' - name: Install dependencies run: pnpm --filter "./packages/**" --filter query --prefer-offline install @@ -79,25 +79,8 @@ jobs: version: 7 - uses: actions/setup-node@v3 with: - node-version: 16.14.2 + 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 }} - test-build: - name: 'Test Build' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2.2.4 - with: - version: 7 - - uses: actions/setup-node@v3 - with: - node-version: 16.14.2 - cache: 'pnpm' - - name: Install dependencies - run: pnpm --filter "./packages/**" --filter query --prefer-offline install - - run: pnpm run test:build - env: - BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }} diff --git a/.nvmrc b/.nvmrc index fb457f39d5..8ddbc0c64a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v16.19.0 +v18.16.0 diff --git a/packages/react-query-devtools/src/__tests__/devtools.test.tsx b/packages/react-query-devtools/src/__tests__/devtools.test.tsx index 7bb37c9307..9be6dabc01 100644 --- a/packages/react-query-devtools/src/__tests__/devtools.test.tsx +++ b/packages/react-query-devtools/src/__tests__/devtools.test.tsx @@ -1089,20 +1089,23 @@ describe('ReactQueryDevtools', () => { let resolvePromise: (value: unknown) => void = () => undefined function App() { - const { data } = useQuery(['key'], () => { - count++ - - // Resolve the promise immediately when - // the query is fetched for the first time - if (count === 1) { - return Promise.resolve('test') - } + const { data } = useQuery({ + queryKey: ['key'], + queryFn: () => { + count++ - return new Promise((resolve) => { - // Do not resolve immediately and store the - // resolve function to resolve the promise later - resolvePromise = resolve - }) + // Resolve the promise immediately when + // the query is fetched for the first time + if (count === 1) { + return Promise.resolve('test') + } + + return new Promise((resolve) => { + // Do not resolve immediately and store the + // resolve function to resolve the promise later + resolvePromise = resolve + }) + }, }) return (