From 3090bab6825d91c345dd4eddb4af782662ad37a9 Mon Sep 17 00:00:00 2001 From: xiejay97 Date: Wed, 17 May 2023 09:09:41 +0800 Subject: [PATCH] style: import scss with new line --- .eslintrc.json | 6 ++++++ package.json | 1 + packages/platform/src/app/routes/dashboard/amap/AMap.tsx | 3 ++- .../platform/src/app/routes/dashboard/echarts/ECharts.tsx | 3 ++- packages/platform/src/app/routes/exception/Exception.tsx | 1 + packages/platform/src/app/routes/layout/Layout.tsx | 3 ++- packages/platform/src/app/routes/layout/header/Header.tsx | 3 ++- .../app/routes/layout/header/notification/Notification.tsx | 1 + packages/platform/src/app/routes/layout/sidebar/Sidebar.tsx | 1 + .../src/app/routes/list/standard-table/StandardTable.tsx | 1 + .../src/app/routes/list/standard-table/detail/Detail.tsx | 1 + packages/platform/src/app/routes/login/Login.tsx | 3 ++- packages/platform/src/app/routes/test/acl/ACL.tsx | 1 + packages/platform/src/app/routes/test/http/Http.tsx | 1 + .../components/route/component/online-ide/codesandbox.ts | 1 + .../app/components/route/component/online-ide/stackblitz.ts | 1 + 16 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 80ee6d49..18fbf574 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -49,6 +49,12 @@ "pattern": "@react-devui/**", "group": "internal", "position": "after" + }, + { + "pattern": "*.scss", + "group": "index", + "patternOptions": { "matchBase": true }, + "position": "after" } ], "pathGroupsExcludedImportTypes": ["type", "builtin"], diff --git a/package.json b/package.json index bbd0121d..ae31ce94 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "build:icons": "ts-node -P ./tools/tsconfig.json ./tools/ui-icons.ts", "build:vscode-extension": "nx build vscode-extension && cd dist/packages/vscode-extension && yarn install && vsce package --yarn", "lint:affected": "nx affected --target=lint --parallel=7", + "lint:affected:fix": "nx affected --target=lint --parallel=7 --fix", "lint:style": "stylelint **/*.{css,scss,html,md}", "lint:style:fix": "yarn lint:style --fix", "prepare": "husky install && ts-node -P ./tools/tsconfig.json ./tools/husky.ts", diff --git a/packages/platform/src/app/routes/dashboard/amap/AMap.tsx b/packages/platform/src/app/routes/dashboard/amap/AMap.tsx index eaab1584..a762dc08 100644 --- a/packages/platform/src/app/routes/dashboard/amap/AMap.tsx +++ b/packages/platform/src/app/routes/dashboard/amap/AMap.tsx @@ -5,9 +5,10 @@ import { DRadio } from '@react-devui/ui'; import { AppMap } from '../../../components'; import { AppRoute } from '../../../utils'; -import styles from './AMap.module.scss'; import points from './points'; +import styles from './AMap.module.scss'; + export default AppRoute(() => { const [mapTmp, setMapTmp] = useState('Marker'); const [infoWindow, setInfoWindow] = useImmer<{ visible: boolean; position?: [number, number] }>({ visible: false }); diff --git a/packages/platform/src/app/routes/dashboard/echarts/ECharts.tsx b/packages/platform/src/app/routes/dashboard/echarts/ECharts.tsx index 8995cccf..5f854339 100644 --- a/packages/platform/src/app/routes/dashboard/echarts/ECharts.tsx +++ b/packages/platform/src/app/routes/dashboard/echarts/ECharts.tsx @@ -6,9 +6,10 @@ import { DCard } from '@react-devui/ui'; import { AppChart, AppRouteHeader } from '../../../components'; import { AppRoute } from '../../../utils'; -import styles from './ECharts.module.scss'; import { barOptions, lineOptions, nightingaleOptions, pieOptions, scatterOptions, stackedBarOptions, stackedLineOptions } from './options'; +import styles from './ECharts.module.scss'; + export default AppRoute(() => { const [options, setOptions] = useState([]); const { t } = useTranslation(); diff --git a/packages/platform/src/app/routes/exception/Exception.tsx b/packages/platform/src/app/routes/exception/Exception.tsx index 9b6e9f54..391ad321 100644 --- a/packages/platform/src/app/routes/exception/Exception.tsx +++ b/packages/platform/src/app/routes/exception/Exception.tsx @@ -8,6 +8,7 @@ import { AppRoute } from '../../utils'; import { ReactComponent as S403 } from './403.svg'; import { ReactComponent as S404 } from './404.svg'; import { ReactComponent as S500 } from './500.svg'; + import styles from './Exception.module.scss'; export default AppRoute(() => { diff --git a/packages/platform/src/app/routes/layout/Layout.tsx b/packages/platform/src/app/routes/layout/Layout.tsx index dee2f855..80c94126 100644 --- a/packages/platform/src/app/routes/layout/Layout.tsx +++ b/packages/platform/src/app/routes/layout/Layout.tsx @@ -3,10 +3,11 @@ import { Outlet, useLocation } from 'react-router-dom'; import { getClassName } from '@react-devui/utils'; -import styles from './Layout.module.scss'; import { AppHeader } from './header/Header'; import { AppSidebar } from './sidebar/Sidebar'; +import styles from './Layout.module.scss'; + export interface AppLayoutProps { sidebar?: { width?: number; diff --git a/packages/platform/src/app/routes/layout/header/Header.tsx b/packages/platform/src/app/routes/layout/header/Header.tsx index 58a70178..65fe43e8 100644 --- a/packages/platform/src/app/routes/layout/header/Header.tsx +++ b/packages/platform/src/app/routes/layout/header/Header.tsx @@ -11,10 +11,11 @@ import { getClassName } from '@react-devui/utils'; import { AppLanguage } from '../../../components'; import { APP_NAME } from '../../../config/other'; import { STORAGE_KEY } from '../../../config/storage'; -import styles from './Header.module.scss'; import { AppNotification } from './notification/Notification'; import { AppUser } from './user/User'; +import styles from './Header.module.scss'; + export interface AppHeaderProps { sidebarWidth: number; menuMode: 'vertical' | 'icon'; diff --git a/packages/platform/src/app/routes/layout/header/notification/Notification.tsx b/packages/platform/src/app/routes/layout/header/notification/Notification.tsx index b3f7e3fb..e4163402 100644 --- a/packages/platform/src/app/routes/layout/header/notification/Notification.tsx +++ b/packages/platform/src/app/routes/layout/header/notification/Notification.tsx @@ -11,6 +11,7 @@ import { getClassName } from '@react-devui/utils'; import { AppList } from '../../../../components'; import { useNotificationState } from '../../../../core'; + import styles from './Notification.module.scss'; export function AppNotification(props: React.ButtonHTMLAttributes): JSX.Element | null { diff --git a/packages/platform/src/app/routes/layout/sidebar/Sidebar.tsx b/packages/platform/src/app/routes/layout/sidebar/Sidebar.tsx index 5ab12295..29de44a7 100644 --- a/packages/platform/src/app/routes/layout/sidebar/Sidebar.tsx +++ b/packages/platform/src/app/routes/layout/sidebar/Sidebar.tsx @@ -2,6 +2,7 @@ import { DDrawer, DMenu } from '@react-devui/ui'; import { getClassName } from '@react-devui/utils'; import { useMenu } from '../../../core'; + import styles from './Sidebar.module.scss'; export interface AppSidebarProps { diff --git a/packages/platform/src/app/routes/list/standard-table/StandardTable.tsx b/packages/platform/src/app/routes/list/standard-table/StandardTable.tsx index ce5addc0..1e592370 100644 --- a/packages/platform/src/app/routes/list/standard-table/StandardTable.tsx +++ b/packages/platform/src/app/routes/list/standard-table/StandardTable.tsx @@ -14,6 +14,7 @@ import { useHttp } from '../../../core'; import { useAPI, useQueryParams } from '../../../hooks'; import { AppRoute, DialogService } from '../../../utils'; import { AppDeviceModal } from './DeviceModal'; + import styles from './StandardTable.module.scss'; export type DeviceData = DeviceDoc; diff --git a/packages/platform/src/app/routes/list/standard-table/detail/Detail.tsx b/packages/platform/src/app/routes/list/standard-table/detail/Detail.tsx index bba1c295..58448f08 100644 --- a/packages/platform/src/app/routes/list/standard-table/detail/Detail.tsx +++ b/packages/platform/src/app/routes/list/standard-table/detail/Detail.tsx @@ -13,6 +13,7 @@ import { useHttp } from '../../../../core'; import { useAPI } from '../../../../hooks'; import { AppRoute, DialogService } from '../../../../utils'; import { AppDeviceModal } from '../DeviceModal'; + import styles from './Detail.module.scss'; export default AppRoute(() => { diff --git a/packages/platform/src/app/routes/login/Login.tsx b/packages/platform/src/app/routes/login/Login.tsx index 0edb8af8..8df040d1 100644 --- a/packages/platform/src/app/routes/login/Login.tsx +++ b/packages/platform/src/app/routes/login/Login.tsx @@ -16,9 +16,10 @@ import { LOGIN_PATH } from '../../config/other'; import { APP_NAME } from '../../config/other'; import { TOKEN, useHttp, useInit } from '../../core'; import { AppRoute, NotificationService } from '../../utils'; -import styles from './Login.module.scss'; import { BASE64_DATA } from './base64.out'; +import styles from './Login.module.scss'; + export default AppRoute(() => { const { t } = useTranslation(); const http = useHttp(); diff --git a/packages/platform/src/app/routes/test/acl/ACL.tsx b/packages/platform/src/app/routes/test/acl/ACL.tsx index 4c55c68b..9e74160a 100644 --- a/packages/platform/src/app/routes/test/acl/ACL.tsx +++ b/packages/platform/src/app/routes/test/acl/ACL.tsx @@ -7,6 +7,7 @@ import { DAlert, DButton, DCard, DTable, DTag } from '@react-devui/ui'; import { AppRouteHeader } from '../../../components'; import { useACL } from '../../../core'; import { AppRoute } from '../../../utils'; + import styles from './ACL.module.scss'; export default AppRoute(() => { diff --git a/packages/platform/src/app/routes/test/http/Http.tsx b/packages/platform/src/app/routes/test/http/Http.tsx index 5f14bb71..750b0570 100644 --- a/packages/platform/src/app/routes/test/http/Http.tsx +++ b/packages/platform/src/app/routes/test/http/Http.tsx @@ -5,6 +5,7 @@ import { DButton, DCard } from '@react-devui/ui'; import { AppRouteHeader } from '../../../components'; import { useHttp } from '../../../core'; import { AppRoute } from '../../../utils'; + import styles from './Http.module.scss'; export default AppRoute(() => { diff --git a/packages/site/src/app/components/route/component/online-ide/codesandbox.ts b/packages/site/src/app/components/route/component/online-ide/codesandbox.ts index c507edd9..c0e05bea 100644 --- a/packages/site/src/app/components/route/component/online-ide/codesandbox.ts +++ b/packages/site/src/app/components/route/component/online-ide/codesandbox.ts @@ -5,6 +5,7 @@ import packageJsonFn from './files/codesandbox/package.json'; import tsconfigJson from './files/codesandbox/tsconfig.json'; import indexHtml from './files/index.html'; import indexTsx from './files/index.tsx'; + import stylesScss from './files/styles.scss'; export function openCodeSandbox(name: string, tsxSource: string, scssSource?: string) { diff --git a/packages/site/src/app/components/route/component/online-ide/stackblitz.ts b/packages/site/src/app/components/route/component/online-ide/stackblitz.ts index 9b0a0a0e..876c3b88 100644 --- a/packages/site/src/app/components/route/component/online-ide/stackblitz.ts +++ b/packages/site/src/app/components/route/component/online-ide/stackblitz.ts @@ -6,6 +6,7 @@ import indexHtml from './files/index.html'; import indexTsx from './files/index.tsx'; import packageJsonFn from './files/stackblitz/package.json'; import tsconfigJson from './files/stackblitz/tsconfig.json'; + import stylesScss from './files/styles.scss'; export function openStackBlitz(name: string, tsxSource: string, scssSource?: string) {