Merge pull request #4758 from Agoric/endo-768

refactor: Relieve dependency on babel-standalone
Agoric · Mar 9, 2022 · a10d1b3 · a10d1b3
2 parents 8f97b34 + 24c123b
commit a10d1b3
Show file tree

Hide file tree

Showing 47 changed files with 242 additions and 293 deletions.
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "packages/wallet/ui"
   ],
   "devDependencies": {
-    "@endo/eslint-config": "^0.4.5",
+    "@endo/eslint-config": "^0.4.6",
     "@jessie.js/eslint-plugin": "^0.1.3",
     "@types/node": "^16.7.10",
     "@typescript-eslint/parser": "^5.10.2",

diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json
@@ -41,12 +41,12 @@
     "@agoric/nat": "^4.1.0",
     "@agoric/notifier": "^0.3.35",
     "@agoric/store": "^0.6.10",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36"
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37"
   },
   "devDependencies": {
     "@agoric/swingset-vat": "^0.25.1",
-    "@endo/bundle-source": "^2.1.0",
+    "@endo/bundle-source": "^2.1.1",
     "ava": "^3.12.1",
     "fast-check": "^2.21.0"
   },

diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
@@ -21,8 +21,8 @@
     "lint:eslint": "eslint '**/*.js'"
   },
   "devDependencies": {
-    "@endo/compartment-mapper": "^0.7.0",
-    "@endo/ses-ava": "^0.2.20",
+    "@endo/compartment-mapper": "^0.7.1",
+    "@endo/ses-ava": "^0.2.21",
     "@types/tmp": "^0.2.0",
     "ava": "^3.12.1",
     "tmp": "^0.2.1"
@@ -35,14 +35,14 @@
     "@agoric/store": "^0.6.10",
     "@agoric/swing-store": "^0.6.5",
     "@agoric/xsnap": "^0.11.2",
-    "@endo/base64": "^0.2.20",
-    "@endo/bundle-source": "^2.1.0",
-    "@endo/captp": "^2.0.2",
-    "@endo/import-bundle": "^0.2.40",
-    "@endo/init": "^0.5.36",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36",
-    "@endo/zip": "^0.2.20",
+    "@endo/base64": "^0.2.21",
+    "@endo/bundle-source": "^2.1.1",
+    "@endo/captp": "^2.0.3",
+    "@endo/import-bundle": "^0.2.41",
+    "@endo/init": "^0.5.37",
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37",
+    "@endo/zip": "^0.2.21",
     "anylogger": "^0.21.0",
     "import-meta-resolve": "^1.1.1",
     "node-lmdb": "^0.9.5",

diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json
@@ -30,11 +30,11 @@
     "@agoric/access-token": "^0.4.17",
     "@agoric/assert": "^0.3.16",
     "@agoric/nat": "^4.1.0",
-    "@endo/bundle-source": "^2.1.0",
-    "@endo/captp": "^2.0.2",
-    "@endo/compartment-mapper": "^0.7.0",
-    "@endo/init": "^0.5.36",
-    "@endo/promise-kit": "^0.2.36",
+    "@endo/bundle-source": "^2.1.1",
+    "@endo/captp": "^2.0.3",
+    "@endo/compartment-mapper": "^0.7.1",
+    "@endo/init": "^0.5.37",
+    "@endo/promise-kit": "^0.2.37",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^2.4.2",

diff --git a/packages/agoric-cli/src/entrypoint.js b/packages/agoric-cli/src/entrypoint.js
@@ -2,9 +2,7 @@
 
 /* global process */
 
-import '@endo/init/pre-bundle-source.js';
-// TODO Remove esm preinitialization
-// https://github.com/endojs/endo/issues/768
+import '@endo/init/pre.js';
 import 'esm';
 import '@endo/init';
 

diff --git a/packages/agoric-cli/test/test-main.js b/packages/agoric-cli/test/test-main.js
@@ -1,7 +1,5 @@
 /* global globalThis */
-// TODO Remove esm preinitialization
-// https://github.com/endojs/endo/issues/768
-import '@endo/init/pre-bundle-source.js';
+import '@endo/init/pre.js';
 import 'esm';
 import '@endo/init';
 import test from 'ava';

diff --git a/packages/cosmic-swingset/package.json b/packages/cosmic-swingset/package.json
@@ -31,9 +31,9 @@
     "@agoric/telemetry": "^0.1.1",
     "@agoric/vats": "^0.7.0",
     "@agoric/xsnap": "^0.11.2",
-    "@endo/import-bundle": "^0.2.40",
-    "@endo/init": "^0.5.36",
-    "@endo/marshal": "^0.6.2",
+    "@endo/import-bundle": "^0.2.41",
+    "@endo/init": "^0.5.37",
+    "@endo/marshal": "^0.6.3",
     "@iarna/toml": "^2.2.3",
     "@opentelemetry/sdk-metrics-base": "^0.27.0",
     "agoric": "^0.14.1",

diff --git a/packages/deploy-script-support/package.json b/packages/deploy-script-support/package.json
@@ -43,9 +43,9 @@
     "@agoric/store": "^0.6.10",
     "@agoric/vats": "^0.7.0",
     "@agoric/zoe": "^0.21.3",
-    "@endo/bundle-source": "^2.1.0",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36"
+    "@endo/bundle-source": "^2.1.1",
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37"
   },
   "devDependencies": {
     "@agoric/swingset-vat": "^0.25.1",

diff --git a/packages/deployment/package.json b/packages/deployment/package.json
@@ -20,8 +20,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@agoric/assert": "^0.3.16",
-    "@endo/init": "^0.5.36",
-    "@endo/marshal": "^0.6.2",
+    "@endo/init": "^0.5.37",
+    "@endo/marshal": "^0.6.3",
     "chalk": "^2.4.2",
     "deterministic-json": "^1.0.5",
     "inquirer": "^6.3.1",

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -25,7 +25,7 @@
     "eslint-config.json"
   ],
   "devDependencies": {
-    "@endo/eslint-config": "^0.4.5",
+    "@endo/eslint-config": "^0.4.6",
     "@jessie.js/eslint-plugin": "^0.1.3",
     "@typescript-eslint/parser": "^5.10.2",
     "eslint": "^7.23.0",

diff --git a/packages/eventual-send/package.json b/packages/eventual-send/package.json
@@ -26,8 +26,8 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "devDependencies": {
-    "@endo/lockdown": "^0.1.8",
-    "@endo/ses-ava": "^0.2.20",
+    "@endo/lockdown": "^0.1.9",
+    "@endo/ses-ava": "^0.2.21",
     "ava": "^3.12.1",
     "c8": "^7.7.2"
   },

diff --git a/packages/governance/package.json b/packages/governance/package.json
@@ -35,19 +35,18 @@
     "@agoric/notifier": "^0.3.35",
     "@agoric/store": "^0.6.10",
     "@agoric/zoe": "^0.21.3",
-    "@endo/captp": "^2.0.2",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36"
+    "@endo/captp": "^2.0.3",
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37"
   },
   "devDependencies": {
-    "@agoric/babel-standalone": "^7.14.3",
     "@agoric/swingset-vat": "^0.25.1",
-    "@endo/bundle-source": "^2.1.0",
-    "@endo/init": "^0.5.36",
+    "@endo/bundle-source": "^2.1.1",
+    "@endo/init": "^0.5.37",
     "ava": "^3.12.1",
     "c8": "^7.7.2",
     "import-meta-resolve": "^1.1.1",
-    "ses": "^0.15.10"
+    "ses": "^0.15.11"
   },
   "files": [
     "README.md",

diff --git a/packages/governance/test/swingsetTests/committeeBinary/test-committee.js b/packages/governance/test/swingsetTests/committeeBinary/test-committee.js
@@ -1,9 +1,5 @@
 // @ts-check
 
-// TODO Remove babel-standalone preinitialization
-// https://github.com/endojs/endo/issues/768
-// eslint-disable-next-line import/no-extraneous-dependencies
-import '@agoric/babel-standalone';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init';
 // eslint-disable-next-line import/no-extraneous-dependencies

diff --git a/packages/governance/test/swingsetTests/contractGovernor/test-governor.js b/packages/governance/test/swingsetTests/contractGovernor/test-governor.js
@@ -1,10 +1,5 @@
 // @ts-check
 
-// TODO Remove babel-standalone preinitialization
-// https://github.com/endojs/endo/issues/768
-// eslint-disable-next-line import/no-extraneous-dependencies
-import '@agoric/babel-standalone';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';

diff --git a/packages/notifier/package.json b/packages/notifier/package.json
@@ -33,12 +33,12 @@
   "dependencies": {
     "@agoric/assert": "^0.3.16",
     "@agoric/eventual-send": "^0.14.1",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36"
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37"
   },
   "devDependencies": {
-    "@endo/init": "^0.5.36",
-    "@endo/ses-ava": "^0.2.20",
+    "@endo/init": "^0.5.37",
+    "@endo/ses-ava": "^0.2.21",
     "ava": "^3.12.1",
     "c8": "^7.7.2"
   },

diff --git a/packages/pegasus/package.json b/packages/pegasus/package.json
@@ -38,11 +38,11 @@
     "@agoric/swingset-vat": "^0.25.1",
     "@agoric/vats": "^0.7.0",
     "@agoric/zoe": "^0.21.3",
-    "@endo/bundle-source": "^2.1.0",
-    "@endo/captp": "^2.0.2",
-    "@endo/init": "^0.5.36",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36"
+    "@endo/bundle-source": "^2.1.1",
+    "@endo/captp": "^2.0.3",
+    "@endo/init": "^0.5.37",
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37"
   },
   "devDependencies": {
     "ava": "^3.12.1",

diff --git a/packages/run-protocol/package.json b/packages/run-protocol/package.json
@@ -39,15 +39,14 @@
     "@agoric/swingset-vat": "^0.25.1",
     "@agoric/vats": "^0.7.0",
     "@agoric/zoe": "^0.21.3",
-    "@endo/bundle-source": "^2.1.0",
-    "@endo/captp": "^2.0.2",
-    "@endo/far": "^0.1.8",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36"
+    "@endo/bundle-source": "^2.1.1",
+    "@endo/captp": "^2.0.3",
+    "@endo/far": "^0.1.9",
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37"
   },
   "devDependencies": {
-    "@agoric/babel-standalone": "^7.14.3",
-    "@endo/init": "^0.5.36",
+    "@endo/init": "^0.5.37",
     "ava": "^3.12.1",
     "c8": "^7.7.2",
     "fast-check": "^2.21.0",

diff --git a/packages/run-protocol/test/swingsetTests/governance/test-governance.js b/packages/run-protocol/test/swingsetTests/governance/test-governance.js
@@ -1,8 +1,5 @@
 // @ts-check
 
-// TODO Remove babel-standalone preinitialization
-// https://github.com/endojs/endo/issues/768
-import '@agoric/babel-standalone';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init';
 // eslint-disable-next-line import/no-extraneous-dependencies

diff --git a/packages/run-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js b/packages/run-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js
@@ -1,8 +1,5 @@
 // @ts-check
 
-// TODO Remove babel-standalone preinitialization
-// https://github.com/endojs/endo/issues/768
-import '@agoric/babel-standalone';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init';
 // eslint-disable-next-line import/no-extraneous-dependencies

diff --git a/packages/same-structure/package.json b/packages/same-structure/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "@agoric/assert": "^0.3.16",
     "@agoric/store": "^0.6.10",
-    "@endo/marshal": "^0.6.2"
+    "@endo/marshal": "^0.6.3"
   },
   "devDependencies": {
     "ava": "^3.12.1"

diff --git a/packages/sharing-service/package.json b/packages/sharing-service/package.json
@@ -28,7 +28,7 @@
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
     "@agoric/assert": "^0.3.16",
-    "@endo/marshal": "^0.6.2"
+    "@endo/marshal": "^0.6.3"
   },
   "devDependencies": {
     "@agoric/eventual-send": "^0.14.1",

diff --git a/packages/solo/package.json b/packages/solo/package.json
@@ -35,11 +35,11 @@
     "@agoric/vats": "^0.7.0",
     "@agoric/wallet": "^0.11.9",
     "@agoric/xsnap": "^0.11.2",
-    "@endo/captp": "^2.0.2",
-    "@endo/import-bundle": "^0.2.40",
-    "@endo/init": "^0.5.36",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36",
+    "@endo/captp": "^2.0.3",
+    "@endo/import-bundle": "^0.2.41",
+    "@endo/init": "^0.5.37",
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37",
     "agoric": "^0.14.1",
     "anylogger": "^0.21.0",
     "deterministic-json": "^1.0.5",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@agoric/ertp": "^0.13.3",
-    "@endo/bundle-source": "^2.1.0",
+    "@endo/bundle-source": "^2.1.1",
     "ava": "^3.12.1",
     "c8": "^7.7.2"
   },

