From e668d3c9106ef6c47c66319afb8d954094b128eb Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Fri, 28 Feb 2020 17:48:32 -0800 Subject: [PATCH] fix(bundle): use the same HandledPromise Refs #606 Fixes TypeError: o["install"] is not a function --- packages/cosmic-swingset/lib/ag-solo/bundle.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/cosmic-swingset/lib/ag-solo/bundle.js b/packages/cosmic-swingset/lib/ag-solo/bundle.js index 4772130b3de..dae45a61a56 100644 --- a/packages/cosmic-swingset/lib/ag-solo/bundle.js +++ b/packages/cosmic-swingset/lib/ag-solo/bundle.js @@ -1,9 +1,9 @@ /* eslint-disable no-await-in-loop */ import parseArgs from 'minimist'; import WebSocket from 'ws'; -import { E } from '@agoric/eventual-send'; +import { E, HandledPromise } from '@agoric/eventual-send'; import { evaluateProgram } from '@agoric/evaluate'; -import { makeCapTP } from '@agoric/captp'; +import { makeCapTP } from '@agoric/captp/lib/captp'; import fs from 'fs'; import path from 'path'; @@ -135,7 +135,10 @@ export default async function bundle(insistIsBasedir, args) { for (const bundled of bundles) { const actualSources = `(${bundled.main.source}\n)\n${bundled.main.sourceMap}`; // console.log(actualSources); - const mainNS = evaluateProgram(actualSources, { require })(); + const mainNS = evaluateProgram(actualSources, { + require, + HandledPromise, + })(); const main = mainNS.default; if (typeof main !== 'function') { console.error(`Bundle main does not have an export default function`);