install foundry via foundry-js

latticexyz · Feb 16, 2024 · 9635c83 · 9635c83
1 parent ccc7b9e
commit 9635c83
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 37 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,3 +1,3 @@
 {
-  "onCreateCommand": "curl -L https://foundry.paradigm.xyz | bash && /home/codespace/.foundry/bin/foundryup && pnpm install"
+  "onCreateCommand": "bash && pnpm install"
 }
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -15,11 +15,6 @@ runs:
         registry-url: https://registry.npmjs.org
         cache: pnpm
 
-    - name: Setup foundry
-      uses: foundry-rs/foundry-toolchain@v1
-      with:
-        version: nightly
-
     # 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)

diff --git a/Dockerfile b/Dockerfile
@@ -26,15 +26,6 @@ RUN wget https://dl.google.com/go/go1.20.4.linux-amd64.tar.gz && \
     tar -C /usr/local/ -xzf go1.20.4.linux-amd64.tar.gz && \
     go version
 
-# foundry
-ENV PATH="${PATH}:/root/.foundry/bin"
-RUN curl -L https://foundry.paradigm.xyz/ | bash && \
-    ${HOME}/.foundry/bin/foundryup && \
-    forge --version && \
-    cast --version && \
-    anvil --version && \
-    chisel --version
-
 # pnpm
 ENV PNPM_HOME="/pnpm"
 ENV PATH="${PATH}:${PNPM_HOME}"

