Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Split buf generation

Tomas Valentab1c3e01c96c7
diff --git a/Makefile b/Makefile
index 77bb1fdb1..1a3194ea6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,14 @@ update-api-spec:
@echo "Done"
-generate: generate-api generate-envd
+generate: generate-js generate-python
-generate-api:
- cd packages/python-sdk && make generate-api
- cd packages/js-sdk && pnpm generate && pnpm generate-envd-api
-
-generate-envd:
+generate-js:
+ cd packages/js-sdk && pnpm generate
cd packages/js-sdk && pnpm generate-envd-api
- cd spec/envd && buf generate && cd ../../packages/python-sdk && ./scripts/fix-python-pb.sh
+ buf generate --template spec/envd/buf-js.gen.yaml
+
+generate-python:
+ cd packages/python-sdk && make generate-api
+ buf generate --template spec/envd/buf-python.gen.yaml
+ cd packages/python-sdk && ./scripts/fix-python-pb.sh
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91de59155..bbc8d4374 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6846,6 +6846,11 @@ packages:
engines: {node: '>=14.17'}
hasBin: true
+ resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==}
+ engines: {node: '>=14.17'}
+ hasBin: true
+
resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==}
engines: {node: '>=14.17'}
@@ -7445,7 +7450,7 @@ snapshots:
'@babel/traverse': 7.24.8
'@babel/types': 7.24.9
convert-source-map: 2.0.0
- debug: 4.3.4
+ debug: 4.3.5
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -7551,7 +7556,7 @@ snapshots:
'@babel/helper-split-export-declaration': 7.24.7
'@babel/parser': 7.24.8
'@babel/types': 7.24.9
- debug: 4.3.4
+ debug: 4.3.5
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@@ -9816,6 +9821,20 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ dependencies:
+ '@typescript-eslint/scope-manager': 6.7.2
+ '@typescript-eslint/types': 6.7.2
+ '@typescript-eslint/typescript-estree': 6.7.2([email protected])
+ '@typescript-eslint/visitor-keys': 6.7.2
+ debug: 4.3.4
+ eslint: 8.49.0
+ optionalDependencies:
+ typescript: 5.4.5
+ transitivePeerDependencies:
+ - supports-color
+ optional: true
+
dependencies:
'@typescript-eslint/scope-manager': 6.7.2
@@ -9922,6 +9941,21 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@typescript-eslint/[email protected]([email protected])':
+ dependencies:
+ '@typescript-eslint/types': 6.7.2
+ '@typescript-eslint/visitor-keys': 6.7.2
+ debug: 4.3.4
+ globby: 11.1.0
+ is-glob: 4.0.3
+ semver: 7.5.4
+ ts-api-utils: 1.0.3([email protected])
+ optionalDependencies:
+ typescript: 5.4.5
+ transitivePeerDependencies:
+ - supports-color
+ optional: true
+
'@typescript-eslint/[email protected]([email protected])':
dependencies:
'@typescript-eslint/types': 6.7.2
@@ -10163,7 +10197,7 @@ snapshots:
dependencies:
- debug: 4.3.4
+ debug: 4.3.5
transitivePeerDependencies:
- supports-color
@@ -11253,7 +11287,7 @@ snapshots:
eslint: 8.49.0
eslint-import-resolver-node: 0.3.9
eslint-import-resolver-typescript: 3.6.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])([email protected])
- eslint-plugin-import: 2.28.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
+ eslint-plugin-import: 2.28.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
eslint-plugin-jsx-a11y: 6.7.1([email protected])
eslint-plugin-react: 7.33.2([email protected])
eslint-plugin-react-hooks: 4.6.0([email protected])
@@ -11277,7 +11311,7 @@ snapshots:
enhanced-resolve: 5.15.0
eslint: 8.49.0
- eslint-plugin-import: 2.28.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
+ eslint-plugin-import: 2.28.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
fast-glob: 3.3.1
get-tsconfig: 4.7.0
is-core-module: 2.13.0
@@ -11288,16 +11322,6 @@ snapshots:
- eslint-import-resolver-webpack
- supports-color
- dependencies:
- debug: 3.2.7
- optionalDependencies:
- '@typescript-eslint/parser': 6.7.2([email protected])([email protected])
- eslint: 8.49.0
- eslint-import-resolver-node: 0.3.9
- transitivePeerDependencies:
- - supports-color
-
dependencies:
debug: 3.2.7
@@ -11309,7 +11333,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
array-includes: 3.1.7
array.prototype.findlastindex: 1.2.3
@@ -11319,7 +11343,7 @@ snapshots:
doctrine: 2.1.0
eslint: 8.49.0
eslint-import-resolver-node: 0.3.9
has: 1.0.3
is-core-module: 2.13.0
is-glob: 4.0.3
@@ -11330,7 +11354,7 @@ snapshots:
semver: 6.3.1
tsconfig-paths: 3.14.2
optionalDependencies:
- '@typescript-eslint/parser': 6.7.2([email protected])([email protected])
+ '@typescript-eslint/parser': 6.7.2([email protected])([email protected])
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
@@ -13041,7 +13065,7 @@ snapshots:
dependencies:
'@types/debug': 4.1.8
- debug: 4.3.4
+ debug: 4.3.5
decode-named-character-reference: 1.0.2
micromark-core-commonmark: 1.1.0
micromark-factory-space: 1.1.0
@@ -14146,7 +14170,7 @@ snapshots:
dependencies:
- debug: 4.3.4
+ debug: 4.3.5
module-details-from-path: 1.0.3
resolve: 1.22.8
transitivePeerDependencies:
@@ -14795,6 +14819,11 @@ snapshots:
dependencies:
typescript: 5.1.6
+ dependencies:
+ typescript: 5.4.5
+ optional: true
+
dependencies:
typescript: 5.5.3
@@ -14879,7 +14908,7 @@ snapshots:
dependencies:
'@tufjs/models': 1.0.4
- debug: 4.3.4
+ debug: 4.3.5
make-fetch-happen: 11.1.1
transitivePeerDependencies:
- supports-color
@@ -14949,6 +14978,9 @@ snapshots:
+ optional: true
+
diff --git a/spec/envd/buf-js.gen.yaml b/spec/envd/buf-js.gen.yaml
new file mode 100644
index 000000000..397146cf8
--- /dev/null
+++ b/spec/envd/buf-js.gen.yaml
@@ -0,0 +1,16 @@
+# buf.gen.yaml defines a local generation template.
+# For details, see https://buf.build/docs/configuration/v1/buf-gen-yaml
+version: v1
+plugins:
+ - plugin: es
+ out: ../../packages/js-sdk/src/envd
+ opt:
+ - target=ts
+ - plugin: connect-es
+ out: ../../packages/js-sdk/src/envd
+ opt:
+ - target=ts
+
+managed:
+ enabled: true
+ optimize_for: SPEED
diff --git a/spec/envd/buf.gen.yaml b/spec/envd/buf-python.gen.yaml
similarity index 72%
rename from spec/envd/buf.gen.yaml
rename to spec/envd/buf-python.gen.yaml
index 028c1cd0c..6ee4cb61f 100644
--- a/spec/envd/buf.gen.yaml
+++ b/spec/envd/buf-python.gen.yaml
@@ -2,14 +2,6 @@
# For details, see https://buf.build/docs/configuration/v1/buf-gen-yaml
version: v1
plugins:
- - plugin: es
- out: ../../packages/js-sdk/src/envd
- opt:
- - target=ts
- - plugin: connect-es
- out: ../../packages/js-sdk/src/envd
- opt:
- - target=ts
- plugin: python
out: ../../packages/python-sdk/e2b/envd
opt: