From dabab60f56956dcacfcfbeb6d9c553c3be6a3688 Mon Sep 17 00:00:00 2001 From: Sidney Keese Date: Thu, 24 Sep 2020 18:02:01 -0700 Subject: [PATCH] Remove TSLint Co-authored-by: Chris Svenningsen --- package.json | 6 +- sticker-creator/app/stages/MetaStage.tsx | 2 - sticker-creator/app/stages/UploadStage.tsx | 1 - sticker-creator/components/ConfirmModal.tsx | 59 +++--- sticker-creator/components/StickerFrame.tsx | 1 - sticker-creator/components/StickerGrid.tsx | 1 - sticker-creator/elements/DropZone.tsx | 1 - sticker-creator/elements/LabeledCheckbox.tsx | 1 - ts/ConversationController.ts | 1 - ts/components/emoji/EmojiButton.tsx | 1 - ts/components/emoji/EmojiPicker.tsx | 1 - ts/components/emoji/lib.ts | 4 - ts/services/groupCredentialFetcher.ts | 1 - ts/services/notify.ts | 1 - ts/services/storage.ts | 2 - ts/services/storageRecordOps.ts | 2 - ts/sql/Client.ts | 3 - ts/sql/Server.ts | 9 - ts/state/createStore.ts | 1 - ts/state/ducks/calling.ts | 3 - ts/state/ducks/conversations.ts | 2 - ts/state/ducks/items.ts | 1 - ts/state/ducks/search.ts | 1 - ts/state/ducks/stickers.ts | 2 - ts/state/selectors/search.ts | 1 - ts/textsecure/AccountManager.ts | 3 - ts/textsecure/EventTarget.ts | 1 - ts/textsecure/Helpers.ts | 1 - ts/textsecure/MessageReceiver.ts | 18 -- ts/textsecure/OutgoingMessage.ts | 3 - ts/textsecure/SendMessage.ts | 2 - ts/textsecure/TaskWithTimeout.ts | 2 - ts/textsecure/WebsocketResources.ts | 1 - ts/textsecure/index.ts | 2 - ts/util/batcher.ts | 2 - ts/util/combineNames.ts | 2 - ts/util/lint/linter.ts | 3 - ts/util/waitBatcher.ts | 2 - ts/util/windowsZoneIdentifier.ts | 1 - tslint.json | 206 ------------------- webpack.config.ts | 2 - yarn.lock | 66 +----- 42 files changed, 31 insertions(+), 394 deletions(-) delete mode 100644 tslint.json diff --git a/package.json b/package.json index 00c7a2d13..38f471517 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,8 @@ "test-node-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/app test/modules ts/test", "eslint": "eslint .", "lint": "yarn format --list-different && yarn lint-windows", - "lint-windows": "yarn eslint && yarn tslint", + "lint-windows": "yarn eslint", "lint-deps": "node ts/util/lint/linter.js", - "tslint": "tslint --format stylish --project .", "format": "prettier --write \"*.{css,js,json,md,scss,ts,tsx}\" \"./**/*.{css,js,json,md,scss,ts,tsx}\"", "transpile": "tsc", "clean-transpile": "rimraf ts/**/*.js && rimraf ts/*.js", @@ -252,9 +251,6 @@ "style-loader": "1.0.0", "ts-loader": "4.1.0", "ts-node": "8.3.0", - "tslint": "6", - "tslint-microsoft-contrib": "6.2.0", - "tslint-react": "3.6.0", "typed-scss-modules": "0.0.11", "typescript": "3.7.4", "webpack": "4.39.2", diff --git a/sticker-creator/app/stages/MetaStage.tsx b/sticker-creator/app/stages/MetaStage.tsx index e58277f8d..e5aabc519 100644 --- a/sticker-creator/app/stages/MetaStage.tsx +++ b/sticker-creator/app/stages/MetaStage.tsx @@ -10,7 +10,6 @@ import { ConfirmModal } from '../../components/ConfirmModal'; import { stickersDuck } from '../../store'; import { useI18n } from '../../util/i18n'; -// tslint:disable-next-line max-func-body-length export const MetaStage: React.ComponentType = () => { const i18n = useI18n(); const actions = stickersDuck.useStickerActions(); @@ -91,7 +90,6 @@ export const MetaStage: React.ComponentType = () => { alt="Cover" /> ) : null} - {/* tslint:disable-next-line react-a11y-input-elements */} diff --git a/sticker-creator/app/stages/UploadStage.tsx b/sticker-creator/app/stages/UploadStage.tsx index bd8ba62af..d68b458eb 100644 --- a/sticker-creator/app/stages/UploadStage.tsx +++ b/sticker-creator/app/stages/UploadStage.tsx @@ -25,7 +25,6 @@ export const UploadStage: React.ComponentType = () => { const [complete, setComplete] = React.useState(0); React.useEffect(() => { - // tslint:disable-next-line: no-floating-promises (async () => { const onProgress = () => { setComplete(i => i + 1); diff --git a/sticker-creator/components/ConfirmModal.tsx b/sticker-creator/components/ConfirmModal.tsx index 4c4c7cc43..40508ce2f 100644 --- a/sticker-creator/components/ConfirmModal.tsx +++ b/sticker-creator/components/ConfirmModal.tsx @@ -5,37 +5,34 @@ import { ConfirmDialog, Props } from '../elements/ConfirmDialog'; export type Mode = 'removable' | 'pick-emoji' | 'add'; -export const ConfirmModal = React.memo( - // tslint:disable-next-line max-func-body-length - (props: Props) => { - const { onCancel } = props; - const [popperRoot, setPopperRoot] = React.useState(); +export const ConfirmModal = React.memo((props: Props) => { + const { onCancel } = props; + const [popperRoot, setPopperRoot] = React.useState(); - // Create popper root and handle outside clicks - React.useEffect(() => { - const root = document.createElement('div'); - setPopperRoot(root); - document.body.appendChild(root); - const handleOutsideClick = ({ target }: MouseEvent) => { - if (!root.contains(target as Node)) { - onCancel(); - } - }; - document.addEventListener('click', handleOutsideClick); + // Create popper root and handle outside clicks + React.useEffect(() => { + const root = document.createElement('div'); + setPopperRoot(root); + document.body.appendChild(root); + const handleOutsideClick = ({ target }: MouseEvent) => { + if (!root.contains(target as Node)) { + onCancel(); + } + }; + document.addEventListener('click', handleOutsideClick); - return () => { - document.body.removeChild(root); - document.removeEventListener('click', handleOutsideClick); - }; - }, [onCancel]); + return () => { + document.body.removeChild(root); + document.removeEventListener('click', handleOutsideClick); + }; + }, [onCancel]); - return popperRoot - ? createPortal( -
- -
, - popperRoot - ) - : null; - } -); + return popperRoot + ? createPortal( +
+ +
, + popperRoot + ) + : null; +}); diff --git a/sticker-creator/components/StickerFrame.tsx b/sticker-creator/components/StickerFrame.tsx index 54022cebd..abab5da5d 100644 --- a/sticker-creator/components/StickerFrame.tsx +++ b/sticker-creator/components/StickerFrame.tsx @@ -63,7 +63,6 @@ const ImageHandle = SortableHandle((props: { src: string }) => ( )); export const StickerFrame = React.memo( - // tslint:disable-next-line max-func-body-length ({ id, emojiData, diff --git a/sticker-creator/components/StickerGrid.tsx b/sticker-creator/components/StickerGrid.tsx index 33c2ec835..819288086 100644 --- a/sticker-creator/components/StickerGrid.tsx +++ b/sticker-creator/components/StickerGrid.tsx @@ -50,7 +50,6 @@ const InnerGrid = SortableContainer( async paths => { actions.initializeStickers(paths); paths.forEach(path => { - // tslint:disable-next-line no-floating-promises queue.add(async () => { try { const webp = await convertToWebp(path); diff --git a/sticker-creator/elements/DropZone.tsx b/sticker-creator/elements/DropZone.tsx index 36b1e1de7..036e22225 100644 --- a/sticker-creator/elements/DropZone.tsx +++ b/sticker-creator/elements/DropZone.tsx @@ -45,7 +45,6 @@ export const DropZone: React.ComponentType = props => { return (
- {/* tslint:disable-next-line */} diff --git a/sticker-creator/elements/LabeledCheckbox.tsx b/sticker-creator/elements/LabeledCheckbox.tsx index 4348ce264..c65e4d646 100644 --- a/sticker-creator/elements/LabeledCheckbox.tsx +++ b/sticker-creator/elements/LabeledCheckbox.tsx @@ -26,7 +26,6 @@ export const LabeledCheckbox = React.memo( return (