agoric 0.21.2-dev-7b582c1.0 → 0.21.2-dev-987bcf1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-7b582c1.0+7b582c1",
+  "version": "0.21.2-dev-987bcf1.0+987bcf1",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -30,28 +30,28 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-7b582c1.0+7b582c1",
-    "@agoric/deploy-script-support": "0.10.4-dev-7b582c1.0+7b582c1",
+    "@agoric/cosmic-swingset": "0.41.4-dev-987bcf1.0+987bcf1",
+    "@agoric/deploy-script-support": "0.10.4-dev-987bcf1.0+987bcf1",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-7b582c1.0+7b582c1",
-    "@agoric/cache": "0.3.3-dev-7b582c1.0+7b582c1",
-    "@agoric/casting": "0.4.3-dev-7b582c1.0+7b582c1",
-    "@agoric/client-utils": "0.1.1-dev-7b582c1.0+7b582c1",
-    "@agoric/cosmic-proto": "0.4.1-dev-7b582c1.0+7b582c1",
-    "@agoric/ertp": "0.16.3-dev-7b582c1.0+7b582c1",
-    "@agoric/governance": "0.10.4-dev-7b582c1.0+7b582c1",
-    "@agoric/inter-protocol": "0.16.2-dev-7b582c1.0+7b582c1",
-    "@agoric/internal": "0.3.3-dev-7b582c1.0+7b582c1",
-    "@agoric/network": "0.1.1-dev-7b582c1.0+7b582c1",
-    "@agoric/smart-wallet": "0.5.4-dev-7b582c1.0+7b582c1",
-    "@agoric/store": "0.9.3-dev-7b582c1.0+7b582c1",
-    "@agoric/swingset-vat": "0.32.3-dev-7b582c1.0+7b582c1",
-    "@agoric/vats": "0.15.2-dev-7b582c1.0+7b582c1",
-    "@agoric/zoe": "0.26.3-dev-7b582c1.0+7b582c1",
-    "@agoric/zone": "0.2.3-dev-7b582c1.0+7b582c1",
+    "@agoric/access-token": "0.4.22-dev-987bcf1.0+987bcf1",
+    "@agoric/cache": "0.3.3-dev-987bcf1.0+987bcf1",
+    "@agoric/casting": "0.4.3-dev-987bcf1.0+987bcf1",
+    "@agoric/client-utils": "0.1.1-dev-987bcf1.0+987bcf1",
+    "@agoric/cosmic-proto": "0.4.1-dev-987bcf1.0+987bcf1",
+    "@agoric/ertp": "0.16.3-dev-987bcf1.0+987bcf1",
+    "@agoric/governance": "0.10.4-dev-987bcf1.0+987bcf1",
+    "@agoric/inter-protocol": "0.16.2-dev-987bcf1.0+987bcf1",
+    "@agoric/internal": "0.3.3-dev-987bcf1.0+987bcf1",
+    "@agoric/network": "0.1.1-dev-987bcf1.0+987bcf1",
+    "@agoric/smart-wallet": "0.5.4-dev-987bcf1.0+987bcf1",
+    "@agoric/store": "0.9.3-dev-987bcf1.0+987bcf1",
+    "@agoric/swingset-vat": "0.32.3-dev-987bcf1.0+987bcf1",
+    "@agoric/vats": "0.15.2-dev-987bcf1.0+987bcf1",
+    "@agoric/zoe": "0.26.3-dev-987bcf1.0+987bcf1",
+    "@agoric/zone": "0.2.3-dev-987bcf1.0+987bcf1",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 78.73
   },
-  "gitHead": "7b582c1ffac84b818165bb8e2f7f2fb97270b751"
+  "gitHead": "987bcf1df00a307034d4c6da3145b6f1318885be"
 }

package/src/install.js

@@ -1,8 +1,10 @@
 /* eslint-env node */
 import path from 'path';
 import chalk from 'chalk';
+import { execFileSync } from 'child_process';
 import { makePspawn } from './helpers.js';
 import DEFAULT_SDK_PACKAGE_NAMES from './sdk-package-names.js';
+import { listWorkspaces } from './lib/packageManager.js';
 
 const REQUIRED_AGORIC_START_PACKAGES = [
   '@agoric/solo',
@@ -30,17 +32,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   const rimraf = file => pspawn('rm', ['-rf', file]);
 
   async function getWorktreePackagePaths(cwd = '.', map = new Map()) {
-    // run `yarn workspaces info` to get the list of directories to
-    // use, instead of a hard-coded list
-    const p = pspawn('yarn', ['workspaces', '--silent', 'info'], {
-      cwd,
-      stdio: ['inherit', 'pipe', 'inherit'],
-    });
-    const stdout = [];
-    p.childProcess.stdout?.on('data', out => stdout.push(out));
-    await p;
-    const d = JSON.parse(Buffer.concat(stdout).toString('utf-8'));
-    for (const [name, { location }] of Object.entries(d)) {
+    for (const { name, location } of listWorkspaces({ execFileSync })) {
       map.set(name, path.resolve(cwd, location));
     }
     return map;

package/src/lib/packageManager.js

@@ -0,0 +1,22 @@
+// @ts-check
+
+/**
+ * @import { execFileSync } from 'child_process';
+ */
+
+/**
+ * Omits the root
+ *
+ * @param {{ execFileSync: execFileSync }} io
+ * @returns {Array<{ location: string, name: string }>}
+ */
+export const listWorkspaces = ({ execFileSync }) => {
+  const out = execFileSync('npm', ['query', '.workspace'], {
+    stdio: ['ignore', 'pipe', 'inherit'],
+    shell: true,
+    encoding: 'utf-8',
+  });
+  /** @type {Array<{ location: string, name: string, description: string }>} */
+  const result = JSON.parse(out);
+  return result.filter(({ location }) => location !== '.');
+};