Integrate SES 0.13, which no longer depends on Babel (merge #3244)

This is the first in a sequence of changes toward achieving Endo bundles #2684 with satisfactory performance endojs/endo#655. It was necessary to make breaking changes in SES and Compartment Mapper to decouple Babel, ejecting a separate package for the StaticModuleRecord constructor, and adding a semi-private API for third-party participation in the SES module system that the new records could plug into. Then, the package structure needed amendment to straddle Node.js ESM and the `node -r esm` emulation. This change updates the Agoric SDK dependencies to these new versions. Unfortunately, the previous coupling between SES and StaticModuleRecord hid the fact that the Babel dependency does not initialize properly under SES, so it becomes necessary to also pre-initialize Babel anywhere it’s actually used, anywhere we use `@agoric/bundle-source` in the same environment. This should have no user-facing consequences and the pre-initialization of Babel should be reverted when we have a version of StaticModuleRecord that can be initialized under SES. endojs/endo#768
Agoric · Jun 9, 2021 · 98dbf8a · 98dbf8a
2 parents e3d55e0 + 3de8d33
commit 98dbf8a
Show file tree

Hide file tree

Showing 57 changed files with 214 additions and 94 deletions.
diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
@@ -28,12 +28,13 @@
   },
   "devDependencies": {
     "@agoric/install-metering-and-ses": "^0.2.13",
-    "@agoric/ses-ava": "^0.1.1",
+    "@endo/ses-ava": "^0.2.1",
     "ava": "^3.12.1"
   },
   "dependencies": {
     "@agoric/assert": "^0.2.12",
     "@agoric/babel-parser": "^7.6.4",
+    "@agoric/babel-standalone": "^7.14.3",
     "@agoric/bundle-source": "^1.3.7",
     "@agoric/captp": "^1.7.13",
     "@agoric/eventual-send": "^0.13.14",
@@ -49,14 +50,14 @@
     "@agoric/tame-metering": "^1.3.9",
     "@agoric/transform-metering": "^1.4.12",
     "@agoric/xsnap": "^0.6.2",
-    "@endo/base64": "^0.1.0",
+    "@endo/base64": "^0.2.1",
     "@types/tmp": "^0.2.0",
     "anylogger": "^0.21.0",
     "esm": "agoric-labs/esm#Agoric-built",
     "node-lmdb": "^0.9.4",
     "re2": "^1.10.5",
     "semver": "^6.3.0",
-    "ses": "^0.12.7",
+    "ses": "^0.13.1",
     "tmp": "^0.2.1"
   },
   "files": [

diff --git a/packages/SwingSet/test/metering/test-dynamic-vat-metered.js b/packages/SwingSet/test/metering/test-dynamic-vat-metered.js
@@ -1,4 +1,7 @@
 /* global require */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-metering-and-ses';
 import bundleSource from '@agoric/bundle-source';
 import test from 'ava';

diff --git a/packages/SwingSet/test/metering/test-dynamic-vat-subcompartment.js b/packages/SwingSet/test/metering/test-dynamic-vat-subcompartment.js
@@ -1,4 +1,7 @@
 /* global require */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-metering-and-ses';
 import bundleSource from '@agoric/bundle-source';
 import test from 'ava';

diff --git a/packages/SwingSet/test/metering/test-dynamic-vat-unmetered.js b/packages/SwingSet/test/metering/test-dynamic-vat-unmetered.js
@@ -1,4 +1,7 @@
 /* global require */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-metering-and-ses';
 import bundleSource from '@agoric/bundle-source';
 import test from 'ava';

diff --git a/packages/SwingSet/test/metering/test-metering.js b/packages/SwingSet/test/metering/test-metering.js
@@ -1,6 +1,9 @@
 /* global require */
 // eslint-disable-next-line import/order
 import { replaceGlobalMeter } from './install-global-metering';
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import { assert, details as X } from '@agoric/assert';
 import bundleSource from '@agoric/bundle-source';

diff --git a/packages/SwingSet/test/vat-admin/terminate/test-terminate.js b/packages/SwingSet/test/vat-admin/terminate/test-terminate.js
@@ -1,4 +1,7 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import path from 'path';
 import test from 'ava';

diff --git a/packages/SwingSet/test/vat-admin/test-innerVat.js b/packages/SwingSet/test/vat-admin/test-innerVat.js
@@ -1,4 +1,7 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-metering-and-ses';
 import path from 'path';
 import test from 'ava';

diff --git a/packages/SwingSet/test/vat-admin/test-replay.js b/packages/SwingSet/test/vat-admin/test-replay.js
@@ -1,4 +1,7 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-metering-and-ses';
 import path from 'path';
 import test from 'ava';

diff --git a/packages/SwingSet/tools/install-ses-debug.js b/packages/SwingSet/tools/install-ses-debug.js
@@ -9,6 +9,9 @@
 
 import 'ses';
 import '@agoric/eventual-send/shim';
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 
 lockdown({
   // The default `{errorTaming: 'safe'}` setting, if possible, redacts the

diff --git a/packages/SwingSet/tools/prepare-test-env-ava.js b/packages/SwingSet/tools/prepare-test-env-ava.js
@@ -4,13 +4,17 @@
  * `test` function.
  */
 
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
+
 // eslint thinks these are extraneous dependencies because this file
 // is in the tools/ directory rather than the test/ directory.
 // TODO How do we tell eslint that tools/ is dev-only? Either
 // that, or should we just move tools/* into test/ ?
 //
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { wrapTest } from '@agoric/ses-ava';
+import { wrapTest } from '@endo/ses-ava';
 import './prepare-test-env';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import rawTest from 'ava';

diff --git a/packages/SwingSet/tools/prepare-test-env.js b/packages/SwingSet/tools/prepare-test-env.js
@@ -6,6 +6,10 @@
  * for virtual objects: makeKind, makeWeakStore
  */
 
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
+
 import './install-ses-debug';
 import { makeFakeVirtualObjectManager } from './fakeVirtualObjectManager';
 

diff --git a/packages/agoric-cli/lib/entrypoint.js b/packages/agoric-cli/lib/entrypoint.js
@@ -1,4 +1,7 @@
 /* global process */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 
 import path from 'path';

diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json
@@ -27,6 +27,7 @@
   "dependencies": {
     "@agoric/access-token": "^0.4.0",
     "@agoric/assert": "^0.2.12",
+    "@agoric/babel-standalone": "^7.14.3",
     "@agoric/bundle-source": "^1.3.7",
     "@agoric/captp": "^1.7.13",
     "@agoric/install-ses": "^0.5.13",

diff --git a/packages/agoric-cli/test/test-main.js b/packages/agoric-cli/test/test-main.js
@@ -1,6 +1,9 @@
 /* global globalThis */
-import test from 'ava';
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
+import test from 'ava';
 import fs from 'fs';
 import anylogger from 'anylogger';
 

diff --git a/packages/assert/package.json b/packages/assert/package.json
@@ -68,6 +68,6 @@
     "access": "public"
   },
   "dependencies": {
-    "ses": "^0.12.7"
+    "ses": "^0.13.1"
   }
 }
diff --git a/packages/bundle-source/package.json b/packages/bundle-source/package.json
@@ -20,17 +20,18 @@
     "ava": "^3.12.1"
   },
   "dependencies": {
-    "@agoric/compartment-mapper": "^0.2.4",
+    "@agoric/babel-standalone": "^7.14.3",
     "@babel/generator": "^7.14.2",
     "@babel/parser": "^7.14.2",
     "@babel/traverse": "^7.14.2",
-    "@endo/base64": "^0.1.0",
+    "@endo/base64": "^0.2.1",
+    "@endo/compartment-mapper": "^0.3.0",
     "@rollup/plugin-commonjs": "^19.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "acorn": "^8.2.4",
     "esm": "agoric-labs/esm#Agoric-built",
     "rollup": "^2.47.0",
-    "ses": "^0.12.6",
+    "ses": "^0.13.1",
     "source-map": "^0.7.3"
   },
   "keywords": [],

diff --git a/packages/bundle-source/src/index.js b/packages/bundle-source/src/index.js
@@ -7,7 +7,7 @@ import commonjs0 from '@rollup/plugin-commonjs';
 import * as babelParser from '@babel/parser';
 import babelGenerate from '@babel/generator';
 import babelTraverse from '@babel/traverse';
-import { makeArchive } from '@agoric/compartment-mapper';
+import { makeArchive } from '@endo/compartment-mapper/archive.js';
 import { encodeBase64 } from '@endo/base64';
 
 import { SourceMapConsumer } from 'source-map';

diff --git a/packages/bundle-source/test/sanity.js b/packages/bundle-source/test/sanity.js
@@ -3,7 +3,7 @@
 import 'ses';
 
 import { decodeBase64 } from '@endo/base64';
-import { parseArchive } from '@agoric/compartment-mapper';
+import { parseArchive } from '@endo/compartment-mapper/import-archive.js';
 import test from 'ava';
 import bundleSource from '..';
 

diff --git a/packages/bundle-source/test/test-bigint-transform.js b/packages/bundle-source/test/test-bigint-transform.js
@@ -1,4 +1,7 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import test from 'ava';
 import bundleSource from '..';

diff --git a/packages/bundle-source/test/test-circular.js b/packages/bundle-source/test/test-circular.js
@@ -1,4 +1,7 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import test from 'ava';
 import bundleSource from '..';

diff --git a/packages/bundle-source/test/test-comment.js b/packages/bundle-source/test/test-comment.js
@@ -1,8 +1,11 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import test from 'ava';
 import { decodeBase64 } from '@endo/base64';
-import { parseArchive } from '@agoric/compartment-mapper';
+import { parseArchive } from '@endo/compartment-mapper/import-archive.js';
 import bundleSource from '..';
 
 function evaluate(src, endowments) {

diff --git a/packages/bundle-source/test/test-explicit.js b/packages/bundle-source/test/test-explicit.js
@@ -1,4 +1,7 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import test from 'ava';
 import { rollup } from 'rollup';

diff --git a/packages/bundle-source/test/test-external-fs.js b/packages/bundle-source/test/test-external-fs.js
@@ -1,4 +1,7 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import test from 'ava';
 import bundleSource from '..';

diff --git a/packages/dapp-svelte-wallet/ui/package.json b/packages/dapp-svelte-wallet/ui/package.json
@@ -24,7 +24,7 @@
     "rollup-plugin-livereload": "^1.0.0",
     "rollup-plugin-svelte": "^5.0.3",
     "rollup-plugin-terser": "^6.1.0",
-    "ses": "^0.12.7",
+    "ses": "^0.13.1",
     "sirv-cli": "^1.0.0",
     "smelte": "^1.0.15",
     "svelte": "^3.0.0",

diff --git a/packages/dapp-svelte-wallet/ui/src/install-ses-lockdown.js b/packages/dapp-svelte-wallet/ui/src/install-ses-lockdown.js
@@ -1,4 +1,4 @@
-import 'ses/lockdown';
+import 'ses';
 import '@agoric/eventual-send/shim';
 
 lockdown();

diff --git a/packages/import-bundle/package.json b/packages/import-bundle/package.json
@@ -19,13 +19,15 @@
   },
   "dependencies": {
     "@agoric/assert": "^0.2.12",
-    "@agoric/compartment-mapper": "^0.2.3",
-    "@endo/base64": "^0.1.0"
+    "@endo/base64": "^0.2.1",
+    "@endo/compartment-mapper": "^0.3.0"
   },
   "devDependencies": {
+    "@agoric/babel-standalone": "^7.14.3",
     "@agoric/bundle-source": "^1.3.7",
     "@agoric/install-ses": "^0.5.13",
     "@agoric/swingset-vat": "^0.17.2",
+    "@endo/ses-ava": "^0.2.0",
     "ava": "^3.12.1",
     "esm": "agoric-labs/esm#Agoric-built"
   },

diff --git a/packages/import-bundle/src/index.js b/packages/import-bundle/src/index.js
@@ -1,4 +1,4 @@
-import { parseArchive } from '@agoric/compartment-mapper';
+import { parseArchive } from '@endo/compartment-mapper/import-archive.js';
 import { decodeBase64 } from '@endo/base64';
 import { assert, details as X } from '@agoric/assert';
 import { wrapInescapableCompartment } from './compartment-wrapper';

diff --git a/packages/import-bundle/test/test-import-bundle.js b/packages/import-bundle/test/test-import-bundle.js
@@ -1,8 +1,11 @@
 /* global require */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import { encodeBase64 } from '@endo/base64';
 import * as fs from 'fs';
-import { makeArchive } from '@agoric/compartment-mapper';
+import { makeArchive } from '@endo/compartment-mapper/archive.js';
 
 import bundleSource from '@agoric/bundle-source';
 import test from 'ava';

diff --git a/packages/install-ses/package.json b/packages/install-ses/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@agoric/eventual-send": "^0.13.14",
-    "ses": "^0.12.7"
+    "ses": "^0.13.1"
   },
   "files": [
     "src/**/*.js"

diff --git a/packages/notifier/src/notifier.js b/packages/notifier/src/notifier.js
@@ -93,6 +93,7 @@ export const makeNotifierKit = (...args) => {
         value: state,
         updateCount: currentUpdateCount,
       });
