From 4cc838505d851be7ce64e6bc14e61aefae8427f2 Mon Sep 17 00:00:00 2001 From: Wes Date: Wed, 2 Oct 2024 09:23:13 -0700 Subject: [PATCH] fix: buf connect package versions and dev deps --- frontend/console/package.json | 18 ++-- .../block/ftl/v1/console/console_connect.ts | 2 +- .../protos/xyz/block/ftl/v1/ftl_connect.ts | 2 +- .../ftl/v1beta1/provisioner/plugin_connect.ts | 2 +- .../v1beta1/provisioner/service_connect.ts | 2 +- pnpm-lock.yaml | 96 +++++++------------ 6 files changed, 44 insertions(+), 78 deletions(-) diff --git a/frontend/console/package.json b/frontend/console/package.json index d64aac63c5..fef83835e8 100644 --- a/frontend/console/package.json +++ b/frontend/console/package.json @@ -24,26 +24,20 @@ "build-storybook": "storybook build" }, "lint-staged": { - "*.(js|cjs|tsx|ts)": [ - "pnpm run lint:fix" - ] + "*.(js|cjs|tsx|ts)": ["pnpm run lint:fix"] }, - "browserslist": [ - "> 2%" - ], + "browserslist": ["> 2%"], "source": "index.html", "dependencies": { - "@bufbuild/protobuf": "^1.1.0", - "@bufbuild/protoc-gen-es": "2.1.0", + "@bufbuild/protobuf": "^1.10.0", "@codemirror/autocomplete": "^6.18.0", "@codemirror/commands": "^6.5.0", "@codemirror/language": "^6.10.1", "@codemirror/lint": "^6.8.1", "@codemirror/state": "^6.4.1", "@codemirror/view": "^6.26.3", - "@connectrpc/connect": "^1.1.2", - "@connectrpc/connect-web": "^1.1.2", - "@connectrpc/protoc-gen-connect-es": "^1.4.0", + "@connectrpc/connect": "^1.5.0", + "@connectrpc/connect-web": "^1.5.0", "@headlessui/react": "2.1.8", "@tailwindcss/forms": "^0.5.6", "@tanstack/react-query": "^5.51.23", @@ -68,7 +62,9 @@ "type-fest": "^4.18.2" }, "devDependencies": { + "@bufbuild/protoc-gen-es": "^1.10.0", "@chromatic-com/storybook": "^2.0.0", + "@connectrpc/protoc-gen-connect-es": "^1.5.0", "@playwright/test": "^1.46.1", "@storybook/addon-essentials": "^8.2.7", "@storybook/addon-interactions": "^8.2.7", diff --git a/frontend/console/src/protos/xyz/block/ftl/v1/console/console_connect.ts b/frontend/console/src/protos/xyz/block/ftl/v1/console/console_connect.ts index db225c56ce..3ea7ea033f 100644 --- a/frontend/console/src/protos/xyz/block/ftl/v1/console/console_connect.ts +++ b/frontend/console/src/protos/xyz/block/ftl/v1/console/console_connect.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts" +// @generated by protoc-gen-connect-es v1.5.0 with parameter "target=ts" // @generated from file xyz/block/ftl/v1/console/console.proto (package xyz.block.ftl.v1.console, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/frontend/console/src/protos/xyz/block/ftl/v1/ftl_connect.ts b/frontend/console/src/protos/xyz/block/ftl/v1/ftl_connect.ts index 9d06b8b34b..390a0bcdbd 100644 --- a/frontend/console/src/protos/xyz/block/ftl/v1/ftl_connect.ts +++ b/frontend/console/src/protos/xyz/block/ftl/v1/ftl_connect.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts" +// @generated by protoc-gen-connect-es v1.5.0 with parameter "target=ts" // @generated from file xyz/block/ftl/v1/ftl.proto (package xyz.block.ftl.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/plugin_connect.ts b/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/plugin_connect.ts index 651a5784c9..50ad199938 100644 --- a/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/plugin_connect.ts +++ b/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/plugin_connect.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts" +// @generated by protoc-gen-connect-es v1.5.0 with parameter "target=ts" // @generated from file xyz/block/ftl/v1beta1/provisioner/plugin.proto (package xyz.block.ftl.v1beta1.provisioner, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/service_connect.ts b/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/service_connect.ts index 1442153f29..3d04e6288b 100644 --- a/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/service_connect.ts +++ b/frontend/console/src/protos/xyz/block/ftl/v1beta1/provisioner/service_connect.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts" +// @generated by protoc-gen-connect-es v1.5.0 with parameter "target=ts" // @generated from file xyz/block/ftl/v1beta1/provisioner/service.proto (package xyz.block.ftl.v1beta1.provisioner, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d51489d39..2bf7394707 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,11 +9,8 @@ importers: frontend/console: dependencies: '@bufbuild/protobuf': - specifier: ^1.1.0 + specifier: ^1.10.0 version: 1.10.0 - '@bufbuild/protoc-gen-es': - specifier: 2.1.0 - version: 2.1.0(@bufbuild/protobuf@1.10.0) '@codemirror/autocomplete': specifier: ^6.18.0 version: 6.18.0(@codemirror/language@6.10.2)(@codemirror/state@6.4.1)(@codemirror/view@6.33.0)(@lezer/common@1.2.1) @@ -33,14 +30,11 @@ importers: specifier: ^6.26.3 version: 6.33.0 '@connectrpc/connect': - specifier: ^1.1.2 - version: 1.4.0(@bufbuild/protobuf@1.10.0) + specifier: ^1.5.0 + version: 1.5.0(@bufbuild/protobuf@1.10.0) '@connectrpc/connect-web': - specifier: ^1.1.2 - version: 1.4.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0)) - '@connectrpc/protoc-gen-connect-es': - specifier: ^1.4.0 - version: 1.4.0(@bufbuild/protoc-gen-es@2.1.0(@bufbuild/protobuf@1.10.0))(@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0)) + specifier: ^1.5.0 + version: 1.5.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.5.0(@bufbuild/protobuf@1.10.0)) '@headlessui/react': specifier: 2.1.8 version: 2.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -108,9 +102,15 @@ importers: specifier: ^4.18.2 version: 4.25.0 devDependencies: + '@bufbuild/protoc-gen-es': + specifier: ^1.10.0 + version: 1.10.0(@bufbuild/protobuf@1.10.0) '@chromatic-com/storybook': specifier: ^2.0.0 version: 2.0.2(react@18.3.1) + '@connectrpc/protoc-gen-connect-es': + specifier: ^1.5.0 + version: 1.5.0(@bufbuild/protoc-gen-es@1.10.0(@bufbuild/protobuf@1.10.0))(@connectrpc/connect@1.5.0(@bufbuild/protobuf@1.10.0)) '@playwright/test': specifier: ^1.46.1 version: 1.46.1 @@ -953,15 +953,12 @@ packages: '@bufbuild/protobuf@1.10.0': resolution: {integrity: sha512-QDdVFLoN93Zjg36NoQPZfsVH9tZew7wKDKyV5qRdj8ntT4wQCOradQjRaTdwMhWUYsgKsvCINKKm87FdEk96Ag==} - '@bufbuild/protobuf@2.1.0': - resolution: {integrity: sha512-+2Mx67Y3skJ4NCD/qNSdBJNWtu6x6Qr53jeNg+QcwiL6mt0wK+3jwHH2x1p7xaYH6Ve2JKOVn0OxU35WsmqI9A==} - - '@bufbuild/protoc-gen-es@2.1.0': - resolution: {integrity: sha512-xGadPol0k8cdDNSbMdHMo0QEK0JvebxGD6KQl5hCVfLTFbpMM4dfMiubyT9gdcwqfwstRe5Tin0Us3dyOzHtag==} + '@bufbuild/protoc-gen-es@1.10.0': + resolution: {integrity: sha512-zBYBsVT/ul4uZb6F+kD7/k4sWNHVVbEPfJwKi0FDr+9VJo8MKIofI6pkr5ksBLr4fi/74r+e/75Xi/0clL5dXg==} engines: {node: '>=14'} hasBin: true peerDependencies: - '@bufbuild/protobuf': 2.1.0 + '@bufbuild/protobuf': 1.10.0 peerDependenciesMeta: '@bufbuild/protobuf': optional: true @@ -969,9 +966,6 @@ packages: '@bufbuild/protoplugin@1.10.0': resolution: {integrity: sha512-u6NE4vL0lw1+EK4/PiE/SQB7fKO4LRJNTEScIXVOi2x88K/c8WKc/k0KyEaA0asVBMpwekJQZGnRyj04ZtN5Gg==} - '@bufbuild/protoplugin@2.1.0': - resolution: {integrity: sha512-8bE6/bAA0UCDa7ZplKhJq4TU/YFgIH04U4x6hhCQP1FXGuTtRk/FH5tiS7y+3kbjpM97Zlk9DwmFhW0BusF4ew==} - '@changesets/changelog-github@0.4.8': resolution: {integrity: sha512-jR1DHibkMAb5v/8ym77E4AMNWZKB5NPzw5a5Wtqm1JepAuIF+hrKp2u04NKM14oBZhHglkCfrla9uq8ORnK/dw==} @@ -1014,24 +1008,24 @@ packages: '@codemirror/view@6.33.0': resolution: {integrity: sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==} - '@connectrpc/connect-web@1.4.0': - resolution: {integrity: sha512-13aO4psFbbm7rdOFGV0De2Za64DY/acMspgloDlcOKzLPPs0yZkhp1OOzAQeiAIr7BM/VOHIA3p8mF0inxCYTA==} + '@connectrpc/connect-web@1.5.0': + resolution: {integrity: sha512-xjiiQ932Kibddaka18fGZ6yQL7xjXuLcYFYh/cU+q1WWEIrFPkZfViG/Ee6yrZbrlZkjcBuDibng+q7baTndfg==} peerDependencies: - '@bufbuild/protobuf': ^1.4.2 - '@connectrpc/connect': 1.4.0 + '@bufbuild/protobuf': ^1.10.0 + '@connectrpc/connect': 1.5.0 - '@connectrpc/connect@1.4.0': - resolution: {integrity: sha512-vZeOkKaAjyV4+RH3+rJZIfDFJAfr+7fyYr6sLDKbYX3uuTVszhFe9/YKf5DNqrDb5cKdKVlYkGn6DTDqMitAnA==} + '@connectrpc/connect@1.5.0': + resolution: {integrity: sha512-1gGg0M6c2Y3lnr5itis9dNj9r8hbOIuBMqoGSbUy7L7Vjw4MAttjJzJfj9HCDgytGCJkGanYEYI6MQVDijdVQw==} peerDependencies: - '@bufbuild/protobuf': ^1.4.2 + '@bufbuild/protobuf': ^1.10.0 - '@connectrpc/protoc-gen-connect-es@1.4.0': - resolution: {integrity: sha512-/7vQ8Q7mEBhV8qEVh/eifRQlQnf8EJ6weMwCD2DljVAQRlZYcW9SLxjYZhV1uM1ZZqQC7Cw2vvgXRg2XQswHBg==} + '@connectrpc/protoc-gen-connect-es@1.5.0': + resolution: {integrity: sha512-W3FX/mFPEY3rOIiIbxxUnIpQOPeFrwyhNL5m/JGBJ1lh5PAF0FH4WImJsnN9UAJR1HMkwf6RMfKVLuxFqu3KTA==} engines: {node: '>=16.0.0'} hasBin: true peerDependencies: - '@bufbuild/protoc-gen-es': ^1.7.2 - '@connectrpc/connect': 1.4.0 + '@bufbuild/protoc-gen-es': ^1.10.0 + '@connectrpc/connect': 1.5.0 peerDependenciesMeta: '@bufbuild/protoc-gen-es': optional: true @@ -6095,11 +6089,6 @@ packages: engines: {node: '>=4.2.0'} hasBin: true - typescript@5.4.5: - resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} - engines: {node: '>=14.17'} - hasBin: true - typescript@5.6.2: resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} engines: {node: '>=14.17'} @@ -7470,11 +7459,9 @@ snapshots: '@bufbuild/protobuf@1.10.0': {} - '@bufbuild/protobuf@2.1.0': {} - - '@bufbuild/protoc-gen-es@2.1.0(@bufbuild/protobuf@1.10.0)': + '@bufbuild/protoc-gen-es@1.10.0(@bufbuild/protobuf@1.10.0)': dependencies: - '@bufbuild/protoplugin': 2.1.0 + '@bufbuild/protoplugin': 1.10.0 optionalDependencies: '@bufbuild/protobuf': 1.10.0 transitivePeerDependencies: @@ -7488,14 +7475,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@bufbuild/protoplugin@2.1.0': - dependencies: - '@bufbuild/protobuf': 2.1.0 - '@typescript/vfs': 1.6.0(typescript@5.4.5) - typescript: 5.4.5 - transitivePeerDependencies: - - supports-color - '@changesets/changelog-github@0.4.8': dependencies: '@changesets/get-github-info': 0.5.2 @@ -7579,22 +7558,22 @@ snapshots: style-mod: 4.1.2 w3c-keyname: 2.2.8 - '@connectrpc/connect-web@1.4.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0))': + '@connectrpc/connect-web@1.5.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.5.0(@bufbuild/protobuf@1.10.0))': dependencies: '@bufbuild/protobuf': 1.10.0 - '@connectrpc/connect': 1.4.0(@bufbuild/protobuf@1.10.0) + '@connectrpc/connect': 1.5.0(@bufbuild/protobuf@1.10.0) - '@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0)': + '@connectrpc/connect@1.5.0(@bufbuild/protobuf@1.10.0)': dependencies: '@bufbuild/protobuf': 1.10.0 - '@connectrpc/protoc-gen-connect-es@1.4.0(@bufbuild/protoc-gen-es@2.1.0(@bufbuild/protobuf@1.10.0))(@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0))': + '@connectrpc/protoc-gen-connect-es@1.5.0(@bufbuild/protoc-gen-es@1.10.0(@bufbuild/protobuf@1.10.0))(@connectrpc/connect@1.5.0(@bufbuild/protobuf@1.10.0))': dependencies: '@bufbuild/protobuf': 1.10.0 '@bufbuild/protoplugin': 1.10.0 optionalDependencies: - '@bufbuild/protoc-gen-es': 2.1.0(@bufbuild/protobuf@1.10.0) - '@connectrpc/connect': 1.4.0(@bufbuild/protobuf@1.10.0) + '@bufbuild/protoc-gen-es': 1.10.0(@bufbuild/protobuf@1.10.0) + '@connectrpc/connect': 1.5.0(@bufbuild/protobuf@1.10.0) transitivePeerDependencies: - supports-color @@ -9423,13 +9402,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript/vfs@1.6.0(typescript@5.4.5)': - dependencies: - debug: 4.3.6(supports-color@8.1.1) - typescript: 5.4.5 - transitivePeerDependencies: - - supports-color - '@uiw/codemirror-theme-atomone@4.23.0(@codemirror/language@6.10.2)(@codemirror/state@6.4.1)(@codemirror/view@6.33.0)': dependencies: '@uiw/codemirror-themes': 4.23.0(@codemirror/language@6.10.2)(@codemirror/state@6.4.1)(@codemirror/view@6.33.0) @@ -13154,8 +13126,6 @@ snapshots: typescript@4.5.2: {} - typescript@5.4.5: {} - typescript@5.6.2: {} uc.micro@1.0.6: {}