Skip to content

Commit 48943b5

Browse files
corwintinescorwintines
authored
Merge pull request #13366 from ethereum/dev
2 parents ee7d9f2 + 59b94f2 commit 48943b5

File tree

704 files changed

+16756
-7536
lines changed

Some content is hidden

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

704 files changed

+16756
-7536
lines changed

‎.all-contributorsrc

Lines changed: 112 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4810,7 +4810,8 @@
48104810
"profile": "http://www.technobunnies.com",
48114811
"contributions": [
48124812
"doc",
4813-
"maintenance"
4813+
"maintenance",
4814+
"content"
48144815
]
48154816
},
48164817
{
@@ -7193,7 +7194,8 @@
71937194
"contributions": [
71947195
"doc",
71957196
"ideas",
7196-
"bug"
7197+
"bug",
7198+
"tool"
71977199
]
71987200
},
71997201
{
@@ -12168,6 +12170,114 @@
1216812170
"contributions": [
1216912171
"tool"
1217012172
]
12173+
},
12174+
{
12175+
"login": "SnehalSrivastava27",
12176+
"name": "SnehalSrivastava27",
12177+
"avatar_url": "https://avatars.githubusercontent.com/u/118104081?v=4",
12178+
"profile": "https://github.com/SnehalSrivastava27",
12179+
"contributions": [
12180+
"maintenance"
12181+
]
12182+
},
12183+
{
12184+
"login": "wrexgem",
12185+
"name": "wrexgem",
12186+
"avatar_url": "https://avatars.githubusercontent.com/u/134736543?v=4",
12187+
"profile": "https://github.com/wrexgem",
12188+
"contributions": [
12189+
"tool"
12190+
]
12191+
},
12192+
{
12193+
"login": "cd-sigma",
12194+
"name": "ciphernova",
12195+
"avatar_url": "https://avatars.githubusercontent.com/u/119534349?v=4",
12196+
"profile": "https://github.com/cd-sigma",
12197+
"contributions": [
12198+
"content"
12199+
]
12200+
},
12201+
{
12202+
"login": "CodeMongerrr",
12203+
"name": "Aditya Joshi",
12204+
"avatar_url": "https://avatars.githubusercontent.com/u/99281767?v=4",
12205+
"profile": "https://github.com/CodeMongerrr",
12206+
"contributions": [
12207+
"ideas"
12208+
]
12209+
},
12210+
{
12211+
"login": "Khemmie-Ray",
12212+
"name": "Atoyebi Oluwakemi",
12213+
"avatar_url": "https://avatars.githubusercontent.com/u/89976006?v=4",
12214+
"profile": "https://github.com/Khemmie-Ray",
12215+
"contributions": [
12216+
"maintenance"
12217+
]
12218+
},
12219+
{
12220+
"login": "pglekshmi",
12221+
"name": "pglekshmi",
12222+
"avatar_url": "https://avatars.githubusercontent.com/u/107828565?v=4",
12223+
"profile": "https://github.com/pglekshmi",
12224+
"contributions": [
12225+
"maintenance"
12226+
]
12227+
},
12228+
{
12229+
"login": "abonnaudet-ledger",
12230+
"name": "abonnaudet-ledger",
12231+
"avatar_url": "https://avatars.githubusercontent.com/u/71646516?v=4",
12232+
"profile": "https://github.com/abonnaudet-ledger",
12233+
"contributions": [
12234+
"bug"
12235+
]
12236+
},
12237+
{
12238+
"login": "JacobSharples",
12239+
"name": "Jacob Sharples",
12240+
"avatar_url": "https://avatars.githubusercontent.com/u/45126111?v=4",
12241+
"profile": "https://github.com/JacobSharples",
12242+
"contributions": [
12243+
"content"
12244+
]
12245+
},
12246+
{
12247+
"login": "omahs",
12248+
"name": "omahs",
12249+
"avatar_url": "https://avatars.githubusercontent.com/u/73983677?v=4",
12250+
"profile": "https://github.com/omahs",
12251+
"contributions": [
12252+
"translation"
12253+
]
12254+
},
12255+
{
12256+
"login": "Shiva-Sai-ssb",
12257+
"name": "Shiva Sai",
12258+
"avatar_url": "https://avatars.githubusercontent.com/u/112751524?v=4",
12259+
"profile": "https://github.com/Shiva-Sai-ssb",
12260+
"contributions": [
12261+
"bug"
12262+
]
12263+
},
12264+
{
12265+
"login": "saurabhburade",
12266+
"name": "Saurabh Burade",
12267+
"avatar_url": "https://avatars.githubusercontent.com/u/39492927?v=4",
12268+
"profile": "https://bsaurabh.xyz/",
12269+
"contributions": [
12270+
"code"
12271+
]
12272+
},
12273+
{
12274+
"login": "yorkerhodes3",
12275+
"name": "Yorke E. Rhodes III",
12276+
"avatar_url": "https://avatars.githubusercontent.com/u/17415717?v=4",
12277+
"profile": "https://github.com/yorkerhodes3",
12278+
"contributions": [
12279+
"content"
12280+
]
1217112281
}
1217212282
],
1217312283
"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+

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,7 @@ robots.txt
5656

5757
# Crowdin report output
5858
src/data/crowdin/bucketsAwaitingReviewReport.csv
59+
60+
# Storybook
61+
build-storybook.log
62+
storybook-static

‎.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/i18next.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ export const baseLocales = {
1313
export const ns = [
1414
"common",
1515
"glossary",
16+
"glossary-tooltip",
1617
"learn-quizzes",
1718
"page-about",
1819
"page-index",
1920
"page-learn",
2021
"page-upgrades",
2122
"page-developers-index",
23+
"page-what-is-ethereum",
2224
] as const
2325
const supportedLngs = Object.keys(baseLocales)
2426

‎.storybook/main.ts

Lines changed: 10 additions & 4 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:
@@ -16,12 +15,17 @@ import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin"
1615
*/
1716

1817
const config: StorybookConfig = {
19-
stories: ["../src/components/**/*.stories.{ts,tsx}"],
18+
stories: [
19+
"../src/components/**/*.stories.{ts,tsx}",
20+
"../src/@chakra-ui/stories/*.stories.tsx",
21+
"../src/layouts/stories/*.stories.tsx",
22+
],
2023
addons: [
2124
"@storybook/addon-links",
2225
"@storybook/addon-essentials",
2326
"@storybook/addon-interactions",
2427
"storybook-react-i18next",
28+
"@chromatic-com/storybook"
2529
],
2630
staticDirs: ["../public"],
2731
framework: {
@@ -68,6 +72,8 @@ const config: StorybookConfig = {
6872
return !(isStyledSystemProp || isHTMLElementProp)
6973
},
7074
},
75+
76+
reactDocgen: "react-docgen-typescript"
7177
},
7278
}
7379
export default config

‎.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
})

0 commit comments

Comments
 (0)