From 6c716b0dc2a08570501ab58ee270de7267d30b83 Mon Sep 17 00:00:00 2001 From: fantasticit Date: Sat, 12 Mar 2022 11:27:56 +0800 Subject: [PATCH] chore: format code --- package.json | 19 +- packages/client/.eslintrc.json | 3 - packages/client/package.json | 5 +- packages/client/src/components/author.tsx | 12 +- .../src/components/data-render/index.tsx | 9 +- .../src/components/document-creator/index.tsx | 15 +- .../src/components/document/actions/index.tsx | 33 +- .../src/components/document/card/index.tsx | 35 +- .../document/collaboration/index.tsx | 95 +- .../document/comments/comments/Item/index.tsx | 40 +- .../document/comments/comments/index.tsx | 23 +- .../components/document/comments/index.tsx | 41 +- .../src/components/document/create/index.tsx | 38 +- .../src/components/document/delete/index.tsx | 22 +- .../src/components/document/editor/editor.tsx | 46 +- .../src/components/document/editor/index.tsx | 59 +- .../src/components/document/link/index.tsx | 17 +- .../components/document/reader/content.tsx | 14 +- .../src/components/document/reader/editor.tsx | 26 +- .../src/components/document/reader/index.tsx | 82 +- .../document/reader/public/index.tsx | 83 +- .../src/components/document/reader/user.tsx | 15 +- .../src/components/document/share/index.tsx | 53 +- .../src/components/document/star/index.tsx | 14 +- .../src/components/document/style/index.tsx | 16 +- packages/client/src/components/empty.tsx | 18 +- .../src/components/grid-select/grid-cell.tsx | 27 +- .../components/grid-select/grid-select.tsx | 36 +- .../src/components/grid-select/index.tsx | 2 +- .../components/icons/IconAddColumnAfter.tsx | 6 +- .../components/icons/IconAddColumnBefore.tsx | 6 +- .../src/components/icons/IconAddRowAfter.tsx | 6 +- .../src/components/icons/IconAddRowBefore.tsx | 6 +- .../src/components/icons/IconAttachment.tsx | 6 +- .../src/components/icons/IconCenter.tsx | 6 +- .../client/src/components/icons/IconClear.tsx | 6 +- .../src/components/icons/IconCodeBlock.tsx | 6 +- .../src/components/icons/IconDeleteColumn.tsx | 6 +- .../src/components/icons/IconDeleteRow.tsx | 6 +- .../src/components/icons/IconDeleteTable.tsx | 6 +- .../src/components/icons/IconDocument.tsx | 8 +- .../src/components/icons/IconDocumentFill.tsx | 8 +- .../client/src/components/icons/IconEmoji.tsx | 6 +- .../client/src/components/icons/IconFont.tsx | 13 +- .../client/src/components/icons/IconFull.tsx | 6 +- .../client/src/components/icons/IconHalf.tsx | 6 +- .../client/src/components/icons/IconImage.tsx | 6 +- .../client/src/components/icons/IconInfo.tsx | 6 +- .../client/src/components/icons/IconLeft.tsx | 6 +- .../client/src/components/icons/IconLink.tsx | 6 +- .../client/src/components/icons/IconMath.tsx | 6 +- .../src/components/icons/IconMergeCell.tsx | 6 +- .../src/components/icons/IconMessage.tsx | 8 +- .../client/src/components/icons/IconMind.tsx | 6 +- .../src/components/icons/IconOverview.tsx | 8 +- .../client/src/components/icons/IconRight.tsx | 6 +- .../src/components/icons/IconSearch.tsx | 8 +- .../src/components/icons/IconSetting.tsx | 8 +- .../client/src/components/icons/IconShare.tsx | 8 +- .../src/components/icons/IconSplitCell.tsx | 6 +- .../src/components/icons/IconStatus.tsx | 12 +- .../client/src/components/icons/IconTable.tsx | 6 +- .../client/src/components/icons/IconTask.tsx | 6 +- .../src/components/icons/IconZoomIn.tsx | 6 +- .../src/components/icons/IconZoomOut.tsx | 6 +- .../client/src/components/icons/index.tsx | 72 +- .../src/components/locale-time/index.tsx | 24 +- packages/client/src/components/logo/index.tsx | 10 +- .../src/components/message/Placeholder.tsx | 6 +- .../client/src/components/message/index.tsx | 48 +- .../src/components/resizeable/index.tsx | 2 +- .../src/components/resizeable/resizeable.tsx | 31 +- .../client/src/components/search/index.tsx | 19 +- packages/client/src/components/seo.tsx | 4 +- .../src/components/template/card/index.tsx | 71 +- .../src/components/template/editor/editor.tsx | 84 +- .../src/components/template/editor/index.tsx | 17 +- .../src/components/template/list/index.tsx | 20 +- .../src/components/template/reader/editor.tsx | 26 +- .../src/components/template/reader/index.tsx | 14 +- .../client/src/components/theme/index.tsx | 18 +- .../client/src/components/tiptap/base-kit.tsx | 96 +- .../bubble-menu/bubble-menu-plugin.tsx | 65 +- .../tiptap/components/bubble-menu/index.tsx | 17 +- .../components/tiptap/components/color.tsx | 61 +- .../components/tiptap/components/divider.tsx | 6 +- .../tiptap/extensions/attachment/index.tsx | 31 +- .../tiptap/extensions/background-color.tsx | 17 +- .../tiptap/extensions/banner/index.tsx | 35 +- .../tiptap/extensions/code-block/index.tsx | 22 +- .../tiptap/extensions/color-highlight.tsx | 12 +- .../src/components/tiptap/extensions/div.tsx | 22 +- .../extensions/documents/children/index.tsx | 53 +- .../extensions/documents/reference/index.tsx | 66 +- .../tiptap/extensions/font-size.tsx | 20 +- .../tiptap/extensions/horizontal-rule.tsx | 22 +- .../tiptap/extensions/iframe/index.tsx | 40 +- .../components/tiptap/extensions/image.tsx | 33 +- .../components/tiptap/extensions/indent.tsx | 47 +- .../tiptap/extensions/katex/index.tsx | 50 +- .../src/components/tiptap/extensions/link.tsx | 2 +- .../tiptap/extensions/mind/index.tsx | 57 +- .../tiptap/extensions/mind/jsmind.jsx | 900 ++++++++---------- .../components/tiptap/extensions/paste.tsx | 35 +- .../tiptap/extensions/status/index.tsx | 61 +- .../components/tiptap/extensions/table.tsx | 8 +- .../components/tiptap/extensions/title.tsx | 22 +- .../tiptap/extensions/toc/index.tsx | 28 +- .../tiptap/extensions/trailing-node.tsx | 47 +- .../client/src/components/tiptap/index.tsx | 29 +- .../components/tiptap/markdown/helpers.tsx | 112 +-- .../src/components/tiptap/markdown/index.tsx | 2 +- .../components/tiptap/markdown/serializer.tsx | 120 ++- .../client/src/components/tiptap/menubar.tsx | 34 +- .../src/components/tiptap/menus/align.tsx | 22 +- .../src/components/tiptap/menus/banner.tsx | 44 +- .../tiptap/menus/base-bubble-menu.tsx | 32 +- .../components/tiptap/menus/base-insert.tsx | 22 +- .../src/components/tiptap/menus/base-menu.tsx | 20 +- .../src/components/tiptap/menus/color.tsx | 34 +- .../tiptap/menus/components/emoji/index.tsx | 21 +- .../tiptap/menus/components/font-size.tsx | 13 +- .../tiptap/menus/components/paragraph.tsx | 22 +- .../src/components/tiptap/menus/image.tsx | 33 +- .../src/components/tiptap/menus/link.tsx | 20 +- .../src/components/tiptap/menus/list.tsx | 25 +- .../components/tiptap/menus/media-insert.tsx | 62 +- .../src/components/tiptap/menus/table.tsx | 16 +- .../client/src/components/tiptap/skeleton.tsx | 10 +- .../src/components/tiptap/toc/index.tsx | 16 +- .../src/components/tiptap/utils/delete.tsx | 10 +- .../components/tiptap/utils/find-colors.tsx | 6 +- .../client/src/components/upload/index.tsx | 21 +- packages/client/src/components/user/index.tsx | 15 +- .../src/components/user/setting/index.tsx | 20 +- .../src/components/wiki-creator/index.tsx | 12 +- .../wiki-or-document-creator/index.tsx | 33 +- .../client/src/components/wiki/card/index.tsx | 23 +- .../src/components/wiki/create/index.tsx | 24 +- .../src/components/wiki/delete/index.tsx | 22 +- .../src/components/wiki/pin-card/index.tsx | 16 +- .../components/wiki/setting/base/index.tsx | 36 +- .../wiki/setting/documents/index.tsx | 60 +- .../src/components/wiki/setting/index.tsx | 14 +- .../components/wiki/setting/more/index.tsx | 8 +- .../src/components/wiki/setting/users/add.tsx | 40 +- .../components/wiki/setting/users/edit.tsx | 35 +- .../components/wiki/setting/users/index.tsx | 54 +- .../wiki/setting/users/placeholder.tsx | 28 +- .../client/src/components/wiki/star/index.tsx | 14 +- .../src/components/wiki/tocs/NavItem.tsx | 14 +- .../client/src/components/wiki/tocs/index.tsx | 68 +- .../components/wiki/tocs/manager/index.tsx | 21 +- .../src/components/wiki/tocs/public.tsx | 46 +- .../client/src/components/wiki/tocs/tree.tsx | 38 +- packages/client/src/data/user.tsx | 34 +- packages/client/src/data/wiki.tsx | 91 +- packages/client/src/helpers/color.tsx | 40 +- packages/client/src/helpers/copy.tsx | 6 +- packages/client/src/helpers/storage.tsx | 4 +- packages/client/src/helpers/url.tsx | 6 +- .../client/src/hooks/use-click-outside.tsx | 10 +- .../client/src/hooks/use-safari-100vh.tsx | 8 +- packages/client/src/hooks/useAsyncLoading.tsx | 10 +- packages/client/src/hooks/useTheme.tsx | 20 +- packages/client/src/hooks/useWindowSize.tsx | 6 +- .../src/illustrations/create-document.tsx | 2 +- .../client/src/illustrations/create-wiki.tsx | 10 +- .../client/src/illustrations/empty-box.tsx | 8 +- packages/client/src/illustrations/share.tsx | 2 +- .../src/layouts/double-column/index.tsx | 41 +- .../layouts/public-double-column/index.tsx | 39 +- .../src/layouts/router-header/Placeholder.tsx | 6 +- .../src/layouts/router-header/Recent.tsx | 52 +- .../client/src/layouts/router-header/Wiki.tsx | 57 +- .../src/layouts/router-header/index.tsx | 40 +- .../src/layouts/single-column/index.tsx | 12 +- packages/client/src/pages/_app.tsx | 6 +- packages/client/src/pages/index.tsx | 44 +- packages/client/src/pages/login/index.tsx | 46 +- packages/client/src/pages/register/index.tsx | 71 +- .../share/document/[documentId]/index.tsx | 4 +- .../[wikiId]/document/[documentId]/index.tsx | 24 +- .../src/pages/share/wiki/[wikiId]/index.tsx | 22 +- packages/client/src/pages/star/index.tsx | 35 +- .../src/pages/template/[templateId]/index.tsx | 4 +- packages/client/src/pages/template/index.tsx | 26 +- .../document/[documentId]/edit/index.tsx | 4 +- .../[wikiId]/document/[documentId]/index.tsx | 12 +- .../pages/wiki/[wikiId]/documents/index.tsx | 36 +- .../client/src/pages/wiki/[wikiId]/index.tsx | 16 +- .../src/pages/wiki/[wikiId]/setting/index.tsx | 24 +- packages/client/src/pages/wiki/index.tsx | 27 +- packages/client/src/services/HttpClient.tsx | 24 +- packages/server/.eslintrc.js | 24 - packages/server/.prettierrc | 4 - packages/server/package.json | 17 +- .../src/controllers/document.controller.ts | 18 +- .../server/src/controllers/file.controller.ts | 10 +- .../src/controllers/template.controller.ts | 5 +- .../server/src/controllers/wiki.controller.ts | 35 +- .../server/src/dtos/create-document.dto.ts | 8 +- packages/server/src/dtos/create-user.dto.ts | 9 +- packages/server/src/dtos/create-wiki.dto.ts | 8 +- packages/server/src/dtos/template.dto.ts | 8 +- .../server/src/dtos/update-document.dto.ts | 8 +- packages/server/src/dtos/update-wiki.dto.ts | 8 +- .../src/exceptions/http-response.exception.ts | 12 +- packages/server/src/guard/jwt.guard.ts | 6 +- packages/server/src/modules/message.module.ts | 5 +- packages/server/src/modules/user.module.ts | 10 +- packages/server/src/pipes/validation.pipe.ts | 7 +- .../src/services/collaboration.service.ts | 35 +- .../server/src/services/collector.service.ts | 14 +- .../server/src/services/comment.service.ts | 56 +- .../server/src/services/document.service.ts | 135 +-- packages/server/src/services/file.service.ts | 5 +- .../server/src/services/message.service.ts | 2 +- .../server/src/services/template.service.ts | 42 +- packages/server/src/services/user.service.ts | 15 +- packages/server/src/services/view.service.ts | 2 +- packages/server/src/services/wiki.service.ts | 74 +- .../src/transforms/http-response.transform.ts | 18 +- packages/server/test/app.e2e-spec.ts | 5 +- pnpm-lock.yaml | 200 ++-- 225 files changed, 2624 insertions(+), 3979 deletions(-) delete mode 100644 packages/client/.eslintrc.json delete mode 100644 packages/server/.eslintrc.js delete mode 100644 packages/server/.prettierrc diff --git a/package.json b/package.json index cab38415..54967dc6 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,7 @@ "pm2": "concurrently \"pnpm:pm2:*\"", "pm2:server": "pnpm run --dir packages/server pm2", "pm2:client": "pnpm run --dir packages/client pm2", - "lint": "eslint . -c ./.eslintrc.js --fix --quiet 'packages/**/*.{ts,tsx,js,jsx}'", - "format": "npm run format:md && npm run format:json && npm run format:source", - "format:md": "prettier --parser markdown --write './**/*.md'", - "format:json": "prettier --parser json --write './**/*.json'", - "format:source": "prettier --write './**/*.{js,ts}'" + "format": "prettier --write --parser typescript \"packages/**/*.ts?(x)\"" }, "dependencies": { "concurrently": "^7.0.0", @@ -36,7 +32,18 @@ "node": ">=16.5.0" }, "devDependencies": { + "@typescript-eslint/eslint-plugin": "^5.0.0", + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^8.11.0", + "eslint-config-next": "12.0.10", + "eslint-config-prettier": "^8.3.0", + "eslint-import-resolver-typescript": "^2.5.0", + "eslint-plugin-import": "^2.25.4", + "eslint-plugin-jest": "^26.1.1", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-react": "^7.29.3", + "eslint-plugin-react-hooks": "^4.3.0", "prettier": "^2.3.2", "typescript": "^4.5.5" } -} +} \ No newline at end of file diff --git a/packages/client/.eslintrc.json b/packages/client/.eslintrc.json deleted file mode 100644 index bffb357a..00000000 --- a/packages/client/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "next/core-web-vitals" -} diff --git a/packages/client/package.json b/packages/client/package.json index 0faaae85..608281aa 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -6,7 +6,6 @@ "prebuild": "rimraf .next", "build": "next build", "start": "cross-env NODE_ENV=production next start -p 5002", - "lint": "next lint", "pm2": "pm2 start npm --name @think/client -- start" }, "dependencies": { @@ -74,9 +73,7 @@ "devDependencies": { "@types/node": "17.0.13", "@types/react": "17.0.38", - "eslint": "8.8.0", - "eslint-config-next": "12.0.10", "tsconfig-paths-webpack-plugin": "^3.5.2", "typescript": "4.5.5" } -} +} \ No newline at end of file diff --git a/packages/client/src/components/author.tsx b/packages/client/src/components/author.tsx index c6f8f105..2070fcad 100644 --- a/packages/client/src/components/author.tsx +++ b/packages/client/src/components/author.tsx @@ -1,18 +1,16 @@ -import { Space, Typography } from "@douyinfe/semi-ui"; -import { IconLikeHeart } from "@douyinfe/semi-icons"; +import { Space, Typography } from '@douyinfe/semi-ui'; +import { IconLikeHeart } from '@douyinfe/semi-icons'; const { Text } = Typography; export const Author = () => { return ( -
+
Develop by - - fantasticit - - with + fantasticit + with
diff --git a/packages/client/src/components/data-render/index.tsx b/packages/client/src/components/data-render/index.tsx index 27bf7fe3..2b16c67a 100644 --- a/packages/client/src/components/data-render/index.tsx +++ b/packages/client/src/components/data-render/index.tsx @@ -1,5 +1,5 @@ -import React from "react"; -import { Empty, Spin, Typography } from "@douyinfe/semi-ui"; +import React from 'react'; +import { Empty, Spin, Typography } from '@douyinfe/semi-ui'; type RenderProps = React.ReactNode | (() => React.ReactNode); @@ -18,11 +18,10 @@ const defaultLoading = () => { }; const defaultRenderError = (error) => { - return {(error && error.message) || "未知错误"}; + return {(error && error.message) || '未知错误'}; }; -const runRender = (fn, ...args) => - typeof fn === "function" ? fn.apply(null, args) : fn; +const runRender = (fn, ...args) => (typeof fn === 'function' ? fn.apply(null, args) : fn); export const DataRender: React.FC = ({ loading, diff --git a/packages/client/src/components/document-creator/index.tsx b/packages/client/src/components/document-creator/index.tsx index 867c2d77..918d57d9 100644 --- a/packages/client/src/components/document-creator/index.tsx +++ b/packages/client/src/components/document-creator/index.tsx @@ -1,17 +1,14 @@ -import React from "react"; -import { Button } from "@douyinfe/semi-ui"; -import { useToggle } from "hooks/useToggle"; -import { useQuery } from "hooks/useQuery"; -import { DocumentCreator as DocumenCreatorForm } from "components/document/create"; +import React from 'react'; +import { Button } from '@douyinfe/semi-ui'; +import { useToggle } from 'hooks/useToggle'; +import { useQuery } from 'hooks/useQuery'; +import { DocumentCreator as DocumenCreatorForm } from 'components/document/create'; interface IProps { onCreateDocument?: () => void; } -export const DocumentCreator: React.FC = ({ - onCreateDocument, - children, -}) => { +export const DocumentCreator: React.FC = ({ onCreateDocument, children }) => { const { wikiId, docId } = useQuery<{ wikiId?: string; docId?: string }>(); const [visible, toggleVisible] = useToggle(false); diff --git a/packages/client/src/components/document/actions/index.tsx b/packages/client/src/components/document/actions/index.tsx index 3e151ffe..944f889f 100644 --- a/packages/client/src/components/document/actions/index.tsx +++ b/packages/client/src/components/document/actions/index.tsx @@ -1,11 +1,11 @@ -import React, { useCallback } from "react"; -import { Dropdown, Button, Typography, Space } from "@douyinfe/semi-ui"; -import { IconMore, IconStar, IconPlus } from "@douyinfe/semi-icons"; -import { DocumentLinkCopyer } from "components/document/link"; -import { DocumentDeletor } from "components/document/delete"; -import { DocumentCreator } from "components/document/create"; -import { DocumentStar } from "components/document/star"; -import { useToggle } from "hooks/useToggle"; +import React, { useCallback } from 'react'; +import { Dropdown, Button, Typography, Space } from '@douyinfe/semi-ui'; +import { IconMore, IconStar, IconPlus } from '@douyinfe/semi-icons'; +import { DocumentLinkCopyer } from 'components/document/link'; +import { DocumentDeletor } from 'components/document/delete'; +import { DocumentCreator } from 'components/document/create'; +import { DocumentStar } from 'components/document/star'; +import { useToggle } from 'hooks/useToggle'; interface IProps { wikiId: string; @@ -65,8 +65,8 @@ export const DocumentActions: React.FC = ({ {text} @@ -80,22 +80,13 @@ export const DocumentActions: React.FC = ({ - + } > {children || ( - + ); @@ -150,13 +134,13 @@ export const DocumentCollaboration: React.FC = ({ > toggleVisible(false)} maskClosable={false} - style={{ maxWidth: "96vw" }} + style={{ maxWidth: '96vw' }} footer={null} > @@ -169,14 +153,14 @@ export const DocumentCollaboration: React.FC = ({ > 邀请成功后,请将该链接发送给对方。 - +