diff --git a/packages/spawner/package.json b/packages/spawner/package.json
@@ -32,13 +32,13 @@
   "dependencies": {
     "@agoric/assert": "^0.3.16",
     "@agoric/eventual-send": "^0.14.1",
-    "@endo/import-bundle": "^0.2.40",
-    "@endo/marshal": "^0.6.2"
+    "@endo/import-bundle": "^0.2.41",
+    "@endo/marshal": "^0.6.3"
   },
   "devDependencies": {
     "@agoric/swingset-vat": "^0.25.1",
-    "@endo/bundle-source": "^2.1.0",
-    "@endo/init": "^0.5.36",
+    "@endo/bundle-source": "^2.1.1",
+    "@endo/init": "^0.5.37",
     "ava": "^3.12.1",
     "c8": "^7.7.2"
   },

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -32,8 +32,8 @@
   "dependencies": {
     "@agoric/assert": "^0.3.16",
     "@agoric/eventual-send": "^0.14.1",
-    "@endo/marshal": "^0.6.2",
-    "@endo/promise-kit": "^0.2.36"
+    "@endo/marshal": "^0.6.3",
+    "@endo/promise-kit": "^0.2.37"
   },
   "devDependencies": {
     "@agoric/swingset-vat": "^0.25.1",

diff --git a/packages/swing-store/package.json b/packages/swing-store/package.json
@@ -24,7 +24,7 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@endo/init": "^0.5.36",
+    "@endo/init": "^0.5.37",
     "ava": "^3.12.1",
     "c8": "^7.7.2"
   },

