build: install forge-std as NPM packaged

build: add peerDependencies field build: ignore src/test/ path in coverage
PaulRBerg · Oct 30, 2023 · 4d6dc03 · 4d6dc03
1 parent 64d5843
commit 4d6dc03
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/codecov.yml b/codecov.yml
@@ -1,4 +1,5 @@
 comment: false
 ignore:
   - "script"
+  - "src/test/"
   - "test"
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/package.json b/package.json
@@ -9,10 +9,9 @@
   "bugs": {
     "url": "https://github.com/PaulRBerg/prb-proxy/issues"
   },
-  "dependencies": {
-    "@prb/test": "0.6.4"
-  },
   "devDependencies": {
+    "@forge/std": "github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e",
+    "@prb/test": "0.6.4",
     "prettier": "^2.8.8",
     "solhint-community": "^3.5.2"
   },
@@ -32,6 +31,10 @@
     "solidity"
   ],
   "license": "MIT",
+  "peerDependencies": {
+    "@forge/std": "github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e",
+    "@prb/test": "0.6.4"
+  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/remappings.txt b/remappings.txt
@@ -1,2 +1,2 @@
+@forge-std/=node_modules/@forge/std/
 @prb/test/=node_modules/@prb/test
-forge-std/=lib/forge-std/src/
diff --git a/script/Base.s.sol b/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.

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

diff --git a/test/proxy/execute/execute.t.sol b/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";
 

diff --git a/test/proxy/run-plugin/runPlugin.t.sol b/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";