V2: Update to Protobuf-ES 2.0.0 (#1189)

connectrpc · Aug 27, 2024 · b92b370 · b92b370
1 parent 938d528
commit b92b370
Show file tree

Hide file tree

Showing 65 changed files with 115 additions and 108 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/connect-cloudflare/buf.gen.yaml b/packages/connect-cloudflare/buf.gen.yaml
@@ -1,5 +1,9 @@
-version: v1
+# Learn more: https://buf.build/docs/configuration/v2/buf-gen-yaml
+version: v2
+# Deletes the directories specified in the `out` field for all plugins before running code generation.
+clean: true
 plugins:
-  - plugin: es
+  - local: protoc-gen-es
+    include_imports: true
     out: ./conformance/gen
     opt: target=ts,import_extension=.js
diff --git a/packages/connect-cloudflare/conformance/gen/connectrpc/conformance/v1/client_compat_pb.ts b/packages/connect-cloudflare/conformance/gen/connectrpc/conformance/v1/client_compat_pb.ts
diff --git a/packages/connect-cloudflare/conformance/gen/connectrpc/conformance/v1/config_pb.ts b/packages/connect-cloudflare/conformance/gen/connectrpc/conformance/v1/config_pb.ts
diff --git a/packages/connect-cloudflare/conformance/gen/connectrpc/conformance/v1/service_pb.ts b/packages/connect-cloudflare/conformance/gen/connectrpc/conformance/v1/service_pb.ts
diff --git a/packages/connect-cloudflare/conformance/gen/invoke/v1/invoke_pb.ts b/packages/connect-cloudflare/conformance/gen/invoke/v1/invoke_pb.ts
diff --git a/packages/connect-cloudflare/package.json b/packages/connect-cloudflare/package.json
@@ -3,14 +3,13 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "pregenerate": "rm -rf conformance/gen/*",
-    "generate": "buf generate --include-imports .",
+    "generate": "buf generate",
     "conformance": "tsc --noEmit && npm run conformance:server && npm run conformance:client",
     "conformance:server": "npx wrangler deploy -c ./conformance/wrangler-server.toml && connectconformance --mode server --conf ./conformance/conformance-cloudflare-server.yaml -v ./conformance/server.ts",
     "conformance:client": "npx wrangler deploy -c ./conformance/wrangler-client.toml && connectconformance --mode client --conf ./conformance/conformance-cloudflare-client.yaml -v --known-failing @./conformance/known-failing-client.txt --bind 0.0.0.0 --port 8181 --cert $CLOUDFLARE_WORKERS_REFERENCE_SERVER_CERT --key $CLOUDFLARE_WORKERS_REFERENCE_SERVER_KEY  -- ./conformance/client.ts"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.0.0-beta.3",
+    "@bufbuild/protobuf": "^2.0.0",
     "@connectrpc/connect": "2.0.0-alpha.1",
     "@connectrpc/connect-node": "2.0.0-alpha.1"
   },
@@ -19,6 +18,6 @@
     "wrangler": "^3.68.0",
     "tsx": "^4.16.5",
     "@connectrpc/connect-conformance": "^2.0.0-alpha.1",
-    "@bufbuild/protoc-gen-es": "^2.0.0-beta.3"
+    "@bufbuild/protoc-gen-es": "^2.0.0"
   }
 }
diff --git a/packages/connect-conformance/package.json b/packages/connect-conformance/package.json
@@ -22,15 +22,15 @@
     "build:esm": "tsc --project tsconfig.json --outDir ./dist/esm --declaration --declarationDir ./dist/esm"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.0.0-beta.3",
+    "@bufbuild/protobuf": "^2.0.0",
     "@connectrpc/connect": "2.0.0-alpha.1",
     "fflate": "^0.8.1",
     "tar-stream": "^3.1.7",
     "undici": "^5.28.4"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.36.0",
-    "@bufbuild/protoc-gen-es": "^2.0.0-beta.3",
+    "@bufbuild/protoc-gen-es": "^2.0.0",
     "@types/node-forge": "^1.3.9",
     "@types/tar-stream": "^3.1.3",
     "@types/debug": "^4.1.12"

