chore(deps): replace protobufjs with @bufbuild/protobuf (#990)

* chore(deps-dev): update dependency ts-proto to v2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Replace dependency on `protobufjs` with `@bufbuild/protobuf` Signed-off-by: Andrew Haines <[email protected]> * Regenerate protobuf code Signed-off-by: Andrew Haines <[email protected]> --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Andrew Haines <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Haines <[email protected]>
cerbos · Aug 19, 2024 · bf05f62 · bf05f62
1 parent 34895a1
commit bf05f62
Show file tree

Hide file tree

Showing 45 changed files with 2,951 additions and 3,184 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -41,19 +41,14 @@
       "rangeStrategy": "pin",
       "semanticCommitScope": "deps-dev"
     },
-    {
-      "matchPackageNames": ["@grpc/grpc-js", "long", "protobufjs"],
-      "groupName": "grpc",
-      "semanticCommitScope": "deps"
-    },
     {
       "matchPackageNames": ["@opentelemetry/*"],
       "groupName": "opentelemetry",
       "semanticCommitScope": "deps"
     },
     {
-      "description": "@types/node should match the Node.js version. long and protobufjs should match @grpc/grpc-js's dependencies.",
-      "matchPackageNames": ["@types/node", "long", "protobufjs"],
+      "description": "@types/node should match the Node.js version",
+      "matchPackageNames": ["@types/node"],
       "matchUpdateTypes": ["major"],
       "enabled": false
     },
@@ -64,7 +59,7 @@
       "enabled": false
     },
     {
-      "description": "eslint-plugin-vitest only supports flat config from v0.5.0 (https://github.com/veritem/eslint-plugin-vitest/issues/414).",
+      "description": "eslint-plugin-vitest only supports flat config from v0.5.0 (https://github.com/veritem/eslint-plugin-vitest/issues/414)",
       "matchPackageNames": ["eslint-plugin-vitest"],
       "matchUpdateTypes": ["minor"],
       "enabled": false

diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "eslint-plugin-tsdoc": "0.3.0",
     "prettier": "3.3.3",
     "prettier-plugin-pkg": "0.18.1",
-    "ts-proto": "1.181.2",
+    "ts-proto": "2.0.2",
     "tsx": "4.17.0",
     "typescript": "5.5.4"
   }

diff --git a/packages/grpc/CHANGELOG.md b/packages/grpc/CHANGELOG.md
@@ -4,9 +4,9 @@
 
 ### Changed
 
-- Bump dependency on [@grpc/grpc-js] to 1.11.1 ([#974](https://github.com/cerbos/cerbos-sdk-javascript/pull/974), [#979](https://github.com/cerbos/cerbos-sdk-javascript/pull/979), [#981](https://github.com/cerbos/cerbos-sdk-javascript/pull/981))
+- Replace dependency on [protobufjs] with [@bufbuild/protobuf] ([#990](https://github.com/cerbos/cerbos-sdk-javascript/pull/990))
 
-- Bump dependency on [protobufjs] to 7.3.2 ([#970](https://github.com/cerbos/cerbos-sdk-javascript/pull/970))
+- Bump dependency on [@grpc/grpc-js] to 1.11.1 ([#974](https://github.com/cerbos/cerbos-sdk-javascript/pull/974), [#979](https://github.com/cerbos/cerbos-sdk-javascript/pull/979), [#981](https://github.com/cerbos/cerbos-sdk-javascript/pull/981))
 
 ## [0.18.1] - 2024-06-11
 
@@ -324,6 +324,7 @@
 [0.5.2]: https://github.com/cerbos/cerbos-sdk-javascript/compare/@cerbos/[email protected]...@cerbos/[email protected]
 [0.5.1]: https://github.com/cerbos/cerbos-sdk-javascript/compare/@cerbos/[email protected]...@cerbos/[email protected]
 [0.5.0]: https://github.com/cerbos/cerbos-sdk-javascript/compare/138ce112e6b775902ddd3791faa8a763dad8614f...@cerbos/[email protected]
+[@bufbuild/protobuf]: https://github.com/bufbuild/protobuf-es
 [@cerbos/core]: ../core/README.md
 [@cerbos/opentelemetry]: ../opentelemetry/README.md
 [@grpc/grpc-js]: https://github.com/grpc/grpc-node

diff --git a/packages/grpc/changelog.yaml b/packages/grpc/changelog.yaml
@@ -1,15 +1,15 @@
 unreleased:
   type: patch
 
+  changed:
+    - summary: Replace dependency on [protobufjs] with [@bufbuild/protobuf]
+      pull: 990
+
   bumped:
     "@grpc/grpc-js":
       to: 1.11.1
       pulls: [974, 979, 981]
 
-    protobufjs:
-      to: 7.3.2
-      pull: 970
-
 releases:
   - version: 0.18.1
     date: 2024-06-11
@@ -394,6 +394,7 @@ releases:
         pull: 73
 
 references:
+  "@bufbuild/protobuf": https://github.com/bufbuild/protobuf-es
   "@cerbos/core": ../core/README.md
   "@cerbos/opentelemetry": ../opentelemetry/README.md
   "@grpc/grpc-js": https://github.com/grpc/grpc-node

diff --git a/packages/grpc/package.json b/packages/grpc/package.json
@@ -49,10 +49,9 @@
     "server-side"
   ],
   "dependencies": {
+    "@bufbuild/protobuf": "^2.0.0",
     "@cerbos/core": "^0.18.1",
-    "@grpc/grpc-js": "^1.11.1",
-    "long": "^5.2.3",
-    "protobufjs": "^7.3.2"
+    "@grpc/grpc-js": "^1.11.1"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/grpc/src/protobuf/buf/validate/expression.ts b/packages/grpc/src/protobuf/buf/validate/expression.ts
diff --git a/packages/grpc/src/protobuf/buf/validate/priv/private.ts b/packages/grpc/src/protobuf/buf/validate/priv/private.ts