@latticexyz/cli 2.2.19 → 2.2.20-391575967cd09bd527d819222232a54a7d722fc2

package/dist/{commands-Q7NE232S.js → commands-YM3AS57B.js}

@@ -12,13 +12,26 @@ import { loadConfig, resolveConfigPath } from "@latticexyz/config/node";
 // src/build.ts
 import { tablegen } from "@latticexyz/store/codegen";
 import { buildSystemsManifest, worldgen } from "@latticexyz/world/node";
-import { forge } from "@latticexyz/common/foundry";
 import { execa } from "execa";
+
+// src/utils/printCommand.ts
+import chalk from "chalk";
+function printCommand(proc) {
+  console.log("\n" + chalk.gray("> " + proc.spawnargs.join(" ")));
+  return proc;
+}
+
+// src/build.ts
 async function build({ rootDir, config, foundryProfile }) {
   await Promise.all([tablegen({ rootDir, config }), worldgen({ rootDir, config })]);
-  await forge(["build"], { profile: foundryProfile });
+  await printCommand(
+    execa("forge", ["build"], {
+      stdio: "inherit",
+      env: { FOUNDRY_PROFILE: foundryProfile ?? process.env.FOUNDRY_PROFILE }
+    })
+  );
   await buildSystemsManifest({ rootDir, config });
-  await execa("mud", ["abi-ts"], { stdio: "inherit" });
+  await printCommand(execa("mud", ["abi-ts"], { stdio: "inherit" }));
 }
 
 // src/commands/build.ts
