Skip to content

Commit 1aaed77

Browse files
koko37koko37
committed
update eslint config(simple-import-sort)
1 parent 63ba263 commit 1aaed77

28 files changed

+284
-141
lines changed

‎.eslintrc.cjs

+28-14
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,36 @@ module.exports = {
22
root: true,
33
env: { browser: true, es2020: true },
44
extends: [
5-
'eslint:recommended',
6-
'plugin:react/recommended',
7-
'plugin:react/jsx-runtime',
8-
'plugin:react-hooks/recommended',
5+
"eslint:recommended",
6+
"plugin:react/recommended",
7+
"plugin:react/jsx-runtime",
8+
"plugin:react-hooks/recommended",
9+
],
10+
ignorePatterns: ["dist", ".eslintrc.cjs"],
11+
parserOptions: { ecmaVersion: "latest", sourceType: "module" },
12+
settings: { react: { version: "18.2" } },
13+
plugins: [
14+
"react-refresh",
15+
"react",
16+
"react-hooks",
17+
"simple-import-sort",
18+
"import",
919
],
10-
ignorePatterns: ['dist', '.eslintrc.cjs'],
11-
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
12-
settings: { react: { version: '18.2' } },
13-
plugins: ['react-refresh'],
1420
rules: {
15-
'react/jsx-no-target-blank': 'off',
16-
'react-refresh/only-export-components': [
17-
'warn',
21+
"react/jsx-no-target-blank": "off",
22+
"react-refresh/only-export-components": [
23+
"warn",
1824
{ allowConstantExport: true },
1925
],
20-
'no-unused-vars': 'warn',
21-
'react/prop-types': 'off',
26+
"no-unused-vars": "warn",
27+
"react/prop-types": "off",
28+
"simple-import-sort/imports": [
29+
"error",
30+
{
31+
groups: [["^react", "^@?\\w"], ["^@mybucks/"], ["^\\.", "^[^.]"]],
32+
},
33+
],
34+
"simple-import-sort/exports": "error",
35+
"comma-spacing": ["error", { before: false, after: true }],
2236
},
23-
}
37+
};

‎package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"dev": "vite",
88
"build": "vite build",
99
"serve": "vite serve",
10-
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
10+
"lint": "eslint . --ext .js,.jsx",
11+
"format": "eslint --fix . --ext .js,.jsx",
1112
"preview": "vite preview"
1213
},
1314
"dependencies": {
@@ -34,9 +35,11 @@
3435
"@types/react-dom": "^18.2.22",
3536
"@vitejs/plugin-react": "^4.2.1",
3637
"eslint": "^8.57.0",
38+
"eslint-plugin-import": "^2.31.0",
3739
"eslint-plugin-react": "^7.34.1",
3840
"eslint-plugin-react-hooks": "^4.6.0",
3941
"eslint-plugin-react-refresh": "^0.4.6",
42+
"eslint-plugin-simple-import-sort": "^12.1.1",
4043
"vite": "^5.2.0",
4144
"vite-plugin-node-polyfills": "^0.22.0"
4245
}

‎src/App.jsx

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import { useContext } from "react";
2-
import styled from "styled-components";
3-
import { toast, ToastContainer } from "react-toastify";
42
import { useIdleTimer } from "react-idle-timer";
3+
import { toast, ToastContainer } from "react-toastify";
4+
import styled from "styled-components";
55

6-
import { IDLE_DURATION, NETWORK } from "@mybucks/lib/conf";
76
import { StoreContext } from "@mybucks/contexts/Store";
8-
9-
import SignIn from "@mybucks/pages/Signin";
7+
import { IDLE_DURATION, NETWORK } from "@mybucks/lib/conf";
108
import Menu from "@mybucks/pages/Menu";
119
import EvmHome from "@mybucks/pages/network/evm/Home";
1210
import EvmToken from "@mybucks/pages/network/evm/Token";
1311
import TronHome from "@mybucks/pages/network/tron/Home";
1412
import TronToken from "@mybucks/pages/network/tron/Token";
13+
import SignIn from "@mybucks/pages/Signin";
1514

1615
import "react-toastify/dist/ReactToastify.css";
1716

