Feature/node compatible cli

Dockerfile.cli

@@ -12,8 +12,6 @@ RUN apt install -y git
 RUN apt install -y curl
 RUN apt install -y unzip
 
-RUN curl -fsSL https://bun.sh/install | bash
-
 RUN curl -L https://foundry.paradigm.xyz | bash
 RUN bash -ci "foundryup"
 
@@ -31,7 +29,7 @@ FROM base as cli-remote
 # This build stage tests that path.
 COPY cli/install.sh cli/install.sh
 RUN bash -ci "./cli/install.sh"
-RUN bash -ci "which ntt"
+RUN bash -ci "which ntt-cli"
 
 FROM base-solana as cli-local
 # NOTE: when invoking the installer inside of the source tree, it installs from
@@ -47,13 +45,16 @@ COPY sdk sdk
 COPY solana/package.json solana/package.json
 COPY solana/ts solana/ts
 COPY evm/ts evm/ts
+COPY evm/script evm/script
 COPY solana/tsconfig.*.json solana/
 COPY cli/package.json cli/package.json
-COPY cli/package-lock.json cli/package-lock.json
 COPY cli/src cli/src
+COPY cli/rollup.config.js cli/rollup.config.js
+COPY cli/tsconfig.json cli/tsconfig.json
+COPY cli/bin.cjs cli/bin.cjs
 COPY cli/install.sh cli/install.sh
 RUN bash -ci "./cli/install.sh"
-RUN bash -ci "which ntt"
+RUN bash -ci "which ntt-cli"
 
 FROM cli-local as cli-local-test
 COPY cli/test cli/test
@@ -63,6 +64,6 @@ RUN bash -ci "./cli/test/sepolia-bsc.sh"
 FROM cli-local as cli-local-test-solana
 COPY cli/test cli/test
 # evm/script needed for the cli, at least for now
-COPY evm/script evm/script
 COPY solana solana
+COPY evm/script evm/script
 RUN bash -ci "./cli/test/solana.sh --use-tmp-dir"

cli/.gitignore

@@ -1,3 +1,9 @@
+script
+buffer.json
+.deployment
+.deployments
+overrides.json
+keys
 
 deployment.json
 *deployment.json

cli/bin.cjs

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+const {YargsCommand} = require('@wormhole-foundation/ntt-cli');
+YargsCommand.parse()

cli/bin.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env tsx
+import {YargsCommand} from "./src"
+YargsCommand.parse()

cli/install.sh

@@ -2,10 +2,10 @@
 
 set -euo pipefail
 
-# check that 'bun' is installed
+# check that 'npm' is installed
 
-if ! command -v bun > /dev/null; then
-  echo "bun is not installed. Follow the instructions at https://bun.sh/docs/installation"
+if ! command -v npm > /dev/null; then
+  echo "npm is not installed."
   exit 1
 fi
 
@@ -121,44 +121,19 @@ function install_cli {
 
   # if 'ntt' is already installed, uninstall it
   # just check with 'which'
-  if which ntt > /dev/null; then
+  if which ntt-cli > /dev/null; then
     echo "Removing existing ntt CLI"
-    rm $(which ntt)
+    rm $(which ntt-cli)
   fi
 
-  # swallow the output of the first install
-  # TODO: figure out why it fails the first time.
-  bun install > /dev/null 2>&1 || true
-  bun install
-
-  # make a temporary directory
-
-  tmpdir="$(mktemp -d)"
-
-  # create a temporary symlink 'npm' to 'bun'
-
-  ln -s "$(command -v bun)" "$tmpdir/npm"
-
-  # add the temporary directory to the PATH
-
-  export PATH="$tmpdir:$PATH"
-
-  # swallow the output of the first build
-  # TODO: figure out why it fails the first time.
-  bun --bun run --filter '*' build > /dev/null 2>&1 || true
-  bun --bun run --filter '*' build
-
-  # remove the temporary directory
-
-  rm -r "$tmpdir"
-
-  # now link the CLI
 
+  npm install
+  npm link
+  npm run build
+  # pack the cli
   cd cli
-
-  bun link
-
-  bun link @wormhole-foundation/ntt-cli
+  mv $(npm pack) out.tgz
+  npm i -g out.tgz
 }
 
 main "$@"