diff --git a/packages/swingset-runner/package.json b/packages/swingset-runner/package.json
@@ -27,9 +27,9 @@
     "@agoric/swing-store": "^0.6.5",
     "@agoric/swingset-vat": "^0.25.1",
     "@agoric/zoe": "^0.21.3",
-    "@endo/bundle-source": "^2.1.0",
-    "@endo/init": "^0.5.36",
-    "@endo/marshal": "^0.6.2",
+    "@endo/bundle-source": "^2.1.1",
+    "@endo/init": "^0.5.37",
+    "@endo/marshal": "^0.6.3",
     "expose-gc": "^1.0.0",
     "n-readlines": "^1.0.1",
     "node-lmdb": "^0.9.5",

diff --git a/packages/swingset-runner/src/runner-debug-entrypoint.js b/packages/swingset-runner/src/runner-debug-entrypoint.js
@@ -5,9 +5,7 @@
  * as yet not-entirely-ESM-supporting version of NodeJS.
  */
 
-// TODO Remove babel-standalone preinitialization
-// https://github.com/endojs/endo/issues/768
-import '@endo/init/pre-bundle-source.js';
+import '@endo/init/pre.js';
 
 // Initialize trasitive dependencies that run afoul of the property override
 // after SES lockdown hazard.

diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
@@ -23,7 +23,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@agoric/store": "^0.6.10",
-    "@endo/init": "^0.5.36",
+    "@endo/init": "^0.5.37",
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/exporter-prometheus": "^0.27.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.27.0",
@@ -37,8 +37,8 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@endo/lockdown": "^0.1.8",
-    "@endo/ses-ava": "^0.2.20",
+    "@endo/lockdown": "^0.1.9",
+    "@endo/ses-ava": "^0.2.21",
     "ava": "^3.12.1",
     "c8": "^7.7.2",
     "tmp": "^0.2.1"