@@ -51,18 +64,18 @@ var commandModule2 = {
   describe: "Start a local Ethereum node for development",
   builder(yargs) {
     return yargs.options({
-      blocktime: { type: "number", default: 1, decs: "Interval in which new blocks are produced" }
+      blocktime: { type: "number", default: 2, decs: "Interval in which new blocks are produced" }
     });
   },
   async handler({ blocktime }) {
     console.log("Clearing devnode history");
     const userHomeDir = homedir();
     rmSync(path2.join(userHomeDir, ".foundry", "anvil", "tmp"), { recursive: true, force: true });
-    const anvilArgs = ["-b", String(blocktime), "--block-base-fee-per-gas", "0"];
-    console.log(`Running: anvil ${anvilArgs.join(" ")}`);
-    const child = execa2("anvil", anvilArgs, {
-      stdio: ["inherit", "inherit", "inherit"]
-    });
+    const child = printCommand(
+      execa2("anvil", ["-b", String(blocktime), "--block-base-fee-per-gas", "0"], {
+        stdio: "inherit"
+      })
+    );
     process.on("SIGINT", () => {
       console.log("\ngracefully shutting down from SIGINT (Crtl-C)");
       child.kill();
@@ -1690,8 +1703,8 @@ import { getChainId } from "viem/actions";
 // src/utils/postDeploy.ts
 import { existsSync } from "fs";
 import path6 from "path";
-import chalk from "chalk";
-import { getScriptDirectory, forge as forge2 } from "@latticexyz/common/foundry";
+import { getScriptDirectory } from "@latticexyz/common/foundry";
+import { execa as execa3 } from "execa";
 async function postDeploy(postDeployScript, worldAddress, rpc, profile, forgeOptions, kms) {
   const userOptions = forgeOptions?.replaceAll("\\", "").split(" ") ?? [];
   const postDeployPath = path6.join(await getScriptDirectory(), postDeployScript + ".s.sol");
@@ -1699,24 +1712,26 @@ async function postDeploy(postDeployScript, worldAddress, rpc, profile, forgeOpt
     console.log(`No script at ${postDeployPath}, skipping post deploy hook`);
     return;
   }
-  console.log(chalk.blue(`Executing post deploy script at ${postDeployPath}`));
-  await forge2(
-    [
-      "script",
-      postDeployScript,
-      "--broadcast",
-      "--sig",
-      "run(address)",
-      worldAddress,
-      "--rpc-url",
-      rpc,
-      "-vvv",
-      kms ? "--aws" : "",
-      ...userOptions
-    ],
-    {
-      profile
-    }
+  await printCommand(
+    execa3(
+      "forge",
+      [
+        "script",
+        postDeployScript,
+        ["--sig", "run(address)", worldAddress],
+        ["--rpc-url", rpc],
+        "--broadcast",
+        "-vvv",
+        kms ? ["--aws"] : [],
+        ...userOptions
+      ].flat(),
+      {
+        stdio: "inherit",
+        env: {
+          FOUNDRY_PROFILE: profile ?? process.env.FOUNDRY_PROFILE
+        }
+      }
+    )
   );
 }
 
@@ -2259,8 +2274,9 @@ function resolveLinkPath(packageJsonPath, mudLinkPath, packageName) {
 var set_version_default = commandModule7;
 
 // src/commands/test.ts
-import { anvil, forge as forge3, getRpcUrl as getRpcUrl2 } from "@latticexyz/common/foundry";
+import { getRpcUrl as getRpcUrl2 } from "@latticexyz/common/foundry";
 import chalk4 from "chalk";
+import { execa as execa4 } from "execa";
 var testOptions = {
   ...deployOptions,
   port: { type: "number", description: "Port to run internal node for fork testing on", default: 4242 },
@@ -2278,8 +2294,12 @@ var commandModule8 = {
   },
   async handler(opts) {
     if (!opts.worldAddress) {
-      const anvilArgs = ["--block-base-fee-per-gas", "0", "--port", String(opts.port)];
-      anvil(anvilArgs);
+      printCommand(
+        execa4("anvil", ["--quiet", ["--port", String(opts.port)], ["--block-base-fee-per-gas", "0"]].flat(), {
+          stdio: "inherit",
+          env: { FOUNDRY_PROFILE: opts.profile ?? process.env.FOUNDRY_PROFILE }
+        })
+      );
     }
     const forkRpc = opts.worldAddress ? await getRpcUrl2(opts.profile) : `http://127.0.0.1:${opts.port}`;
     const worldAddress = opts.worldAddress ?? (await runDeploy({
@@ -2290,12 +2310,15 @@ var commandModule8 = {
     console.log(chalk4.blue("World address", worldAddress));
     const userOptions = opts.forgeOptions?.replaceAll("\\", "").split(" ") ?? [];
     try {
-      await forge3(["test", "--fork-url", forkRpc, ...userOptions], {
-        profile: opts.profile,
-        env: {
-          WORLD_ADDRESS: worldAddress
-        }
-      });
+      await printCommand(
+        execa4("forge", ["test", ["--fork-url", forkRpc], ...userOptions].flat(), {
+          stdio: "inherit",
+          env: {
+            FOUNDRY_PROFILE: opts.profile ?? process.env.FOUNDRY_PROFILE,
+            WORLD_ADDRESS: worldAddress
+          }
+        })
+      );
       process.exit(0);
     } catch (e) {
       console.error(e);
@@ -2310,11 +2333,12 @@ import path11 from "node:path";
 import fs from "node:fs";
 import { loadConfig as loadConfig5, resolveConfigPath as resolveConfigPath5 } from "@latticexyz/config/node";
 import { MUDError as MUDError4 } from "@latticexyz/common/errors";
-import { cast, getRpcUrl as getRpcUrl3 } from "@latticexyz/common/foundry";
+import { getRpcUrl as getRpcUrl3 } from "@latticexyz/common/foundry";
 import worldConfig4 from "@latticexyz/world/mud.config";
 import { createClient, http as http2 } from "viem";
 import { getChainId as getChainId2, readContract as readContract2 } from "viem/actions";
 import { resolveSystems as resolveSystems2 } from "@latticexyz/world/node";
+import { execa as execa5 } from "execa";
 var systemsTableId = worldConfig4.namespaces.world.tables.Systems.tableId;
 function getWorldAddress(worldsFile, chainId) {
   if (!fs.existsSync(worldsFile)) {
@@ -2362,21 +2386,27 @@ var commandModule9 = {
         })
       }))
     );
-    const result = await cast([
-      "run",
-      "--label",
-      `${worldAddress}:World`,
-      ...labels.map(({ label, address }) => ["--label", `${address}:${label}`]).flat(),
-      `${args.tx}`
-    ]);
-    console.log(result);
-    process.exit(0);
+    await printCommand(
+      execa5(
+        "cast",
+        [
+          "run",
+          ["--label", `${worldAddress}:World`],
+          ...labels.map(({ label, address }) => ["--label", `${address}:${label}`]),
+          args.tx
+        ].flat(),
+        {
+          stdio: "inherit",
+          env: { FOUNDRY_PROFILE: profile ?? process.env.FOUNDRY_PROFILE }
+        }
+      )
+    );
   }
 };
 var trace_default = commandModule9;
 
 // src/commands/dev-contracts.ts
-import { anvil as anvil2, getScriptDirectory as getScriptDirectory2, getSrcDirectory } from "@latticexyz/common/foundry";
+import { getScriptDirectory as getScriptDirectory2, getSrcDirectory } from "@latticexyz/common/foundry";
 import chalk5 from "chalk";
 import chokidar from "chokidar";
 import { loadConfig as loadConfig6, resolveConfigPath as resolveConfigPath6 } from "@latticexyz/config/node";
@@ -2385,6 +2415,7 @@ import { homedir as homedir2 } from "os";
 import { rmSync as rmSync2 } from "fs";
 import { BehaviorSubject, debounceTime, exhaustMap, filter } from "rxjs";
 import { isDefined as isDefined5 } from "@latticexyz/common/utils";
+import { execa as execa6 } from "execa";
 var devOptions = {
   rpc: deployOptions.rpc,
   configPath: deployOptions.configPath,
@@ -2408,8 +2439,11 @@ var commandModule10 = {
       console.log(chalk5.gray("Cleaning devnode cache"));
       const userHomeDir = homedir2();
       rmSync2(path12.join(userHomeDir, ".foundry", "anvil", "tmp"), { recursive: true, force: true });
-      const anvilArgs = ["--block-time", "1", "--block-base-fee-per-gas", "0"];
-      anvil2(anvilArgs);
+      await printCommand(
+        execa6("anvil", ["--quiet", ["--block-time", "2"], ["--block-base-fee-per-gas", "0"]].flat(), {
+          stdio: "inherit"
+        })
+      );
       rpc = "http://127.0.0.1:8545";
     }
     const lastChange$ = new BehaviorSubject(Date.now());
@@ -2473,23 +2507,29 @@ var dev_contracts_default = commandModule10;
 import { sliceHex, zeroHash } from "viem";
 
 // src/verify/verifyContract.ts
-import { forge as forge4 } from "@latticexyz/common/foundry";
+import { execa as execa7 } from "execa";
 async function verifyContract(options2) {
-  const args = ["verify-contract", options2.address, options2.name, "--rpc-url", options2.rpc];
-  if (options2.verifier) {
-    args.push("--verifier", options2.verifier);
-  }
-  if (options2.verifierUrl) {
-    args.push("--verifier-url", options2.verifierUrl);
-  }
-  await forge4(args, { cwd: options2.cwd });
+  await printCommand(
+    execa7(
+      "forge",
+      [
+        "verify-contract",
+        options2.address,
+        options2.name,
+        ["--rpc-url", options2.rpc],
+        options2.verifier ? ["--verifier", options2.verifier] : [],
+        options2.verifierUrl ? ["--verifier-url", options2.verifierUrl] : []
+      ].flat(),
+      { stdio: "inherit" }
+    )
+  );
 }
 
 // src/verify.ts
 import PQueue from "p-queue";
 import { MUDError as MUDError5 } from "@latticexyz/common/errors";
 import { getStorageAt } from "viem/actions";
-import { execa as execa3 } from "execa";
+import { execa as execa8 } from "execa";
 import { getContractAddress as getContractAddress6, getDeployer } from "@latticexyz/common/internal";
 var ERC1967_IMPLEMENTATION_SLOT = "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
 async function verify({
@@ -2532,13 +2572,13 @@ async function verify({
     })
   );
   if (verifier === "sourcify") {
-    await execa3("npm", ["install"], {
+    await execa8("npm", ["install"], {
       cwd: "node_modules/@latticexyz/store"
     });
-    await execa3("npm", ["install"], {
+    await execa8("npm", ["install"], {
       cwd: "node_modules/@latticexyz/world"
     });
-    await execa3("npm", ["install"], {
+    await execa8("npm", ["install"], {
       cwd: "node_modules/@latticexyz/world-modules"
     });
     Object.entries(
@@ -3013,4 +3053,4 @@ var commands = [
 export {
   commands
 };
-//# sourceMappingURL=commands-Q7NE232S.js.map
+//# sourceMappingURL=commands-YM3AS57B.js.map