Upgrade to latest, cleanup connect versions (#31)

river-build · May 22, 2024 · 17c2d98 · 17c2d98
1 parent 3dec3e9
commit 17c2d98
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 40 deletions.
diff --git a/core/dlog/package.json b/core/dlog/package.json
@@ -17,7 +17,7 @@
         "watch": "tsc --watch"
     },
     "dependencies": {
-        "@bufbuild/protobuf": "^1.4.1",
+        "@bufbuild/protobuf": "^1.9.0",
         "@river-build/proto": "workspace:^",
         "browser-or-node": "^2.1.1",
         "debug": "^4.3.4",

diff --git a/core/encryption/package.json b/core/encryption/package.json
@@ -17,7 +17,7 @@
         "watch": "tsc --watch"
     },
     "dependencies": {
-        "@bufbuild/protobuf": "^1.4.1",
+        "@bufbuild/protobuf": "^1.9.0",
         "@ethereumjs/util": "^8.0.1",
         "@matrix-org/olm": "^3.2.15",
         "@river-build/dlog": "workspace:^",

diff --git a/core/proto/buf.gen.yaml b/core/proto/buf.gen.yaml
@@ -1,9 +1,9 @@
 version: v2
 plugins:
-    - remote: buf.build/bufbuild/connect-es
+    - remote: buf.build/bufbuild/es
       out: core/proto/src/gen
       opt: target=ts
-    - remote: buf.build/bufbuild/es
+    - remote: buf.build/connectrpc/es
       out: core/proto/src/gen
       opt: target=ts
 inputs:

diff --git a/core/proto/package.json b/core/proto/package.json
@@ -20,9 +20,9 @@
         "watch:go": "node scripts/watch_proto_files_go.cjs"
     },
     "dependencies": {
-        "@bufbuild/protobuf": "^1.4.1",
-        "@connectrpc/connect": "^1.3.0",
-        "@connectrpc/connect-web": "^1.3.0"
+        "@bufbuild/protobuf": "^1.9.0",
+        "@connectrpc/connect": "^1.4.0",
+        "@connectrpc/connect-web": "^1.4.0"
     },
     "devDependencies": {
         "@bufbuild/buf": "^1.32.0",

diff --git a/core/sdk/package.json b/core/sdk/package.json
@@ -19,8 +19,8 @@
         "test:ci:load-tests-s3": "RIVER_ENV=local_single_ne yarn my-jest --group=load-tests-s3 --testTimeout=1180000",
         "test:ci:load-tests-s3.1": "RIVER_ENV=local_single_ne yarn my-jest --group=load-tests-3.1 --testTimeout=1180000",
         "test:ci:load-tests-s4.1": "RIVER_ENV=local_single_ne yarn my-jest --group=load-tests-s4.1 --testTimeout=1180000",
-        "test:ci:multi:ne": "RIVER_ENV=local_multi_ne yarn my-jest --group=main",
         "test:ci:multi:ent": "RIVER_ENV=local_multi yarn my-jest --group=with-entitilements",
+        "test:ci:multi:ne": "RIVER_ENV=local_multi_ne yarn my-jest --group=main",
         "test:ci:stress-test-follower": "RIVER_ENV=local_single_ne yarn my-jest --group=stress-test-follower --testTimeout=180000000 --detectOpenHandles --runInBand",
         "test:ci:stress-test-leader": "RIVER_ENV=local_single_ne yarn my-jest --group=stress-test-leader --testTimeout=180000000 --detectOpenHandles --runInBand",
         "test:ci:synthetic:all": "RIVER_ENV=local_single_ne yarn my-jest --group=synthetic",
@@ -31,9 +31,9 @@
         "watch": "tsc --watch"
     },
     "dependencies": {
-        "@bufbuild/protobuf": "^1.4.1",
-        "@connectrpc/connect": "^1.3.0",
-        "@connectrpc/connect-web": "^1.3.0",
+        "@bufbuild/protobuf": "^1.9.0",
+        "@connectrpc/connect": "^1.4.0",
+        "@connectrpc/connect-web": "^1.4.0",
         "@datadog/browser-rum": "^5.8.0",
         "@ethereumjs/util": "^8.0.1",
         "@river-build/dlog": "workspace:^",

diff --git a/core/stress/package.json b/core/stress/package.json
@@ -7,14 +7,14 @@
     "scripts": {
         "build": "tsc",
         "lint": "eslint . --ext .ts",
-        "my-node": "node -r ../../scripts/node-no-warn.js --experimental-loader ./custom-loader.mjs",
         "my-jest": "NODE_TLS_REJECT_UNAUTHORIZED=0 DEBUG='csb:*' DEBUG_DEPTH='10' yarn node -r ../../scripts/node-no-warn.js --experimental-vm-modules $(yarn bin jest)",
-        "test": "RIVER_ENV=local_single_ne yarn my-jest",
-        "start": "yarn my-node ./dist/start.js"
+        "my-node": "node -r ../../scripts/node-no-warn.js --experimental-loader ./custom-loader.mjs",
+        "start": "yarn my-node ./dist/start.js",
+        "test": "RIVER_ENV=local_single_ne yarn my-jest"
     },
     "dependencies": {
         "@babel/node": "^7.23.9",
-        "@bufbuild/protobuf": "^1.4.1",
+        "@bufbuild/protobuf": "^1.9.0",
         "@river-build/dlog": "workspace:^",
         "@river-build/encryption": "workspace:^",
         "@river-build/proto": "workspace:^",

diff --git a/yarn.lock b/yarn.lock
@@ -573,13 +573,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@bufbuild/protobuf@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "@bufbuild/protobuf@npm:1.4.1"
-  checksum: c42c29dd70e580b19b32a94ab7cde9f86f2540554dd2fa7a8f9af9909534c3ad6c06980b16e5453530934f744076ab2870e2b0d31d3ed567b399b901ecf9fa51
-  languageName: node
-  linkType: hard
-
 "@bufbuild/protoc-gen-es@npm:^1.9.0":
   version: 1.9.0
   resolution: "@bufbuild/protoc-gen-es@npm:1.9.0"
@@ -625,22 +618,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@connectrpc/connect-web@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "@connectrpc/connect-web@npm:1.3.0"
+"@connectrpc/connect-web@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@connectrpc/connect-web@npm:1.4.0"
   peerDependencies:
     "@bufbuild/protobuf": ^1.4.2
-    "@connectrpc/connect": 1.3.0
-  checksum: 085dcf01cfe652849dd5c046acdeb9baa578add4a58d35643c162e8eccd5203021451b49bfb3d66c69d1e65759ef25727b6b64ee62ea017a040097c3535d214a
+    "@connectrpc/connect": 1.4.0
+  checksum: bf53f5cdd0be69be1cdebf7d7e01f74936f83b410fb26d7f515284771290e6c24f5701e6144ea600805fa2e39d5255ef009210f7b1c35f1dade60005e231b022
   languageName: node
   linkType: hard
 
-"@connectrpc/connect@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "@connectrpc/connect@npm:1.3.0"
+"@connectrpc/connect@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@connectrpc/connect@npm:1.4.0"
   peerDependencies:
     "@bufbuild/protobuf": ^1.4.2
-  checksum: a68bfffedd817a7db3563c00e5efc5eb510cc00a93c722d81fa1f52b71a96300d7175b0c0710a9d2ef2e8aaabee36921c90470a80343e7a9fbccffd3cc83f868
+  checksum: 388145ea90b3216f133b34d96a47dfd0273dfa12c4b4963c7223cf45bdcbf8b3490ab234dda34fd42a7112ad9f51f22efc013f3183744a3f2ae65b825917b870
   languageName: node
   linkType: hard
 
@@ -2356,7 +2349,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@river-build/dlog@workspace:core/dlog"
   dependencies:
-    "@bufbuild/protobuf": ^1.4.1
+    "@bufbuild/protobuf": ^1.9.0
     "@river-build/proto": "workspace:^"
     "@types/jest": ^29.5.3
     "@typescript-eslint/eslint-plugin": ^6.10.0
@@ -2380,7 +2373,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@river-build/encryption@workspace:core/encryption"
   dependencies:
-    "@bufbuild/protobuf": ^1.4.1
+    "@bufbuild/protobuf": ^1.9.0
     "@ethereumjs/util": ^8.0.1
     "@matrix-org/olm": ^3.2.15
     "@river-build/dlog": "workspace:^"
@@ -2420,10 +2413,10 @@ __metadata:
   resolution: "@river-build/proto@workspace:core/proto"
   dependencies:
     "@bufbuild/buf": ^1.32.0
-    "@bufbuild/protobuf": ^1.4.1
+    "@bufbuild/protobuf": ^1.9.0
     "@bufbuild/protoc-gen-es": ^1.9.0
-    "@connectrpc/connect": ^1.3.0
-    "@connectrpc/connect-web": ^1.3.0
+    "@connectrpc/connect": ^1.4.0
+    "@connectrpc/connect-web": ^1.4.0
     "@connectrpc/protoc-gen-connect-es": ^1.4.0
     "@types/jest": ^29.5.3
     jest: ^29.6.2
@@ -2440,7 +2433,7 @@ __metadata:
   resolution: "@river-build/stress@workspace:core/stress"
   dependencies:
     "@babel/node": ^7.23.9
-    "@bufbuild/protobuf": ^1.4.1
+    "@bufbuild/protobuf": ^1.9.0
     "@jest/globals": ^29.6.2
     "@river-build/dlog": "workspace:^"
     "@river-build/encryption": "workspace:^"
@@ -2546,9 +2539,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@river/sdk@workspace:core/sdk"
   dependencies:
-    "@bufbuild/protobuf": ^1.4.1
-    "@connectrpc/connect": ^1.3.0
-    "@connectrpc/connect-web": ^1.3.0
+    "@bufbuild/protobuf": ^1.9.0
+    "@connectrpc/connect": ^1.4.0
+    "@connectrpc/connect-web": ^1.4.0
     "@datadog/browser-rum": ^5.8.0
     "@ethereumjs/util": ^8.0.1
     "@jest/globals": ^29.6.2