diff --git a/packages/connect-conformance/src/gen/connectrpc/conformance/v1/client_compat_pb.ts b/packages/connect-conformance/src/gen/connectrpc/conformance/v1/client_compat_pb.ts
diff --git a/packages/connect-conformance/src/gen/connectrpc/conformance/v1/config_pb.ts b/packages/connect-conformance/src/gen/connectrpc/conformance/v1/config_pb.ts
diff --git a/packages/connect-conformance/src/gen/connectrpc/conformance/v1/server_compat_pb.ts b/packages/connect-conformance/src/gen/connectrpc/conformance/v1/server_compat_pb.ts
diff --git a/packages/connect-conformance/src/gen/connectrpc/conformance/v1/service_pb.ts b/packages/connect-conformance/src/gen/connectrpc/conformance/v1/service_pb.ts
diff --git a/packages/connect-conformance/src/gen/connectrpc/conformance/v1/suite_pb.ts b/packages/connect-conformance/src/gen/connectrpc/conformance/v1/suite_pb.ts
diff --git a/packages/connect-express/buf.gen.yaml b/packages/connect-express/buf.gen.yaml
@@ -1,5 +1,10 @@
-version: v1
+# Learn more: https://buf.build/docs/configuration/v2/buf-gen-yaml
+version: v2
+# Deletes the directories specified in the `out` field for all plugins before running code generation.
+clean: true
+inputs:
+  - module: buf.build/connectrpc/eliza
 plugins:
-  - plugin: es
+  - local: protoc-gen-es
     out: src/testdata/gen
     opt: ts_nocheck=false,target=ts,import_extension=.js
diff --git a/packages/connect-express/package.json b/packages/connect-express/package.json
@@ -9,8 +9,7 @@
   },
   "scripts": {
     "clean": "rm -rf ./dist/*",
-    "pregenerate": "rm -rf src/testdata/gen/*",
-    "generate": "buf generate buf.build/connectrpc/eliza",
+    "generate": "buf generate",
     "build": "npm run build:cjs && npm run build:esm",
     "build:cjs": "tsc --project tsconfig.build.json --module commonjs --verbatimModuleSyntax false --moduleResolution node10 --outDir ./dist/cjs --declaration --declarationDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
     "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm --declaration --declarationDir ./dist/esm",
@@ -37,7 +36,7 @@
     "tsx": "^4.16.5"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "^2.0.0-beta.3",
+    "@bufbuild/protobuf": "^2.0.0",
     "@connectrpc/connect": "2.0.0-alpha.1",
     "@connectrpc/connect-node": "2.0.0-alpha.1"
   }

diff --git a/packages/connect-express/src/testdata/gen/connectrpc/eliza/v1/eliza_pb.ts b/packages/connect-express/src/testdata/gen/connectrpc/eliza/v1/eliza_pb.ts
diff --git a/packages/connect-fastify/package.json b/packages/connect-fastify/package.json
@@ -31,7 +31,7 @@
     "@connectrpc/connect-conformance": "^2.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "^2.0.0-beta.3",
+    "@bufbuild/protobuf": "^2.0.0",
     "fastify": "^4.22.1",
     "@connectrpc/connect": "2.0.0-alpha.1",
     "@connectrpc/connect-node": "2.0.0-alpha.1"

diff --git a/packages/connect-next/package.json b/packages/connect-next/package.json
@@ -27,7 +27,7 @@
     "node": ">=16.0.0"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "^2.0.0-beta.3",
+    "@bufbuild/protobuf": "^2.0.0",
     "next": "^13.2.4 || ^14.2.5",
     "@connectrpc/connect": "2.0.0-alpha.1",
     "@connectrpc/connect-node": "2.0.0-alpha.1"

diff --git a/packages/connect-node/package.json b/packages/connect-node/package.json
@@ -34,7 +34,7 @@
     "undici": "^5.28.4"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "^2.0.0-beta.3",
+    "@bufbuild/protobuf": "^2.0.0",
     "@connectrpc/connect": "2.0.0-alpha.1"
   },
   "devDependencies": {

diff --git a/packages/connect-web-bench/README.md b/packages/connect-web-bench/README.md
@@ -15,10 +15,10 @@ usually do. We repeat this for an increasing number of RPCs.
 
 | code generator | RPCs | bundle size |  minified | compressed |
 | -------------- | ---: | ----------: | --------: | ---------: |
-| Connect-ES     |    1 |   276,258 b | 176,396 b |   35,777 b |
-| Connect-ES     |    4 |   280,524 b | 179,498 b |   36,547 b |
-| Connect-ES     |    8 |   285,394 b | 183,929 b |   37,515 b |
-| Connect-ES     |   16 |   294,536 b | 191,553 b |   38,996 b |
+| Connect-ES     |    1 |   276,454 b | 176,396 b |   35,777 b |
+| Connect-ES     |    4 |   280,720 b | 179,498 b |   36,547 b |
+| Connect-ES     |    8 |   285,590 b | 183,929 b |   37,515 b |
+| Connect-ES     |   16 |   294,732 b | 191,553 b |   38,996 b |
 | gRPC-Web       |    1 |   876,563 b | 548,495 b |   52,300 b |
 | gRPC-Web       |    4 |   928,964 b | 580,477 b |   54,673 b |
 | gRPC-Web       |    8 | 1,004,833 b | 628,223 b |   57,118 b |