Skip to content

Commit 3b53a0a

Browse files
authored
Update connect libraries (#18886)
* Update connect lib * Update protoc-gen-connect-es * Fix
1 parent 14d20ce commit 3b53a0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+372
-679
lines changed

components/dashboard/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"version": "0.0.0",
55
"private": true,
66
"dependencies": {
7-
"@bufbuild/connect-web": "^0.13.0",
7+
"@connectrpc/connect-web": "1.1.2",
8+
"@connectrpc/connect": "1.1.2",
89
"@gitpod/gitpod-protocol": "0.1.5",
910
"@gitpod/public-api": "0.1.5",
1011
"@stripe/react-stripe-js": "^1.7.2",

components/dashboard/src/service/public-api.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* See License.AGPL.txt in the project root for license information.
55
*/
66

7-
import { createPromiseClient } from "@bufbuild/connect";
8-
import { createConnectTransport } from "@bufbuild/connect-web";
7+
import { createPromiseClient } from "@connectrpc/connect";
8+
import { createConnectTransport } from "@connectrpc/connect-web";
99
import { Project as ProtocolProject, Team as ProtocolTeam } from "@gitpod/gitpod-protocol/lib/teams-projects-protocol";
10-
import { HelloService } from "@gitpod/public-api/lib/gitpod/experimental/v1/dummy_connectweb";
11-
import { TeamsService } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_connectweb";
12-
import { TokensService } from "@gitpod/public-api/lib/gitpod/experimental/v1/tokens_connectweb";
13-
import { ProjectsService } from "@gitpod/public-api/lib/gitpod/experimental/v1/projects_connectweb";
14-
import { WorkspacesService } from "@gitpod/public-api/lib/gitpod/experimental/v1/workspaces_connectweb";
15-
import { OIDCService } from "@gitpod/public-api/lib/gitpod/experimental/v1/oidc_connectweb";
10+
import { HelloService } from "@gitpod/public-api/lib/gitpod/experimental/v1/dummy_connect";
11+
import { TeamsService } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_connect";
12+
import { TokensService } from "@gitpod/public-api/lib/gitpod/experimental/v1/tokens_connect";
13+
import { ProjectsService } from "@gitpod/public-api/lib/gitpod/experimental/v1/projects_connect";
14+
import { WorkspacesService } from "@gitpod/public-api/lib/gitpod/experimental/v1/workspaces_connect";
15+
import { OIDCService } from "@gitpod/public-api/lib/gitpod/experimental/v1/oidc_connect";
1616
import { getMetricsInterceptor } from "@gitpod/public-api/lib/metrics";
1717
import { Team } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_pb";
1818
import { TeamMemberInfo, TeamMemberRole } from "@gitpod/gitpod-protocol";

components/dashboard/src/service/service.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { IDEFrontendDashboardService } from "@gitpod/gitpod-protocol/lib/fronten
2121
import { RemoteTrackMessage } from "@gitpod/gitpod-protocol/lib/analytics";
2222
import { helloService } from "./public-api";
2323
import { getExperimentsClient } from "../experiments/client";
24-
import { ConnectError, Code } from "@bufbuild/connect";
24+
import { ConnectError, Code } from "@connectrpc/connect";
2525
import { instrumentWebSocket } from "./metrics";
2626

2727
export const gitpodHostUrl = new GitpodHostUrl(window.location.toString());

components/dashboard/src/teams/NewTeam.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See License.AGPL.txt in the project root for license information.
55
*/
66

7-
import { ConnectError } from "@bufbuild/connect";
7+
import { ConnectError } from "@connectrpc/connect";
88
import { FormEvent, useState } from "react";
99
import { useHistory } from "react-router-dom";
1010
import { Heading1, Heading3, Subheading } from "../components/typography/headings";

components/public-api/buf.gen.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins:
2222
out: typescript/src
2323
opt: target=ts
2424
path: typescript/node_modules/.bin/protoc-gen-es
25-
- name: connect-web
25+
- name: connect-es
2626
out: typescript/src
2727
opt: target=ts
28-
path: typescript/node_modules/.bin/protoc-gen-connect-web
28+
path: typescript/node_modules/.bin/protoc-gen-connect-es

components/public-api/typescript/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@
4545
"exit": true
4646
},
4747
"dependencies": {
48-
"@bufbuild/connect": "^0.13.0",
49-
"@bufbuild/protobuf": "^0.1.1",
48+
"@connectrpc/connect-node": "1.1.2",
49+
"@connectrpc/connect": "1.1.2",
50+
"@bufbuild/protobuf": "^1.3.3",
5051
"prom-client": "^14.2.0"
5152
},
5253
"devDependencies": {
53-
"@bufbuild/protoc-gen-connect-web": "^0.2.1",
54-
"@bufbuild/protoc-gen-es": "^0.1.1",
54+
"@connectrpc/protoc-gen-connect-es": "1.1.2",
55+
"@bufbuild/protoc-gen-es": "1.3.3",
5556
"@testdeck/mocha": "0.1.2",
5657
"@types/chai": "^4.1.2",
5758
"@types/node": "^16.11.0",

components/public-api/typescript/src/gitpod/experimental/v1/cell_stats_connectweb.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

components/public-api/typescript/src/gitpod/experimental/v1/cell_stats_pb.ts

Lines changed: 0 additions & 99 deletions
This file was deleted.

components/public-api/typescript/src/gitpod/experimental/v1/dummy_connectweb.ts renamed to components/public-api/typescript/src/gitpod/experimental/v1/dummy_connect.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* See License.AGPL.txt in the project root for license information.
55
*/
66

7-
// @generated by protoc-gen-connect-web v0.2.1 with parameter "target=ts"
7+
// @generated by protoc-gen-connect-es v1.1.2 with parameter "target=ts"
88
// @generated from file gitpod/experimental/v1/dummy.proto (package gitpod.experimental.v1, syntax proto3)
99
/* eslint-disable */
10-
/* @ts-nocheck */
10+
// @ts-nocheck
1111

12-
import {LotsOfRepliesRequest, LotsOfRepliesResponse, SayHelloRequest, SayHelloResponse} from "./dummy_pb.js";
13-
import {MethodKind} from "@bufbuild/protobuf";
12+
import { LotsOfRepliesRequest, LotsOfRepliesResponse, SayHelloRequest, SayHelloResponse } from "./dummy_pb.js";
13+
import { MethodKind } from "@bufbuild/protobuf";
1414

1515
/**
1616
* HelloService is a dummy service that says hello. It is used for reliability

components/public-api/typescript/src/gitpod/experimental/v1/dummy_pb.ts

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/public-api/typescript/src/gitpod/experimental/v1/editor_service_connectweb.ts renamed to components/public-api/typescript/src/gitpod/experimental/v1/editor_service_connect.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* See License.AGPL.txt in the project root for license information.
55
*/
66

7-
// @generated by protoc-gen-connect-web v0.2.1 with parameter "target=ts"
7+
// @generated by protoc-gen-connect-es v1.1.2 with parameter "target=ts"
88
// @generated from file gitpod/experimental/v1/editor_service.proto (package gitpod.experimental.v1, syntax proto3)
99
/* eslint-disable */
10-
/* @ts-nocheck */
10+
// @ts-nocheck
1111

12-
import {ListEditorOptionsRequest, ListEditorOptionsResponse} from "./editor_service_pb.js";
13-
import {MethodKind} from "@bufbuild/protobuf";
12+
import { ListEditorOptionsRequest, ListEditorOptionsResponse } from "./editor_service_pb.js";
13+
import { MethodKind } from "@bufbuild/protobuf";
1414

1515
/**
1616
* @generated from service gitpod.experimental.v1.EditorService
@@ -29,4 +29,3 @@ export const EditorService = {
2929
},
3030
}
3131
} as const;
32-

components/public-api/typescript/src/gitpod/experimental/v1/editor_service_pb.ts

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/public-api/typescript/src/gitpod/experimental/v1/ide_client_connectweb.ts renamed to components/public-api/typescript/src/gitpod/experimental/v1/ide_client_connect.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* See License.AGPL.txt in the project root for license information.
55
*/
66

7-
// @generated by protoc-gen-connect-web v0.2.1 with parameter "target=ts"
7+
// @generated by protoc-gen-connect-es v1.1.2 with parameter "target=ts"
88
// @generated from file gitpod/experimental/v1/ide_client.proto (package gitpod.experimental.v1, syntax proto3)
99
/* eslint-disable */
10-
/* @ts-nocheck */
10+
// @ts-nocheck
1111

12-
import {SendDidCloseRequest, SendDidCloseResponse, SendHeartbeatRequest, SendHeartbeatResponse, UpdateGitStatusRequest, UpdateGitStatusResponse} from "./ide_client_pb.js";
13-
import {MethodKind} from "@bufbuild/protobuf";
12+
import { SendDidCloseRequest, SendDidCloseResponse, SendHeartbeatRequest, SendHeartbeatResponse, UpdateGitStatusRequest, UpdateGitStatusResponse } from "./ide_client_pb.js";
13+
import { MethodKind } from "@bufbuild/protobuf";
1414

1515
/**
1616
* @generated from service gitpod.experimental.v1.IDEClientService
@@ -53,4 +53,3 @@ export const IDEClientService = {
5353
},
5454
}
5555
} as const;
56-

0 commit comments

Comments
 (0)