Skip to content

Commit ad491e0

Browse files
committed
Merge branch 'dev' into pr/thanedouglass/13448
2 parents 5927f86 + 438bec9 commit ad491e0

File tree

4,314 files changed

+298875
-144387
lines changed

Some content is hidden

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

4,314 files changed

+298875
-144387
lines changed

.all-contributorsrc

Lines changed: 391 additions & 1 deletion
Large diffs are not rendered by default.

.env.example

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
# NEXT_PUBLIC_ALGOLIA_APP_ID=insertValue
88
# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=insertValue
99
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue
10+
11+
# Github token for read-only use with api functions
1012
# NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=insertValue
1113

1214
# Etherscan API key (required for Etherscan API fetches)
@@ -29,8 +31,15 @@ IS_PREVIEW_DEPLOY=false
2931
# Build pages only for the specified langs. Leave it empty to build all the langs
3032
# e.g. `en,fr` will only build English and French pages
3133
# Note: always include `en` as it is the default lang of the site
32-
BUILD_LOCALES=
34+
NEXT_PUBLIC_BUILD_LOCALES=
3335

3436
# If resource constraints are being hit during builds, change LIMIT_CPUS to a
3537
# fixed number of CPUs (e.g. 2) to limit the demand during build time
36-
LIMIT_CPUS=
38+
LIMIT_CPUS=
39+
40+
# Enables the bundle analyzer
41+
ANALYZE=false
42+
43+
# Use mock data for development. Set to "false" to use live data but you must have the
44+
# environment variables set to make api requests
45+
USE_MOCK_DATA=true

.eslintrc.json

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
"env": {
1010
"es6": true
1111
},
12-
"plugins": [
13-
"simple-import-sort",
14-
"@typescript-eslint",
15-
"unused-imports"
16-
],
12+
"plugins": ["simple-import-sort", "@typescript-eslint", "unused-imports"],
1713
"parser": "@typescript-eslint/parser",
1814
"rules": {
1915
"simple-import-sort/imports": [
@@ -26,55 +22,27 @@
2622
],
2723
// Packages. `react` related packages come first.
2824
// Also, put `react-icons` in sorting order not with `react`
29-
[
30-
"^react(?!-.)$",
31-
"^\\w",
32-
"^@\\w"
33-
],
34-
// The Chakra theme directory if imported to story file or other places
35-
[
36-
"^@/@chakra-ui"
37-
],
25+
["^react(?!-.)$", "^\\w", "^@\\w"],
3826
// From the `types` directory.
39-
[
40-
"^@/lib/types",
41-
"^@/lib/interfaces"
42-
],
27+
["^@/lib/types", "^@/lib/interfaces"],
4328
// From the `components` directory.
44-
[
45-
"^@/components"
46-
],
29+
["^@/components"],
4730
// From the `utils` directory.
48-
[
49-
"^@/lib/utils"
50-
],
31+
["^@/lib/utils"],
5132
// From the `data` directory.
52-
[
53-
"^@/data"
54-
],
33+
["^@/data"],
5534
// From the `constants` directory.
5635
["^@/lib/constants"],
57-
// From the `.storybook/utils` file
58-
["^@/storybook-utils"],
36+
// `.storybook` directory and utils files`
37+
["^@/storybook","^@/storybook-utils"],
5938
// Parent imports. Put `..` last.
60-
[
61-
"^\\.\\.(?!/?$)",
62-
"^\\.\\./?$"
63-
],
39+
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
6440
// Other relative imports. Put same-folder imports and `.` last.
65-
[
66-
"^\\./(?=.*/)(?!/?$)",
67-
"^\\.(?!/?$)",
68-
"^\\./?$"
69-
],
41+
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
7042
// Style imports.
71-
[
72-
"^.+\\.s?css$"
73-
],
43+
["^.+\\.s?css$"],
7444
// Side effect imports.
75-
[
76-
"^\\u0000"
77-
]
45+
["^\\u0000"]
7846
]
7947
}
8048
],
@@ -89,7 +57,7 @@
8957
],
9058
"unused-imports/no-unused-vars": [
9159
"error",
92-
{
60+
{
9361
"args": "all",
9462
"argsIgnorePattern": "^_$",
9563
"varsIgnorePattern": "^_$"
@@ -98,4 +66,3 @@
9866
"unused-imports/no-unused-imports-ts": "warn"
9967
}
10068
}
101-

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
# These owners will be the default owners for everything in
77
# the repo. Unless a later match takes precedence,
8-
* @wackerow @corwintines @pettinarip @minimalsm @nhsz
8+
* @wackerow @corwintines @pettinarip @minimalsm
99

1010
# Owners of specific files
1111
/src/data/consensus-bounty-hunters.json @djrtwo @asanso @fredriksvantes
12+
/src/data/wallets/new-to-crypto.ts @konopkja @minimalsm

.github/ISSUE_TEMPLATE/suggest_quiz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Suggest quiz
2-
description: Add, update, delete questions for a quiz on ethereum.osg
2+
description: Add, update, delete questions for a quiz on ethereum.org
33
title: Add/Update/Delete quiz question
44
labels: ["feature ✨", "quiz 📚"]
55
body:

.github/ISSUE_TEMPLATE/suggest_wallet.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ body:
264264
- type: input
265265
id: wallet_l2_support
266266
attributes:
267-
label: Does the wallet support Ethereum layer 2 networks?
267+
label: Which Ethereum Layer 2 networks does the wallet support?
268268
description: Please provide documentation on Ethereum layer 2 networks this wallet supports.
269269
validations:
270270
required: true

.github/labeler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"config ⚙️":
1717
- i18n.config.json
1818
- next.config.js
19-
- next-i18next.config,js
2019
- next-sitemap.config.js
2120
- tsconfig.json
2221
- .nvmrc

.github/workflows/chromatic.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
- "src/components/**/*"
1616
- "src/pages/**/*"
1717
- "src/layouts/**/*"
18-
- "src/@chakra-ui/**/*"
1918
- ".storybook/**/*"
2019
- "tailwind.config.ts"
2120
- "src/styles/**/*"

.github/workflows/generate-review-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
2929

3030
- name: Upload output as artifact
31-
uses: actions/upload-artifact@v2
31+
uses: actions/upload-artifact@v4
3232
with:
3333
name: output
3434
path: ./src/data/crowdin/bucketsAwaitingReviewReport.csv

.github/workflows/non-english-warning.yml

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)