chore!: Move generated protobuf to default buf file path (#1009)

Following the update to the Buf config v2 in arcjet/arcjet#2435 [the default path](https://buf.build/docs/migration-guides/migrate-v2-config-files#v2-configuration) is now `proto` so the `out` is specified as `../arcjet-js/protocol`
arcjet · Jun 28, 2024 · 6800a00 · 6800a00
1 parent 6b692da
commit 6800a00
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 17 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -39,7 +39,7 @@ lint:
     - linters: [ALL]
       paths:
         - analyze/wasm/**
-        - protocol/gen/**
+        - protocol/proto/**
         - "**/LICENSE"
         - "**/CHANGELOG.md"
         - .github/CODEOWNERS

diff --git a/protocol/.gitignore b/protocol/.gitignore
@@ -136,6 +136,4 @@ client.js
 client.d.ts
 convert.js
 convert.d.ts
-proto.js
-proto.d.ts
 test/*.js
diff --git a/protocol/client.ts b/protocol/client.ts
@@ -13,11 +13,11 @@ import {
   ArcjetRule,
   ArcjetStack,
 } from "./index.js";
-import { DecideService } from "./gen/es/decide/v1alpha1/decide_connect.js";
+import { DecideService } from "./proto/decide/v1alpha1/decide_connect.js";
 import {
   DecideRequest,
   ReportRequest,
-} from "./gen/es/decide/v1alpha1/decide_pb.js";
+} from "./proto/decide/v1alpha1/decide_pb.js";
 
 // TODO: Dedupe with `errorMessage` in core
 function errorMessage(err: unknown): string {

diff --git a/protocol/convert.ts b/protocol/convert.ts
@@ -48,7 +48,7 @@ import {
   RuleState,
   SDKStack,
   ShieldReason,
-} from "./gen/es/decide/v1alpha1/decide_pb.js";
+} from "./proto/decide/v1alpha1/decide_pb.js";
 
 export function ArcjetModeToProtocol(mode: ArcjetMode) {
   switch (mode) {

diff --git a/protocol/index.ts b/protocol/index.ts
@@ -1,5 +1,5 @@
 import { typeid } from "typeid-js";
-import { Reason } from "./gen/es/decide/v1alpha1/decide_pb.js";
+import { Reason } from "./proto/decide/v1alpha1/decide_pb.js";
 
 type RequiredProps<T, K extends keyof T> = Required<Pick<T, K>> & Omit<T, K>;
 

diff --git a/protocol/package.json b/protocol/package.json
@@ -27,7 +27,7 @@
   "files": [
     "LICENSE",
     "README.md",
-    "gen/",
+    "proto/",
     "*.js",
     "*.d.ts",
     "*.ts",

diff --git a/...en/es/decide/v1alpha1/decide_connect.d.ts → ...proto/decide/v1alpha1/decide_connect.d.ts b/...en/es/decide/v1alpha1/decide_connect.d.ts → ...proto/decide/v1alpha1/decide_connect.d.ts
diff --git a/.../gen/es/decide/v1alpha1/decide_connect.js → ...l/proto/decide/v1alpha1/decide_connect.js b/.../gen/es/decide/v1alpha1/decide_connect.js → ...l/proto/decide/v1alpha1/decide_connect.js
diff --git a/...col/gen/es/decide/v1alpha1/decide_pb.d.ts → ...ocol/proto/decide/v1alpha1/decide_pb.d.ts b/...col/gen/es/decide/v1alpha1/decide_pb.d.ts → ...ocol/proto/decide/v1alpha1/decide_pb.d.ts
@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0
+// @generated by protoc-gen-es v1.10.0
 // @generated from file proto/decide/v1alpha1/decide.proto (package proto.decide.v1alpha1, syntax proto3)
 /* eslint-disable */
 // @ts-nocheck

diff --git a/protocol/gen/es/decide/v1alpha1/decide_pb.js → protocol/proto/decide/v1alpha1/decide_pb.js b/protocol/gen/es/decide/v1alpha1/decide_pb.js → protocol/proto/decide/v1alpha1/decide_pb.js
@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0
+// @generated by protoc-gen-es v1.10.0
 // @generated from file proto/decide/v1alpha1/decide.proto (package proto.decide.v1alpha1, syntax proto3)
 /* eslint-disable */
 // @ts-nocheck

diff --git a/protocol/rollup.config.js b/protocol/rollup.config.js
@@ -7,16 +7,16 @@ export default createConfig(import.meta.url, {
       // This externalizes the auto-generated protobuf code so it is not
       // processed by rollup
       resolveId(source) {
-        if (source === "./gen/es/decide/v1alpha1/decide_pb.js") {
+        if (source === "./proto/decide/v1alpha1/decide_pb.js") {
           return { id: source, external: true };
         }
-        if (source === "../gen/es/decide/v1alpha1/decide_pb.js") {
+        if (source === "../proto/decide/v1alpha1/decide_pb.js") {
           return { id: source, external: true };
         }
-        if (source === "./gen/es/decide/v1alpha1/decide_connect.js") {
+        if (source === "./proto/decide/v1alpha1/decide_connect.js") {
           return { id: source, external: true };
         }
-        if (source === "../gen/es/decide/v1alpha1/decide_connect.js") {
+        if (source === "../proto/decide/v1alpha1/decide_connect.js") {
           return { id: source, external: true };
         }
         return null;

diff --git a/protocol/test/client.test.ts b/protocol/test/client.test.ts
@@ -8,7 +8,7 @@ import {
 } from "@jest/globals";
 import { createClient } from "../client.js";
 import { createRouterTransport } from "@connectrpc/connect";
-import { DecideService } from "../gen/es/decide/v1alpha1/decide_connect.js";
+import { DecideService } from "../proto/decide/v1alpha1/decide_connect.js";
 import {
   Conclusion,
   DecideRequest,
@@ -20,7 +20,7 @@ import {
   RuleResult,
   RuleState,
   SDKStack,
-} from "../gen/es/decide/v1alpha1/decide_pb.js";
+} from "../proto/decide/v1alpha1/decide_pb.js";
 import {
   ArcjetAllowDecision,
   ArcjetChallengeDecision,

diff --git a/protocol/test/convert.test.ts b/protocol/test/convert.test.ts
@@ -33,7 +33,7 @@ import {
   RuleResult,
   RuleState,
   SDKStack,
-} from "../gen/es/decide/v1alpha1/decide_pb.js";
+} from "../proto/decide/v1alpha1/decide_pb.js";
 import {
   ArcjetAllowDecision,
   ArcjetBotReason,