fix: remove references to @agoric/babel-parser

michaelfig · michaelfig · commit e4b1e2b4bb13 · 2021-05-13T14:33:26.000-06:00
diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml
@@ -155,10 +155,6 @@ jobs:
     # the top level.
     #- name: yarn test (everything)
     #  run: yarn test
-    - name: yarn test (acorn-eventual-send)
-      run: cd packages/acorn-eventual-send && yarn test
-      env:
-        ESM_DISABLE_CACHE: true
     - name: yarn test (agoric-cli)
       run: cd packages/agoric-cli && yarn test
       env:
@@ -303,10 +299,6 @@ jobs:
       run: cd packages/tame-metering && yarn test
       env:
         ESM_DISABLE_CACHE: true
-    - name: yarn test (transform-eventual-send)
-      run: cd packages/transform-eventual-send && yarn test
-      env:
-        ESM_DISABLE_CACHE: true
     - name: yarn test (transform-metering)
       run: cd packages/transform-metering && yarn test
       env:
diff --git a/package.json b/package.json
@@ -12,12 +12,10 @@
     "packages/import-manager",
     "packages/sparse-ints",
     "packages/store",
-    "packages/acorn-eventual-send",
     "packages/bundle-source",
     "packages/import-bundle",
     "packages/eventual-send",
     "packages/promise-kit",
-    "packages/transform-eventual-send",
     "packages/tame-metering",
     "packages/transform-metering",
     "packages/install-metering-and-ses",
diff --git a/packages/SwingSet/src/kernel/liveSlots.js b/packages/SwingSet/src/kernel/liveSlots.js
@@ -792,9 +792,6 @@ function build(
     syscall.dropImports([slot]);
   }
 
