Skip to content

Commit b51a866

Browse files
committed
fix location where peer dependency is added
1 parent 9e1ce8d commit b51a866

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

scripts/upgradeable/transpile.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
set -euo pipefail -x
44

5-
VERSION=$(jq -r .version package.json)
5+
VERSION="$(jq -r .version package.json)"
66
DIRNAME="$(dirname -- "${BASH_SOURCE[0]}")"
77

88
bash "$DIRNAME/patch-apply.sh"
9-
sed -i "s/<package-version>/$VERSION/g" package.json
10-
git add package.json
9+
sed -i "s/<package-version>/$VERSION/g" contracts/package.json
10+
git add contracts/package.json
1111

1212
npm run clean
1313
npm run compile

scripts/upgradeable/upgradeable.patch

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ index ff596b0c3..000000000
5959
-<!-- Make sure that you have reviewed the OpenZeppelin Contracts Contributor Guidelines. -->
6060
-<!-- https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/CONTRIBUTING.md -->
6161
diff --git a/README.md b/README.md
62-
index 53c29e5f8..59f72a542 100644
62+
index 549891e3f..a6b24078e 100644
6363
--- a/README.md
6464
+++ b/README.md
6565
@@ -23,6 +23,9 @@
@@ -81,8 +81,8 @@ index 53c29e5f8..59f72a542 100644
8181
```
8282

8383
#### Foundry (git)
84-
@@ -40,10 +43,10 @@ $ npm install @openzeppelin/contracts
85-
> **Warning** Foundry installs the latest version initially, but subsequent `forge update` commands will use the `master` branch.
84+
@@ -42,10 +45,10 @@ $ npm install @openzeppelin/contracts
85+
> Foundry installs the latest version initially, but subsequent `forge update` commands will use the `master` branch.
8686

8787
```
8888
-$ forge install OpenZeppelin/openzeppelin-contracts
@@ -94,7 +94,7 @@ index 53c29e5f8..59f72a542 100644
9494

9595
### Usage
9696

97-
@@ -52,10 +55,11 @@ Once installed, you can use the contracts in the library by importing them:
97+
@@ -54,10 +57,11 @@ Once installed, you can use the contracts in the library by importing them:
9898
```solidity
9999
pragma solidity ^0.8.20;
100100

@@ -110,7 +110,7 @@ index 53c29e5f8..59f72a542 100644
110110
}
111111
```
112112
diff --git a/contracts/package.json b/contracts/package.json
113-
index 9017953ca..c6eec1a88 100644
113+
index 9017953ca..f51c1d38b 100644
114114
--- a/contracts/package.json
115115
+++ b/contracts/package.json
116116
@@ -1,5 +1,5 @@
@@ -129,6 +129,16 @@ index 9017953ca..c6eec1a88 100644
129129
},
130130
"keywords": [
131131
"solidity",
132+
@@ -28,5 +28,8 @@
133+
"bugs": {
134+
"url": "https://github.com/OpenZeppelin/openzeppelin-contracts/issues"
135+
},
136+
- "homepage": "https://openzeppelin.com/contracts/"
137+
+ "homepage": "https://openzeppelin.com/contracts/",
138+
+ "peerDependencies": {
139+
+ "@openzeppelin/contracts": "<package-version>"
140+
+ }
141+
}
132142
diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol
133143
index 644f6f531..ab8ba05ff 100644
134144
--- a/contracts/utils/cryptography/EIP712.sol
@@ -297,10 +307,10 @@ index 644f6f531..ab8ba05ff 100644
297307
}
298308
}
299309
diff --git a/package.json b/package.json
300-
index e25097399..fbcc10d88 100644
310+
index 3a1617c09..97e59c2d9 100644
301311
--- a/package.json
302312
+++ b/package.json
303-
@@ -33,7 +33,7 @@
313+
@@ -32,7 +32,7 @@
304314
},
305315
"repository": {
306316
"type": "git",
@@ -309,16 +319,6 @@ index e25097399..fbcc10d88 100644
309319
},
310320
"keywords": [
311321
"solidity",
312-
@@ -49,6 +49,9 @@
313-
"url": "https://github.com/OpenZeppelin/openzeppelin-contracts/issues"
314-
},
315-
"homepage": "https://openzeppelin.com/contracts/",
316-
+ "peerDependencies": {
317-
+ "@openzeppelin/contracts": "<package-version>"
318-
+ },
319-
"devDependencies": {
320-
"@changesets/changelog-github": "^0.4.8",
321-
"@changesets/cli": "^2.26.0",
322322
diff --git a/test/utils/cryptography/EIP712.test.js b/test/utils/cryptography/EIP712.test.js
323323
index faf01f1a3..b25171a56 100644
324324
--- a/test/utils/cryptography/EIP712.test.js

0 commit comments

Comments
 (0)