Skip to content

Commit 1c47ec3

Browse files
authored
Merge branch 'dev' into setupFindWalletTranslation
2 parents a42b98d + 7108a12 commit 1c47ec3

File tree

72 files changed

+3256
-4029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3256
-4029
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9991,6 +9991,15 @@
99919991
"contributions": [
99929992
"content"
99939993
]
9994+
},
9995+
{
9996+
"login": "therealharpaljadeja",
9997+
"name": "Harpal Jadeja",
9998+
"avatar_url": "https://avatars.githubusercontent.com/u/38040789?v=4",
9999+
"profile": "https://github.com/therealharpaljadeja",
10000+
"contributions": [
10001+
"code"
10002+
]
999410003
}
999510004
],
999610005
"contributorsPerLine": 7,

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,6 +1565,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15651565
<td align="center" valign="top" width="14.28%"><a href="https://github.com/danierod"><img src="https://avatars.githubusercontent.com/u/12255235?v=4?s=100" width="100px;" alt="danierod"/><br /><sub><b>danierod</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=danierod" title="Code">💻</a></td>
15661566
<td align="center" valign="top" width="14.28%"><a href="https://github.com/siddtheone"><img src="https://avatars.githubusercontent.com/u/45398971?v=4?s=100" width="100px;" alt="siddtheone"/><br /><sub><b>siddtheone</b></sub></a><br /><a href="#content-siddtheone" title="Content">🖋</a></td>
15671567
<td align="center" valign="top" width="14.28%"><a href="http://shawkisukkar.com/"><img src="https://avatars.githubusercontent.com/u/57439827?v=4?s=100" width="100px;" alt="Shawki Sukkar"/><br /><sub><b>Shawki Sukkar</b></sub></a><br /><a href="#content-ShawkiS" title="Content">🖋</a></td>
1568+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/therealharpaljadeja"><img src="https://avatars.githubusercontent.com/u/38040789?v=4?s=100" width="100px;" alt="Harpal Jadeja"/><br /><sub><b>Harpal Jadeja</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=therealharpaljadeja" title="Code">💻</a></td>
15681569
</tr>
15691570
</tbody>
15701571
</table>

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@
2828
"ethereum-blockies-base64": "^1.0.2",
2929
"focus-trap-react": "^10.0.0",
3030
"framer-motion": "^6.5.1",
31-
"gatsby": "^4.21.1",
32-
"gatsby-plugin-emotion": "^7.19.0",
33-
"gatsby-plugin-gatsby-cloud": "^4.20.0",
34-
"gatsby-plugin-image": "^2.21.0",
35-
"gatsby-plugin-manifest": "^4.21.0",
36-
"gatsby-plugin-matomo": "^0.9.0",
31+
"gatsby": "^5.4.1",
32+
"gatsby-plugin-emotion": "^8.4.0",
33+
"gatsby-plugin-gatsby-cloud": "^5.4.0",
34+
"gatsby-plugin-image": "^3.4.0",
35+
"gatsby-plugin-manifest": "^5.4.0",
36+
"gatsby-plugin-matomo": "^0.14.0",
3737
"gatsby-plugin-mdx": "^3.0.0",
38-
"gatsby-plugin-netlify": "^5.0.1",
39-
"gatsby-plugin-react-helmet": "^5.0.0",
38+
"gatsby-plugin-netlify": "^5.1.0",
39+
"gatsby-plugin-react-helmet": "^6.4.0",
4040
"gatsby-plugin-react-helmet-canonical-urls": "^1.4.0",
41-
"gatsby-plugin-react-svg": "^3.1.0",
42-
"gatsby-plugin-robots-txt": "^1.7.1",
43-
"gatsby-plugin-sharp": "^4.21.0",
44-
"gatsby-plugin-sitemap": "^5.21.0",
41+
"gatsby-plugin-react-svg": "^3.3.0",
42+
"gatsby-plugin-robots-txt": "^1.8.0",
43+
"gatsby-plugin-sharp": "^5.4.0",
44+
"gatsby-plugin-sitemap": "^6.4.0",
4545
"gatsby-remark-autolink-headers": "^5.21.0",
4646
"gatsby-remark-copy-linked-files": "^5.21.0",
4747
"gatsby-remark-images": "^6.21.0",
4848
"gatsby-remark-reading-time": "^1.1.0",
49-
"gatsby-source-filesystem": "^4.21.1",
49+
"gatsby-source-filesystem": "^5.4.0",
5050
"gatsby-theme-i18n": "^3.0.0",
5151
"gatsby-theme-i18n-react-intl": "^3.0.0",
52-
"gatsby-transformer-csv": "^4.0.0",
52+
"gatsby-transformer-csv": "^5.4.0",
5353
"gatsby-transformer-gitinfo": "^1.1.0",
54-
"gatsby-transformer-json": "^4.11.0",
55-
"gatsby-transformer-remark": "^5.25.1",
56-
"gatsby-transformer-sharp": "^4.21.0",
54+
"gatsby-transformer-json": "^5.4.0",
55+
"gatsby-transformer-remark": "^6.4.0",
56+
"gatsby-transformer-sharp": "^5.4.0",
5757
"is-relative-url": "^3.0.0",
5858
"lodash": "^4.17.21",
5959
"luxon": "^1.28.1",
@@ -110,14 +110,14 @@
110110
},
111111
"scripts": {
112112
"build": "gatsby build",
113-
"build:lambda": "netlify-lambda build src/lambda --config=./webpack.lambda.js",
113+
"build:lambda": "NODE_OPTIONS=--openssl-legacy-provider netlify-lambda build src/lambda --config=./webpack.lambda.js",
114114
"build:10gb": "NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
115115
"clean": "gatsby clean",
116116
"crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
117117
"crowdin-import": "ts-node src/scripts/crowdin-import.ts",
118118
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
119119
"markdown-checker": "node src/scripts/markdown-checker.js",
120-
"generate-heading-ids": "ts-node --esm src/scripts/generateHeadingIds.mts",
120+
"generate-heading-ids": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/generateHeadingIds.ts",
121121
"start": "gatsby develop",
122122
"start:lambda": "netlify-lambda serve src/lambda",
123123
"start:static": "gatsby build && gatsby serve",
@@ -132,7 +132,7 @@
132132
}
133133
},
134134
"volta": {
135-
"node": "16.15.0",
135+
"node": "18.13.0",
136136
"npm": "8.5.5",
137137
"yarn": "1.22.18"
138138
}

src/@chakra-ui/gatsby-plugin/foundations/shadows.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const shadows = {
1515
light: "0 1px 1px rgba(0, 0, 0, 0.1)",
1616
dark: "0 1px 1px hsla(0,0%,100%,.1)",
1717
},
18+
tableItemBoxHover: "0 0 1px var(--eth-colors-primary)",
1819
}
1920

2021
export default shadows

src/assets/wallets/apex.png

17.5 KB
Loading

src/assets/wallets/bitkeep.png

24 KB
Loading

src/assets/wallets/blockwallet.png

460 Bytes
Loading

src/assets/wallets/okx.jpeg

8.47 KB
Loading

src/assets/wallets/onekey.png

11.5 KB
Loading

src/assets/wallets/safe.png

61.1 KB
Loading

0 commit comments

Comments
 (0)