Skip to content

Update connect libraries #18886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2023
Merged

Update connect libraries #18886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aa900d
Update connect lib
jeanp413 Oct 6, 2023
12f1fc3
Update protoc-gen-connect-es
jeanp413 Oct 6, 2023
484f7fd
Fix
jeanp413 Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion components/dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@bufbuild/connect-web": "^0.13.0",
"@connectrpc/connect-web": "1.1.2",
"@connectrpc/connect": "1.1.2",
"@gitpod/gitpod-protocol": "0.1.5",
"@gitpod/public-api": "0.1.5",
"@stripe/react-stripe-js": "^1.7.2",
Expand Down
16 changes: 8 additions & 8 deletions components/dashboard/src/service/public-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* See License.AGPL.txt in the project root for license information.
*/

import { createPromiseClient } from "@bufbuild/connect";
import { createConnectTransport } from "@bufbuild/connect-web";
import { createPromiseClient } from "@connectrpc/connect";
import { createConnectTransport } from "@connectrpc/connect-web";
import { Project as ProtocolProject, Team as ProtocolTeam } from "@gitpod/gitpod-protocol/lib/teams-projects-protocol";
import { HelloService } from "@gitpod/public-api/lib/gitpod/experimental/v1/dummy_connectweb";
import { TeamsService } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_connectweb";
import { TokensService } from "@gitpod/public-api/lib/gitpod/experimental/v1/tokens_connectweb";
import { ProjectsService } from "@gitpod/public-api/lib/gitpod/experimental/v1/projects_connectweb";
import { WorkspacesService } from "@gitpod/public-api/lib/gitpod/experimental/v1/workspaces_connectweb";
import { OIDCService } from "@gitpod/public-api/lib/gitpod/experimental/v1/oidc_connectweb";
import { HelloService } from "@gitpod/public-api/lib/gitpod/experimental/v1/dummy_connect";
import { TeamsService } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_connect";
import { TokensService } from "@gitpod/public-api/lib/gitpod/experimental/v1/tokens_connect";
import { ProjectsService } from "@gitpod/public-api/lib/gitpod/experimental/v1/projects_connect";
import { WorkspacesService } from "@gitpod/public-api/lib/gitpod/experimental/v1/workspaces_connect";
import { OIDCService } from "@gitpod/public-api/lib/gitpod/experimental/v1/oidc_connect";
import { getMetricsInterceptor } from "@gitpod/public-api/lib/metrics";
import { Team } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_pb";
import { TeamMemberInfo, TeamMemberRole } from "@gitpod/gitpod-protocol";
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/service/service.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { IDEFrontendDashboardService } from "@gitpod/gitpod-protocol/lib/fronten
import { RemoteTrackMessage } from "@gitpod/gitpod-protocol/lib/analytics";
import { helloService } from "./public-api";
import { getExperimentsClient } from "../experiments/client";
import { ConnectError, Code } from "@bufbuild/connect";
import { ConnectError, Code } from "@connectrpc/connect";
import { instrumentWebSocket } from "./metrics";

export const gitpodHostUrl = new GitpodHostUrl(window.location.toString());
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/teams/NewTeam.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* See License.AGPL.txt in the project root for license information.
*/

import { ConnectError } from "@bufbuild/connect";
import { ConnectError } from "@connectrpc/connect";
import { FormEvent, useState } from "react";
import { useHistory } from "react-router-dom";
import { Heading1, Heading3, Subheading } from "../components/typography/headings";
Expand Down
4 changes: 2 additions & 2 deletions components/public-api/buf.gen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins:
out: typescript/src
opt: target=ts
path: typescript/node_modules/.bin/protoc-gen-es
- name: connect-web
- name: connect-es
out: typescript/src
opt: target=ts
path: typescript/node_modules/.bin/protoc-gen-connect-web
path: typescript/node_modules/.bin/protoc-gen-connect-es
9 changes: 5 additions & 4 deletions components/public-api/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,14 @@
"exit": true
},
"dependencies": {
"@bufbuild/connect": "^0.13.0",
"@bufbuild/protobuf": "^0.1.1",
"@connectrpc/connect-node": "1.1.2",
"@connectrpc/connect": "1.1.2",
"@bufbuild/protobuf": "^1.3.3",
"prom-client": "^14.2.0"
},
"devDependencies": {
"@bufbuild/protoc-gen-connect-web": "^0.2.1",
"@bufbuild/protoc-gen-es": "^0.1.1",
"@connectrpc/protoc-gen-connect-es": "1.1.2",
"@bufbuild/protoc-gen-es": "1.3.3",
"@testdeck/mocha": "0.1.2",
"@types/chai": "^4.1.2",
"@types/node": "^16.11.0",
Expand Down
33 changes: 0 additions & 33 deletions components/public-api/typescript/src/gitpod/experimental/v1/cell_stats_connectweb.ts
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions components/public-api/typescript/src/gitpod/experimental/v1/cell_stats_pb.ts
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...itpod/experimental/v1/dummy_connectweb.ts → ...c/gitpod/experimental/v1/dummy_connect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
* See License.AGPL.txt in the project root for license information.
*/

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

import {LotsOfRepliesRequest, LotsOfRepliesResponse, SayHelloRequest, SayHelloResponse} from "./dummy_pb.js";
import {MethodKind} from "@bufbuild/protobuf";
import { LotsOfRepliesRequest, LotsOfRepliesResponse, SayHelloRequest, SayHelloResponse } from "./dummy_pb.js";
import { MethodKind } from "@bufbuild/protobuf";

/**
* HelloService is a dummy service that says hello. It is used for reliability
Expand Down
16 changes: 8 additions & 8 deletions components/public-api/typescript/src/gitpod/experimental/v1/dummy_pb.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions ...erimental/v1/editor_service_connectweb.ts → ...experimental/v1/editor_service_connect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
* See License.AGPL.txt in the project root for license information.
*/

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

import {ListEditorOptionsRequest, ListEditorOptionsResponse} from "./editor_service_pb.js";
import {MethodKind} from "@bufbuild/protobuf";
import { ListEditorOptionsRequest, ListEditorOptionsResponse } from "./editor_service_pb.js";
import { MethodKind } from "@bufbuild/protobuf";

/**
* @generated from service gitpod.experimental.v1.EditorService
Expand All @@ -29,4 +29,3 @@ export const EditorService = {
},
}
} as const;

16 changes: 8 additions & 8 deletions components/public-api/typescript/src/gitpod/experimental/v1/editor_service_pb.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions .../experimental/v1/ide_client_connectweb.ts → ...pod/experimental/v1/ide_client_connect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
* See License.AGPL.txt in the project root for license information.
*/

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

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

/**
* @generated from service gitpod.experimental.v1.IDEClientService
Expand Down Expand Up @@ -53,4 +53,3 @@ export const IDEClientService = {
},
}
} as const;

Loading