Skip to content

Commit 2e22f87

Browse files
committed
Merge branch 'dev' into shadcn-tooltip
2 parents a2178c4 + ece1544 commit 2e22f87

Some content is hidden

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

57 files changed

+1608
-1747
lines changed

.eslintrc.json

Lines changed: 12 additions & 43 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,29 @@
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-
],
25+
["^react(?!-.)$", "^\\w", "^@\\w"],
3426
// The Chakra theme directory if imported to story file or other places
35-
[
36-
"^@/@chakra-ui"
37-
],
27+
["^@/@chakra-ui"],
3828
// From the `types` directory.
39-
[
40-
"^@/lib/types",
41-
"^@/lib/interfaces"
42-
],
29+
["^@/lib/types", "^@/lib/interfaces"],
4330
// From the `components` directory.
44-
[
45-
"^@/components"
46-
],
31+
["^@/components"],
4732
// From the `utils` directory.
48-
[
49-
"^@/lib/utils"
50-
],
33+
["^@/lib/utils"],
5134
// From the `data` directory.
52-
[
53-
"^@/data"
54-
],
35+
["^@/data"],
5536
// From the `constants` directory.
5637
["^@/lib/constants"],
5738
// From the `.storybook/utils` file
5839
["^@/storybook-utils"],
5940
// Parent imports. Put `..` last.
60-
[
61-
"^\\.\\.(?!/?$)",
62-
"^\\.\\./?$"
63-
],
41+
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
6442
// Other relative imports. Put same-folder imports and `.` last.
65-
[
66-
"^\\./(?=.*/)(?!/?$)",
67-
"^\\.(?!/?$)",
68-
"^\\./?$"
69-
],
43+
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
7044
// Style imports.
71-
[
72-
"^.+\\.s?css$"
73-
],
45+
["^.+s?css$"],
7446
// Side effect imports.
75-
[
76-
"^\\u0000"
77-
]
47+
["^\\u0000"]
7848
]
7949
}
8050
],
@@ -89,7 +59,7 @@
8959
],
9060
"unused-imports/no-unused-vars": [
9161
"error",
92-
{
62+
{
9363
"args": "all",
9464
"argsIgnorePattern": "^_$",
9565
"varsIgnorePattern": "^_$"
@@ -98,4 +68,3 @@
9868
"unused-imports/no-unused-imports-ts": "warn"
9969
}
10070
}
101-

.storybook/preview.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ import ThemeProvider from "@/components/ThemeProvider"
77

88
import i18n, { baseLocales } from "./i18next"
99

10+
import "@docsearch/css"
1011
import "../src/styles/global.css"
1112
import "../src/styles/fonts.css"
13+
import "../src/styles/docsearch.css"
1214

1315
MotionGlobalConfig.skipAnimations = isChromatic()
1416

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@
3737
"@next/bundle-analyzer": "^14.2.5",
3838
"@radix-ui/react-accordion": "^1.2.0",
3939
"@radix-ui/react-checkbox": "^1.1.1",
40+
"@radix-ui/react-compose-refs": "^1.1.0",
4041
"@radix-ui/react-dialog": "^1.1.1",
4142
"@radix-ui/react-navigation-menu": "^1.2.0",
4243
"@radix-ui/react-popover": "^1.1.1",
44+
"@radix-ui/react-portal": "^1.1.1",
45+
"@radix-ui/react-progress": "^1.1.0",
4346
"@radix-ui/react-radio-group": "^1.2.0",
4447
"@radix-ui/react-slot": "^1.1.0",
4548
"@radix-ui/react-switch": "^1.1.0",
@@ -50,6 +53,7 @@
5053
"chartjs-plugin-datalabels": "^2.2.0",
5154
"class-variance-authority": "^0.7.0",
5255
"clsx": "^2.1.1",
56+
"cmdk": "^1.0.0",
5357
"embla-carousel-react": "^7.0.0",
5458
"ethereum-blockies-base64": "^1.0.2",
5559
"framer-motion": "^10.13.0",

public/_redirects

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,3 @@
173173
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!
174174

175175
/*/deprecated-software /:splat/dapps/ 301!
176-
177-
/*/developers/docs/smart-contracts/languages/ /:splat/developers/docs/smart-contracts/languages/
178-
179-
/*/languages /:splat/developers/docs/programming-languages/ 301!

public/content/contributing/translation-program/translatathon/details/index.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ EthStaker
123123
- https://crowdin.com/project/ethstaker-website
124124
- https://crowdin.com/project/ethstaker-knowledge-base
125125

126+
Solidity Language Docs
127+
- https://crowdin.com/project/solidity-language-docs
128+
126129
### Evaluation process
127130

128131
All translations will be subject to QA and feedback, where professional linguists will evaluate submissions based on quality and accuracy.

src/components/Buttons/Button.stories.tsx

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

src/components/Buttons/ButtonTwoLines/ButtonTwoLines.stories.tsx

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

0 commit comments

Comments
 (0)