From a9d7464c9ff0a1d1641568c52291cd27d9f07cc8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 20:31:19 +0000 Subject: [PATCH 1/2] Update dependency typescript to v5.4.2 --- backend/auto-operation/package.json | 2 +- frontend/dashboard/package.json | 2 +- frontend/editor/package.json | 2 +- pnpm-lock.yaml | 46 +++++++++++++---------------- 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/backend/auto-operation/package.json b/backend/auto-operation/package.json index 5e38e84..beb2b1b 100644 --- a/backend/auto-operation/package.json +++ b/backend/auto-operation/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@types/node": "20.9.5", "tsx": "^4.3.0", - "typescript": "5.2.2", + "typescript": "5.4.2", "@connectrpc/protoc-gen-connect-es": "^1.1.3", "@bufbuild/protoc-gen-es": "^1.4.2" }, diff --git a/frontend/dashboard/package.json b/frontend/dashboard/package.json index 8bd0406..647d9bd 100644 --- a/frontend/dashboard/package.json +++ b/frontend/dashboard/package.json @@ -31,7 +31,7 @@ "eslint-config-prettier": "^9.0.0", "prettier": "3.1.0", "sass": "^1.69.5", - "typescript": "5.2.2" + "typescript": "5.4.2" }, "files": [ ".next/standalone", diff --git a/frontend/editor/package.json b/frontend/editor/package.json index ba9b895..66ce230 100644 --- a/frontend/editor/package.json +++ b/frontend/editor/package.json @@ -16,6 +16,6 @@ "@types/node": "20.9.5", "@types/react": "18.2.38", "@types/react-dom": "18.2.17", - "typescript": "5.3.2" + "typescript": "5.4.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93a561b..1c17931 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,8 +40,8 @@ importers: specifier: ^4.3.0 version: 4.3.0 typescript: - specifier: 5.2.2 - version: 5.2.2 + specifier: 5.4.2 + version: 5.4.2 frontend/dashboard: dependencies: @@ -87,7 +87,7 @@ importers: version: 0.6.0(@bufbuild/protoc-gen-es@1.4.2) '@svgr/webpack': specifier: ^8.1.0 - version: 8.1.0(typescript@5.2.2) + version: 8.1.0(typescript@5.4.2) '@types/node': specifier: 20.9.5 version: 20.9.5 @@ -107,8 +107,8 @@ importers: specifier: ^1.69.5 version: 1.69.5 typescript: - specifier: 5.2.2 - version: 5.2.2 + specifier: 5.4.2 + version: 5.4.2 frontend/editor: dependencies: @@ -144,8 +144,8 @@ importers: specifier: 3.1.0 version: 3.1.0 typescript: - specifier: 5.3.2 - version: 5.3.2 + specifier: 5.4.2 + version: 5.4.2 frontend/video-sender: dependencies: @@ -2135,14 +2135,14 @@ packages: '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.23.3) dev: true - /@svgr/core@8.1.0(typescript@5.2.2): + /@svgr/core@8.1.0(typescript@5.4.2): resolution: {integrity: sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==} engines: {node: '>=14'} dependencies: '@babel/core': 7.23.3 '@svgr/babel-preset': 8.1.0(@babel/core@7.23.3) camelcase: 6.3.0 - cosmiconfig: 8.3.6(typescript@5.2.2) + cosmiconfig: 8.3.6(typescript@5.4.2) snake-case: 3.0.4 transitivePeerDependencies: - supports-color @@ -2165,28 +2165,28 @@ packages: dependencies: '@babel/core': 7.23.3 '@svgr/babel-preset': 8.1.0(@babel/core@7.23.3) - '@svgr/core': 8.1.0(typescript@5.2.2) + '@svgr/core': 8.1.0(typescript@5.4.2) '@svgr/hast-util-to-babel-ast': 8.0.0 svg-parser: 2.0.4 transitivePeerDependencies: - supports-color dev: true - /@svgr/plugin-svgo@8.1.0(@svgr/core@8.1.0)(typescript@5.2.2): + /@svgr/plugin-svgo@8.1.0(@svgr/core@8.1.0)(typescript@5.4.2): resolution: {integrity: sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==} engines: {node: '>=14'} peerDependencies: '@svgr/core': '*' dependencies: - '@svgr/core': 8.1.0(typescript@5.2.2) - cosmiconfig: 8.3.6(typescript@5.2.2) + '@svgr/core': 8.1.0(typescript@5.4.2) + cosmiconfig: 8.3.6(typescript@5.4.2) deepmerge: 4.3.1 svgo: 3.0.4 transitivePeerDependencies: - typescript dev: true - /@svgr/webpack@8.1.0(typescript@5.2.2): + /@svgr/webpack@8.1.0(typescript@5.4.2): resolution: {integrity: sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==} engines: {node: '>=14'} dependencies: @@ -2195,9 +2195,9 @@ packages: '@babel/preset-env': 7.23.3(@babel/core@7.23.3) '@babel/preset-react': 7.23.3(@babel/core@7.23.3) '@babel/preset-typescript': 7.23.3(@babel/core@7.23.3) - '@svgr/core': 8.1.0(typescript@5.2.2) + '@svgr/core': 8.1.0(typescript@5.4.2) '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0) - '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0)(typescript@5.2.2) + '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0)(typescript@5.4.2) transitivePeerDependencies: - supports-color - typescript @@ -3085,7 +3085,7 @@ packages: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} dev: true - /cosmiconfig@8.3.6(typescript@5.2.2): + /cosmiconfig@8.3.6(typescript@5.4.2): resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} engines: {node: '>=14'} peerDependencies: @@ -3098,7 +3098,7 @@ packages: js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 - typescript: 5.2.2 + typescript: 5.4.2 dev: true /cross-spawn@7.0.3: @@ -5548,14 +5548,8 @@ packages: hasBin: true dev: true - /typescript@5.2.2: - resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} - engines: {node: '>=14.17'} - hasBin: true - dev: true - - /typescript@5.3.2: - resolution: {integrity: sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==} + /typescript@5.4.2: + resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} engines: {node: '>=14.17'} hasBin: true dev: true From ae6f95c5c83ada403d1028a11ea70309575c097f Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 20:32:15 +0000 Subject: [PATCH 2/2] Commit from GitHub Actions (compile PB) --- .../state/v1/statev1connect/state.connect.go | 70 ++++++++++++++----- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/backend/spec/state/v1/statev1connect/state.connect.go b/backend/spec/state/v1/statev1connect/state.connect.go index fba2f96..23ec261 100644 --- a/backend/spec/state/v1/statev1connect/state.connect.go +++ b/backend/spec/state/v1/statev1connect/state.connect.go @@ -18,7 +18,7 @@ import ( // generated with a version of connect newer than the one compiled into your binary. You can fix the // problem by either regenerating this code with an older version of connect or updating the connect // version compiled into your binary. -const _ = connect.IsAtLeastVersion0_1_0 +const _ = connect.IsAtLeastVersion1_13_0 const ( // StateManagerServiceName is the fully-qualified name of the StateManagerService service. @@ -62,6 +62,20 @@ const ( StateManagerServiceUpdateTrainProcedure = "/state.v1.StateManagerService/UpdateTrain" ) +// These variables are the protoreflect.Descriptor objects for the RPCs defined in this package. +var ( + stateManagerServiceServiceDescriptor = v1.File_state_v1_state_proto.Services().ByName("StateManagerService") + stateManagerServiceGetBlockStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetBlockStates") + stateManagerServiceUpdateBlockStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateBlockState") + stateManagerServiceUpdatePointStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdatePointState") + stateManagerServiceGetPointStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetPointStates") + stateManagerServiceUpdateStopStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateStopState") + stateManagerServiceGetStopStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetStopStates") + stateManagerServiceGetTrainsMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetTrains") + stateManagerServiceAddTrainMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("AddTrain") + stateManagerServiceUpdateTrainMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateTrain") +) + // StateManagerServiceClient is a client for the state.v1.StateManagerService service. type StateManagerServiceClient interface { // Block @@ -92,47 +106,56 @@ func NewStateManagerServiceClient(httpClient connect.HTTPClient, baseURL string, getBlockStates: connect.NewClient[v1.GetBlockStatesRequest, v1.GetBlockStatesResponse]( httpClient, baseURL+StateManagerServiceGetBlockStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetBlockStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), updateBlockState: connect.NewClient[v1.UpdateBlockStateRequest, v1.UpdateBlockStateResponse]( httpClient, baseURL+StateManagerServiceUpdateBlockStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateBlockStateMethodDescriptor), + connect.WithClientOptions(opts...), ), updatePointState: connect.NewClient[v1.UpdatePointStateRequest, v1.UpdatePointStateResponse]( httpClient, baseURL+StateManagerServiceUpdatePointStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdatePointStateMethodDescriptor), + connect.WithClientOptions(opts...), ), getPointStates: connect.NewClient[v1.GetPointStatesRequest, v1.GetPointStatesResponse]( httpClient, baseURL+StateManagerServiceGetPointStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetPointStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), updateStopState: connect.NewClient[v1.UpdateStopStateRequest, v1.UpdateStopStateResponse]( httpClient, baseURL+StateManagerServiceUpdateStopStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateStopStateMethodDescriptor), + connect.WithClientOptions(opts...), ), getStopStates: connect.NewClient[v1.GetStopStatesRequest, v1.GetStopStatesResponse]( httpClient, baseURL+StateManagerServiceGetStopStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetStopStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), getTrains: connect.NewClient[v1.GetTrainsRequest, v1.GetTrainsResponse]( httpClient, baseURL+StateManagerServiceGetTrainsProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetTrainsMethodDescriptor), + connect.WithClientOptions(opts...), ), addTrain: connect.NewClient[v1.AddTrainRequest, v1.AddTrainResponse]( httpClient, baseURL+StateManagerServiceAddTrainProcedure, - opts..., + connect.WithSchema(stateManagerServiceAddTrainMethodDescriptor), + connect.WithClientOptions(opts...), ), updateTrain: connect.NewClient[v1.UpdateTrainRequest, v1.UpdateTrainResponse]( httpClient, baseURL+StateManagerServiceUpdateTrainProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateTrainMethodDescriptor), + connect.WithClientOptions(opts...), ), } } @@ -221,47 +244,56 @@ func NewStateManagerServiceHandler(svc StateManagerServiceHandler, opts ...conne stateManagerServiceGetBlockStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetBlockStatesProcedure, svc.GetBlockStates, - opts..., + connect.WithSchema(stateManagerServiceGetBlockStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateBlockStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdateBlockStateProcedure, svc.UpdateBlockState, - opts..., + connect.WithSchema(stateManagerServiceUpdateBlockStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdatePointStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdatePointStateProcedure, svc.UpdatePointState, - opts..., + connect.WithSchema(stateManagerServiceUpdatePointStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetPointStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetPointStatesProcedure, svc.GetPointStates, - opts..., + connect.WithSchema(stateManagerServiceGetPointStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateStopStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdateStopStateProcedure, svc.UpdateStopState, - opts..., + connect.WithSchema(stateManagerServiceUpdateStopStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetStopStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetStopStatesProcedure, svc.GetStopStates, - opts..., + connect.WithSchema(stateManagerServiceGetStopStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetTrainsHandler := connect.NewUnaryHandler( StateManagerServiceGetTrainsProcedure, svc.GetTrains, - opts..., + connect.WithSchema(stateManagerServiceGetTrainsMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceAddTrainHandler := connect.NewUnaryHandler( StateManagerServiceAddTrainProcedure, svc.AddTrain, - opts..., + connect.WithSchema(stateManagerServiceAddTrainMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateTrainHandler := connect.NewUnaryHandler( StateManagerServiceUpdateTrainProcedure, svc.UpdateTrain, - opts..., + connect.WithSchema(stateManagerServiceUpdateTrainMethodDescriptor), + connect.WithHandlerOptions(opts...), ) return "/state.v1.StateManagerService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { switch r.URL.Path {