refactor(cli): split up deploy into modules (#1384)

Co-authored-by: Kevin Ingersoll <[email protected]> Co-authored-by: alvrs <[email protected]>
latticexyz · Sep 15, 2023 · 76055f4 · 76055f4
1 parent e037776
commit 76055f4
Show file tree

Hide file tree

Showing 31 changed files with 795 additions and 569 deletions.
diff --git a/packages/cli/src/commands/deploy.ts b/packages/cli/src/commands/deploy.ts
@@ -1,6 +1,6 @@
 import type { CommandModule, Options } from "yargs";
 import { logError } from "../utils/errors";
-import { deployHandler, DeployOptions } from "../utils";
+import { DeployOptions, deployHandler } from "../utils/deployHandler";
 
 export const yDeployOptions = {
   configPath: { type: "string", desc: "Path to the config file" },

diff --git a/packages/cli/src/commands/dev-contracts.ts b/packages/cli/src/commands/dev-contracts.ts
@@ -9,10 +9,12 @@ import path from "path";
 import { debounce } from "throttle-debounce";
 import { worldgenHandler } from "./worldgen";
 import { WorldConfig } from "@latticexyz/world";
-import { deployHandler, logError, printMUD } from "../utils";
 import { homedir } from "os";
 import { rmSync } from "fs";
 import { execa } from "execa";
+import { logError } from "../utils/errors";
+import { deployHandler } from "../utils/deployHandler";
+import { printMUD } from "../utils/printMUD";
 
 type Options = {
   rpc?: string;

diff --git a/packages/cli/src/commands/test.ts b/packages/cli/src/commands/test.ts
@@ -3,7 +3,7 @@ import { anvil, forge, getRpcUrl } from "@latticexyz/common/foundry";
 import chalk from "chalk";
 import { rmSync, writeFileSync } from "fs";
 import { yDeployOptions } from "./deploy";
-import { deployHandler, DeployOptions } from "../utils";
+import { DeployOptions, deployHandler } from "../utils/deployHandler";
 
 type Options = DeployOptions & { port?: number; worldAddress?: string; forgeOptions?: string };
 

diff --git a/packages/cli/src/commands/trace.ts b/packages/cli/src/commands/trace.ts
@@ -10,7 +10,8 @@ import { resolveWorldConfig, WorldConfig } from "@latticexyz/world";
 import IBaseWorldAbi from "@latticexyz/world/out/IBaseWorld.sol/IBaseWorld.abi.json" assert { type: "json" };
 import worldConfig from "@latticexyz/world/mud.config.js";
 import { tableIdToHex } from "@latticexyz/common";
-import { getChainId, getExistingContracts } from "../utils";
+import { getExistingContracts } from "../utils/getExistingContracts";
+import { getChainId } from "../utils/utils/getChainId";
 
 // TODO account for multiple namespaces (https://github.com/latticexyz/mud/issues/994)
 const systemsTableId = tableIdToHex(worldConfig.namespace, worldConfig.tables.Systems.name);

diff --git a/packages/cli/src/commands/worldgen.ts b/packages/cli/src/commands/worldgen.ts
@@ -6,7 +6,7 @@ import { worldgen } from "@latticexyz/world/node";
 import { getSrcDirectory } from "@latticexyz/common/foundry";
 import path from "path";
 import { rmSync } from "fs";
-import { getExistingContracts } from "../utils";
+import { getExistingContracts } from "../utils/getExistingContracts";
 
 type Options = {
   configPath?: string;