refactor(solo): Convert RESM to NESM

Refs #527

packages/solo/bin/ag-solo

@@ -0,0 +1 @@
+../src/entrypoint.js

packages/solo/package.json

@@ -2,11 +2,9 @@
   "name": "@agoric/solo",
   "version": "0.2.12",
   "description": "Agoric's Solo vat runner",
-  "parsers": {
-    "js": "mjs"
-  },
+  "type": "module",
   "bin": {
-    "ag-solo": "src/entrypoint.cjs"
+    "ag-solo": "src/entrypoint.js"
   },
   "main": "src/main.js",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -46,8 +44,8 @@
     "@agoric/xsnap": "^0.6.10",
     "anylogger": "^0.21.0",
     "deterministic-json": "^1.0.5",
-    "esm": "agoric-labs/esm#Agoric-built",
     "express": "^4.17.1",
+    "import-meta-resolve": "^1.1.1",
     "minimist": "^1.2.0",
     "morgan": "^1.9.1",
     "node-fetch": "^2.6.0",
@@ -79,9 +77,6 @@
     "files": [
       "test/**/test-*.js"
     ],
-    "require": [
-      "esm"
-    ],
     "timeout": "20m"
   }
 }

packages/solo/src/add-chain.js

@@ -6,7 +6,7 @@ import path from 'path';
 import fs from 'fs';
 
 import { assert, details as X } from '@agoric/assert';
-import setGCIIngress from './set-gci-ingress';
+import setGCIIngress from './set-gci-ingress.js';
 
 const DEFAULT_CHAIN_CONFIG = 'https://testnet.agoric.com/network-config';
 

packages/solo/src/chain-cosmos-sdk.js

@@ -14,7 +14,7 @@ import { assert, details as X } from '@agoric/assert';
 import {
   DEFAULT_BATCH_TIMEOUT_MS,
   makeBatchedDeliver,
-} from '@agoric/vats/src/batched-deliver';
+} from '@agoric/vats/src/batched-deliver.js';
 
 const console = anylogger('chain-cosmos-sdk');
 

packages/solo/src/init-basedir.js

@@ -1,4 +1,4 @@
-/* global __dirname Buffer process */
+/* global Buffer process */
 import fs from 'fs';
 import path from 'path';
 import { execFileSync } from 'child_process';
@@ -10,6 +10,9 @@ const log = anylogger('ag-solo:init');
 
 const DEFAULT_WALLET = '@agoric/dapp-svelte-wallet';
 