‎src/components/ConfirmPasscodeModal.jsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import React, { useContext, useState } from "react";
2-
import styled from "styled-components";
32
import { toast } from "react-toastify";
4-
import { StoreContext } from "@mybucks/contexts/Store";
5-
import Modal from "@mybucks/components/Modal";
3+
import styled from "styled-components";
4+
5+
import Button from "@mybucks/components/Button";
66
import Input from "@mybucks/components/Input";
7+
import Modal from "@mybucks/components/Modal";
78
import { H3 } from "@mybucks/components/Texts";
8-
import Button from "@mybucks/components/Button";
9+
import { StoreContext } from "@mybucks/contexts/Store";
910
import {
10-
PASSCODE_MIN_LENGTH,
1111
PASSCODE_MAX_LENGTH,
1212
PASSCODE_MAX_TRY,
13+
PASSCODE_MIN_LENGTH,
1314
} from "@mybucks/lib/conf";
1415

1516
const Wrap = styled.div`

‎src/components/Containers.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from "react";
22
import styled from "styled-components";
3+
34
import media from "@mybucks/styles/media";
45

56
export const Container = styled.div`

‎src/components/Modal.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useEffect, useRef } from "react";
2-
import styled from "styled-components";
32
import FocusTrap from "focus-trap-react";
3+
import styled from "styled-components";
4+
45
import CloseIcon from "@mybucks/assets/icons/close.svg";
56
import useOnClickOutside from "@mybucks/hooks/useOnClickOutside";
67

‎src/components/NetworkSelector.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { NETWORK, EVM_NETWORKS } from "@mybucks/lib/conf";
21
import Select from "@mybucks/components/Select";
2+
import { EVM_NETWORKS, NETWORK } from "@mybucks/lib/conf";
33