-  // vats which use D are in: acorn-eventual-send, cosmic-swingset
-  // (bootstrap, bridge, vat-http), swingset
-
   const vatGlobals = harden({
     makeWeakStore,
     makeKind,
@@ -804,6 +801,7 @@ function build(
     assert(!didRoot);
     didRoot = true;
 
+    // vats which use D are: (bootstrap, bridge, vat-http), swingset
     const vpow = {
       D,
       exitVat,
diff --git a/packages/bundle-source/package.json b/packages/bundle-source/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@agoric/acorn-eventual-send": "^2.1.9",
-    "@agoric/babel-parser": "^7.6.4",
+    "@babel/parser": "^7.6.4",
     "@agoric/compartment-mapper": "^0.2.4",
     "@babel/generator": "^7.6.4",
     "@babel/traverse": "^7.8.3",
diff --git a/packages/bundle-source/src/index.js b/packages/bundle-source/src/index.js
@@ -4,7 +4,7 @@ import { rollup as rollup0 } from 'rollup';
 import path from 'path';
 import resolve0 from '@rollup/plugin-node-resolve';
 import commonjs0 from '@rollup/plugin-commonjs';
-import * as babelParser from '@agoric/babel-parser';
+import * as babelParser from '@babel/parser';
 import babelGenerate from '@babel/generator';
 import babelTraverse from '@babel/traverse';
 import { makeArchive } from '@agoric/compartment-mapper';
diff --git a/packages/dapp-svelte-wallet/package.json b/packages/dapp-svelte-wallet/package.json
@@ -24,7 +24,6 @@
     "build": "exit 0"
   },
   "dependencies": {
-    "@agoric/babel-parser": "^7.6.4",
     "agoric": "^0.13.2",
     "babel-eslint": "^10.0.3",
     "eslint-plugin-eslint-comments": "^3.1.2"
diff --git a/packages/transform-metering/package.json b/packages/transform-metering/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@agoric/nat": "^4.0.0",
     "@agoric/tame-metering": "^1.3.9",
-    "@agoric/babel-parser": "^7.6.4",
+    "@babel/parser": "^7.6.4",
     "@babel/types": "^7.6.0",
     "@babel/generator": "^7.6.0",
     "@babel/traverse": "^7.6.0",
diff --git a/packages/transform-metering/src/pure-babel-core.js b/packages/transform-metering/src/pure-babel-core.js
@@ -1,9 +1,10 @@
-import * as babelParser from '@agoric/babel-parser';
+import * as babelParser from '@babel/parser';
 import traverse, { NodePath } from '@babel/traverse';
 import generator from '@babel/generator';
 import * as types from '@babel/types';
 
 // Create a file structure to wire into @babel/traverse.
+// Gleaned from @babel/core/lib/transformation/file/file.js
 export function makePureFile({ code, ast }) {
   const file = {
     ast,
@@ -34,6 +35,7 @@ export function makePureFile({ code, ast }) {
 
 /**
  * Create a working subset of babelCore that doesn't touch the filesystem.
+ * Gleaned from @babel/core/lib/transformation/index.js
  */
 export function makePureBabelCore() {
   return {
diff --git a/packages/vats/package.json b/packages/vats/package.json
@@ -40,7 +40,6 @@
     "@agoric/sparse-ints": "^0.1.9",
     "@agoric/store": "^0.4.14",
     "@agoric/swingset-vat": "^0.17.2",
-    "@agoric/transform-eventual-send": "^1.4.9",
     "@agoric/treasury": "^0.4.2",
     "@agoric/zoe": "^0.15.7",
     "@babel/generator": "^7.6.4",
diff --git a/packages/vats/src/repl.js b/packages/vats/src/repl.js
@@ -121,11 +121,7 @@ function dump0(value, spaces, inProgress, depth) {
   }
 }
 
-export function getReplHandler(replObjects, send, vatPowers) {
-  // transformTildot is baked into the Compartment we use to evaluate REPL
-  // inputs. We provide getInterfaceOf and Remotable to REPL input code., but
-  // import them from @agoric/marshal directly
-  const { transformTildot } = vatPowers;
+export function getReplHandler(replObjects, send) {
   let highestHistory = -1;
   const commands = {
     [highestHistory]: '',
@@ -207,15 +203,7 @@ export function getReplHandler(replObjects, send, vatPowers) {
     agent: agentMakers, // TODO: Remove
     ...replObjects,
   };
-  const modules = {};
-  const transforms = [];
-  if (typeof transformTildot === 'function') {
-    transforms.push(transformTildot);
-  } else {
-    console.log(`REPL was not given working transformTildot, disabled`);
-  }
-  const options = { transforms };
-  const c = new Compartment(endowments, modules, options);
+  const c = new Compartment(endowments);
 
   const handler = {
     getHighestHistory() {
diff --git a/packages/vats/test/test-repl.js b/packages/vats/test/test-repl.js
@@ -1,17 +1,12 @@
 import '@agoric/install-ses';
-import { makeTransform } from '@agoric/transform-eventual-send';
-import * as babelParser from '@agoric/babel-parser';
-import babelGenerate from '@babel/generator';
 import test from 'ava';
 import { getReplHandler } from '../src/repl';
 
 function make() {
   const homeObjects = { base: 1, fries: 2, cooking: 3 };
   const sentMessages = [];
   const send = m => sentMessages.push(m);
-  const transformTildot = makeTransform(babelParser, babelGenerate);
-  const vatPowers = { transformTildot };
-  const rh = getReplHandler({ home: homeObjects }, send, vatPowers);
+  const rh = getReplHandler({ home: homeObjects }, send);
 
   const ch = rh.getCommandHandler();
   function getHighestHistory() {
@@ -173,7 +168,7 @@ test('repl: sloppyGlobals, home, endowments', async t => {
   t.deepEqual(sentMessages, []);
 });
 
-test('repl: tildot', async t => {
+test('repl: eventual send', async t => {
   const { doEval, sentMessages } = make();
 
   let m = sentMessages.shift();
@@ -191,11 +186,11 @@ test('repl: tildot', async t => {
   t.is(m.display, '{"foo":[Function foo]}');
   t.deepEqual(sentMessages, []);
 
-  t.deepEqual(doEval(1, 'target~.foo(2)'), {});
+  t.deepEqual(doEval(1, 'E(target).foo(2)'), {});
   m = sentMessages.shift();
   t.is(m.type, 'updateHistory');
   t.is(m.histnum, 1);
-  t.is(m.display, 'working on eval(target~.foo(2))');
+  t.is(m.display, 'working on eval(E(target).foo(2))');
 
   m = sentMessages.shift();
   t.is(m.type, 'updateHistory');
diff --git a/yarn.lock b/yarn.lock
@@ -149,27 +149,6 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/core@^7.5.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941"
-  integrity sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.3"
-    "@babel/helpers" "^7.8.3"
-    "@babel/parser" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
 "@babel/core@^7.7.5":
   version "7.11.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
@@ -219,6 +198,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.14.2", "@babel/generator@^7.6.0":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.2.tgz#d5773e8b557d421fd6ce0d5efa5fd7fc22567c30"
+  integrity sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==
+  dependencies:
+    "@babel/types" "^7.14.2"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.5.0", "@babel/generator@^7.6.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
@@ -308,6 +296,15 @@
     "@babel/template" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/helper-function-name@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
+  integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.14.2"
+
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
@@ -503,6 +500,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
   integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
 
+"@babel/helper-validator-identifier@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
+  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
+
 "@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.17":
   version "7.12.17"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
@@ -536,15 +538,6 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
-"@babel/helpers@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.3.tgz#382fbb0382ce7c4ce905945ab9641d688336ce85"
-  integrity sha512-LmU3q9Pah/XyZU89QvBgGt+BCsTPoQa+73RxAQh8fb8qkDyIfeQnmgs+hvzhTCKTzqOyk7JTkS3MS1S8Mq5yrQ==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
 "@babel/highlight@^7.0.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
@@ -596,6 +589,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
   integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
 
+"@babel/parser@^7.14.2", "@babel/parser@^7.6.4":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.2.tgz#0c1680aa44ad4605b16cbdcc5c341a61bde9c746"
+  integrity sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==
+
 "@babel/parser@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081"
@@ -1375,6 +1373,20 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
+"@babel/traverse@^7.6.0":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
+  integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.14.2"
+    "@babel/helper-function-name" "^7.14.2"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.14.2"
+    "@babel/types" "^7.14.2"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/traverse@^7.7.0":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
@@ -1432,6 +1444,14 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.14.2", "@babel/types@^7.6.0":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3"
+  integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
@@ -7961,13 +7981,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
-  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
-  dependencies:
-    minimist "^1.2.0"
-
 json5@^2.1.2, json5@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
