Skip to content

Commit 12ce1ac

Browse files
pettinarippettinarip
committed
Merge branch 'dev' of github.com:ethereum/ethereum-org-website into performance-chartjs
2 parents 6d2d594 + 665a215 commit 12ce1ac

File tree

163 files changed

+3461
-1857
lines changed

Some content is hidden

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

163 files changed

+3461
-1857
lines changed

‎.all-contributorsrc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12168,6 +12168,42 @@
1216812168
"contributions": [
1216912169
"tool"
1217012170
]
12171+
},
12172+
{
12173+
"login": "SnehalSrivastava27",
12174+
"name": "SnehalSrivastava27",
12175+
"avatar_url": "https://avatars.githubusercontent.com/u/118104081?v=4",
12176+
"profile": "https://github.com/SnehalSrivastava27",
12177+
"contributions": [
12178+
"maintenance"
12179+
]
12180+
},
12181+
{
12182+
"login": "wrexgem",
12183+
"name": "wrexgem",
12184+
"avatar_url": "https://avatars.githubusercontent.com/u/134736543?v=4",
12185+
"profile": "https://github.com/wrexgem",
12186+
"contributions": [
12187+
"tool"
12188+
]
12189+
},
12190+
{
12191+
"login": "cd-sigma",
12192+
"name": "ciphernova",
12193+
"avatar_url": "https://avatars.githubusercontent.com/u/119534349?v=4",
12194+
"profile": "https://github.com/cd-sigma",
12195+
"contributions": [
12196+
"content"
12197+
]
12198+
},
12199+
{
12200+
"login": "CodeMongerrr",
12201+
"name": "Aditya Joshi",
12202+
"avatar_url": "https://avatars.githubusercontent.com/u/99281767?v=4",
12203+
"profile": "https://github.com/CodeMongerrr",
12204+
"contributions": [
12205+
"ideas"
12206+
]
1217112207
}
1217212208
],
1217312209
"contributorsPerLine": 7,

‎.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
.next
22
dist
33
node_modules/
4+
5+
!.storybook

‎.eslintrc.json

Lines changed: 66 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{
22
"extends": [
3+
"eslint:recommended",
4+
"plugin:@typescript-eslint/recommended",
35
"next/core-web-vitals",
46
"prettier",
57
"plugin:storybook/recommended"
68
],
7-
"env": { "es6": true },
8-
"plugins": ["simple-import-sort"],
9+
"env": {
10+
"es6": true
11+
},
12+
"plugins": [
13+
"simple-import-sort",
14+
"@typescript-eslint",
15+
"unused-imports"
16+
],
17+
"parser": "@typescript-eslint/parser",
918
"rules": {
1019
"simple-import-sort/imports": [
1120
"error",
@@ -17,32 +26,76 @@
1726
],
1827
// Packages. `react` related packages come first.
1928
// Also, put `react-icons` in sorting order not with `react`
20-
["^react(?!-.)$", "^\\w", "^@\\w"],
29+
[
30+
"^react(?!-.)$",
31+
"^\\w",
32+
"^@\\w"
33+
],
2134
// The Chakra theme directory if imported to story file or other places
22-
["^@/@chakra-ui"],
35+
[
36+
"^@/@chakra-ui"
37+
],
2338
// From the `types` directory.
24-
["^@/lib/types", "^@/lib/interfaces"],
39+
[
40+
"^@/lib/types",
41+
"^@/lib/interfaces"
42+
],
2543
// From the `components` directory.
26-
["^@/components"],
44+
[
45+
"^@/components"
46+
],
2747
// From the `utils` directory.
28-
["^@/lib/utils"],
48+
[
49+
"^@/lib/utils"
50+
],
2951
// From the `data` directory.
30-
["^@/data"],
52+
[
53+
"^@/data"
54+
],
3155
// From the `constants` directory.
3256
["^@/lib/constants"],
3357
// From the `.storybook/utils` file
3458
["^@/storybook-utils"],
3559
// Parent imports. Put `..` last.
36-
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
60+
[
61+
"^\\.\\.(?!/?$)",
62+
"^\\.\\./?$"
63+
],
3764
// Other relative imports. Put same-folder imports and `.` last.
38-
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
65+
[
66+
"^\\./(?=.*/)(?!/?$)",
67+
"^\\.(?!/?$)",
68+
"^\\./?$"
69+
],
3970
// Style imports.
40-
["^.+\\.s?css$"],
71+
[
72+
"^.+\\.s?css$"
73+
],
4174
// Side effect imports.
42-
["^\\u0000"]
75+
[
76+
"^\\u0000"
77+
]
4378
]
4479
}
4580
],
46-
"simple-import-sort/exports": "error"
81+
"simple-import-sort/exports": "error",
82+
"no-unused-vars": "off",
83+
"@typescript-eslint/no-unused-vars": "off",
84+
"@typescript-eslint/no-explicit-any": [
85+
"error",
86+
{
87+
"fixToUnknown": true
88+
}
89+
],
90+
"unused-imports/no-unused-vars": [
91+
"error",
92+
{
93+
"args": "all",
94+
"argsIgnorePattern": "^_$",
95+
"varsIgnorePattern": "^_$"
96+
}
97+
],
98+
"unused-imports/no-unused-imports-ts": "warn"
4799
}
48100
}
101+

‎.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npx lint-staged

‎.lintstagedrc.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
const path = require("path")
2+
3+
const buildEslintCommand = (filenames) =>
4+
`next lint --fix --file ${filenames
5+
.map((f) => path.relative(process.cwd(), f))
6+
.join(" --file ")}`
7+
8+
module.exports = {
9+
"*.{js,jsx,ts,tsx}": [buildEslintCommand],
10+
}

‎.storybook/main.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import type { StorybookConfig } from "@storybook/nextjs"
2-
import { propNames } from "@chakra-ui/react"
3-
41
import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin"
2+
import { propNames } from "@chakra-ui/react"
3+
import type { StorybookConfig } from "@storybook/nextjs"
54

65
/**
76
* Note regarding package.json settings related to Storybook:

‎.storybook/manager-head.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<link rel="icon" type="image/png" href="/favicon.png" sizes="192x192" />

‎.storybook/manager.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { addons } from "@storybook/manager-api"
2-
import theme from "./theme"
2+
33
import favicon from "../public/images/favicon.png"
44

5+
import theme from "./theme"
6+
57
addons.setConfig({
68
theme,
79
})

‎.storybook/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { getI18n } from "react-i18next"
2+
23
import { ns as exposedNs } from "./i18next"
34

45
/**

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,6 +1862,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18621862
<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>
18631863
<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>
18641864
<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>
1865+
<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>
1866+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/wrexgem"><img src="https://avatars.githubusercontent.com/u/134736543?v=4?s=100" width="100px;" alt="wrexgem"/><br /><sub><b>wrexgem</b></sub></a><br /><a href="#tool-wrexgem" title="Tools">🔧</a></td>
1867+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cd-sigma"><img src="https://avatars.githubusercontent.com/u/119534349?v=4?s=100" width="100px;" alt="ciphernova"/><br /><sub><b>ciphernova</b></sub></a><br /><a href="#content-cd-sigma" title="Content">🖋</a></td>
1868+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/CodeMongerrr"><img src="https://avatars.githubusercontent.com/u/99281767?v=4?s=100" width="100px;" alt="Aditya Joshi"/><br /><sub><b>Aditya Joshi</b></sub></a><br /><a href="#ideas-CodeMongerrr" title="Ideas, Planning, & Feedback">🤔</a></td>
18651869
</tr>
18661870
</tbody>
18671871
</table>

0 commit comments

Comments
 (0)