From 6b07cd85f377602471fe2557bd86f1888a3f86f2 Mon Sep 17 00:00:00 2001 From: Chris Sauve Date: Fri, 6 Sep 2024 00:46:41 -0400 Subject: [PATCH] Fix duplicate react-query versions --- pnpm-lock.yaml | 67 +++++++++------------- tests/e2e/integrations/react-query.test.ts | 5 +- tests/e2e/package.json | 2 +- 3 files changed, 31 insertions(+), 43 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0774bbb7..2d6beec6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,7 +158,7 @@ importers: version: link:../../packages/quilt '@tanstack/react-query': specifier: ^5.34.1 - version: 5.34.1(react@packages+react) + version: 5.54.1(react@packages+react) react: specifier: workspace:@quilted/react@^18.2.0 version: link:../../packages/react @@ -273,7 +273,7 @@ importers: version: 11.0.0-rc.498(@trpc/server@11.0.0-rc.498) '@trpc/react-query': specifier: next - version: 11.0.0-rc.498(@tanstack/react-query@5.53.3(react@18.2.0))(@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498))(@trpc/server@11.0.0-rc.498)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 11.0.0-rc.498(@tanstack/react-query@5.54.1(react@18.2.0))(@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498))(@trpc/server@11.0.0-rc.498)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@trpc/server': specifier: next version: 11.0.0-rc.498 @@ -947,14 +947,14 @@ importers: specifier: workspace:* version: link:../../integrations/trpc '@tanstack/react-query': - specifier: ^5.53.0 - version: 5.53.3(react@packages+react) + specifier: ^5.54.1 + version: 5.54.1(react@packages+react) '@trpc/client': specifier: 11.0.0-rc.498 version: 11.0.0-rc.498(@trpc/server@11.0.0-rc.498) '@trpc/react-query': specifier: 11.0.0-rc.498 - version: 11.0.0-rc.498(@tanstack/react-query@5.53.3(react@packages+react))(@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498))(@trpc/server@11.0.0-rc.498)(react-dom@18.2.0(react@packages+react))(react@packages+react) + version: 11.0.0-rc.498(@tanstack/react-query@5.54.1(react@packages+react))(@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498))(@trpc/server@11.0.0-rc.498)(react-dom@18.2.0(react@packages+react))(react@packages+react) '@trpc/server': specifier: 11.0.0-rc.498 version: 11.0.0-rc.498 @@ -2302,8 +2302,8 @@ packages: resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} engines: {node: '>=6.0.0'} - '@jridgewell/source-map@0.3.2': - resolution: {integrity: sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==} + '@jridgewell/source-map@0.3.6': + resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==} '@jridgewell/sourcemap-codec@1.4.14': resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} @@ -2616,19 +2616,11 @@ packages: '@sinclair/typebox@0.27.8': resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} - '@tanstack/query-core@5.34.1': - resolution: {integrity: sha512-/a4yTnX525QUl8rFULrDLIogjqqcY/CiVvS/vWMgl477mO4WIIDxwQsLvEgb7vzlW8FqX/9CiCmaiAUnYVgB1w==} + '@tanstack/query-core@5.54.1': + resolution: {integrity: sha512-hKS+WRpT5zBFip21pB6Jx1C0hranWQrbv5EJ7qPoiV5MYI3C8rTCqWC9DdBseiPT1JgQWh8Y55YthuYZNiw3Xw==} - '@tanstack/query-core@5.53.3': - resolution: {integrity: sha512-ZfjAgd7NpqDx0e4aYBt7EmS2enbulPrJwowTy+mayRE93WUUH+sIYHun1TdRjpGwDPMNNZ5D6goh7n3CwoO+HA==} - - '@tanstack/react-query@5.34.1': - resolution: {integrity: sha512-5DWzrK+ou5maZqVoIY0S26TYNpnA7re6JlviXVOe/4OBPtlvd4WEHJmyeLZhE43piJvrsKMxemp/f6Q2RPfebA==} - peerDependencies: - react: ^18.0.0 - - '@tanstack/react-query@5.53.3': - resolution: {integrity: sha512-286mN/91CeM7vC6CZFLKYDHSw+WyMX6ekIvzoTbpM4xyPb99VSyCKPLyPgaOatKqYm6ooMBquSq9NGRdKgsJfg==} + '@tanstack/react-query@5.54.1': + resolution: {integrity: sha512-SuMi4JBYv49UtmiRyqjxY7XAnE1qwLht9nlkC8sioxFXz5Uzj30lepiKf2mYXuXfC7fHYjTrAPkNx+427pRHXA==} peerDependencies: react: ^18 || ^19 @@ -2793,8 +2785,8 @@ packages: '@vitest/utils@2.0.3': resolution: {integrity: sha512-c/UdELMuHitQbbc/EVctlBaxoYAwQPQdSNwv7z/vHyBKy2edYZaFgptE27BRueZB7eW8po+cllotMNTDpL3HWg==} - acorn@8.10.0: - resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} + acorn@8.12.1: + resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==} engines: {node: '>=0.4.0'} hasBin: true @@ -6442,7 +6434,7 @@ snapshots: '@jridgewell/set-array@1.2.1': {} - '@jridgewell/source-map@0.3.2': + '@jridgewell/source-map@0.3.6': dependencies: '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 @@ -6803,40 +6795,33 @@ snapshots: '@sinclair/typebox@0.27.8': {} - '@tanstack/query-core@5.34.1': {} - - '@tanstack/query-core@5.53.3': {} - - '@tanstack/react-query@5.34.1(react@packages+react)': - dependencies: - '@tanstack/query-core': 5.34.1 - react: link:packages/react + '@tanstack/query-core@5.54.1': {} - '@tanstack/react-query@5.53.3(react@18.2.0)': + '@tanstack/react-query@5.54.1(react@18.2.0)': dependencies: - '@tanstack/query-core': 5.53.3 + '@tanstack/query-core': 5.54.1 react: 18.2.0 - '@tanstack/react-query@5.53.3(react@packages+react)': + '@tanstack/react-query@5.54.1(react@packages+react)': dependencies: - '@tanstack/query-core': 5.53.3 + '@tanstack/query-core': 5.54.1 react: link:packages/react '@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498)': dependencies: '@trpc/server': 11.0.0-rc.498 - '@trpc/react-query@11.0.0-rc.498(@tanstack/react-query@5.53.3(react@18.2.0))(@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498))(@trpc/server@11.0.0-rc.498)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@trpc/react-query@11.0.0-rc.498(@tanstack/react-query@5.54.1(react@18.2.0))(@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498))(@trpc/server@11.0.0-rc.498)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: - '@tanstack/react-query': 5.53.3(react@18.2.0) + '@tanstack/react-query': 5.54.1(react@18.2.0) '@trpc/client': 11.0.0-rc.498(@trpc/server@11.0.0-rc.498) '@trpc/server': 11.0.0-rc.498 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - '@trpc/react-query@11.0.0-rc.498(@tanstack/react-query@5.53.3(react@packages+react))(@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498))(@trpc/server@11.0.0-rc.498)(react-dom@18.2.0(react@packages+react))(react@packages+react)': + '@trpc/react-query@11.0.0-rc.498(@tanstack/react-query@5.54.1(react@packages+react))(@trpc/client@11.0.0-rc.498(@trpc/server@11.0.0-rc.498))(@trpc/server@11.0.0-rc.498)(react-dom@18.2.0(react@packages+react))(react@packages+react)': dependencies: - '@tanstack/react-query': 5.53.3(react@packages+react) + '@tanstack/react-query': 5.54.1(react@packages+react) '@trpc/client': 11.0.0-rc.498(@trpc/server@11.0.0-rc.498) '@trpc/server': 11.0.0-rc.498 react: link:packages/react @@ -7013,7 +6998,7 @@ snapshots: loupe: 3.1.1 tinyrainbow: 1.2.0 - acorn@8.10.0: + acorn@8.12.1: optional: true agent-base@7.1.1: @@ -8955,8 +8940,8 @@ snapshots: terser@5.16.8: dependencies: - '@jridgewell/source-map': 0.3.2 - acorn: 8.10.0 + '@jridgewell/source-map': 0.3.6 + acorn: 8.12.1 commander: 2.20.3 source-map-support: 0.5.21 optional: true diff --git a/tests/e2e/integrations/react-query.test.ts b/tests/e2e/integrations/react-query.test.ts index 3fb114a4..2e84d4f4 100644 --- a/tests/e2e/integrations/react-query.test.ts +++ b/tests/e2e/integrations/react-query.test.ts @@ -3,7 +3,10 @@ import {multiline, createWorkspace, startServer} from '../utilities.ts'; describe('react-query', () => { it('can server and client render a query using suspense', async () => { - await using workspace = await createWorkspace({fixture: 'basic-app'}); + await using workspace = await createWorkspace({ + fixture: 'basic-app', + debug: true, + }); await workspace.fs.write({ 'App.tsx': multiline` diff --git a/tests/e2e/package.json b/tests/e2e/package.json index 60adc33b..9923030a 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -7,7 +7,7 @@ "@quilted/quilt": "workspace:*", "@quilted/react-query": "workspace:*", "@quilted/trpc": "workspace:*", - "@tanstack/react-query": "^5.53.0", + "@tanstack/react-query": "^5.54.1", "@trpc/client": "11.0.0-rc.498", "@trpc/react-query": "11.0.0-rc.498", "@trpc/server": "11.0.0-rc.498",