+      assert(currentResponse);
       nextPromiseKit.resolve(currentResponse);
       nextPromiseKit = makePromiseKit();
     },
@@ -109,6 +110,7 @@ export const makeNotifierKit = (...args) => {
         value: finalState,
         updateCount: currentUpdateCount,
       });
+      assert(currentResponse);
       nextPromiseKit.resolve(currentResponse);
       nextPromiseKit = undefined;
     },

diff --git a/packages/pegasus/package.json b/packages/pegasus/package.json
@@ -50,7 +50,7 @@
     "@agoric/install-ses": "^0.5.13",
     "ava": "^3.12.1",
     "esm": "agoric-labs/esm#Agoric-built",
-    "ses": "^0.12.7"
+    "ses": "^0.13.1"
   },
   "files": [
     "bundles/",

diff --git a/packages/solo/package.json b/packages/solo/package.json
@@ -54,6 +54,7 @@
     "ws": "^7.2.0"
   },
   "devDependencies": {
+    "@agoric/babel-standalone": "^7.14.3",
     "@agoric/bundle-source": "^1.3.7",
     "ava": "^3.12.1"
   },

diff --git a/packages/solo/src/entrypoint.cjs b/packages/solo/src/entrypoint.cjs
@@ -6,6 +6,10 @@ const esmRequire = require('esm')(module);
 // import node-lmdb early to work around SES incompatibility
 require('node-lmdb');
 
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+esmRequire('@agoric/babel-standalone');
+
 // we need to enable Math.random as a workaround for 'brace-expansion' module
 // (dep chain: temp->glob->minimatch->brace-expansion)
 esmRequire('@agoric/install-metering-and-ses');

