From 617f9b9bfc6b72ff3da9dc10efbdbdce0e93c8b4 Mon Sep 17 00:00:00 2001 From: DarkSky Date: Sat, 13 Aug 2022 02:08:21 +0800 Subject: [PATCH] chore: organizeImports --- .eslintrc.json | 6 +++++ .vscode/settings.json | 1 + apps/keck/src/index.ts | 2 +- apps/ligo-virgo/src/index.tsx | 1 - apps/ligo-virgo/src/pages/AppContainer.tsx | 2 +- apps/ligo-virgo/src/pages/AppRoutes.tsx | 12 ++++----- apps/ligo-virgo/src/pages/RoutePrivate.tsx | 2 +- apps/ligo-virgo/src/pages/agenda/index.tsx | 6 ++--- .../src/pages/tools/icons/Icons.tsx | 2 +- apps/ligo-virgo/src/pages/tools/index.tsx | 2 +- apps/ligo-virgo/src/pages/ui/index.tsx | 2 -- apps/ligo-virgo/src/pages/workspace/Home.tsx | 4 +-- .../src/pages/workspace/Whiteboard.tsx | 2 +- .../pages/workspace/WorkspaceContainer.tsx | 3 +-- .../src/pages/workspace/docs/Page.tsx | 25 +++++++++---------- .../workspace/docs/collapsible-page-tree.tsx | 6 +---- .../workspace/docs/components/tabs/Tabs.tsx | 2 +- .../src/pages/workspace/docs/index.spec.tsx | 1 - .../pages/workspace/docs/workspace-name.tsx | 8 +++--- apps/venus/src/app/index.tsx | 9 +++---- apps/venus/src/index.tsx | 1 - .../src/login/{authing.tsx => Authing.tsx} | 12 +++------ .../src/login/{fs.tsx => FileSystem.tsx} | 3 +-- .../src/login/{firebase.tsx => Firebase.tsx} | 9 +++---- libs/components/account/src/login/index.tsx | 9 +++---- .../editor-plugins/src/search/index.tsx | 5 ++-- .../layout/src/header/FileSystem.tsx | 3 +-- 27 files changed, 63 insertions(+), 77 deletions(-) rename libs/components/account/src/login/{authing.tsx => Authing.tsx} (95%) rename libs/components/account/src/login/{fs.tsx => FileSystem.tsx} (96%) rename libs/components/account/src/login/{firebase.tsx => Firebase.tsx} (99%) diff --git a/.eslintrc.json b/.eslintrc.json index 89fe5429c..549f14aed 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -260,6 +260,12 @@ ] } }, + { + "files": ["index.tsx", "index.*.tsx"], + "rules": { + "filename-rules/match": "off" + } + }, { "files": ["*.ts", "*.tsx"], "extends": ["plugin:@nrwl/nx/typescript"], diff --git a/.vscode/settings.json b/.vscode/settings.json index defe3ab90..8d06279b1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,6 +2,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "editor.formatOnSaveMode": "file", + "editor.codeActionsOnSave": ["source.fixAll", "source.organizeImports"], "prettier.prettierPath": "./node_modules/prettier", "cSpell.words": [ "AUTOINCREMENT", diff --git a/apps/keck/src/index.ts b/apps/keck/src/index.ts index 31dadb789..d924f1d78 100644 --- a/apps/keck/src/index.ts +++ b/apps/keck/src/index.ts @@ -7,8 +7,8 @@ import firebaseAuth = require('firebase-admin/auth'); import LRUCache = require('lru-cache'); import nanoid = require('nanoid'); -import { handleConnection } from './utils'; import { URL } from 'url'; +import { handleConnection } from './utils'; if (process.env.NODE_ENV !== 'development') { firebaseApp.initializeApp({ diff --git a/apps/ligo-virgo/src/index.tsx b/apps/ligo-virgo/src/index.tsx index 14e33ec10..19d5446ee 100644 --- a/apps/ligo-virgo/src/index.tsx +++ b/apps/ligo-virgo/src/index.tsx @@ -1,4 +1,3 @@ -/* eslint-disable filename-rules/match */ import { createRoot } from 'react-dom/client'; import { BrowserRouter } from 'react-router-dom'; diff --git a/apps/ligo-virgo/src/pages/AppContainer.tsx b/apps/ligo-virgo/src/pages/AppContainer.tsx index 18caa7d20..db451148f 100644 --- a/apps/ligo-virgo/src/pages/AppContainer.tsx +++ b/apps/ligo-virgo/src/pages/AppContainer.tsx @@ -1,7 +1,7 @@ import { Outlet } from 'react-router-dom'; +import { LayoutHeader, SettingsSidebar } from '@toeverything/components/layout'; import { styled } from '@toeverything/components/ui'; -import { SettingsSidebar, LayoutHeader } from '@toeverything/components/layout'; export function LigoVirgoRootContainer() { return ( diff --git a/apps/ligo-virgo/src/pages/AppRoutes.tsx b/apps/ligo-virgo/src/pages/AppRoutes.tsx index 2c79a8125..c27ae6a76 100644 --- a/apps/ligo-virgo/src/pages/AppRoutes.tsx +++ b/apps/ligo-virgo/src/pages/AppRoutes.tsx @@ -1,20 +1,20 @@ -import { Routes, Route, Navigate } from 'react-router-dom'; +import { Navigate, Route, Routes } from 'react-router-dom'; +import { Login } from './account'; import Agenda from './agenda'; -import { WorkspaceContainer } from './workspace'; +import { LigoVirgoRootContainer } from './AppContainer'; import Recent from './recent'; +import { RoutePrivate } from './RoutePrivate'; +import { RoutePublicAutoLogin } from './RoutePublicAutoLogin'; import Search from './search'; import Settings from './settings'; import Shared from './shared'; import Starred from './starred'; -import { Login } from './account'; import { PageNotFound } from './status/page-not-found'; import { WorkspaceNotFound } from './status/workspace-not-found'; -import { RoutePrivate } from './RoutePrivate'; -import { RoutePublicAutoLogin } from './RoutePublicAutoLogin'; import { Tools } from './tools'; -import { LigoVirgoRootContainer } from './AppContainer'; import { UIPage } from './ui'; +import { WorkspaceContainer } from './workspace'; export function LigoVirgoRoutes() { return ( diff --git a/apps/ligo-virgo/src/pages/RoutePrivate.tsx b/apps/ligo-virgo/src/pages/RoutePrivate.tsx index a7cedac93..76c254610 100644 --- a/apps/ligo-virgo/src/pages/RoutePrivate.tsx +++ b/apps/ligo-virgo/src/pages/RoutePrivate.tsx @@ -1,6 +1,6 @@ import { Navigate, useLocation } from 'react-router-dom'; -import { PageLoading, Error } from '@toeverything/components/account'; +import { PageLoading } from '@toeverything/components/account'; import { useUserAndSpaces } from '@toeverything/datasource/state'; export type RoutePrivateProps = { diff --git a/apps/ligo-virgo/src/pages/agenda/index.tsx b/apps/ligo-virgo/src/pages/agenda/index.tsx index 23f478ad5..6a0f4bf01 100644 --- a/apps/ligo-virgo/src/pages/agenda/index.tsx +++ b/apps/ligo-virgo/src/pages/agenda/index.tsx @@ -1,10 +1,10 @@ -import { Routes, Route } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; -import Container from './container'; import Calendar from './calendar'; +import Container from './container'; +import Home from './home'; import Tasks from './tasks'; import Today from './today'; -import Home from './home'; export default function AgendaContainer() { return ( diff --git a/apps/ligo-virgo/src/pages/tools/icons/Icons.tsx b/apps/ligo-virgo/src/pages/tools/icons/Icons.tsx index 10ce45316..48059b477 100644 --- a/apps/ligo-virgo/src/pages/tools/icons/Icons.tsx +++ b/apps/ligo-virgo/src/pages/tools/icons/Icons.tsx @@ -1,6 +1,6 @@ -import { type ComponentType, useRef } from 'react'; import * as uiIcons from '@toeverything/components/icons'; import { message, styled } from '@toeverything/components/ui'; +import { useRef, type ComponentType } from 'react'; import { copy } from './copy'; const IconBooth = ({ diff --git a/apps/ligo-virgo/src/pages/tools/index.tsx b/apps/ligo-virgo/src/pages/tools/index.tsx index 984fae407..ff32a85cf 100644 --- a/apps/ligo-virgo/src/pages/tools/index.tsx +++ b/apps/ligo-virgo/src/pages/tools/index.tsx @@ -1,4 +1,4 @@ -import { Routes, Route } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; import { Container } from './container'; import { Icons } from './icons'; diff --git a/apps/ligo-virgo/src/pages/ui/index.tsx b/apps/ligo-virgo/src/pages/ui/index.tsx index be4d79a68..48189656e 100644 --- a/apps/ligo-virgo/src/pages/ui/index.tsx +++ b/apps/ligo-virgo/src/pages/ui/index.tsx @@ -1,5 +1,3 @@ -import React from 'react'; - export const UIPage = () => { return (
diff --git a/apps/ligo-virgo/src/pages/workspace/Home.tsx b/apps/ligo-virgo/src/pages/workspace/Home.tsx index 0077fa69b..aa7f62cd4 100644 --- a/apps/ligo-virgo/src/pages/workspace/Home.tsx +++ b/apps/ligo-virgo/src/pages/workspace/Home.tsx @@ -1,7 +1,7 @@ +import { services, TemplateFactory } from '@toeverything/datasource/db-service'; +import { useUserAndSpaces } from '@toeverything/datasource/state'; import { useEffect } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; -import { useUserAndSpaces } from '@toeverything/datasource/state'; -import { services, TemplateFactory } from '@toeverything/datasource/db-service'; export function WorkspaceHome() { const navigate = useNavigate(); diff --git a/apps/ligo-virgo/src/pages/workspace/Whiteboard.tsx b/apps/ligo-virgo/src/pages/workspace/Whiteboard.tsx index 16bdf814f..7059a264c 100644 --- a/apps/ligo-virgo/src/pages/workspace/Whiteboard.tsx +++ b/apps/ligo-virgo/src/pages/workspace/Whiteboard.tsx @@ -2,8 +2,8 @@ import { memo, useEffect } from 'react'; import { useParams } from 'react-router'; import { AffineBoard } from '@toeverything/components/affine-board'; -import { useUserAndSpaces } from '@toeverything/datasource/state'; import { services } from '@toeverything/datasource/db-service'; +import { useUserAndSpaces } from '@toeverything/datasource/state'; const MemoAffineBoard = memo(AffineBoard, (prev, next) => { return prev.rootBlockId === next.rootBlockId; diff --git a/apps/ligo-virgo/src/pages/workspace/WorkspaceContainer.tsx b/apps/ligo-virgo/src/pages/workspace/WorkspaceContainer.tsx index a2e5c9297..f8cdb7a24 100644 --- a/apps/ligo-virgo/src/pages/workspace/WorkspaceContainer.tsx +++ b/apps/ligo-virgo/src/pages/workspace/WorkspaceContainer.tsx @@ -1,5 +1,4 @@ -/* eslint-disable filename-rules/match */ -import { Routes, Route, useParams, Navigate } from 'react-router'; +import { Route, Routes, useParams } from 'react-router'; import { useUserAndSpaces } from '@toeverything/datasource/state'; diff --git a/apps/ligo-virgo/src/pages/workspace/docs/Page.tsx b/apps/ligo-virgo/src/pages/workspace/docs/Page.tsx index 886d8f1c1..a2440a175 100644 --- a/apps/ligo-virgo/src/pages/workspace/docs/Page.tsx +++ b/apps/ligo-virgo/src/pages/workspace/docs/Page.tsx @@ -1,29 +1,28 @@ -/* eslint-disable filename-rules/match */ -import { useEffect, useRef, type UIEvent, useState } from 'react'; +import { useEffect, useRef, useState, type UIEvent } from 'react'; import { useParams } from 'react-router'; import { AffineEditor } from '@toeverything/components/affine-editor'; -import { - CalendarHeatmap, - PageTree, - Activities, -} from '@toeverything/components/layout'; import { CollapsibleTitle } from '@toeverything/components/common'; import { - useShowSpaceSidebar, - usePageClientWidth, -} from '@toeverything/datasource/state'; + Activities, + CalendarHeatmap, + PageTree, +} from '@toeverything/components/layout'; import { MuiBox as Box, MuiCircularProgress as CircularProgress, styled, } from '@toeverything/components/ui'; +import { + usePageClientWidth, + useShowSpaceSidebar, +} from '@toeverything/datasource/state'; -import { WorkspaceName } from './workspace-name'; -import { CollapsiblePageTree } from './collapsible-page-tree'; -import { useFlag } from '@toeverything/datasource/feature-flags'; import { type BlockEditor } from '@toeverything/components/editor-core'; +import { useFlag } from '@toeverything/datasource/feature-flags'; +import { CollapsiblePageTree } from './collapsible-page-tree'; import { Tabs } from './components/tabs'; +import { WorkspaceName } from './workspace-name'; type PageProps = { workspace: string; }; diff --git a/apps/ligo-virgo/src/pages/workspace/docs/collapsible-page-tree.tsx b/apps/ligo-virgo/src/pages/workspace/docs/collapsible-page-tree.tsx index d37910583..9aef73aa2 100644 --- a/apps/ligo-virgo/src/pages/workspace/docs/collapsible-page-tree.tsx +++ b/apps/ligo-virgo/src/pages/workspace/docs/collapsible-page-tree.tsx @@ -1,8 +1,4 @@ -import { - AddIcon, - ArrowDropDownIcon, - ArrowRightIcon, -} from '@toeverything/components/icons'; +import { AddIcon } from '@toeverything/components/icons'; import { useCalendarHeatmap, usePageTree, diff --git a/apps/ligo-virgo/src/pages/workspace/docs/components/tabs/Tabs.tsx b/apps/ligo-virgo/src/pages/workspace/docs/components/tabs/Tabs.tsx index 7f442caca..74a8dcc5a 100644 --- a/apps/ligo-virgo/src/pages/workspace/docs/components/tabs/Tabs.tsx +++ b/apps/ligo-virgo/src/pages/workspace/docs/components/tabs/Tabs.tsx @@ -1,6 +1,6 @@ -import { useState } from 'react'; import { styled } from '@toeverything/components/ui'; import type { ValueOf } from '@toeverything/utils'; +import { useState } from 'react'; const StyledTabs = styled('div')(({ theme }) => { return { diff --git a/apps/ligo-virgo/src/pages/workspace/docs/index.spec.tsx b/apps/ligo-virgo/src/pages/workspace/docs/index.spec.tsx index e17c51392..6e1b4880f 100644 --- a/apps/ligo-virgo/src/pages/workspace/docs/index.spec.tsx +++ b/apps/ligo-virgo/src/pages/workspace/docs/index.spec.tsx @@ -1,4 +1,3 @@ -/* eslint-disable filename-rules/match */ import { render } from '@testing-library/react'; import { Page } from './index'; diff --git a/apps/ligo-virgo/src/pages/workspace/docs/workspace-name.tsx b/apps/ligo-virgo/src/pages/workspace/docs/workspace-name.tsx index 6769ed288..b46eea521 100644 --- a/apps/ligo-virgo/src/pages/workspace/docs/workspace-name.tsx +++ b/apps/ligo-virgo/src/pages/workspace/docs/workspace-name.tsx @@ -1,17 +1,17 @@ -import { styled, Input } from '@toeverything/components/ui'; import { PinIcon } from '@toeverything/components/icons'; +import { Input, styled } from '@toeverything/components/ui'; +import { services } from '@toeverything/datasource/db-service'; import { - useUserAndSpaces, useShowSpaceSidebar, + useUserAndSpaces, } from '@toeverything/datasource/state'; -import React, { +import { ChangeEvent, KeyboardEvent, useCallback, useEffect, useState, } from 'react'; -import { services } from '@toeverything/datasource/db-service'; import { Logo } from './components/logo/Logo'; const WorkspaceContainer = styled('div')({ diff --git a/apps/venus/src/app/index.tsx b/apps/venus/src/app/index.tsx index b40f3deee..529f988af 100644 --- a/apps/venus/src/app/index.tsx +++ b/apps/venus/src/app/index.tsx @@ -1,20 +1,19 @@ /* eslint-disable max-lines */ /* eslint-disable @typescript-eslint/naming-convention */ -/* eslint-disable filename-rules/match */ -import { useEffect, useMemo, useState } from 'react'; import clsx from 'clsx'; +import { useEffect, useMemo, useState } from 'react'; -import { CssVarsProvider, styled } from '@mui/joy/styles'; -import { Box, Button, Container, Grid, SvgIcon, Typography } from '@mui/joy'; import GitHubIcon from '@mui/icons-material/GitHub'; import RedditIcon from '@mui/icons-material/Reddit'; import TelegramIcon from '@mui/icons-material/Telegram'; +import { Box, Button, Container, Grid, SvgIcon, Typography } from '@mui/joy'; +import { CssVarsProvider, styled } from '@mui/joy/styles'; import { LogoIcon } from '@toeverything/components/icons'; // eslint-disable-next-line no-restricted-imports import { useMediaQuery } from '@mui/material'; -import LogoImage from './logo.png'; import CollaborationImage from './collaboration.png'; +import LogoImage from './logo.png'; import PageImage from './page.png'; import ShapeImage from './shape.png'; import TaskImage from './task.png'; diff --git a/apps/venus/src/index.tsx b/apps/venus/src/index.tsx index c14c54bfa..f76f9a6f2 100644 --- a/apps/venus/src/index.tsx +++ b/apps/venus/src/index.tsx @@ -1,4 +1,3 @@ -/* eslint-disable filename-rules/match */ import { StrictMode } from 'react'; import { createRoot } from 'react-dom/client'; import { BrowserRouter } from 'react-router-dom'; diff --git a/libs/components/account/src/login/authing.tsx b/libs/components/account/src/login/Authing.tsx similarity index 95% rename from libs/components/account/src/login/authing.tsx rename to libs/components/account/src/login/Authing.tsx index e4a1b01ce..0cfb7b13b 100644 --- a/libs/components/account/src/login/authing.tsx +++ b/libs/components/account/src/login/Authing.tsx @@ -1,16 +1,12 @@ +import { Guard as AuthingGuard } from '@authing/react-ui-components'; +import { MuiBox as Box } from '@toeverything/components/ui'; +import type { User as AuthingUser } from 'authing-js-sdk'; import { useCallback, useEffect, useMemo } from 'react'; import { useNavigate } from 'react-router-dom'; import style9 from 'style9'; -import { MuiBox as Box } from '@toeverything/components/ui'; -import { Guard as AuthingGuard } from '@authing/react-ui-components'; -import type { User as AuthingUser } from 'authing-js-sdk'; -import { - AUTHING_APP_ID_US, - AUTHING_APP_ID_CN, - AUTHING_APP_HOST_US, -} from '@toeverything/utils'; import { useUserAndSpaces } from '@toeverything/datasource/state'; +import { AUTHING_APP_HOST_US, AUTHING_APP_ID_US } from '@toeverything/utils'; import '@authing/react-ui-components/lib/index.min.css'; diff --git a/libs/components/account/src/login/fs.tsx b/libs/components/account/src/login/FileSystem.tsx similarity index 96% rename from libs/components/account/src/login/fs.tsx rename to libs/components/account/src/login/FileSystem.tsx index 2482e5187..8b70bc51e 100644 --- a/libs/components/account/src/login/fs.tsx +++ b/libs/components/account/src/login/FileSystem.tsx @@ -1,5 +1,4 @@ -/* eslint-disable filename-rules/match */ -import { useEffect, useMemo } from 'react'; +import { useMemo } from 'react'; import { LogoIcon } from '@toeverything/components/icons'; import { MuiButton } from '@toeverything/components/ui'; diff --git a/libs/components/account/src/login/firebase.tsx b/libs/components/account/src/login/Firebase.tsx similarity index 99% rename from libs/components/account/src/login/firebase.tsx rename to libs/components/account/src/login/Firebase.tsx index 0c295010e..f976ef8a8 100644 --- a/libs/components/account/src/login/firebase.tsx +++ b/libs/components/account/src/login/Firebase.tsx @@ -1,12 +1,11 @@ -/* eslint-disable filename-rules/match */ -import { useCallback, useMemo } from 'react'; import { initializeApp } from 'firebase/app'; import { - GoogleAuthProvider, - getAuth, - signInWithPopup, browserLocalPersistence, + getAuth, + GoogleAuthProvider, + signInWithPopup, } from 'firebase/auth'; +import { useCallback, useMemo } from 'react'; import { MuiButton } from '@toeverything/components/ui'; diff --git a/libs/components/account/src/login/index.tsx b/libs/components/account/src/login/index.tsx index e0dbed46b..5c80f3712 100644 --- a/libs/components/account/src/login/index.tsx +++ b/libs/components/account/src/login/index.tsx @@ -1,12 +1,11 @@ -/* eslint-disable filename-rules/match */ -import { useCallback, useState } from 'react'; import { LogoImg } from '@toeverything/components/common'; import { MuiBox, MuiGrid, MuiSnackbar } from '@toeverything/components/ui'; +import { useCallback, useState } from 'react'; -// import { Authing } from './authing'; -import { Firebase } from './firebase'; -import { FileSystem } from './fs'; import { Error } from './../error'; +// import { Authing } from './Authing'; +import { FileSystem } from './FileSystem'; +import { Firebase } from './Firebase'; export function Login() { const [error, setError] = useState(false); diff --git a/libs/components/editor-plugins/src/search/index.tsx b/libs/components/editor-plugins/src/search/index.tsx index f49de00a7..41a13695c 100644 --- a/libs/components/editor-plugins/src/search/index.tsx +++ b/libs/components/editor-plugins/src/search/index.tsx @@ -1,11 +1,10 @@ -/* eslint-disable filename-rules/match */ import { StrictMode } from 'react'; import { HookType } from '@toeverything/framework/virgo'; import { BasePlugin } from '../base-plugin'; -import { Search } from './Search'; import { PluginRenderRoot } from '../utils'; +import { Search } from './Search'; export class FullTextSearchPlugin extends BasePlugin { #root?: PluginRenderRoot; @@ -58,5 +57,5 @@ export class FullTextSearchPlugin extends BasePlugin { } } -export type { QueryResult } from './Search'; export { QueryBlocks } from './Search'; +export type { QueryResult } from './Search'; diff --git a/libs/components/layout/src/header/FileSystem.tsx b/libs/components/layout/src/header/FileSystem.tsx index 83c638c5b..016b26d1c 100644 --- a/libs/components/layout/src/header/FileSystem.tsx +++ b/libs/components/layout/src/header/FileSystem.tsx @@ -1,10 +1,9 @@ -/* eslint-disable filename-rules/match */ import { useCallback, useMemo, useState } from 'react'; +import { CloseIcon } from '@toeverything/components/common'; import { IconButton, MuiSnackbar, styled } from '@toeverything/components/ui'; import { services } from '@toeverything/datasource/db-service'; import { useLocalTrigger } from '@toeverything/datasource/state'; -import { CloseIcon } from '@toeverything/components/common'; const cleanupWorkspace = (workspace: string) => new Promise((resolve, reject) => {