build: include test utils in package

build: install prb test as npm package
build: install forge as npm package
build: remove gitmodules
ci: install node js dependencies in build and test job
chore: update remappings accordingly

.github/workflows/ci.yml

@@ -52,8 +52,6 @@ jobs:
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
 
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"
@@ -103,8 +101,6 @@ jobs:
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
 
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"
@@ -116,6 +112,20 @@ jobs:
           key: "foundry-build-${{ github.sha }}"
           path: "out-optimized"
 
+      - name: "Install Pnpm"
+        uses: "pnpm/action-setup@v2"
+        with:
+          version: "8"
+
+      - name: "Install Node.js"
+        uses: "actions/setup-node@v3"
+        with:
+          cache: "pnpm"
+          node-version: "lts/*"
+
+      - name: "Install the Node.js dependencies"
+        run: "pnpm install"
+
       - name: "Run the tests against the optimized build"
         run: "FOUNDRY_PROFILE=test-optimized forge test"
 
@@ -130,12 +140,24 @@ jobs:
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
 
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"
 
+      - name: "Install Pnpm"
+        uses: "pnpm/action-setup@v2"
+        with:
+          version: "8"
+
+      - name: "Install Node.js"
+        uses: "actions/setup-node@v3"
+        with:
+          cache: "pnpm"
+          node-version: "lts/*"
+
+      - name: "Install the Node.js dependencies"
+        run: "pnpm install"
+
       - name: "Run the tests and generate the coverage report"
         run: "forge coverage --report lcov"
 
@@ -155,8 +177,6 @@ jobs:
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
 
       - name: "Run Slither"
         uses: "crytic/[email protected]"

package.json

@@ -10,12 +10,15 @@
     "url": "https://github.com/PaulRBerg/prb-proxy/issues"
   },
   "devDependencies": {
+    "@forge/std": "github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e",
+    "@prb/test": "0.6.4",
     "prettier": "^2.8.8",
     "solhint-community": "^3.5.2"
   },
   "files": [
     "artifacts",
     "src",
+    "test/utils",
     "CHANGELOG.md"
   ],
   "homepage": "https://github.com/PaulRBerg/prb-proxy#readme",
@@ -29,6 +32,10 @@
     "solidity"
   ],
   "license": "MIT",
+  "peerDependencies": {
+    "@forge/std": "github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e",
+    "@prb/test": "0.6.4"
+  },
   "publishConfig": {
     "access": "public"
   },

remappings.txt

@@ -1,2 +1,2 @@
-@prb/test/=lib/prb-test/src/
-forge-std/=lib/forge-std/src/
+@forge-std/=node_modules/@forge/std/
+@prb/test/=node_modules/@prb/test

script/Base.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.19 <=0.9.0;
 
-import { Script } from "forge-std/Script.sol";
+import { Script } from "@forge-std/src/Script.sol";
 
 abstract contract BaseScript is Script {
     /// @dev Included to enable compilation of the script without a $MNEMONIC environment variable.

test/Base.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.19 <=0.9.0;
 
-import { eqString } from "@prb/test/Helpers.sol";
-import { StdCheats } from "forge-std/StdCheats.sol";
-import { StdUtils } from "forge-std/StdUtils.sol";
+import { eqString } from "@prb/test/src/Helpers.sol";
+import { StdCheats } from "@forge-std/src/StdCheats.sol";
+import { StdUtils } from "@forge-std/src/StdUtils.sol";
 
 import { IPRBProxy } from "../src/interfaces/IPRBProxy.sol";
 import { IPRBProxyRegistry } from "../src/interfaces/IPRBProxyRegistry.sol";

test/proxy/execute/execute.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.19 <=0.9.0;
 
-import { stdError } from "forge-std/StdError.sol";
+import { stdError } from "@forge-std/src/StdError.sol";
 
 import { IPRBProxy } from "src/interfaces/IPRBProxy.sol";
 

test/proxy/run-plugin/runPlugin.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.18 <0.9.0;
 
-import { stdError } from "forge-std/StdError.sol";
+import { stdError } from "@forge-std/src/StdError.sol";
 
 import { IPRBProxy } from "src/interfaces/IPRBProxy.sol";
 

test/utils/Assertions.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.18;
 
-import { PRBTest } from "@prb/test/PRBTest.sol";
+import { PRBTest } from "@prb/test/src/PRBTest.sol";
 
 import { IPRBProxyPlugin } from "../../src/interfaces/IPRBProxyPlugin.sol";