Skip to content

Commit

Permalink
infra: simplify eslint config
Browse files Browse the repository at this point in the history
  • Loading branch information
aolyang committed Jan 16, 2025
1 parent 12e60c2 commit 829c497
Show file tree
Hide file tree
Showing 71 changed files with 1,092 additions and 509 deletions.
70 changes: 0 additions & 70 deletions .configs/eslint.config.base.mjs

This file was deleted.

37 changes: 0 additions & 37 deletions .configs/eslint.config.dev.mjs

This file was deleted.

46 changes: 0 additions & 46 deletions .configs/eslint.config.packages.mjs

This file was deleted.

23 changes: 0 additions & 23 deletions .configs/eslint.config.stylistic.mjs

This file was deleted.

58 changes: 20 additions & 38 deletions docs/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { builtinModules } from "module"
import { dirname } from "path"
import { fileURLToPath } from "url"
import { dirname } from "path"
import { fileURLToPath } from "url"

import { FlatCompat } from "@eslint/eslintrc"

import configBase, { configShared } from "../.configs/eslint.config.base.mjs"
import configStylistic from "../.configs/eslint.config.stylistic.mjs"
import { FlatCompat } from "@eslint/eslintrc"
import { combine, ignores } from "@aolyang/eslint-config"
import importExport from "@aolyang/eslint-config/import-export"
import stylistic from "@aolyang/eslint-config/stylistic"
import typescript from "@aolyang/eslint-config/typescript"

const __filename = fileURLToPath(import.meta.url)
const __dirname = dirname(__filename)
Expand All @@ -14,44 +15,25 @@ const compat = new FlatCompat({
baseDirectory: __dirname
})

const eslintConfig = [
...compat.extends("next/core-web-vitals"),
{
plugins: {
"@stylistic": configShared[0].plugins["@stylistic"],
"simple-import-sort": configShared[0].plugins["simple-import-sort"]
}
},
...configBase,
...configStylistic,
{
export default combine(
compat.extends("next/core-web-vitals"),
stylistic(),
typescript(),
importExport(),
importExport({
files: ["eslint.config.mjs"],
rules: {
"simple-import-sort/imports": [
"error",
{
groups: [
// style less,scss,css
["^.+\\.(l|s)?css$"],
// Side effect imports.
["^\\u0000"],
["\\u0000$"],
[
"globals",
`node:`,
`^(${builtinModules.join("|")})(/|$)`
],
["^@?\\w.*\\u0000$", "^[^.].*\\u0000$", "^\\..*\\u0000$"],
["^"],
["^\\."]
["globals", "module", "node:", `^(${builtinModules.join("|")})(/|$)`],
["^@eslint", "^eslint-*", "^@?\\w"],
["^"]
]
}
]

}
},
{
ignores: ["\\.next"]
}
]

export default eslintConfig
}),
{ ignores: ignores.concat(["**/_meta.ts"]) }
)
5 changes: 3 additions & 2 deletions docs/src/app/[lang]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import "@/styles/tailwind.css"
import type { Metadata } from "next"
import type { ReactNode } from "react"

import ClientThemeProvider from "@/components/ClientThemeProvider"
import { i18n } from "@/utils/i18n"
import { AppRouterCacheProvider } from "@mui/material-nextjs/v15-appRouter"
import { Head } from "nextra/components"
import { getPageMap } from "nextra/page-map"
import { Footer, LastUpdated, Layout, LocaleSwitch, Navbar, ThemeSwitch } from "nextra-theme-docs"

import ClientThemeProvider from "@/components/ClientThemeProvider"
import { i18n } from "@/utils/i18n"

export const { viewport } = Head

export const metadata: Metadata = {
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/ClientThemeProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
"use client"
import type { ReactNode } from "react"

import theme from "@/utils/theme"
import { CssBaseline, ThemeProvider } from "@mui/material"

import theme from "@/utils/theme"

export default function ClientThemeProvider({ children }: { children: ReactNode }) {
return (
<ThemeProvider theme={theme} modeStorageKey="theme">
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/Hr.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function Hr({ className = "", ...restProps }: HrProps) {
return (
<div
className={cn(
`border-r border-neutral-400 dark:border-neutral-500`,
"border-r border-neutral-400 dark:border-neutral-500",
className
)}
{...restProps}
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/PlainTextDropdown.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import type { ForwardedRef, ReactNode } from "react"

import useMenuTrigger from "@/hooks/useMenuTrigger"
import { mdiMenuDown } from "@mdi/js"
import { Icon } from "@mdi/react"
import { ButtonBase, ClickAwayListener, Menu, MenuList, Tooltip } from "@mui/material"
import cn from "clsx"
import { forwardRef, useImperativeHandle } from "react"

import useMenuTrigger from "@/hooks/useMenuTrigger"

interface PlainTextSelectProps {
className?: string
Label: ReactNode
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/Blockquote.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconBar from "@/components/IconBar"
import { ediBlockquote } from "@tiptiz/editor-icons"

import IconBar from "@/components/IconBar"

export default function Blockquote() {
return <IconBar path={ediBlockquote} tooltip="Blockquote" />
}
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/BulletList.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import PlainTextSelect from "@/components/PlainTextSelect"
import { Icon } from "@mdi/react"
import { ediBulletList, ediListCircle, ediListDisc, ediListSquare } from "@tiptiz/editor-icons"

import PlainTextSelect from "@/components/PlainTextSelect"

interface ListStyle {
icon?: string
label?: string
Expand Down
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/CheckList.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconBar from "@/components/IconBar"
import { ediCheckList } from "@tiptiz/editor-icons"

import IconBar from "@/components/IconBar"

export default function CheckList() {
return <IconBar path={ediCheckList} tooltip="Check List" />
}
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/CodeBlock.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconBar from "@/components/IconBar"
import { ediCodeBlock } from "@tiptiz/editor-icons"

import IconBar from "@/components/IconBar"

export default function CodeBlock() {
return <IconBar path={ediCodeBlock} tooltip="Code Block" />
}
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/Emoji.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconBar from "@/components/IconBar"
import { ediEmoji } from "@tiptiz/editor-icons"

import IconBar from "@/components/IconBar"

export default function Emoji() {
return <IconBar path={ediEmoji} tooltip="Emoji" />
}
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/FontBold.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconBar from "@/components/IconBar"
import { ediBold } from "@tiptiz/editor-icons"

import IconBar from "@/components/IconBar"

export default function FontBold() {
return <IconBar tooltip="Font Bold" path={ediBold} />
}
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/FontItalic.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconBar from "@/components/IconBar"
import { ediItalic } from "@tiptiz/editor-icons"

import IconBar from "@/components/IconBar"

export default function FontItalic() {
return <IconBar path={ediItalic} tooltip="Font Italic" />
}
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/FontSizeMinus.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconBar from "@/components/IconBar"
import { ediFontSizeMinus } from "@tiptiz/editor-icons"

import IconBar from "@/components/IconBar"

export default function FontSizeMinus() {
return <IconBar tooltip="Font Size Decrease" path={ediFontSizeMinus} />
}
3 changes: 2 additions & 1 deletion docs/src/components/editor-toolbars/FontSizePus.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconBar from "@/components/IconBar"
import { ediFontSizePlus } from "@tiptiz/editor-icons"

import IconBar from "@/components/IconBar"

export default function FontSizePus() {
return <IconBar tooltip="Font Size Increase" path={ediFontSizePlus} />
}
Loading

0 comments on commit 829c497

Please sign in to comment.