44
const NetworkSelector = ({ network, chainId, updateNetwork }) => {
55
const onChange = (e) => {

‎src/components/Select.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from "react";
22
import styled from "styled-components";
3+
34
import media from "@mybucks/styles/media";
45

56
const SelectWrapper = styled.div`

‎src/components/Texts.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from "react";
22
import styled from "styled-components";
3+
34
import media from "@mybucks/styles/media";
45

56
export const H1 = styled.h1`

‎src/contexts/Store.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { createContext, useState, useEffect, useMemo } from "react";
1+
import { createContext, useEffect, useMemo, useState } from "react";
2+
23
import EvmAccount from "@mybucks/lib/account/evm";
34
import TronAccount from "@mybucks/lib/account/tron";
45
import {

‎src/hooks/useDebounce.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useRef, useEffect } from "react";
1+
import { useEffect, useRef } from "react";
22

33
const useDebounce = () => {
44
const timeout = useRef();

‎src/lib/account/evm.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { ethers, Contract } from "ethers";
21
import { CovalentClient } from "@covalenthq/client-sdk";
3-
import camelcaseKeys from "camelcase-keys";
42
import { tokens as defaultTokensList } from "@sushiswap/default-token-list";
3+
import camelcaseKeys from "camelcase-keys";
4+
import { Contract, ethers } from "ethers";
55

6-
import { NETWORK, EVM_NETWORKS, getEvmPrivateKey } from "@mybucks/lib/conf";
6+
import { EVM_NETWORKS, getEvmPrivateKey, NETWORK } from "@mybucks/lib/conf";
77
import IERC20 from "@mybucks/lib/erc20.json";
88

99
class EvmAccount {

‎src/lib/account/tron.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { TronWeb } from "tronweb";
21
import { Buffer } from "buffer";
3-
import { NETWORK, getEvmPrivateKey } from "@mybucks/lib/conf";
2+
import { TronWeb } from "tronweb";
3+
4+
import { getEvmPrivateKey, NETWORK } from "@mybucks/lib/conf";
45

56
const TRC20_USDT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
67

‎src/main.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from "react";
22
import ReactDOM from "react-dom/client";
3-
import App from "./App.jsx";
4-
import StoreProvider from "@mybucks/contexts/Store";
53
import { ThemeProvider } from "styled-components";
64

5+
import StoreProvider from "@mybucks/contexts/Store";
76
import GlobalStyle from "@mybucks/styles/global.js";
87
import themes from "@mybucks/styles/themes.js";
98

9+
import App from "./App.jsx";
1010
import "@mybucks/styles/font.css";
1111

1212
ReactDOM.createRoot(document.getElementById("root")).render(

‎src/pages/Menu/index.jsx

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import React, { useContext, useState } from "react";
2-
import { StoreContext } from "@mybucks/contexts/Store";
3-
import styled from "styled-components";
42
import { toast } from "react-toastify";
53
import copy from "clipboard-copy";
4+
import styled from "styled-components";
65

7-
import { Container, Box as BaseBox } from "@mybucks/components/Containers";
6+
import BackIcon from "@mybucks/assets/icons/back.svg";
87
import BaseButton from "@mybucks/components/Button";
98
import ConfirmPasscodeModal from "@mybucks/components/ConfirmPasscodeModal";
9+
import { Box as BaseBox, Container } from "@mybucks/components/Containers";
1010
import { H3 } from "@mybucks/components/Texts";
11-
12-
import BackIcon from "@mybucks/assets/icons/back.svg";
11+
import { StoreContext } from "@mybucks/contexts/Store";
1312

1413
const Box = styled(BaseBox)`
1514
display: flex;

‎src/pages/Signin/index.jsx

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
import React, { useContext, useState, useMemo } from "react";
1+
import React, { useContext, useMemo, useState } from "react";
22
import { Buffer } from "buffer";
33
import { scrypt } from "scrypt-js";
44
import styled from "styled-components";
5-
import {
6-
HASH_OPTIONS,
7-
PASSWORD_MIN_LENGTH,
8-
PASSWORD_MAX_LENGTH,
9-
PASSCODE_MIN_LENGTH,
10-
PASSCODE_MAX_LENGTH,
11-
generateSalt,
12-
} from "@mybucks/lib/conf";
13-
import { StoreContext } from "@mybucks/contexts/Store";
14-
import { Box } from "@mybucks/components/Containers";
5+
156
import Button from "@mybucks/components/Button";
16-
import Input from "@mybucks/components/Input";
177
import Checkbox from "@mybucks/components/Checkbox";
18-
import Progress from "@mybucks/components/Progress";
8+
import { Box } from "@mybucks/components/Containers";
9+
import Input from "@mybucks/components/Input";
1910
import { Label } from "@mybucks/components/Label";
20-
import { H1 } from "@mybucks/components/Texts";
2111
import Modal from "@mybucks/components/Modal";
12+
import Progress from "@mybucks/components/Progress";
13+
import { H1 } from "@mybucks/components/Texts";
14+
import { StoreContext } from "@mybucks/contexts/Store";
15+
import {
16+
generateSalt,
17+
HASH_OPTIONS,
18+
PASSCODE_MAX_LENGTH,
19+
PASSCODE_MIN_LENGTH,
20+
PASSWORD_MAX_LENGTH,
21+
PASSWORD_MIN_LENGTH,
22+
} from "@mybucks/lib/conf";
2223
import media from "@mybucks/styles/media";
2324

2425
const TEST_PASSWORD = "randommPassword82^";

‎src/pages/network/common/ActivityTable.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React from "react";
2+
import { format } from "date-fns";
23
import { ethers } from "ethers";
34
import styled from "styled-components";
4-
import { format } from "date-fns";
55
import toFlexible from "toflexible";
66

7-
import { truncate } from "@mybucks/lib/utils";
87
import { Box as BaseBox } from "@mybucks/components/Containers";
98
import Link from "@mybucks/components/Link";
109
import { H3 } from "@mybucks/components/Texts";
10+
import { truncate } from "@mybucks/lib/utils";
1111
import media from "@mybucks/styles/media";
1212

1313
const Box = styled(BaseBox)`

‎src/pages/network/common/TokenBalanceRow.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import React from "react";
22
import styled from "styled-components";
33
import toFlexible from "toflexible";
4-
import { BALANCE_PLACEHOLDER } from "@mybucks/lib/conf";
4+
55
import Avatar from "@mybucks/components/Avatar";
6+
import { BALANCE_PLACEHOLDER } from "@mybucks/lib/conf";
67

78
/*
89
token:

‎src/pages/network/evm/ConfirmTransaction.jsx

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
import React, { useContext, useEffect, useState } from "react";
2-
import { StoreContext } from "@mybucks/contexts/Store";
32
import { ethers } from "ethers";
43
import styled from "styled-components";
54

6-
import { GAS_PRICE, gasMultiplier } from "@mybucks/lib/conf";
7-
import { Container, Box } from "@mybucks/components/Containers";
5+
import BackIcon from "@mybucks/assets/icons/back.svg";
6+
import InfoGreenIcon from "@mybucks/assets/icons/info-green.svg";
7+
import InfoRedIcon from "@mybucks/assets/icons/info-red.svg";
88
import BaseButton from "@mybucks/components/Button";
9+
import { Box, Container } from "@mybucks/components/Containers";
910
import { H3 } from "@mybucks/components/Texts";
11+
import { StoreContext } from "@mybucks/contexts/Store";
12+
import { GAS_PRICE, gasMultiplier } from "@mybucks/lib/conf";
1013
import media from "@mybucks/styles/media";
1114

12-
import BackIcon from "@mybucks/assets/icons/back.svg";
13-
import InfoRedIcon from "@mybucks/assets/icons/info-red.svg";
14-
import InfoGreenIcon from "@mybucks/assets/icons/info-green.svg";
15-
1615
const NavsWrapper = styled.div`
1716
width: 100%;
1817
display: flex;

‎src/pages/network/evm/Home.jsx

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
import React, { useContext, useMemo } from "react";
2-
import toFlexible from "toflexible";
2+
import { toast } from "react-toastify";
33
import copy from "clipboard-copy";
44
import { ethers } from "ethers";
5-
import { toast } from "react-toastify";
65
import styled from "styled-components";
6+
import toFlexible from "toflexible";
77

8-
import { StoreContext } from "@mybucks/contexts/Store";
9-
import TokenBalanceRow from "@mybucks/pages/network/common/TokenBalanceRow";
10-
import { truncate } from "@mybucks/lib/utils";
11-
import media from "@mybucks/styles/media";
12-
import { Container, Box } from "@mybucks/components/Containers";
8+
import ArrowUpIcon from "@mybucks/assets/icons/arrow-up.svg";
9+
import CopyIcon from "@mybucks/assets/icons/copy.svg";
10+
import GasIcon from "@mybucks/assets/icons/gas.svg";
11+
import HideIcon from "@mybucks/assets/icons/hide.svg";
12+
import LockIcon from "@mybucks/assets/icons/lock.svg";
13+
import RefreshIcon from "@mybucks/assets/icons/refresh.svg";
14+
import ShowIcon from "@mybucks/assets/icons/show.svg";
1315
import BaseButton from "@mybucks/components/Button";
16+
import { Box, Container } from "@mybucks/components/Containers";
1417
import Link from "@mybucks/components/Link";
1518
import NetworkSelector from "@mybucks/components/NetworkSelector";
19+
import { StoreContext } from "@mybucks/contexts/Store";
1620
import { BALANCE_PLACEHOLDER, LOADING_PLACEHOLDER } from "@mybucks/lib/conf";
17-
18-
import RefreshIcon from "@mybucks/assets/icons/refresh.svg";
19-
import ShowIcon from "@mybucks/assets/icons/show.svg";
20-
import HideIcon from "@mybucks/assets/icons/hide.svg";
21-
import CopyIcon from "@mybucks/assets/icons/copy.svg";
22-
import GasIcon from "@mybucks/assets/icons/gas.svg";
23-
import LockIcon from "@mybucks/assets/icons/lock.svg";
24-
import ArrowUpIcon from "@mybucks/assets/icons/arrow-up.svg";
21+
import { truncate } from "@mybucks/lib/utils";
22+
import TokenBalanceRow from "@mybucks/pages/network/common/TokenBalanceRow";
23+
import media from "@mybucks/styles/media";
2524

2625
const NetworkAndFeatures = styled.div`
2726
display: flex;

‎src/pages/network/evm/MinedTransaction.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from "react";
22
import styled from "styled-components";
3-
import { Container, Box as BaseBox } from "@mybucks/components/Containers";
4-
import { H3 } from "@mybucks/components/Texts";
5-
import Link from "@mybucks/components/Link";
6-
import { truncate } from "@mybucks/lib/utils";
73

84
import BackIcon from "@mybucks/assets/icons/back.svg";
95
import SuccessIcon from "@mybucks/assets/icons/success.svg";
6+
import { Box as BaseBox, Container } from "@mybucks/components/Containers";
7+
import Link from "@mybucks/components/Link";
8+
import { H3 } from "@mybucks/components/Texts";
9+
import { truncate } from "@mybucks/lib/utils";
1010

1111
const NavsWrapper = styled.div`
1212
width: 100%;

0 commit comments

Comments
 (0)