From 507a685019e10e916b7736d78fec0c492ebb4a2d Mon Sep 17 00:00:00 2001 From: Untone Date: Thu, 15 Feb 2024 17:26:27 +0300 Subject: [PATCH] no-lintstaged --- .husky/pre-commit | 4 ---- package.json | 19 +++++++++---------- .../Topic/TopicBadge/TopicBadge.module.scss | 1 + src/components/Views/Inbox/Inbox.tsx | 6 +++++- 4 files changed, 15 insertions(+), 15 deletions(-) delete mode 100755 .husky/pre-commit diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index d4a43dd1..00000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -npm run pre-commit diff --git a/package.json b/package.json index 94d61246..4e9fbf8e 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,6 @@ "lint:code:fix": "npx @biomejs/biome lint src --apply-unsafe --log-kind=compact --verbose", "lint:styles": "stylelint **/*.{scss,css}", "lint:styles:fix": "stylelint **/*.{scss,css} --fix", - "pre-commit": "lint-staged", - "prepare": "husky install", "preview": "vite preview", "start": "vite", "typecheck": "tsc --noEmit", @@ -31,7 +29,7 @@ }, "dependencies": { "form-data": "4.0.0", - "mailgun.js": "8.2.1" + "mailgun.js": "10.1.0" }, "devDependencies": { "@authorizerdev/authorizer-js": "2.0.0", @@ -120,24 +118,25 @@ "solid-popper": "0.3.0", "solid-tiptap": "0.7.0", "solid-transition-group": "0.2.3", - "stylelint": "15.11.0", - "stylelint-config-standard-scss": "11.1.0", + "stylelint": "^16.0.0", + "stylelint-config-standard-scss": "13.0.0", "stylelint-order": "6.0.3", - "stylelint-scss": "5.3.1", + "stylelint-scss": "^6.1.0", "swiper": "11.0.5", "throttle-debounce": "5.0.0", "typescript": "5.2.2", - "typograf": "7.1.0", + "typograf": "7.3.0", "uniqolor": "1.1.0", "vike": "0.4.148", "vite": "5.1.2", "vite-plugin-mkcert": "^1.17.3", "vite-plugin-sass-dts": "^1.3.17", - "vite-plugin-solid": "2.7.2", + "vite-plugin-solid": "2.10.1", "y-prosemirror": "1.2.2", - "yjs": "13.6.0" + "yjs": "13.6.8" }, "overrides": { - "y-prosemirror": "1.2.2" + "y-prosemirror": "1.2.2", + "yjs": "13.6.8" } } diff --git a/src/components/Topic/TopicBadge/TopicBadge.module.scss b/src/components/Topic/TopicBadge/TopicBadge.module.scss index 3f9d8436..f219910a 100644 --- a/src/components/Topic/TopicBadge/TopicBadge.module.scss +++ b/src/components/Topic/TopicBadge/TopicBadge.module.scss @@ -8,6 +8,7 @@ flex-direction: row; margin-bottom: .8rem; } + .basicInfo { display: flex; flex-flow: row nowrap; diff --git a/src/components/Views/Inbox/Inbox.tsx b/src/components/Views/Inbox/Inbox.tsx index f74bd32f..74f09d21 100644 --- a/src/components/Views/Inbox/Inbox.tsx +++ b/src/components/Views/Inbox/Inbox.tsx @@ -9,7 +9,7 @@ import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' import { useRouter } from '../../../stores/router' import { showModal } from '../../../stores/ui' -import SimplifiedEditor from '../../Editor/SimplifiedEditor' + import DialogCard from '../../Inbox/DialogCard' import DialogHeader from '../../Inbox/DialogHeader' import { Message } from '../../Inbox/Message' @@ -21,6 +21,10 @@ import { InviteMembers } from '../../_shared/InviteMembers' import { Popover } from '../../_shared/Popover' import styles from './Inbox.module.scss' +import { lazy } from 'solid-js' + +const SimplifiedEditor = lazy(() => import('../../Editor/SimplifiedEditor')) + type InboxSearchParams = { by?: string