Skip to content

armgit / E2B

Public Imported from GitHub
0

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

chore(js-sdk): rollup replace problematic json plugin (#129)

Pavel 'Strajk' Dolecek01e950741834
diff --git a/.changeset/breezy-singers-type.md b/.changeset/breezy-singers-type.md
new file mode 100644
index 000000000..98fab6472
--- /dev/null
+++ b/.changeset/breezy-singers-type.md
@@ -0,0 +1,5 @@
+---
+"@e2b/sdk": patch
+---
+
+Use rollup replace plugin instead of json plugin
diff --git a/package-lock.json b/package-lock.json
index c3b855431..de7fa4034 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,9 @@
"dependencies": {
"@changesets/cli": "^2.26.2",
"@changesets/read": "^0.5.9"
+ },
+ "devDependencies": {
+ "changeset": "^0.2.6"
}
},
"apps/dashboard": {
@@ -2114,18 +2117,6 @@
"sourcemap-codec": "^1.4.8"
}
},
- "node_modules/@rollup/plugin-json": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
- "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
- "dev": true,
- "dependencies": {
- "@rollup/pluginutils": "^3.0.8"
- },
- "peerDependencies": {
- "rollup": "^1.20.0 || ^2.0.0"
- }
- },
"node_modules/@rollup/plugin-node-resolve": {
"version": "14.1.0",
"resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-14.1.0.tgz",
@@ -2147,6 +2138,67 @@
"rollup": "^2.78.0"
}
},
+ "node_modules/@rollup/plugin-replace": {
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz",
+ "integrity": "sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==",
+ "dev": true,
+ "dependencies": {
+ "@rollup/pluginutils": "^5.0.1",
+ "magic-string": "^0.27.0"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "peerDependencies": {
+ "rollup": "^1.20.0||^2.0.0||^3.0.0"
+ },
+ "peerDependenciesMeta": {
+ "rollup": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@rollup/plugin-replace/node_modules/@rollup/pluginutils": {
+ "version": "5.0.4",
+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.4.tgz",
+ "integrity": "sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==",
+ "dev": true,
+ "dependencies": {
+ "@types/estree": "^1.0.0",
+ "estree-walker": "^2.0.2",
+ "picomatch": "^2.3.1"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "peerDependencies": {
+ "rollup": "^1.20.0||^2.0.0||^3.0.0"
+ },
+ "peerDependenciesMeta": {
+ "rollup": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@rollup/plugin-replace/node_modules/@types/estree": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+ "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+ "dev": true
+ },
+ "node_modules/@rollup/plugin-replace/node_modules/magic-string": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
+ "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/sourcemap-codec": "^1.4.13"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
"node_modules/@rollup/pluginutils": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
@@ -3751,6 +3803,16 @@
"url": "https://github.com/chalk/chalk?sponsor=1"
}
},
+ "node_modules/changeset": {
+ "version": "0.2.6",
+ "resolved": "https://registry.npmjs.org/changeset/-/changeset-0.2.6.tgz",
+ "integrity": "sha512-d21ym9zLPOKMVhIa8ulJo5IV3QR2NNdK6BWuwg48qJA0XSQaMeDjo1UGThcTn7YDmU08j3UpKyFNvb3zplk8mw==",
+ "dev": true,
+ "dependencies": {
+ "udc": "^1.0.0",
+ "underscore": "^1.8.3"
+ }
+ },
"node_modules/chardet": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
@@ -9273,6 +9335,12 @@
"node": ">=4.2.0"
}
},
+ "node_modules/udc": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/udc/-/udc-1.0.1.tgz",
+ "integrity": "sha512-jv+D9de1flsum5QkFtBdjyppCQAdz9kTck/0xST5Vx48T9LL2BYnw0Iw77dSKDQ9KZ/PS3qPO1vfXHDpLZlxcQ==",
+ "dev": true
+ },
"node_modules/ufo": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz",
@@ -9293,6 +9361,12 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/underscore": {
+ "version": "1.13.6",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+ "dev": true
+ },
"node_modules/undici": {
"version": "5.23.0",
"resolved": "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz",
@@ -10072,8 +10146,8 @@
"rpc-websocket-client": "^1.1.4"
},
"devDependencies": {
- "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^14.1.0",
+ "@rollup/plugin-replace": "^5.0.2",
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
"@types/node": "^18.7.23",
"@types/normalize-path": "^3.0.0",
@@ -11147,8 +11221,8 @@
"@e2b/sdk": {
"version": "file:packages/js-sdk",
"requires": {
- "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^14.1.0",
+ "@rollup/plugin-replace": "^5.0.2",
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
"@types/node": "^18.7.23",
"@types/normalize-path": "^3.0.0",
@@ -11635,15 +11709,6 @@
}
}
},
- "@rollup/plugin-json": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
- "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
- "dev": true,
- "requires": {
- "@rollup/pluginutils": "^3.0.8"
- }
- },
"@rollup/plugin-node-resolve": {
"version": "14.1.0",
"resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-14.1.0.tgz",
@@ -11658,6 +11723,44 @@
"resolve": "^1.19.0"
}
},
+ "@rollup/plugin-replace": {
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz",
+ "integrity": "sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==",
+ "dev": true,
+ "requires": {
+ "@rollup/pluginutils": "^5.0.1",
+ "magic-string": "^0.27.0"
+ },
+ "dependencies": {
+ "@rollup/pluginutils": {
+ "version": "5.0.4",
+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.4.tgz",
+ "integrity": "sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==",
+ "dev": true,
+ "requires": {
+ "@types/estree": "^1.0.0",
+ "estree-walker": "^2.0.2",
+ "picomatch": "^2.3.1"
+ }
+ },
+ "@types/estree": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+ "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+ "dev": true
+ },
+ "magic-string": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
+ "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/sourcemap-codec": "^1.4.13"
+ }
+ }
+ }
+ },
"@rollup/pluginutils": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
@@ -12723,6 +12826,16 @@
"supports-color": "^7.1.0"
}
},
+ "changeset": {
+ "version": "0.2.6",
+ "resolved": "https://registry.npmjs.org/changeset/-/changeset-0.2.6.tgz",
+ "integrity": "sha512-d21ym9zLPOKMVhIa8ulJo5IV3QR2NNdK6BWuwg48qJA0XSQaMeDjo1UGThcTn7YDmU08j3UpKyFNvb3zplk8mw==",
+ "dev": true,
+ "requires": {
+ "udc": "^1.0.0",
+ "underscore": "^1.8.3"
+ }
+ },
"chardet": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
@@ -16408,6 +16521,12 @@
"integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
"dev": true
},
+ "udc": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/udc/-/udc-1.0.1.tgz",
+ "integrity": "sha512-jv+D9de1flsum5QkFtBdjyppCQAdz9kTck/0xST5Vx48T9LL2BYnw0Iw77dSKDQ9KZ/PS3qPO1vfXHDpLZlxcQ==",
+ "dev": true
+ },
"ufo": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz",
@@ -16425,6 +16544,12 @@
"which-boxed-primitive": "^1.0.2"
}
},
+ "underscore": {
+ "version": "1.13.6",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+ "dev": true
+ },
"undici": {
"version": "5.23.0",
"resolved": "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz",
diff --git a/package.json b/package.json
index 2f9c7d72a..6dafdd199 100644
--- a/package.json
+++ b/package.json
@@ -13,5 +13,8 @@
"dependencies": {
"@changesets/cli": "^2.26.2",
"@changesets/read": "^0.5.9"
+ },
+ "devDependencies": {
+ "changeset": "^0.2.6"
}
}
diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.json
index ef4f705d4..514dea940 100644
--- a/packages/js-sdk/package.json
+++ b/packages/js-sdk/package.json
@@ -36,7 +36,7 @@
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^14.1.0",
- "@rollup/plugin-json": "^4.1.0",
+ "@rollup/plugin-replace": "^5.0.2",
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
"@types/node": "^18.7.23",
"@types/normalize-path": "^3.0.0",
diff --git a/packages/js-sdk/rollup.config.js b/packages/js-sdk/rollup.config.js
index d1bb07474..77d268046 100644
--- a/packages/js-sdk/rollup.config.js
+++ b/packages/js-sdk/rollup.config.js
@@ -1,5 +1,5 @@
-import json from '@rollup/plugin-json'
import nodeResolve from '@rollup/plugin-node-resolve'
+import replace from '@rollup/plugin-replace'
import autoExternal from 'rollup-plugin-auto-external'
import nodePolyfills from 'rollup-plugin-polyfill-node'
import typescript from 'rollup-plugin-typescript2'
@@ -40,6 +40,11 @@ export default {
preferBuiltins: true,
browser: true,
}),
- json(),
+ // Beware: Using @rollup/plugin-json caused wrong structure of dist directory
+ // It should be dist/cjs/*files* and with json plugin it's dist/cjs/src/*files*
+ // That's why we opted for using replace plugin instead of importing package.json with json plugin
+ replace({
+ __pkgVersion__: pkg.version,
+ }),
],
}
diff --git a/packages/js-sdk/src/api/index.ts b/packages/js-sdk/src/api/index.ts
index c0fd62ac9..7b91f6910 100644
--- a/packages/js-sdk/src/api/index.ts
+++ b/packages/js-sdk/src/api/index.ts
@@ -2,7 +2,6 @@ import 'cross-fetch/polyfill'
import { Fetcher } from 'openapi-typescript-fetch'
import platform from 'platform'
-import pjson from '../../package.json'
import { SESSION_DOMAIN } from '../constants'
import type { components, paths } from './schema.gen'
@@ -12,7 +11,7 @@ client.configure({
baseUrl: `https://${SESSION_DOMAIN}`,
init: {
headers: {
- package_version: pjson.version,
+ package_version: '__pkgVersion__',
lang: 'js',
engine: platform.name || 'unknown',
lang_version: platform.version || 'unknown',