+const filename = new URL(import.meta.url).pathname;
+const dirname = path.dirname(filename);
+
 export default function initBasedir(
   basedir,
   webport,
@@ -27,7 +30,6 @@ export default function initBasedir(
   options.wallet = wallet;
   options.defaultManagerType = defaultManagerType;
 
-  const here = __dirname;
   // We either need a basedir with an initialised key, or no basedir.
   assert(
     fs.existsSync(path.join(basedir, 'ag-cosmos-helper-address')) ||
@@ -50,11 +52,11 @@ export default function initBasedir(
 
   // Save our version codes.
   const pj = 'package.json';
-  fs.copyFileSync(path.join(here, '..', pj), path.join(dstHtmldir, pj));
+  fs.copyFileSync(path.join(dirname, '..', pj), path.join(dstHtmldir, pj));
   const gr = 'git-revision.txt';
   try {
     fs.copyFileSync(
-      path.join(here, '../public', gr),
+      path.join(dirname, '../public', gr),
       path.join(dstHtmldir, gr),
     );
   } catch (e) {
@@ -118,7 +120,7 @@ export default function initBasedir(
 
   // this marker file is how we recognize ag-solo basedirs
   fs.copyFileSync(
-    path.join(here, '..', 'solo-README-to-install.md'),
+    path.join(dirname, '..', 'solo-README-to-install.md'),
     path.join(basedir, 'solo-README.md'),
   );
 

packages/solo/src/main.js

@@ -1,4 +1,3 @@
-/* global __dirname */
 import fs from 'fs';
 import path from 'path';
 import parseArgs from 'minimist';
@@ -9,12 +8,12 @@ import { assert } from '@agoric/assert';
 import anylogger from 'anylogger';
 
 // Start a network service
-import addChain from './add-chain';
-import initBasedir from './init-basedir';
-import resetState from './reset-state';
-import setGCIIngress from './set-gci-ingress';
-import setFakeChain from './set-fake-chain';
-import start from './start';
+import addChain from './add-chain.js';
+import initBasedir from './init-basedir.js';
+import resetState from './reset-state.js';
+import setGCIIngress from './set-gci-ingress.js';
+import setFakeChain from './set-fake-chain.js';
+import start from './start.js';
 
 const log = anylogger('ag-solo');
 
@@ -142,7 +141,9 @@ start
     }
     case 'calc-gci':
     case 'calc-rpcport': {
-      const cp = spawnSync(`${__dirname}/../../${argv[0]}.js`, argv.slice(1), {
+      const filename = new URL(import.meta.url).pathname;
+      const dirname = path.dirname(filename);
+      const cp = spawnSync(`${dirname}/../../${argv[0]}.js`, argv.slice(1), {
         stdio: 'inherit',
       });
       return cp.status;

packages/solo/src/start.js

@@ -1,9 +1,10 @@
-/* global __dirname require process setTimeout */
+/* global process setTimeout */
 import fs from 'fs';
 import path from 'path';
 import temp from 'temp';
 import { fork } from 'child_process';
 import { promisify } from 'util';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
 // import { createHash } from 'crypto';
 
 import anylogger from 'anylogger';
@@ -24,13 +25,13 @@ import {
   buildTimer,
 } from '@agoric/swingset-vat';
 import { openLMDBSwingStore } from '@agoric/swing-store-lmdb';
-import { connectToFakeChain } from '@agoric/cosmic-swingset/src/sim-chain';
-import { makeWithQueue } from '@agoric/vats/src/queue';
+import { connectToFakeChain } from '@agoric/cosmic-swingset/src/sim-chain.js';
+import { makeWithQueue } from '@agoric/vats/src/queue.js';
 
-import { deliver, addDeliveryTarget } from './outbound';
-import { makeHTTPListener } from './web';
+import { deliver, addDeliveryTarget } from './outbound.js';
+import { makeHTTPListener } from './web.js';
 
-import { connectToChain } from './chain-cosmos-sdk';
+import { connectToChain } from './chain-cosmos-sdk.js';
 
 const log = anylogger('start');
 
@@ -112,7 +113,7 @@ async function buildSwingset(
   const plugin = buildPlugin(pluginDir, importPlugin, queueThunkForKernel);
 
   const config = await loadSwingsetConfigFile(
-    `${__dirname}/../solo-config.json`,
+    new URL('../solo-config.json', import.meta.url).pathname,
   );
   config.devices = {
     mailbox: {
@@ -326,7 +327,9 @@ export default async function start(basedir, argv) {
   await unlink('html/wallet').catch(_ => {});
 
   // Symlink the wallet.
-  const pjs = require.resolve(`${wallet}/package.json`);
+  const pjs = new URL(
+    await importMetaResolve(`${wallet}/package.json`, import.meta.url),
+  ).pathname;
   const {
     'agoric-wallet': {
       htmlBasedir = 'ui/build',
@@ -407,7 +410,9 @@ export default async function start(basedir, argv) {
     .map(dep => path.resolve(agWallet, dep))
     .join(' ');
 
-  const agoricCli = require.resolve('agoric/bin/agoric');
+  const agoricCli = new URL(
+    await importMetaResolve('agoric/bin/agoric', import.meta.url),
+  ).pathname;
 
   // Use the same verbosity as our caller did for us.
   let verbosity;

packages/solo/src/vat-http.js

@@ -2,8 +2,8 @@ import { makeNotifierKit } from '@agoric/notifier';
 import { E } from '@agoric/eventual-send';
 import { Far } from '@agoric/marshal';
 import { assert, details as X } from '@agoric/assert';
-import { getReplHandler } from '@agoric/vats/src/repl';
-import { getCapTPHandler } from './captp';
+import { getReplHandler } from '@agoric/vats/src/repl.js';
+import { getCapTPHandler } from './captp.js';
 
 // This vat contains the HTTP request handler.
 export function buildRootObject(vatPowers) {

packages/solo/src/vat-uploads.js

@@ -1,5 +1,5 @@
 import { Far } from '@agoric/marshal';
-import makeScratchPad from './scratch';
+import makeScratchPad from './scratch.js';
 
 // This vat contains the private upload scratch pad.
 

packages/solo/src/web.js

@@ -1,19 +1,15 @@
-/* global __dirname require setTimeout clearTimeout setInterval clearInterval */
+/* global setTimeout clearTimeout setInterval clearInterval */
 // Start a network service
 import path from 'path';
 import http from 'http';
 import { createConnection } from 'net';
 import express from 'express';
 import WebSocket from 'ws';
 import anylogger from 'anylogger';
+import morgan from 'morgan';
 
 import { getAccessToken } from '@agoric/access-token';
 
-// We need to CommonJS require morgan or else it warns, until:
-// https://github.com/expressjs/morgan/issues/190
-// is fixed.
-const morgan = require('morgan');
-
 const log = anylogger('web');
 
 const channels = new Map();
@@ -89,7 +85,7 @@ export async function makeHTTPListener(basedir, port, host, rawInboundCommand) {
   const htmldir = path.join(basedir, 'html');
   log(`Serving static files from ${htmldir}`);
   app.use(express.static(htmldir));
-  app.use(express.static(`${__dirname}/../public`));
+  app.use(express.static(new URL('../public', import.meta.url).pathname));
 
   // The rules for validation:
   //

packages/solo/test/captp-fixture.js

@@ -1,4 +1,4 @@
-/* global __dirname process setTimeout */
+/* global process setTimeout */
 import { spawn } from 'child_process';
 import WebSocket from 'ws';
 import { makeCapTP, E } from '@agoric/captp';
@@ -18,7 +18,7 @@ export async function makeFixture(PORT, noisy = false) {
     : ['ignore', 'pipe', 'pipe'];
   const cp = spawn('./startsolo.sh', {
     env: { ...process.env, PORT },
-    cwd: __dirname,
+    cwd: new URL('./', import.meta.url).pathname,
     stdio,
     detached: true,
   });

packages/solo/test/test-home.js

@@ -1,4 +1,4 @@
-/* global require process */
+/* global process */
 
 // `test.after.always` does not yet seem compatible with ses-ava
 // See https://github.com/endojs/endo/issues/647
@@ -7,15 +7,16 @@
 // TODO Remove babel-standalone preinitialization
 // https://github.com/endojs/endo/issues/768
 import '@agoric/babel-standalone';
-import '@agoric/swingset-vat/tools/prepare-test-env';
+import '@agoric/swingset-vat/tools/prepare-test-env.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 
 import bundleSource from '@agoric/bundle-source';
 import { Far } from '@agoric/marshal';
-import { CENTRAL_ISSUER_NAME } from '@agoric/vats/src/issuers';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+import { CENTRAL_ISSUER_NAME } from '@agoric/vats/src/issuers.js';
 
-import { makeFixture, E } from './captp-fixture';
+import { makeFixture, E } from './captp-fixture.js';
 
 const SOLO_PORT = 7999;
 
@@ -60,9 +61,13 @@ test.serial('home.wallet - receive zoe invite', async t => {
   const { wallet, zoe, board } = E.get(home);
 
   // Setup contract in order to get an invite to use in tests
-  const contractRoot = require.resolve(
-    '@agoric/zoe/src/contracts/automaticRefund',
-  );
+  const contractRoot = new URL(
+    await importMetaResolve(
+      '@agoric/zoe/src/contracts/automaticRefund.js',
+      import.meta.url,
+    ),
+  ).pathname;
+  t.log({ contractRoot });
   const bundle = await bundleSource(contractRoot);
   const installationHandle = await E(zoe).install(bundle);
   const { creatorInvitation: invite } = await E(zoe).startInstance(

packages/solo/test/test-xsnap-store.js

@@ -1,4 +1,3 @@
-/* global require */
 import '@agoric/install-ses';
 
 import fs from 'fs';
@@ -9,18 +8,20 @@ import tmp from 'tmp';
 import test from 'ava';
 import { xsnap } from '@agoric/xsnap';
 import { makeSnapStore } from '@agoric/swing-store-lmdb';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
 
 const { freeze } = Object;
 
 const ld = (() => {
   /** @param { string } ref */
   // WARNING: ambient
-  const resolve = ref => require.resolve(ref);
+  const resolve = async ref =>
+    new URL(await importMetaResolve(ref, import.meta.url)).pathname;
   const readFile = fs.promises.readFile;
   return freeze({
     resolve,
     /**  @param { string } ref */
-    asset: async ref => readFile(resolve(ref), 'utf-8'),
+    asset: async ref => readFile(await resolve(ref), 'utf-8'),
   });
 })();