Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: fix linter

Johnny8acded1f23ef
diff --git a/web/.prettierrc.js b/web/.prettierrc.js
index 1b07b8aa1..e9531d61a 100644
--- a/web/.prettierrc.js
+++ b/web/.prettierrc.js
@@ -4,5 +4,5 @@ module.exports = {
semi: true,
singleQuote: false,
plugins: [require.resolve("@trivago/prettier-plugin-sort-imports")],
- importOrder: ["<BUILTIN_MODULES>", "<THIRD_PARTY_MODULES>", "^[./]", "^(.+).css"],
+ importOrder: ["<BUILTIN_MODULES>", "<THIRD_PARTY_MODULES>", "^@/((?!css).+)", "^[./]", "^(.+).css"],
};
diff --git a/web/src/components/MemoContent/Math.tsx b/web/src/components/MemoContent/Math.tsx
index 3e73eef62..fff1ff45c 100644
--- a/web/src/components/MemoContent/Math.tsx
+++ b/web/src/components/MemoContent/Math.tsx
@@ -1,6 +1,6 @@
import TeX from "@matejmazur/react-katex";
-import "katex/dist/katex.min.css";
import { cn } from "@/utils";
+import "katex/dist/katex.min.css";
interface Props {
content: string;
diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx
index 72269d24e..42321181f 100644
--- a/web/src/components/MemoEditor/index.tsx
+++ b/web/src/components/MemoEditor/index.tsx
@@ -5,7 +5,6 @@ import { LoaderIcon, SendIcon } from "lucide-react";
import { observer } from "mobx-react-lite";
import React, { useEffect, useMemo, useRef, useState } from "react";
import DatePicker from "react-datepicker";
-import "react-datepicker/dist/react-datepicker.css";
import { toast } from "react-hot-toast";
import { useTranslation } from "react-i18next";
import useLocalStorage from "react-use/lib/useLocalStorage";
@@ -32,6 +31,7 @@ import RelationListView from "./RelationListView";
import ResourceListView from "./ResourceListView";
import { handleEditorKeydownWithMarkdownShortcuts, hyperlinkHighlightedText } from "./handlers";
import { MemoEditorContext } from "./types";
+import "react-datepicker/dist/react-datepicker.css";
export interface Props {
className?: string;
diff --git a/web/src/components/StatisticsView.tsx b/web/src/components/StatisticsView.tsx
index d4c09c4d7..86abbe63f 100644
--- a/web/src/components/StatisticsView.tsx
+++ b/web/src/components/StatisticsView.tsx
@@ -5,7 +5,6 @@ import { CheckCircleIcon, ChevronRightIcon, ChevronLeftIcon, Code2Icon, LinkIcon
import { observer } from "mobx-react-lite";
import { useState } from "react";
import DatePicker from "react-datepicker";
-import "react-datepicker/dist/react-datepicker.css";
import useAsyncEffect from "@/hooks/useAsyncEffect";
import i18n from "@/i18n";
import { useMemoFilterStore } from "@/store/v1";
@@ -14,6 +13,7 @@ import { UserStats_MemoTypeStats } from "@/types/proto/api/v1/user_service";
import { cn } from "@/utils";
import { useTranslate } from "@/utils/i18n";
import ActivityCalendar from "./ActivityCalendar";
+import "react-datepicker/dist/react-datepicker.css";
const StatisticsView = observer(() => {
const t = useTranslate();
diff --git a/web/src/main.tsx b/web/src/main.tsx
index 87309eb71..3d839e910 100644
--- a/web/src/main.tsx
+++ b/web/src/main.tsx
@@ -1,7 +1,5 @@
import "@github/relative-time-element";
import { CssVarsProvider } from "@mui/joy";
-import "@usememos/mui/dist/index.css";
-import "leaflet/dist/leaflet.css";
import { observer } from "mobx-react-lite";
import { createRoot } from "react-dom/client";
import { Toaster } from "react-hot-toast";
@@ -13,6 +11,8 @@ import router from "./router";
import { initialUserStore } from "./store/v2/user";
import { initialWorkspaceStore } from "./store/v2/workspace";
import theme from "./theme";
+import "@usememos/mui/dist/index.css";
+import "leaflet/dist/leaflet.css";
const Main = observer(() => (
<CssVarsProvider theme={theme}>