Skip to content

Commit

Permalink
Merge branch 'master' into v15-upgrade-proposal
Browse files Browse the repository at this point in the history
  • Loading branch information
clemsos authored Dec 5, 2024
2 parents 528f5a5 + 19f41a9 commit 057d991
Show file tree
Hide file tree
Showing 256 changed files with 23,927 additions and 6,907 deletions.
614 changes: 307 additions & 307 deletions .yarn/releases/yarn-4.5.1.cjs → .yarn/releases/yarn-4.5.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-engines.cjs
spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js"

yarnPath: .yarn/releases/yarn-4.5.1.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
1 change: 0 additions & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,3 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ We also maintain a production branch which is used to deploy to ... production!

If needed, we can also deploy specific versions to production. For this is recommended approach is to open a new pull request against the production branch containing **only** the commits to be deployed since the latest production deploy. One way to do this is to rebase a local production-fix branch against the remote production branch and cherry pick the commits to be deployed from master. After this is a pull request is made and has to be approved by some of our team members. Once approved the updated production branch is immediately deployed.

#### Execptions
#### Exceptions

Both wedlocks (email service) and unlock-protocol-com (static site) are deployed to production from the `master` branch. They do not have a staging environment.

Expand Down
Binary file added design/UP/UP-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions design/UP/UP.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker/development/eth-node/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.1.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
8 changes: 4 additions & 4 deletions docker/development/eth-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"@unlock-protocol/contracts": "latest",
"@unlock-protocol/hardhat-plugin": "latest",
"@unlock-protocol/networks": "latest",
"eslint": "9.14.0",
"eslint": "9.16.0",
"ethers": "6.13.4",
"fs-extra": "11.2.0",
"hardhat": "2.22.15",
"hardhat": "2.22.16",
"hardhat-erc1820": "0.1.0",
"ts-node": "10.9.2",
"typescript": "5.6.3"
"typescript": "5.7.2"
},
"packageManager": "[email protected].1"
"packageManager": "[email protected].3"
}
Loading

0 comments on commit 057d991

Please sign in to comment.