-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
💄 style: Update ESLint configuration and add Prettier configuration
The commit updates eslint configuration by adding new rules to improve code organization. The changes include importing plugins for sorting imports, enforcing import order, and sorting object keys in TypeScript interfaces. Additionally, the commit adds a new prettier configuration file while deleting the old one. The new prettier configuration includes settings for organizing imports, formatting package.json files, and overriding settings for markdown files.
- Loading branch information
1 parent
7475595
commit 5ac1ae9
Showing
12 changed files
with
130 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
module.exports = { | ||
displayTypes: ['feat', 'fix', 'styles', 'pref'], | ||
} | ||
displayTypes: ['feat', 'fix', 'style', 'pref', 'build'], | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,15 @@ | ||
module.exports = { | ||
extends: require.resolve('@umijs/lint/dist/config/eslint'), | ||
plugins: ['simple-import-sort', 'import', 'typescript-sort-keys'], | ||
rules: { | ||
'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }], | ||
'no-param-reassign': 1, | ||
'simple-import-sort/imports': 'error', | ||
'simple-import-sort/exports': 'error', | ||
'import/first': 'error', | ||
'import/newline-after-import': 'error', | ||
'import/no-duplicates': 'error', | ||
'typescript-sort-keys/interface': 'error', | ||
'typescript-sort-keys/string-enum': 'error', | ||
'react/jsx-sort-props': 'error', | ||
'react/jsx-no-useless-fragment': 'error', | ||
}, | ||
} | ||
}; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
module.exports = { | ||
pluginSearchDirs: false, | ||
plugins: [ | ||
require.resolve('prettier-plugin-organize-imports'), | ||
require.resolve('prettier-plugin-packagejson'), | ||
], | ||
printWidth: 100, | ||
proseWrap: 'never', | ||
singleQuote: true, | ||
trailingComma: 'all', | ||
overrides: [ | ||
{ | ||
files: '*.md', | ||
options: { | ||
proseWrap: 'preserve', | ||
}, | ||
}, | ||
], | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
module.exports = { | ||
extends: ['semantic-release-config-gitmoji'], | ||
branches: ['master'], | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,19 @@ | ||
import { darkLogo, lightLogo } from '@/components/Header/style' | ||
import { useThemeMode } from 'antd-style' | ||
import React from 'react' | ||
import { useThemeMode } from 'antd-style'; | ||
import React from 'react'; | ||
|
||
import { darkLogo, lightLogo } from '@/components/Header/style'; | ||
|
||
interface LogoProps { | ||
size?: number | ||
size?: number; | ||
|
||
style?: React.CSSProperties | ||
style?: React.CSSProperties; | ||
} | ||
|
||
const Logo: React.FC<LogoProps> = ({ size = 20, style }) => { | ||
const { isDarkMode } = useThemeMode() | ||
return <img src={isDarkMode ? darkLogo : lightLogo} alt="logo" style={{ height: size, ...style }} /> | ||
} | ||
const { isDarkMode } = useThemeMode(); | ||
return ( | ||
<img alt="logo" src={isDarkMode ? darkLogo : lightLogo} style={{ height: size, ...style }} /> | ||
); | ||
}; | ||
|
||
export default React.memo(Logo) | ||
export default React.memo(Logo); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,36 @@ | ||
import { MenuProps } from 'antd' | ||
import { MenuProps } from 'antd'; | ||
|
||
export const darkLogo = 'https://gw.alipayobjects.com/zos/bmw-prod/9ecb2822-1592-4cb0-a087-ce0097fef2ca.svg' | ||
export const lightLogo = 'https://gw.alipayobjects.com/zos/bmw-prod/e146116d-c65a-4306-a3d2-bb8d05e1c49b.svg' | ||
export const darkLogo = | ||
'https://gw.alipayobjects.com/zos/bmw-prod/9ecb2822-1592-4cb0-a087-ce0097fef2ca.svg'; | ||
export const lightLogo = | ||
'https://gw.alipayobjects.com/zos/bmw-prod/e146116d-c65a-4306-a3d2-bb8d05e1c49b.svg'; | ||
|
||
export const themeIcon = { | ||
auto: ( | ||
<span role="img" className="anticon anticon-github"> | ||
<svg viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor"> | ||
<span className="anticon anticon-github" role="img"> | ||
<svg fill="currentColor" height="1em" viewBox="0 0 16 16" width="1em"> | ||
<path d="M14.595 8a6.595 6.595 0 1 1-13.19 0 6.595 6.595 0 0 1 13.19 0ZM8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0Zm0 2.014v11.972A5.986 5.986 0 0 0 8 2.014Z"></path> | ||
</svg> | ||
</span> | ||
), | ||
light: ( | ||
<span role="img" className="anticon anticon-github"> | ||
<svg viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor"> | ||
<span className="anticon anticon-github" role="img"> | ||
<svg fill="currentColor" height="1em" viewBox="0 0 16 16" width="1em"> | ||
<path d="M8 13a1 1 0 0 1 1 1v1a1 1 0 1 1-2 0v-1a1 1 0 0 1 1-1ZM8 3a1 1 0 0 1-1-1V1a1 1 0 1 1 2 0v1a1 1 0 0 1-1 1Zm7 4a1 1 0 1 1 0 2h-1a1 1 0 1 1 0-2h1ZM3 8a1 1 0 0 1-1 1H1a1 1 0 1 1 0-2h1a1 1 0 0 1 1 1Zm9.95 3.536.707.707a1 1 0 0 1-1.414 1.414l-.707-.707a1 1 0 0 1 1.414-1.414Zm-9.9-7.072-.707-.707a1 1 0 0 1 1.414-1.414l.707.707A1 1 0 0 1 3.05 4.464Zm9.9 0a1 1 0 0 1-1.414-1.414l.707-.707a1 1 0 0 1 1.414 1.414l-.707.707Zm-9.9 7.072a1 1 0 0 1 1.414 1.414l-.707.707a1 1 0 0 1-1.414-1.414l.707-.707ZM8 4a4 4 0 1 0 0 8 4 4 0 0 0 0-8Zm0 6.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5Z"></path> | ||
</svg> | ||
</span> | ||
), | ||
dark: ( | ||
<span role="img" className="anticon anticon-github"> | ||
<svg viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor"> | ||
<span className="anticon anticon-github" role="img"> | ||
<svg fill="currentColor" height="1em" viewBox="0 0 16 16" width="1em"> | ||
<path d="M8.218 1.455c3.527.109 6.327 3.018 6.327 6.545 0 3.6-2.945 6.545-6.545 6.545a6.562 6.562 0 0 1-6.036-4h.218c3.6 0 6.545-2.945 6.545-6.545 0-.91-.182-1.745-.509-2.545m0-1.455c-.473 0-.909.218-1.2.618-.29.4-.327.946-.145 1.382.254.655.4 1.31.4 2 0 2.8-2.291 5.09-5.091 5.09h-.218c-.473 0-.91.22-1.2.62-.291.4-.328.945-.146 1.38C1.891 14.074 4.764 16 8 16c4.4 0 8-3.6 8-8a7.972 7.972 0 0 0-7.745-8h-.037Z"></path> | ||
</svg> | ||
</span> | ||
), | ||
} | ||
}; | ||
|
||
export const ThemeList = ({ onSetThemeMode }: any): MenuProps['items'] => [ | ||
{ icon: themeIcon.auto, label: 'Auto', key: 'auto', onClick: () => onSetThemeMode('auto') }, | ||
{ icon: themeIcon.light, label: 'Light', key: 'light', onClick: () => onSetThemeMode('light') }, | ||
{ icon: themeIcon.dark, label: 'Dark', key: 'dark', onClick: () => onSetThemeMode('dark') }, | ||
] | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
import React from 'react' | ||
import React from 'react'; | ||
|
||
const App: React.FC = () => { | ||
return <div>CanisMinor Template</div> | ||
} | ||
return <div>CanisMinor Template</div>; | ||
}; | ||
|
||
export default App | ||
export default App; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
import { ThemeMode } from 'antd-style' | ||
import { create } from 'zustand' | ||
import { devtools } from 'zustand/middleware' | ||
import { ThemeMode } from 'antd-style'; | ||
import { create } from 'zustand'; | ||
import { devtools } from 'zustand/middleware'; | ||
|
||
export interface AppState { | ||
themeMode: ThemeMode | ||
onSetThemeMode: (themeMode: ThemeMode) => void | ||
onSetThemeMode: (themeMode: ThemeMode) => void; | ||
themeMode: ThemeMode; | ||
} | ||
|
||
export const useAppStore = create<AppState>()( | ||
devtools((set) => ({ | ||
themeMode: 'auto', | ||
onSetThemeMode: (themeMode) => { | ||
set(() => ({ themeMode }), false, 'onSetThemeMode') | ||
set(() => ({ themeMode }), false, 'onSetThemeMode'); | ||
}, | ||
})) | ||
) | ||
})), | ||
); |