diff --git a/packages/solo/test/test-home.js b/packages/solo/test/test-home.js
@@ -4,6 +4,9 @@
 // See https://github.com/endojs/endo/issues/647
 // TODO restore
 // import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/swingset-vat/tools/prepare-test-env';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';

diff --git a/packages/spawner/package.json b/packages/spawner/package.json
@@ -37,6 +37,7 @@
     "@agoric/marshal": "^0.4.11"
   },
   "devDependencies": {
+    "@agoric/babel-standalone": "^7.14.3",
     "@agoric/bundle-source": "^1.3.7",
     "@agoric/install-metering-and-ses": "^0.2.13",
     "@agoric/install-ses": "^0.5.13",

diff --git a/packages/spawner/test/swingsetTests/contractHost/test-contractHost.js b/packages/spawner/test/swingsetTests/contractHost/test-contractHost.js
@@ -1,4 +1,7 @@
 /* global __dirname */
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 import '@agoric/install-metering-and-ses';
 import test from 'ava';
 import path from 'path';

diff --git a/packages/swingset-runner/bin/runner b/packages/swingset-runner/bin/runner
@@ -7,8 +7,12 @@
  * as yet not-entirely-ESM-supporting version of NodeJS.
  */
 
-// LMDB bindings need to be imported before lockdown.
+// Initialize trasitive dependencies that run afoul of the property override
+// after SES lockdown hazard.
 import 'node-lmdb';
+// TODO Remove babel-standalone preinitialization
+// https://github.com/endojs/endo/issues/768
+import '@agoric/babel-standalone';
 
 // Now do lockdown.
 import '../src/install-optional-metering-and-ses';