From 152129970ae729cd1968a21c010cbb07cec53e67 Mon Sep 17 00:00:00 2001 From: Steve Ayers Date: Tue, 1 Oct 2024 13:37:36 -0400 Subject: [PATCH] Fixes --- package-lock.json | 11 +++++---- package.json | 2 +- .../connect-playwright-example/package.json | 2 +- .../connect-playwright-example/src/App.tsx | 12 ++++------ .../src/testdata/gen/test_pb.ts | 23 ++++++++----------- 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 857881d..4938441 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-n": "^17.9.0", "prettier": "^3.2.5", - "typescript": "^5.5.4" + "typescript": "~5.5.4" }, "engines": { "node": ">=16", @@ -4166,10 +4166,11 @@ } }, "node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4406,7 +4407,7 @@ "@types/react-dom": "^18.3.0", "esbuild": "^0.24.0", "prettier": "^3.3.2", - "typescript": "^5.5.4" + "typescript": "~5.5.4" } } } diff --git a/package.json b/package.json index c6f7ef0..e51ac32 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-n": "^17.9.0", "prettier": "^3.2.5", - "typescript": "^5.5.4" + "typescript": "~5.5.4" }, "dependencies": { "@types/jasmine": "^5.1.4", diff --git a/packages/connect-playwright-example/package.json b/packages/connect-playwright-example/package.json index 122de0e..d9a9d76 100644 --- a/packages/connect-playwright-example/package.json +++ b/packages/connect-playwright-example/package.json @@ -23,7 +23,7 @@ "@types/react-dom": "^18.3.0", "esbuild": "^0.24.0", "prettier": "^3.3.2", - "typescript": "^5.5.4" + "typescript": "~5.5.4" }, "dependencies": { "@connectrpc/connect-playwright": "^0.4.0", diff --git a/packages/connect-playwright-example/src/App.tsx b/packages/connect-playwright-example/src/App.tsx index 3532063..3034537 100644 --- a/packages/connect-playwright-example/src/App.tsx +++ b/packages/connect-playwright-example/src/App.tsx @@ -13,11 +13,7 @@ // limitations under the License. import { useCallback, useState, FormEvent, FC } from "react"; -import { - ConnectError, - createPromiseClient, - PromiseClient, -} from "@connectrpc/connect"; +import { ConnectError, createClient, Client } from "@connectrpc/connect"; import { createGrpcWebTransport, createConnectTransport, @@ -30,7 +26,7 @@ interface ChatMessage { } const baseUrl = "https://demo.connectrpc.com"; -let elizaClient: PromiseClient; +let elizaClient: Client; // Read the transport and format parameters from the URL // Note that users do not need to worry about this since this is just for @@ -41,7 +37,7 @@ const transportParam = params.get("transport"); const useBinaryFormat = params.get("format") === "binary"; if (transportParam === "grpcweb") { - elizaClient = createPromiseClient( + elizaClient = createClient( ElizaService, createGrpcWebTransport({ baseUrl, @@ -49,7 +45,7 @@ if (transportParam === "grpcweb") { }), ); } else { - elizaClient = createPromiseClient( + elizaClient = createClient( ElizaService, createConnectTransport({ baseUrl, diff --git a/packages/connect-playwright/src/testdata/gen/test_pb.ts b/packages/connect-playwright/src/testdata/gen/test_pb.ts index f41b275..89a56d8 100644 --- a/packages/connect-playwright/src/testdata/gen/test_pb.ts +++ b/packages/connect-playwright/src/testdata/gen/test_pb.ts @@ -18,21 +18,14 @@ import type { GenFile, GenService } from "@bufbuild/protobuf/codegenv1"; import { fileDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1"; -import type { - Int32ValueSchema, - StringValueSchema, -} from "@bufbuild/protobuf/wkt"; +import type { Int32ValueSchema, StringValueSchema } from "@bufbuild/protobuf/wkt"; import { file_google_protobuf_wrappers } from "@bufbuild/protobuf/wkt"; /** * Describes the file test.proto. */ -export const file_test: GenFile = - /*@__PURE__*/ - fileDesc( - "Cgp0ZXN0LnByb3RvEgR0ZXN0MusBCgtUZXN0U2VydmljZRJFCghVbmFyeU9uZRIbLmdvb2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVlGhwuZ29vZ2xlLnByb3RvYnVmLlN0cmluZ1ZhbHVlEkUKCFVuYXJ5VHdvEhsuZ29vZ2xlLnByb3RvYnVmLkludDMyVmFsdWUaHC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWUSTgoPU2VydmVyU3RyZWFtaW5nEhsuZ29vZ2xlLnByb3RvYnVmLkludDMyVmFsdWUaHC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWUwAWIGcHJvdG8z", - [file_google_protobuf_wrappers], - ); +export const file_test: GenFile = /*@__PURE__*/ + fileDesc("Cgp0ZXN0LnByb3RvEgR0ZXN0MusBCgtUZXN0U2VydmljZRJFCghVbmFyeU9uZRIbLmdvb2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVlGhwuZ29vZ2xlLnByb3RvYnVmLlN0cmluZ1ZhbHVlEkUKCFVuYXJ5VHdvEhsuZ29vZ2xlLnByb3RvYnVmLkludDMyVmFsdWUaHC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWUSTgoPU2VydmVyU3RyZWFtaW5nEhsuZ29vZ2xlLnByb3RvYnVmLkludDMyVmFsdWUaHC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWUwAWIGcHJvdG8z", [file_google_protobuf_wrappers]); /** * @generated from service test.TestService @@ -45,7 +38,7 @@ export const TestService: GenService<{ methodKind: "unary"; input: typeof Int32ValueSchema; output: typeof StringValueSchema; - }; + }, /** * @generated from rpc test.TestService.UnaryTwo */ @@ -53,7 +46,7 @@ export const TestService: GenService<{ methodKind: "unary"; input: typeof Int32ValueSchema; output: typeof StringValueSchema; - }; + }, /** * @generated from rpc test.TestService.ServerStreaming */ @@ -61,5 +54,7 @@ export const TestService: GenService<{ methodKind: "server_streaming"; input: typeof Int32ValueSchema; output: typeof StringValueSchema; - }; -}> = /*@__PURE__*/ serviceDesc(file_test, 0); + }, +}> = /*@__PURE__*/ + serviceDesc(file_test, 0); +