Merge pull request #29 from tenetxyz/compile-to-cjs

Compile to cjs
tenetxyz · Oct 31, 2023 · 401e034 · 401e034
2 parents 160fd14 + 505dd3a
commit 401e034
Show file tree

Hide file tree

Showing 44 changed files with 1,858 additions and 1,645 deletions.
diff --git a/e2e/packages/sync-test/package.json b/e2e/packages/sync-test/package.json
@@ -17,10 +17,10 @@
     "@latticexyz/utils": "link:../../../packages/utils",
     "@viem/anvil": "^0.0.6",
     "abitype": "0.9.3",
-    "chalk": "^5.2.0",
+    "chalk": "4.1.2",
     "dotenv": "^16.0.3",
     "ethers": "^5.7.2",
-    "execa": "^7.1.1",
+    "execa": "^5.1.1",
     "jsdom": "^22.0.0",
     "typescript": "5.1.6",
     "viem": "1.6.0",

diff --git a/examples/indexer-client/pnpm-lock.yaml b/examples/indexer-client/pnpm-lock.yaml
diff --git a/package.json b/package.json
@@ -34,9 +34,9 @@
     "@types/node": "^18.15.11",
     "@typescript-eslint/eslint-plugin": "5.46.1",
     "@typescript-eslint/parser": "5.46.1",
-    "chalk": "^5.2.0",
+    "chalk": "4.1.2",
     "eslint": "8.29.0",
-    "execa": "^7.0.0",
+    "execa": "^5.1.1",
     "husky": ">=6",
     "lint-staged": ">=10",
     "prettier": "^2.8.4",

diff --git a/packages/block-logs-stream/package.json b/packages/block-logs-stream/package.json
@@ -8,10 +8,13 @@
     "directory": "packages/block-logs-stream"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
-    ".": "./dist/index.js"
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js"
+    }
   },
