Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
build:
strategy:
matrix:
node: [18.x, 20.x, 22.x]
node: [22.x]
os: [ubuntu-latest, windows-latest, macos-latest]

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
22
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.*ignore
*.proto
*.cmd
.nvmrc

# Generated or imported files
change/*.json
Expand Down
11 changes: 11 additions & 0 deletions change/change-888a50db-9b3f-4d84-a6c0-55234a3753f5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"type": "minor",
"comment": "Update dependency fastify to v5 [SECURITY]",
"packageName": "@lage-run/rpc",
"email": "renovate@whitesourcesoftware.com",
"dependentChangeType": "patch"
}
]
}
18 changes: 18 additions & 0 deletions change/change-9313794b-1e43-4af6-b467-cf6cd7fa439f.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"changes": [
{
"type": "patch",
"comment": "updates for fastify/connectrpc update",
"packageName": "@lage-run/cli",
"email": "elcraig@microsoft.com",
"dependentChangeType": "patch"
},
{
"type": "patch",
"comment": "updates for fastify/connectrpc update",
"packageName": "@lage-run/config",
"email": "elcraig@microsoft.com",
"dependentChangeType": "patch"
}
]
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"devDependencies": {
"@types/jest": "^30.0.0",
"@types/node": "^16.18.3",
"@types/node": "^22.0.0",
"beachball": "^2.63.0",
"dts-bundle-generator": "patch:dts-bundle-generator@npm%3A9.5.1#~/.yarn/patches/dts-bundle-generator-npm-9.5.1-0927b6826f.patch",
"fast-glob": "3.3.3",
Expand All @@ -60,7 +60,7 @@
"@azure/core-xml": "1.4.5",
"@azure/logger": "1.2.0",
"@azure/storage-blob": "12.27.0",
"@types/node@npm:*": "^16.0.0",
"@types/node@npm:*": "^22.0.0",
"typescript@npm:>=5.0.2": "~5.9.3",
"node-gyp@npm:latest": "^9.0.0",
"listr2@npm:^9.0.5": "9.0.3",
Expand All @@ -83,7 +83,7 @@
"*": "prettier --write"
},
"engines": {
"node": ">=16.14.0"
"node": ">=22.18.0"
},
"packageManager": "yarn@4.12.0"
}
1 change: 0 additions & 1 deletion packages/cli/src/commands/exec/executeRemotely.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ interface ExecRemotelyOptions extends ReporterInitOptions {
async function tryCreateClient(host: string, port: number) {
const client = createClient({
baseUrl: `http://${host}:${port}`,
httpVersion: "2",
});

try {
Expand Down
2 changes: 1 addition & 1 deletion packages/config/src/getConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { CacheOptions } from "./types/CacheOptions.js";
*/
export async function getConfig(cwd: string): Promise<ConfigOptions> {
const config = (await readConfigFile(cwd)) || ({} as Partial<ConfigOptions>);
const availableParallelism = "availableParallelism" in os ? (os as any)["availableParallelism"]() : os.cpus().length - 1;
const availableParallelism = os.availableParallelism();
return {
cacheOptions: config?.cacheOptions ?? ({} as CacheOptions),
ignore: config?.ignore ?? [],
Expand Down
3 changes: 0 additions & 3 deletions packages/rpc/buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@ plugins:
- local: protoc-gen-es
out: src/gen
opt: target=ts
- local: protoc-gen-connect-es
out: src/gen
opt: target=ts
2 changes: 1 addition & 1 deletion packages/rpc/buf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ modules:
- path: proto
lint:
use:
- DEFAULT
- STANDARD
breaking:
use:
- FILE
15 changes: 7 additions & 8 deletions packages/rpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@
"generate": "buf generate"
},
"dependencies": {
"@bufbuild/protobuf": "1.10.1",
"@connectrpc/connect": "1.7.0",
"@connectrpc/connect-fastify": "1.7.0",
"@connectrpc/connect-node": "1.7.0",
"fastify": "4.29.1"
"@bufbuild/protobuf": "2.11.0",
"@connectrpc/connect": "2.1.1",
"@connectrpc/connect-fastify": "2.1.1",
"@connectrpc/connect-node": "2.1.1",
"fastify": "5.7.3"
},
"devDependencies": {
"@bufbuild/buf": "^1.39.0",
"@bufbuild/protoc-gen-es": "^1.10.0",
"@connectrpc/protoc-gen-connect-es": "1.7.0",
"@bufbuild/buf": "^1.66.1",
"@bufbuild/protoc-gen-es": "^2.11.0",
"@lage-run/monorepo-scripts": "workspace:^"
},
"files": [
Expand Down
10 changes: 4 additions & 6 deletions packages/rpc/src/createClient.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { createPromiseClient, type PromiseClient } from "@connectrpc/connect";
import { createClient as connectCreateClient, type Client } from "@connectrpc/connect";
import { createGrpcTransport } from "@connectrpc/connect-node";
import { LageService } from "./gen/lage/v1/lage_connect.js";
import { LageService } from "./gen/lage/v1/lage_pb.js";

export interface CreateClientOptions {
baseUrl: string;
httpVersion: "1.1" | "2";
}

export type LageClient = ReturnType<typeof createClient>;

export function createClient({ baseUrl, httpVersion }: CreateClientOptions): PromiseClient<typeof LageService> {
export function createClient({ baseUrl }: CreateClientOptions): Client<typeof LageService> {
const transport = createGrpcTransport({
httpVersion,
baseUrl,
});

return createPromiseClient(LageService, transport);
return connectCreateClient(LageService, transport);
}
2 changes: 1 addition & 1 deletion packages/rpc/src/createRoutes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type ConnectRouter } from "@connectrpc/connect";
import { LageService } from "./gen/lage/v1/lage_connect.js";
import { LageService } from "./gen/lage/v1/lage_pb.js";
import { type ILageService } from "./types/ILageService.js";

export function createRoutes(serviceImpl: ILageService) {
Expand Down
60 changes: 0 additions & 60 deletions packages/rpc/src/gen/lage/v1/lage_connect.ts

This file was deleted.

Loading
Loading