From 7067ae0e8afe122ee64f5652c45d0288b74516a5 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Wed, 24 Jun 2020 12:24:34 -0700
Subject: [PATCH 1/2] fix(captp): stop creating dist bundles

This is the last code bundle we were making during `yarn build`, and it
caused problems in the contract-deploy step (different versions of
HandledPromise).

We still have a build step in `wallet-frontend` (which builds the React
browser app).
---
 packages/captp/package.json     | 13 ++++---------
 packages/captp/rollup.config.js | 24 ------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 packages/captp/rollup.config.js

diff --git a/packages/captp/package.json b/packages/captp/package.json
index f7be49ec30c..b13fa0a8682 100644
--- a/packages/captp/package.json
+++ b/packages/captp/package.json
@@ -10,23 +10,21 @@
   "author": "Michael FIG <michael@fig.org>",
   "homepage": "/~https://github.com/Agoric/agoric-sdk#readme",
   "license": "Apache-2.0",
-  "main": "dist/captp.cjs.js",
+  "main": "lib/captp.js",
   "module": "lib/captp.js",
-  "browser": "dist/captp.umd.js",
   "directories": {
     "lib": "lib",
     "test": "test"
   },
   "files": [
-    "lib",
-    "dist"
+    "lib"
   ],
   "repository": {
     "type": "git",
     "url": "git+/~https://github.com/Agoric/agoric-sdk.git"
   },
   "scripts": {
-    "build": "rollup -c",
+    "build": "exit 0",
     "test": "tape -r esm 'test/**/*.js'",
     "lint-fix": "eslint --fix '**/*.js'",
     "lint-check": "eslint '**/*.js'",
@@ -44,10 +42,7 @@
     "@agoric/marshal": "^0.2.2",
     "@agoric/nat": "^2.0.1",
     "@agoric/produce-promise": "^0.1.2",
-    "esm": "^3.2.5",
-    "rollup": "^1.24.0",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-node-resolve": "^5.2.0"
+    "esm": "^3.2.5"
   },
   "bugs": {
     "url": "/~https://github.com/Agoric/agoric-sdk/issues"
diff --git a/packages/captp/rollup.config.js b/packages/captp/rollup.config.js
deleted file mode 100644
index d561c72e99f..00000000000
--- a/packages/captp/rollup.config.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import resolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-
-export default [
-  {
-    input: 'lib/captp.js',
-    output: [
-      {
-        file: 'dist/captp.umd.js',
-        format: 'umd',
-        name: 'CapTP',
-      },
-      {
-        file: 'dist/captp.esm.js',
-        format: 'esm',
-      },
-      {
-        file: 'dist/captp.cjs.js',
-        format: 'cjs',
-      },
-    ],
-    plugins: [resolve(), commonjs({ include: 'node_modules/**' })],
-  },
-];

From aef47efaaea5dfb756852c489e1778c1c5c4d58f Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Wed, 24 Jun 2020 15:14:09 -0700
Subject: [PATCH 2/2] chore: update yarn.lock

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index e3e6ec4ba36..34e39780f72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12918,7 +12918,7 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@^1.16.6, rollup@^1.16.7, rollup@^1.2.2, rollup@^1.23.1, rollup@^1.24.0, rollup@^1.26.2:
+rollup@^1.16.6, rollup@^1.16.7, rollup@^1.2.2, rollup@^1.23.1, rollup@^1.26.2:
   version "1.27.5"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.5.tgz#d100fb0ffd8353575cb2057152547b9abfddfe59"
   integrity sha512-8rfVdzuTg2kt8ObD9LNJpEwUN7B6lsl3sHc5fddtgICpLjpYeSf4m2+RftBzcCaBTMi1iYX3Ez8zFT4Gj2nJjg==