Skip to content

Commit

Permalink
Merge branch 'dev' into pr/13213
Browse files Browse the repository at this point in the history
  • Loading branch information
wackerow committed Jun 24, 2024
2 parents ea2daaf + bc3427c commit 782c6f3
Show file tree
Hide file tree
Showing 1,115 changed files with 5,875 additions and 4,393 deletions.
54 changes: 54 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -12123,6 +12123,60 @@
"contributions": [
"bug"
]
},
{
"login": "stolab",
"name": "stolab",
"avatar_url": "https://avatars.githubusercontent.com/u/144235139?v=4",
"profile": "https://github.com/stolab",
"contributions": [
"content"
]
},
{
"login": "jacobjelen",
"name": "jacobjelen",
"avatar_url": "https://avatars.githubusercontent.com/u/6750124?v=4",
"profile": "http://www.jacobjelen.com",
"contributions": [
"bug"
]
},
{
"login": "Dennayz",
"name": "Dennis Zhang",
"avatar_url": "https://avatars.githubusercontent.com/u/58843979?v=4",
"profile": "https://github.com/Dennayz",
"contributions": [
"tool"
]
},
{
"login": "JanetMo",
"name": "Marlene Marz",
"avatar_url": "https://avatars.githubusercontent.com/u/42071757?v=4",
"profile": "https://github.com/JanetMo",
"contributions": [
"content"
]
},
{
"login": "mahnunchik",
"name": "Evgeny",
"avatar_url": "https://avatars.githubusercontent.com/u/780935?v=4",
"profile": "https://github.com/mahnunchik",
"contributions": [
"tool"
]
},
{
"login": "SnehalSrivastava27",
"name": "SnehalSrivastava27",
"avatar_url": "https://avatars.githubusercontent.com/u/118104081?v=4",
"profile": "https://github.com/SnehalSrivastava27",
"contributions": [
"maintenance"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Bug report
description: Create a report to help us improve
title: Bug report
labels: ["bug :bug:"]
labels: ["bug 🐛"]
body:
- type: textarea
id: bug_report_description
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/event_listing.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Event listing
description: Request an Ethereum event for listing
title: Event listing
labels: ["event :calendar:"]
labels: ["event 📅"]
body:
- type: input
id: event_listing_name
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Feature request
description: Suggest an idea for this project
title: Feature request
labels: ["feature :sparkles:"]
labels: ["feature "]
body:
- type: textarea
id: feature_request_description
Expand Down
9 changes: 8 additions & 1 deletion .github/ISSUE_TEMPLATE/suggest_dapp.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest a dapp
description: Suggest a new dapp to list on ethereum.org
title: Suggest a dapp
labels: ["feature :sparkles:", "content :fountain_pen:"]
labels: ["product 🧰"]
body:
- type: markdown
attributes:
Expand All @@ -24,6 +24,13 @@ body:
description: Please provide the official name of the dapp
validations:
required: true
- type: input
id: dapp_url
attributes:
label: Dapp URL
description: Please provide a URL to the dapp
validations:
required: true
- type: textarea
id: dapp_description
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_dev_tool.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest a developer tool
description: Anything a developer can use when building with Ethereum
title: Suggest a developer tool
labels: ["feature :sparkles:", "content :fountain_pen:"]
labels: ["product 🧰"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_exchange.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest an exchange
description: Suggest a new exchange to list on ethereum.org
title: Suggest an exchange
labels: ["content :fountain_pen:"]
labels: ["product 🧰"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_glossary_term.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest a glossary term
description: Suggest a new ethereum.org glossary term
title: Suggest a glossary term
labels: ["feature :sparkles:", "content :fountain_pen:"]
labels: ["feature ", "content 🖋️"]
body:
- type: checkboxes
id: glossary_checklist
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_layer2.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest a Layer 2
description: Suggest a Layer 2 to list on ethereum.org
title: Suggest a Layer 2
labels: ["feature :sparkles:", "content :fountain_pen:"]
labels: ["product 🧰"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_quiz.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest quiz
description: Add, update, delete questions for a quiz on ethereum.osg
title: Add/Update/Delete quiz question
labels: ["feature :sparkles", "quiz :books:"]
labels: ["feature ", "quiz 📚"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_staking_product.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest a staking product or service
description: Suggest a staking product or service to list on ethereum.org
title: Suggest a staking product or service
labels: ["feature :sparkles:", "content :fountain_pen:"]
labels: ["product 🧰"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_tutorial.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest a tutorial
description: Suggest a tutorial to our developers platform
title: Suggest a tutorial
labels: ["feature :sparkles:", "content :fountain_pen:"]
labels: ["feature ", "content 🖋️"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_wallet.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Suggest a wallet
description: Suggest a new wallet to list on ethereum.org
title: Suggest a wallet
labels: ["wallet :purse:"]
labels: ["product 🧰", "wallet 👛"]
body:
- type: markdown
attributes:
Expand Down
38 changes: 19 additions & 19 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
name-template: v$NEXT_PATCH_VERSION
tag-template: v$NEXT_PATCH_VERSION
categories:
- title: ":rocket: Enhancement"
label: "feature :sparkles:"
- title: "🚀 Enhancement"
label: "feature "

- title: ":globe_with_meridians: Translations"
label: "translation :earth_africa:"
- title: "🌐 Translations"
label: "translation 🌍"

- title: ":bug: Bug Fix"
label: "bug :bug:"
- title: "🐛 Bug Fix"
label: "bug 🐛"

- title: ":memo: Documentation"
label: "documentation :book:"
- title: "📝 Documentation"
label: "documentation 📖"

- title: ":nail_care: Refactor"
label: "refactor :recycle:"
- title: "💅 Refactor"
label: "refactor ♻️"

- title: ":house: Internal"
label: "internal :house:"
- title: "🏠 Internal"
label: "internal 🏠"

- title: ":wrench: Tooling"
label: "tooling :wrench:"
- title: "🔧 Tooling"
label: "tooling 🔧"

- title: ":package: Dependencies"
label: "dependencies :package:"
- title: "📦 Dependencies"
label: "dependencies 📦"

change-template: "- $TITLE (#$NUMBER) @$AUTHOR"
no-changes-template: "- No changes"
template: |
***
### :zap: Changes
### ⚡️ Changes
$CHANGES
***
### :unicorn: Contributors
Thank you $CONTRIBUTORS for the contributions! :trophy:
### 🦄 Contributors
Thank you $CONTRIBUTORS for the contributions! 🏆
***
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,7 @@ robots.txt

# Crowdin report output
src/data/crowdin/bucketsAwaitingReviewReport.csv

# Storybook
build-storybook.log
storybook-static
3 changes: 3 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const config: StorybookConfig = {
"@storybook/addon-essentials",
"@storybook/addon-interactions",
"storybook-react-i18next",
"@chromatic-com/storybook"
],
staticDirs: ["../public"],
framework: {
Expand Down Expand Up @@ -68,6 +69,8 @@ const config: StorybookConfig = {
return !(isStyledSystemProp || isHTMLElementProp)
},
},

reactDocgen: "react-docgen-typescript"
},
}
export default config
2 changes: 1 addition & 1 deletion .storybook/manager.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { addons } from "@storybook/manager-api"
import theme from "./theme"
import favicon from "../public/favicon.png"
import favicon from "../public/images/favicon.png"

addons.setConfig({
theme,
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1855,6 +1855,14 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/yunseonna"><img src="https://avatars.githubusercontent.com/u/148749864?v=4?s=100" width="100px;" alt="yunseon na"/><br /><sub><b>yunseon na</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=yunseonna" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/alex1092"><img src="https://avatars.githubusercontent.com/u/59183749?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=alex1092" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kyndrawynne"><img src="https://avatars.githubusercontent.com/u/108100622?v=4?s=100" width="100px;" alt="kyndrawynne"/><br /><sub><b>kyndrawynne</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Akyndrawynne" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/stolab"><img src="https://avatars.githubusercontent.com/u/144235139?v=4?s=100" width="100px;" alt="stolab"/><br /><sub><b>stolab</b></sub></a><br /><a href="#content-stolab" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.jacobjelen.com"><img src="https://avatars.githubusercontent.com/u/6750124?v=4?s=100" width="100px;" alt="jacobjelen"/><br /><sub><b>jacobjelen</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Ajacobjelen" title="Bug reports">🐛</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Dennayz"><img src="https://avatars.githubusercontent.com/u/58843979?v=4?s=100" width="100px;" alt="Dennis Zhang"/><br /><sub><b>Dennis Zhang</b></sub></a><br /><a href="#tool-Dennayz" title="Tools">🔧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JanetMo"><img src="https://avatars.githubusercontent.com/u/42071757?v=4?s=100" width="100px;" alt="Marlene Marz"/><br /><sub><b>Marlene Marz</b></sub></a><br /><a href="#content-JanetMo" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mahnunchik"><img src="https://avatars.githubusercontent.com/u/780935?v=4?s=100" width="100px;" alt="Evgeny"/><br /><sub><b>Evgeny</b></sub></a><br /><a href="#tool-mahnunchik" title="Tools">🔧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SnehalSrivastava27"><img src="https://avatars.githubusercontent.com/u/118104081?v=4?s=100" width="100px;" alt="SnehalSrivastava27"/><br /><sub><b>SnehalSrivastava27</b></sub></a><br /><a href="#maintenance-SnehalSrivastava27" title="Maintenance">🚧</a></td>
</tr>
</tbody>
</table>
Expand Down
5 changes: 5 additions & 0 deletions chromatic.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projectId": "Project:6629cd26b1440f2cc20b94c0",
"zip": true,
"buildScriptName": "build-storybook:chromatic"
}
24 changes: 1 addition & 23 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,4 @@
[[plugins.inputs.audits]]
path = "en/developers/docs/intro-to-ethereum/"
[[plugins.inputs.audits]]
path = "en/developers/tutorials/creating-a-wagmi-ui-for-your-contract/"

[functions]

[functions.___netlify-odb-handler]
external_node_modules = ["sharp"]
included_files = [
"./src/intl/**/*",
"!./public/**/*",
"node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/router-context*",
"node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/amp-context*",
"node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/head-manager-context*",
"node_modules/sharp/**/*",
]

[functions.___netlify-handler]
included_files = [
"./src/intl/**/*",
"!./public/**/*",
"node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/router-context*",
"node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/amp-context*",
"node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/head-manager-context*",
]
path = "en/developers/tutorials/creating-a-wagmi-ui-for-your-contract/"
24 changes: 23 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,29 @@ module.exports = (phase, { defaultConfig }) => {
}

if (phase !== PHASE_DEVELOPMENT_SERVER) {
nextConfig = { ...nextConfig, experimental }
nextConfig = {
...nextConfig,
experimental: {
...experimental,
outputFileTracingExcludes: {
"*": [
/**
* Exclude these paths from the trace output to avoid bloating the
* Netlify functions bundle.
*
* @see https://github.com/orgs/vercel/discussions/103#discussioncomment-5427097
* @see https://nextjs.org/docs/app/api-reference/next-config-js/output#automatically-copying-traced-files
*/
"node_modules/@swc/core-linux-x64-gnu",
"node_modules/@swc/core-linux-x64-musl",
"node_modules/@esbuild/linux-x64",
"public/**/*.png",
"public/**/*.gif",
"src/data",
],
},
},
}
}

return nextConfig
Expand Down
Loading

0 comments on commit 782c6f3

Please sign in to comment.