From 5585db1365779376e569384fb5c713a24d224890 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 9 Oct 2023 10:22:31 +0100 Subject: [PATCH] Revert "Moved to new github org (#137)" (#138) This reverts commit 7a7080ed43e43834c91c39670345a65b5c3e2525. --- package.json | 6 ++-- pnpm-lock.yaml | 33 ++++++++++--------- .../account-AdminService_connectquery.ts | 2 +- .../account-ManagementService_connectquery.ts | 2 +- .../apikey-ApiKeyService_connectquery.ts | 2 +- .../auth0support-Auth0Support_connectquery.ts | 2 +- ...bookmarks-BookmarksService_connectquery.ts | 2 +- .../changes-ChangesService_connectquery.ts | 2 +- .../invites-InviteService_connectquery.ts | 2 +- ...snapshots-SnapshotsService_connectquery.ts | 2 +- 10 files changed, 28 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 327d9f5..bdad275 100644 --- a/package.json +++ b/package.json @@ -31,12 +31,12 @@ "qa": "pnpm typecheck && pnpm lint:fix && pnpm prettier:fix && npm test" }, "dependencies": { + "@bufbuild/connect-query": "^0.4.0", "@bufbuild/protobuf": "^1.2.1", "@tanstack/react-query": "^4.29.15", "react": "^18.2.0", "react-dom": "^18.2.0", - "uuid": "^9.0.0", - "@connectrpc/connect-query": "^0.5.1" + "uuid": "^9.0.0" }, "devDependencies": { "@types/node": "^18.16.18", @@ -55,4 +55,4 @@ "vitest": "^0.34.0" }, "packageManager": "pnpm@8.8.0" -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1cd8ede..decfd7e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,12 +5,12 @@ settings: excludeLinksFromLockfile: false dependencies: + '@bufbuild/connect-query': + specifier: ^0.4.0 + version: 0.4.1(@bufbuild/connect@0.13.0)(@bufbuild/protobuf@1.3.1)(@tanstack/react-query@4.35.3)(react-dom@18.2.0)(react@18.2.0) '@bufbuild/protobuf': specifier: ^1.2.1 version: 1.3.1 - '@connectrpc/connect-query': - specifier: ^0.5.1 - version: 0.5.2(@bufbuild/protobuf@1.3.1)(@connectrpc/connect@1.1.2)(@tanstack/react-query@4.35.3)(react-dom@18.2.0)(react@18.2.0) '@tanstack/react-query': specifier: ^4.29.15 version: 4.35.3(react-dom@18.2.0)(react@18.2.0) @@ -284,35 +284,36 @@ packages: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true - /@bufbuild/protobuf@1.3.1: - resolution: {integrity: sha512-BUyJWutgP2S8K/1NphOJokuwDckXS4qI2T1pGZAlkFdZchWae3jm6fCdkcGbLlM1QLOcNFFePd+7Feo4BYGrJQ==} - dev: false - - /@connectrpc/connect-query@0.5.2(@bufbuild/protobuf@1.3.1)(@connectrpc/connect@1.1.2)(@tanstack/react-query@4.35.3)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-Z9vB62u2LzsaGmN4lDkFFhTXKfTJ3TCEnUxMY8VS23W0vnbiuYVYIozGllmzG0gZI5NYopVOvjqBOSAhpU8SAA==} + /@bufbuild/connect-query@0.4.1(@bufbuild/connect@0.13.0)(@bufbuild/protobuf@1.3.1)(@tanstack/react-query@4.35.3)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-rkQB+oin+1Nab91mx8CDHwkGn3AqXT22IEXLRMUZqkSODDjn9sFAGFc/mz5K6Fpsf0Qd50B/792vjkLd1y3fRA==} peerDependencies: - '@bufbuild/protobuf': ^1.3.3 - '@connectrpc/connect': ^1.1.2 - '@tanstack/react-query': 4.x + '@bufbuild/connect': '>=0.12.0' + '@bufbuild/protobuf': '>=1.3.0' + '@tanstack/react-query': ^4.20.4 react: ^18.2.0 react-dom: ^18.2.0 dependencies: + '@bufbuild/connect': 0.13.0(@bufbuild/protobuf@1.3.1) '@bufbuild/protobuf': 1.3.1 - '@connectrpc/connect': 1.1.2(@bufbuild/protobuf@1.3.1) '@tanstack/react-query': 4.35.3(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) stable-hash: 0.0.3 dev: false - /@connectrpc/connect@1.1.2(@bufbuild/protobuf@1.3.1): - resolution: {integrity: sha512-oDuKJFRORtzyH4IhZyNgIQ5DKjlDnbP72AH55Aabpc0fwApyus/h4cmYU1KDvahVbqsvUOpd5qUTyMH8IhMmLA==} + /@bufbuild/connect@0.13.0(@bufbuild/protobuf@1.3.1): + resolution: {integrity: sha512-eZSMbVLyUFtXiZNORgCEvv580xKZeYQdMOWj2i/nxOcpXQcrEzTMTA7SZzWv4k4gveWCOSRoWmYDeOhfWXJv0g==} + deprecated: Connect has moved to its own org @connectrpc and has a stable v1. Run `npx @connectrpc/connect-migrate@latest` to update. See https://github.com/connectrpc/connect-es/releases/tag/v0.13.1 for details. peerDependencies: - '@bufbuild/protobuf': ^1.3.3 + '@bufbuild/protobuf': ^1.2.1 dependencies: '@bufbuild/protobuf': 1.3.1 dev: false + /@bufbuild/protobuf@1.3.1: + resolution: {integrity: sha512-BUyJWutgP2S8K/1NphOJokuwDckXS4qI2T1pGZAlkFdZchWae3jm6fCdkcGbLlM1QLOcNFFePd+7Feo4BYGrJQ==} + dev: false + /@esbuild/android-arm64@0.18.20: resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} engines: {node: '>=12'} diff --git a/src/__generated__/account-AdminService_connectquery.ts b/src/__generated__/account-AdminService_connectquery.ts index f4b495c..afd8c3e 100644 --- a/src/__generated__/account-AdminService_connectquery.ts +++ b/src/__generated__/account-AdminService_connectquery.ts @@ -3,7 +3,7 @@ /* eslint-disable */ // @ts-nocheck -import { createQueryService } from "@connectrpc/connect-query"; +import { createQueryService } from "@bufbuild/connect-query"; import { MethodKind } from "@bufbuild/protobuf"; import { AdminCreateSourceRequest, AdminCreateTokenRequest, AdminDeleteSourceRequest, AdminGetAccountRequest, AdminGetSourceRequest, AdminKeepaliveSourcesRequest, AdminListSourcesRequest, AdminUpdateSourceRequest, CreateAccountRequest, CreateAccountResponse, CreateSourceResponse, CreateTokenResponse, DeleteAccountRequest, DeleteAccountResponse, DeleteSourceResponse, GetAccountResponse, GetSourceResponse, KeepaliveSourcesResponse, ListAccountsRequest, ListAccountsResponse, ListSourcesResponse, UpdateSourceResponse } from "./account_pb.ts"; diff --git a/src/__generated__/account-ManagementService_connectquery.ts b/src/__generated__/account-ManagementService_connectquery.ts index f8cbd01..79bc2ad 100644 --- a/src/__generated__/account-ManagementService_connectquery.ts +++ b/src/__generated__/account-ManagementService_connectquery.ts @@ -3,7 +3,7 @@ /* eslint-disable */ // @ts-nocheck -import { createQueryService } from "@connectrpc/connect-query"; +import { createQueryService } from "@bufbuild/connect-query"; import { MethodKind } from "@bufbuild/protobuf"; import { CreateSourceRequest, CreateSourceResponse, CreateTokenRequest, CreateTokenResponse, DeleteSourceRequest, DeleteSourceResponse, GetAccountRequest, GetAccountResponse, GetSourceRequest, GetSourceResponse, KeepaliveSourcesRequest, KeepaliveSourcesResponse, ListSourcesRequest, ListSourcesResponse, UpdateSourceRequest, UpdateSourceResponse } from "./account_pb.ts"; diff --git a/src/__generated__/apikey-ApiKeyService_connectquery.ts b/src/__generated__/apikey-ApiKeyService_connectquery.ts index 89a706c..4008da6 100644 --- a/src/__generated__/apikey-ApiKeyService_connectquery.ts +++ b/src/__generated__/apikey-ApiKeyService_connectquery.ts @@ -3,7 +3,7 @@ /* eslint-disable */ // @ts-nocheck -import { createQueryService } from "@connectrpc/connect-query"; +import { createQueryService } from "@bufbuild/connect-query"; import { MethodKind } from "@bufbuild/protobuf"; import { CreateAPIKeyRequest, CreateAPIKeyResponse, DeleteAPIKeyRequest, DeleteAPIKeyResponse, ExchangeKeyForTokenRequest, ExchangeKeyForTokenResponse, GetAPIKeyRequest, GetAPIKeyResponse, ListAPIKeysRequest, ListAPIKeysResponse, UpdateAPIKeyRequest, UpdateAPIKeyResponse } from "./apikey_pb.ts"; diff --git a/src/__generated__/auth0support-Auth0Support_connectquery.ts b/src/__generated__/auth0support-Auth0Support_connectquery.ts index cbc1f47..204eeb3 100644 --- a/src/__generated__/auth0support-Auth0Support_connectquery.ts +++ b/src/__generated__/auth0support-Auth0Support_connectquery.ts @@ -3,7 +3,7 @@ /* eslint-disable */ // @ts-nocheck -import { createQueryService } from "@connectrpc/connect-query"; +import { createQueryService } from "@bufbuild/connect-query"; import { MethodKind } from "@bufbuild/protobuf"; import { Auth0CreateUserRequest, Auth0CreateUserResponse } from "./auth0support_pb.ts"; import { AdminKeepaliveSourcesRequest, KeepaliveSourcesResponse } from "./account_pb.ts"; diff --git a/src/__generated__/bookmarks-BookmarksService_connectquery.ts b/src/__generated__/bookmarks-BookmarksService_connectquery.ts index 6ba47dd..22b274b 100644 --- a/src/__generated__/bookmarks-BookmarksService_connectquery.ts +++ b/src/__generated__/bookmarks-BookmarksService_connectquery.ts @@ -3,7 +3,7 @@ /* eslint-disable */ // @ts-nocheck -import { createQueryService } from "@connectrpc/connect-query"; +import { createQueryService } from "@bufbuild/connect-query"; import { MethodKind } from "@bufbuild/protobuf"; import { CreateBookmarkRequest, CreateBookmarkResponse, DeleteBookmarkRequest, DeleteBookmarkResponse, GetAffectedBookmarksRequest, GetAffectedBookmarksResponse, GetBookmarkRequest, GetBookmarkResponse, ListBookmarkResponse, ListBookmarksRequest, UpdateBookmarkRequest, UpdateBookmarkResponse } from "./bookmarks_pb.ts"; diff --git a/src/__generated__/changes-ChangesService_connectquery.ts b/src/__generated__/changes-ChangesService_connectquery.ts index d319fa7..d659ecd 100644 --- a/src/__generated__/changes-ChangesService_connectquery.ts +++ b/src/__generated__/changes-ChangesService_connectquery.ts @@ -3,7 +3,7 @@ /* eslint-disable */ // @ts-nocheck -import { createQueryService } from "@connectrpc/connect-query"; +import { createQueryService } from "@bufbuild/connect-query"; import { MethodKind } from "@bufbuild/protobuf"; import { CreateAppRequest, CreateAppResponse, CreateChangeRequest, CreateChangeResponse, CreateSimpleAppRequest, CreateSimpleAppResponse, DeleteAppRequest, DeleteAppResponse, DeleteChangeRequest, DeleteChangeResponse, GetAffectedAppsRequest, GetAffectedAppsResponse, GetAppRequest, GetAppResponse, GetAppSummariesRequest, GetAppSummariesResponse, GetAppSummaryRequest, GetAppSummaryResponse, GetChangeRequest, GetChangeResponse, GetChangeTimelineRequest, GetChangeTimelineResponse, GetDiffRequest, GetDiffResponse, GetOnboardingRequest, GetOnboardingResponse, ListAppChangesRequest, ListAppChangesResponse, ListAppChangesSummaryRequest, ListAppChangesSummaryResponse, ListAppsRequest, ListAppsResponse, ListChangesByStatusRequest, ListChangesByStatusResponse, ListChangesRequest, ListChangesResponse, ListChangingItemsSummaryRequest, ListChangingItemsSummaryResponse, ListHomeAppsRequest, ListHomeAppsResponse, ListHomeChangesRequest, ListHomeChangesResponse, RefreshStateRequest, RefreshStateResponse, UpdateAppRequest, UpdateAppResponse, UpdateChangeRequest, UpdateChangeResponse, UpdateOnboardingRequest, UpdateOnboardingResponse } from "./changes_pb.ts"; diff --git a/src/__generated__/invites-InviteService_connectquery.ts b/src/__generated__/invites-InviteService_connectquery.ts index d91464c..b2dcb56 100644 --- a/src/__generated__/invites-InviteService_connectquery.ts +++ b/src/__generated__/invites-InviteService_connectquery.ts @@ -3,7 +3,7 @@ /* eslint-disable */ // @ts-nocheck -import { createQueryService } from "@connectrpc/connect-query"; +import { createQueryService } from "@bufbuild/connect-query"; import { MethodKind } from "@bufbuild/protobuf"; import { CreateInviteRequest, CreateInviteResponse, ListInvitesRequest, ListInvitesResponse, RevokeInviteRequest, RevokeInviteResponse } from "./invites_pb.ts"; diff --git a/src/__generated__/snapshots-SnapshotsService_connectquery.ts b/src/__generated__/snapshots-SnapshotsService_connectquery.ts index 3daefa4..595dad9 100644 --- a/src/__generated__/snapshots-SnapshotsService_connectquery.ts +++ b/src/__generated__/snapshots-SnapshotsService_connectquery.ts @@ -3,7 +3,7 @@ /* eslint-disable */ // @ts-nocheck -import { createQueryService } from "@connectrpc/connect-query"; +import { createQueryService } from "@bufbuild/connect-query"; import { MethodKind } from "@bufbuild/protobuf"; import { CreateSnapshotRequest, CreateSnapshotResponse, DeleteSnapshotRequest, DeleteSnapshotResponse, GetInitialDataRequest, GetInitialDataResponse, GetSnapshotRequest, GetSnapshotResponse, ListSnapshotResponse, ListSnapshotsRequest, UpdateSnapshotRequest, UpdateSnapshotResponse } from "./snapshots_pb.ts";