+  "main": "./dist/index.js",
   "types": "src/index.ts",
   "scripts": {
     "build": "pnpm run build:js",

diff --git a/packages/block-logs-stream/tsup.config.ts b/packages/block-logs-stream/tsup.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["src/index.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: false,
   sourcemap: true,
   clean: true,

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -8,9 +8,11 @@
     "directory": "packages/cli"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
-    ".": "./dist/index.js"
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js"
+    }
   },
   "types": "src/index.ts",
   "bin": {
@@ -41,12 +43,12 @@
     "@latticexyz/utils": "workspace:*",
     "@latticexyz/world": "workspace:*",
     "@typechain/ethers-v5": "^10.2.0",
-    "chalk": "^5.0.1",
+    "chalk": "4.1.2",
     "chokidar": "^3.5.3",
     "dotenv": "^16.0.3",
     "ejs": "^3.1.8",
     "ethers": "^5.7.2",
-    "execa": "^7.0.0",
+    "execa": "^5.1.1",
     "glob": "^8.0.3",
     "nice-grpc-web": "^2.0.1",
     "openurl": "^1.1.1",

diff --git a/packages/cli/scripts/generate-test-tables.ts b/packages/cli/scripts/generate-test-tables.ts
@@ -73,10 +73,12 @@ try {
   logError(error);
 }
 
-const srcDirectory = await getSrcDirectory();
+(async () => {
+  const srcDirectory = await getSrcDirectory();
 
-if (config !== undefined) {
-  tablegen(config, path.join(srcDirectory, config.codegenDirectory));
-} else {
-  process.exit(1);
-}
+  if (config !== undefined) {
+    tablegen(config, path.join(srcDirectory, config.codegenDirectory));
+  } else {
+    process.exit(1);
+  }
+})();
diff --git a/packages/cli/src/commands/devnode.ts b/packages/cli/src/commands/devnode.ts
@@ -2,7 +2,7 @@ import { rmSync } from "fs";
 import { homedir } from "os";
 import path from "path";
 import type { CommandModule } from "yargs";
-import { execa } from "execa";
+import execa from "execa";
 
 type Options = {
   blocktime: number;

diff --git a/packages/cli/tsup.config.ts b/packages/cli/tsup.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["src/index.ts", "src/mud.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: false,
   sourcemap: true,
   clean: true,

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -8,17 +8,41 @@
     "directory": "packages/common"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
-    ".": "./dist/index.js",
-    "./chains": "./dist/chains.js",
-    "./codegen": "./dist/codegen.js",
-    "./deprecated": "./dist/deprecated.js",
-    "./errors": "./dist/errors.js",
-    "./foundry": "./dist/foundry.js",
-    "./type-utils": "./dist/type-utils.js",
-    "./utils": "./dist/utils.js"
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js"
+    },
+    "./chains": {
+      "require": "./dist/chains.js",
+      "import": "./dist/chains.js"
+    },
+    "./codegen": {
+      "require": "./dist/codegen.js",
+      "import": "./dist/codegen.js"
+    },
+    "./deprecated": {
+      "require": "./dist/deprecated.js",
+      "import": "./dist/deprecated.js"
+    },
+    "./errors": {
+      "require": "./dist/errors.js",
+      "import": "./dist/errors.js"
+    },
+    "./foundry": {
+      "require": "./dist/foundry.js",
+      "import": "./dist/foundry.js"
+    },
+    "./type-utils": {
+      "require": "./dist/type-utils.js",
+      "import": "./dist/type-utils.js"
+    },
+    "./utils": {
+      "require": "./dist/utils.js",
+      "import": "./dist/utils.js"
+    }
   },
+  "main": "./dist/index.js",
   "typesVersions": {
     "*": {
       "index": [
@@ -59,10 +83,10 @@
     "@latticexyz/schema-type": "workspace:*",
     "@solidity-parser/parser": "^0.16.0",
     "abitype": "0.9.3",
-    "chalk": "^5.2.0",
+    "chalk": "4.1.2",
     "debug": "^4.3.4",
-    "execa": "^7.0.0",
-    "p-retry": "^5.1.2",
+    "execa": "^5.1.1",
+    "p-retry": "4.6.2",
     "prettier": "^2.8.4",
     "prettier-plugin-solidity": "^1.1.2",
     "viem": "1.6.0"

diff --git a/packages/common/src/foundry/index.ts b/packages/common/src/foundry/index.ts
@@ -1,4 +1,4 @@
-import { execa, Options } from "execa";
+import execa, { Options } from "execa";
 import chalk from "chalk";
 
 export interface ForgeConfig {

diff --git a/packages/common/tsup.config.ts b/packages/common/tsup.config.ts
@@ -12,7 +12,7 @@ export default defineConfig({
     utils: "src/utils/index.ts",
   },
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: false,
   sourcemap: true,
   clean: true,

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -8,12 +8,21 @@
     "directory": "packages/config"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
-    ".": "./dist/library/index.js",
-    "./register": "./dist/register/index.js",
-    "./node": "./dist/node/index.js"
+    ".": {
+      "require": "./dist/library/index.js",
+      "import": "./dist/library/index.js"
+    },
+    "./register": {
+      "require": "./dist/register/index.js",
+      "import": "./dist/register/index.js"
+    },
+    "./node": {
+      "require": "./dist/node/index.js",
+      "import": "./dist/node/index.js"
+    }
   },
+  "main": "./dist/library/index.js",
   "typesVersions": {
     "*": {
       "index": [
@@ -38,10 +47,11 @@
   "dependencies": {
     "@latticexyz/common": "workspace:*",
     "@latticexyz/schema-type": "workspace:*",
-    "chalk": "^5.2.0",
+    "chalk": "4.1.2",
     "esbuild": "^0.17.15",
     "ethers": "^5.7.2",
-    "find-up": "^6.3.0",
+    "find-up": "5.0.0",
+    "p-retry": "4.6.2",
     "zod": "^3.21.4",
     "zod-validation-error": "^1.3.0"
   },

diff --git a/packages/config/src/node/loadConfig.ts b/packages/config/src/node/loadConfig.ts
@@ -1,4 +1,4 @@
-import { findUp } from "find-up";
+import findUp from "find-up";
 import path from "path";
 import { NotInsideProjectError } from "../library/errors";
 import esbuild from "esbuild";

diff --git a/packages/config/tsup.config.ts b/packages/config/tsup.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["src/library/index.ts", "src/register/index.ts", "src/node/index.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: false,
   sourcemap: true,
   clean: true,

diff --git a/packages/gas-report/package.json b/packages/gas-report/package.json
@@ -8,9 +8,11 @@
     "directory": "packages/gas-report"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
-    ".": "./dist/index.js"
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js"
+    }
   },
   "typesVersions": {
     "*": {
@@ -29,10 +31,9 @@
     "test": "vitest typecheck --run --passWithNoTests && vitest --run --passWithNoTests && forge test"
   },
   "dependencies": {
-    "chalk": "^5.3.0",
+    "chalk": "4.1.2",
     "dotenv": "^16.0.3",
-    "execa": "^7.0.0",
-    "strip-ansi": "^7.1.0",
+    "execa": "^5.1.1",
     "table": "^6.8.1",
     "yargs": "^17.7.1"
   },

diff --git a/packages/gas-report/ts/index.ts b/packages/gas-report/ts/index.ts
@@ -1,9 +1,11 @@
 import type { CommandModule } from "yargs";
 import { readFileSync, writeFileSync } from "fs";
-import { execa } from "execa";
+import execa from "execa";
 import chalk from "chalk";
 import { table, getBorderCharacters } from "table";
-import stripAnsi from "strip-ansi";
+// TODO: Fix this import for cjs
+// import stripAnsi from "strip-ansi";
+// const stripAnsi = require('strip-ansi');
 
 /**
  * Print the gas report to the console, save it to a file and compare it to a previous gas report if provided.
@@ -112,7 +114,8 @@ async function runGasReport(): Promise<GasReport> {
   }
 
   // Extract the gas reports from the logs
-  const lines = stdout.split("\n").map(stripAnsi);
+  // const lines = stdout.split("\n").map(stripAnsi);
+  const lines = stdout.split("\n");
   const gasReportPattern = /^\s*GAS REPORT: (\d+) (.*)$/;
   const testFunctionPattern = /^\[(?:PASS|FAIL).*\] (\w+)\(\)/;
   const testFilePattern = /^Running \d+ tests? for (.*):(.*)$/;

diff --git a/packages/gas-report/tsup.config.ts b/packages/gas-report/tsup.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["ts/index.ts", "ts/mud-gas-report.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: false,
   sourcemap: true,
   clean: true,

diff --git a/packages/protocol-parser/package.json b/packages/protocol-parser/package.json
@@ -8,10 +8,13 @@
     "directory": "packages/protocol-parser"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
-    ".": "./dist/index.js"
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js"
+    }
   },
+  "main": "./dist/index.js",
   "types": "src/index.ts",
   "scripts": {
     "build": "pnpm run build:js",

diff --git a/packages/protocol-parser/tsup.config.ts b/packages/protocol-parser/tsup.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["src/index.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: false,
   sourcemap: true,
   clean: true,

diff --git a/packages/recs/package.json b/packages/recs/package.json
@@ -7,11 +7,17 @@
     "directory": "packages/recs"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
-    ".": "./dist/index.js",
-    "./deprecated": "./dist/deprecated/index.js"
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js"
+    },
+    "./deprecated": {
+      "require": "./dist/deprecated/index.js",
+      "import": "./dist/deprecated/index.js"
+    }
   },
+  "main": "./dist/index.js",
   "typesVersions": {
     "*": {
       "index": [

diff --git a/packages/recs/tsup.config.ts b/packages/recs/tsup.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["src/index.ts", "src/deprecated/index.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: false,
   sourcemap: true,
   clean: true,