diff --git a/docs/pages/quick-start.mdx b/docs/pages/quick-start.mdx
@@ -9,17 +9,15 @@ Before we begin let’s make sure your local environment is setup with the prope
 ## Prerequisites
 
 1. git ([download](https://git-scm.com/downloads))
-2. foundry (forge, anvil, cast) ([download](https://book.getfoundry.sh/getting-started/installation), make sure to `foundryup` at least once)
-3. node.js (v16+) ([download](https://nodejs.org/en/download/))
-4. pnpm (after installing node: `npm install --global pnpm`)
+2. node.js (v16+) ([download](https://nodejs.org/en/download/))
+3. pnpm (after installing node: `npm install --global pnpm`)
 
 If you are using Windows:
 
 **Windows steps**
 
 1. install git bash (gitforwindows.org)
 2. install `nodejs`, including “native modules” (nodejs.org/en/download) (re native modules: just keep the checkmark, it’s enabled by default in the installer)
-3. Install foundry via foundryup using Git bash
 
 ## Project setup
 

diff --git a/docs/pages/tutorials/emojimon/getting-started.mdx b/docs/pages/tutorials/emojimon/getting-started.mdx
@@ -3,9 +3,8 @@
 ## Prerequisites
 
 1. git ([download](https://git-scm.com/downloads))
-2. foundry (forge, anvil, cast) ([download](https://book.getfoundry.sh/getting-started/installation), make sure to `foundryup` at least once)
-3. node.js (v17+) ([download](https://nodejs.org/en/download/))
-4. pnpm (`npm install pnpm --global` after installing node)
+2. node.js (v17+) ([download](https://nodejs.org/en/download/))
+3. pnpm (`npm install pnpm --global` after installing node)
 
 ## Setup
 

diff --git a/package.json b/package.json
@@ -13,10 +13,9 @@
     "dev": "turbo run dev --concurrency 100",
     "dist-tag-rm": "pnpm recursive exec -- sh -c 'npm dist-tag rm $(cat package.json | jq -r \".name\") $TAG || true'",
     "docs:generate:api": "bun scripts/render-api-docs.ts",
-    "foundryup": "curl -L https://foundry.paradigm.xyz | bash && bash ~/.foundry/bin/foundryup",
     "gas-report": "pnpm run --recursive --parallel gas-report",
     "lint": "pnpm prettier:check && eslint . --ext .ts --ext .tsx",
-    "prepare": "husky install && (forge --version || pnpm foundryup)",
+    "prepare": "husky install && forge --version",
     "prettier": "prettier --write '**/*.{ts,tsx,css,md,mdx,sol}'",
     "prettier:check": "prettier --check '**/*.{ts,tsx,css,md,mdx,sol}'",
     "release:check": "changeset status --verbose --since=origin/main",
@@ -40,6 +39,7 @@
     "chalk": "^5.2.0",
     "eslint": "8.29.0",
     "execa": "^7.0.0",
+    "foundry-js": "^1.0.63",
     "husky": ">=6",
     "lint-staged": ">=10",
     "prettier": "^2.8.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/templates/phaser/package.json b/templates/phaser/package.json
@@ -6,16 +6,16 @@
     "dev": "mprocs",
     "dev:client": "pnpm --filter 'client' run dev",
     "dev:contracts": "pnpm --filter 'contracts' dev",
-    "foundry:up": "curl -L https://foundry.paradigm.xyz | bash && bash $HOME/.foundry/bin/foundryup",
     "mud:up": "pnpm mud set-version --tag main && pnpm install",
-    "prepare": "(forge --version || pnpm foundry:up)",
+    "prepare": "forge --version",
     "test": "pnpm recursive run test"
   },
   "devDependencies": {
     "@latticexyz/cli": "link:../../packages/cli",
     "@typescript-eslint/eslint-plugin": "5.46.1",
     "@typescript-eslint/parser": "5.46.1",
     "eslint": "8.29.0",
+    "foundry-js": "^1.0.63",
     "mprocs": "^0.6.4",
     "rimraf": "^3.0.2",
     "typescript": "5.1.6"

diff --git a/templates/react-ecs/package.json b/templates/react-ecs/package.json
@@ -6,16 +6,16 @@
     "dev": "mprocs",
     "dev:client": "pnpm --filter 'client' run dev",
     "dev:contracts": "pnpm --filter 'contracts' dev",
-    "foundry:up": "curl -L https://foundry.paradigm.xyz | bash && bash $HOME/.foundry/bin/foundryup",
     "mud:up": "pnpm mud set-version --tag main && pnpm install",
-    "prepare": "(forge --version || pnpm foundry:up)",
+    "prepare": "forge --version",
     "test": "pnpm recursive run test"
   },
   "devDependencies": {
     "@latticexyz/cli": "link:../../packages/cli",
     "@typescript-eslint/eslint-plugin": "5.46.1",
     "@typescript-eslint/parser": "5.46.1",
     "eslint": "8.29.0",
+    "foundry-js": "^1.0.63",
     "mprocs": "^0.6.4",
     "rimraf": "^3.0.2",
     "typescript": "5.1.6"

diff --git a/templates/react/package.json b/templates/react/package.json
@@ -6,16 +6,16 @@
     "dev": "mprocs",
     "dev:client": "pnpm --filter 'client' run dev",
     "dev:contracts": "pnpm --filter 'contracts' dev",
-    "foundry:up": "curl -L https://foundry.paradigm.xyz | bash && bash $HOME/.foundry/bin/foundryup",
     "mud:up": "pnpm mud set-version --tag main && pnpm install",
-    "prepare": "(forge --version || pnpm foundry:up)",
+    "prepare": "forge --version",
     "test": "pnpm recursive run test"
   },
   "devDependencies": {
     "@latticexyz/cli": "link:../../packages/cli",
     "@typescript-eslint/eslint-plugin": "5.46.1",
     "@typescript-eslint/parser": "5.46.1",
     "eslint": "8.29.0",
+    "foundry-js": "^1.0.63",
     "mprocs": "^0.6.4",
     "rimraf": "^3.0.2",
     "typescript": "5.1.6"

diff --git a/templates/threejs/package.json b/templates/threejs/package.json
@@ -6,16 +6,16 @@
     "dev": "mprocs",
     "dev:client": "pnpm --filter 'client' run dev",
     "dev:contracts": "pnpm --filter 'contracts' dev",
-    "foundry:up": "curl -L https://foundry.paradigm.xyz | bash && bash $HOME/.foundry/bin/foundryup",
     "mud:up": "pnpm mud set-version --tag main && pnpm install",
-    "prepare": "(forge --version || pnpm foundry:up)",
+    "prepare": "forge --version",
     "test": "pnpm recursive run test"
   },
   "devDependencies": {
     "@latticexyz/cli": "link:../../packages/cli",
     "@typescript-eslint/eslint-plugin": "5.46.1",
     "@typescript-eslint/parser": "5.46.1",
     "eslint": "8.29.0",
+    "foundry-js": "^1.0.63",
     "mprocs": "^0.6.4",
     "rimraf": "^3.0.2",
     "typescript": "5.1.6"

diff --git a/templates/vanilla/package.json b/templates/vanilla/package.json
@@ -6,9 +6,8 @@
     "dev": "mprocs",
     "dev:client": "pnpm --filter 'client' run dev",
     "dev:contracts": "pnpm --filter 'contracts' dev",
-    "foundry:up": "curl -L https://foundry.paradigm.xyz | bash && bash $HOME/.foundry/bin/foundryup",
     "mud:up": "pnpm mud set-version --tag main && pnpm install",
-    "prepare": "(forge --version || pnpm foundry:up)",
+    "prepare": "forge --version",
     "test": "pnpm recursive run test"
   },
   "devDependencies": {