Merge branch 'main' into kumpis/explorer-docs

latticexyz · Aug 29, 2024 · 5fb3dda · 5fb3dda
2 parents 265e196 + c1bf7d3
commit 5fb3dda
Show file tree

Hide file tree

Showing 94 changed files with 654 additions and 568 deletions.
diff --git a/.changeset/odd-coats-bake.md b/.changeset/odd-coats-bake.md
@@ -0,0 +1,5 @@
+---
+"create-mud": patch
+---
+
+Templates now use `shx` to run shell commands in scripts for better Windows compatibility.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -6,13 +6,6 @@ runs:
     - name: Setup prerequisites
       uses: ./.github/actions/setup-prerequisites
 
-    # pnpm no longer runs this before the actual install (https://github.com/pnpm/pnpm/issues/3760)
-    # but we need to create some placeholder files like bins so that the install step can find them and put references to them in the right spot
-    # this resolves some chicken-and-egg problems with using workspace bins before they're created (install -> build -> install)
-    - name: Run prepare scripts
-      shell: bash
-      run: pnpm recursive run prepare
-
     - name: Install node dependencies
       shell: bash
       run: pnpm install --frozen-lockfile

diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml
@@ -2,6 +2,8 @@ name: Changeset
 
 on:
   pull_request:
+    paths:
+      - ".changeset/*.md"
 
 jobs:
   changeset:

diff --git a/.github/workflows/test-published-packages.yml b/.github/workflows/test-published-packages.yml
@@ -17,9 +17,8 @@ jobs:
   test-create-mud-project:
     name: Test create-mud project
     strategy:
-      fail-fast: false
       matrix:
-        os: [depot-ubuntu-22.04-16, windows-latest]
+        os: [depot-ubuntu-22.04-16]
         template: [vanilla, react, react-ecs, phaser, threejs]
 
     runs-on: ${{ matrix.os }}

diff --git a/.prettierignore b/.prettierignore
@@ -3,3 +3,6 @@ dist
 templates/phaser/packages/art
 CODEOWNERS
 out
+
+# forge docs output (gitignored anyway)
+packages/*/docs
diff --git a/.prettierrc.js → .prettierrc.cjs b/.prettierrc.js → .prettierrc.cjs
diff --git a/Dockerfile b/Dockerfile
@@ -37,10 +37,6 @@ FROM base AS mud
 COPY . /app
 WORKDIR /app
 
-# pnpm no longer runs prepare before the actual install (https://github.com/pnpm/pnpm/issues/3760)
-# but we need to create some placeholder files like bins so that the install step can find them and put references to them in the right spot
-# this resolves some chicken-and-egg problems with using workspace bins before they're created (install -> build -> install)
-RUN pnpm recursive run prepare
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 RUN NODE_OPTIONS=--max-old-space-size=4096 pnpm run -r build
 

diff --git a/docs/pages/world/reference/internal/erc165.mdx b/docs/pages/world/reference/internal/erc165.mdx
@@ -43,7 +43,7 @@ _Returns a boolean array where each value corresponds to the
 interfaces passed in and whether they're supported or not. This allows
 you to batch check interfaces for a contract where your expectation
 is that some interfaces may not be supported.
-See [IERC165-supportsInterface](/world/reference/internal/erc165-external#supportsinterface)._
+See [IERC165.supportsInterface](./erc165-external#supportsinterface)._
 
 ```solidity
 function getSupportedInterfaces(address account, bytes4[] memory interfaceIds) internal view returns (bool[] memory);

diff --git a/e2e/package.json b/e2e/package.json
@@ -11,6 +11,7 @@
     "test:ci": "pnpm run test"
   },
   "devDependencies": {
-    "@playwright/test": "1.35.1"
+    "@playwright/test": "1.35.1",
+    "shx": "^0.3.4"
   }
 }
diff --git a/e2e/packages/client-vanilla/package.json b/e2e/packages/client-vanilla/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "scripts": {
     "build": "vite build",
-    "clean": "rimraf dist",
+    "clean": "shx rm -rf dist",
     "dev": "vite"
   },
   "dependencies": {
@@ -30,7 +30,6 @@
     "viem": "2.19.8"
   },
   "devDependencies": {
-    "rimraf": "^3.0.2",
     "vite": "^4.2.1",
     "vitest": "0.34.6"
   }

diff --git a/e2e/packages/contracts/package.json b/e2e/packages/contracts/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "scripts": {
     "build": "mud build",
-    "clean": "forge clean && rimraf src/codegen",
+    "clean": "forge clean && shx rm -rf src/**/codegen",
     "deploy:local": "mud deploy",
     "test": "mud test",
     "test:ci": "pnpm run test"
@@ -21,7 +21,6 @@
     "ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
     "forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
     "prettier": "3.2.5",
-    "rimraf": "^3.0.2",
     "typescript": "5.4.2",
     "vite": "^4.2.1",
     "vitest": "0.34.6"

diff --git a/e2e/pnpm-lock.yaml b/e2e/pnpm-lock.yaml
diff --git a/examples/local-explorer/mprocs.yaml b/examples/local-explorer/mprocs.yaml
@@ -10,7 +10,7 @@ procs:
     shell: anvil --base-fee 0 --block-time 2
   indexer:
     cwd: packages/contracts
-    shell: rimraf $SQLITE_FILENAME && pnpm sqlite-indexer
+    shell: shx rm -rf $SQLITE_FILENAME && pnpm sqlite-indexer
     env:
       RPC_HTTP_URL: "http://127.0.0.1:8545"
       FOLLOW_BLOCK_TAG: "latest"

diff --git a/examples/local-explorer/package.json b/examples/local-explorer/package.json
@@ -21,7 +21,7 @@
     "@typescript-eslint/parser": "7.1.1",
     "eslint": "8.57.0",
     "mprocs": "^0.6.4",
-    "rimraf": "^3.0.2",
+    "shx": "^0.3.4",
     "typescript": "5.4.2"
   },
   "engines": {