From 69cbab8bb420c6c945df057f5890315019f5c56f Mon Sep 17 00:00:00 2001 From: HoshinoSuzumi Date: Sat, 23 Nov 2024 17:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20chore:=20lint=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/components/content/ComponentDefaults.vue | 5 +- docs/components/content/ComponentPreview.vue | 25 ++++-- docs/components/content/Prose/ProseCode.vue | 14 ++- docs/components/content/Prose/ProsePre.vue | 40 +++++---- docs/components/icon/TablerFile.vue | 7 +- .../icon/VscodeIconsFileTypeJson.vue | 7 +- .../icon/VscodeIconsFileTypeNuxt.vue | 7 +- src/runtime/components/elements/Button.vue | 3 +- src/runtime/ui.config/elements/button.ts | 86 +++++++++---------- 9 files changed, 104 insertions(+), 90 deletions(-) diff --git a/docs/components/content/ComponentDefaults.vue b/docs/components/content/ComponentDefaults.vue index 8cfc085..91be093 100644 --- a/docs/components/content/ComponentDefaults.vue +++ b/docs/components/content/ComponentDefaults.vue @@ -1,7 +1,7 @@ @@ -41,6 +41,4 @@ pre code .line { pre code .line.highlight { @apply !bg-gray-200/50 dark:!bg-gray-800; } - - diff --git a/docs/components/content/Prose/ProsePre.vue b/docs/components/content/Prose/ProsePre.vue index 90b17ef..dc51d64 100644 --- a/docs/components/content/Prose/ProsePre.vue +++ b/docs/components/content/Prose/ProsePre.vue @@ -3,39 +3,39 @@ import FileTypeVue from '../../icon/VscodeIconsFileTypeVue.vue' import FileTypeTypescript from '../../icon/VscodeIconsFileTypeTypescriptOfficial.vue' import FileTypeJavascript from '../../icon/VscodeIconsFileTypeJsOfficial.vue' import TablerTerminal from '../../icon/TablerTerminal.vue' -import TablerFile from '~/components/icon/TablerFile.vue'; -import VscodeIconsFileTypeJson from '~/components/icon/VscodeIconsFileTypeJson.vue'; -import VscodeIconsFileTypeNuxt from '~/components/icon/VscodeIconsFileTypeNuxt.vue'; +import TablerFile from '~/components/icon/TablerFile.vue' +import VscodeIconsFileTypeJson from '~/components/icon/VscodeIconsFileTypeJson.vue' +import VscodeIconsFileTypeNuxt from '~/components/icon/VscodeIconsFileTypeNuxt.vue' const props = defineProps({ code: { type: String, - default: '' + default: '', }, language: { type: String, - default: null + default: null, }, filename: { type: String, - default: null + default: null, }, highlights: { type: Array as () => number[], - default: () => [] + default: () => [], }, meta: { type: String, - default: null + default: null, }, class: { type: String, - default: null + default: null, }, style: { type: [String, Object], - default: null - } + default: null, + }, }) const mapIconLanguage = { @@ -46,17 +46,17 @@ const mapIconLanguage = { 'sh': TablerTerminal, 'ts': FileTypeTypescript, 'js': FileTypeJavascript, - 'json': VscodeIconsFileTypeJson + 'json': VscodeIconsFileTypeJson, } const mapIconFilename = { - 'nuxt.config.ts': VscodeIconsFileTypeNuxt + 'nuxt.config.ts': VscodeIconsFileTypeNuxt, } const resolveIcon = computed(() => { if (props.filename) { if (props.filename.endsWith('.vue')) return FileTypeVue - + const icon = mapIconFilename[props.filename as keyof typeof mapIconFilename] if (icon) return icon } @@ -72,9 +72,15 @@ const resolveIcon = computed(() => { {{ filename }} - -
+ +
diff --git a/docs/components/icon/TablerFile.vue b/docs/components/icon/TablerFile.vue index b1f130d..5c33180 100644 --- a/docs/components/icon/TablerFile.vue +++ b/docs/components/icon/TablerFile.vue @@ -1,10 +1,9 @@ - \ No newline at end of file + diff --git a/docs/components/icon/VscodeIconsFileTypeJson.vue b/docs/components/icon/VscodeIconsFileTypeJson.vue index 8795bee..69f5dda 100644 --- a/docs/components/icon/VscodeIconsFileTypeJson.vue +++ b/docs/components/icon/VscodeIconsFileTypeJson.vue @@ -1,10 +1,9 @@ - \ No newline at end of file + diff --git a/docs/components/icon/VscodeIconsFileTypeNuxt.vue b/docs/components/icon/VscodeIconsFileTypeNuxt.vue index 50f9ba6..688f2cd 100644 --- a/docs/components/icon/VscodeIconsFileTypeNuxt.vue +++ b/docs/components/icon/VscodeIconsFileTypeNuxt.vue @@ -1,10 +1,9 @@ - \ No newline at end of file + diff --git a/src/runtime/components/elements/Button.vue b/src/runtime/components/elements/Button.vue index d5179e3..cdc8bb5 100644 --- a/src/runtime/components/elements/Button.vue +++ b/src/runtime/components/elements/Button.vue @@ -86,12 +86,13 @@ export default defineComponent({ }) return { + // eslint-disable-next-line vue/no-dupe-keys ui, attrs, extProps, buttonClass, } - } + }, }) diff --git a/src/runtime/ui.config/elements/button.ts b/src/runtime/ui.config/elements/button.ts index fe1afa8..2b00b33 100644 --- a/src/runtime/ui.config/elements/button.ts +++ b/src/runtime/ui.config/elements/button.ts @@ -1,69 +1,69 @@ export default { - base: "focus:outline-none focus-visible:outline-0 disabled:cursor-not-allowed disabled:opacity-70 aria-disabled:cursor-not-allowed aria-disabled:opacity-70 flex-shrink-0 transition", - rounded: "rounded-lg", - font: "font-medium", - block: "w-full flex justify-center items-center", - inline: "inline-flex items-center", + base: 'focus:outline-none focus-visible:outline-0 disabled:cursor-not-allowed disabled:opacity-70 aria-disabled:cursor-not-allowed aria-disabled:opacity-70 flex-shrink-0 transition', + rounded: 'rounded-lg', + font: 'font-medium', + block: 'w-full flex justify-center items-center', + inline: 'inline-flex items-center', size: { - "2xs": "text-xs", - xs: "text-xs", - sm: "text-sm", - md: "text-sm", - lg: "text-sm", - xl: "text-base", + '2xs': 'text-xs', + 'xs': 'text-xs', + 'sm': 'text-sm', + 'md': 'text-sm', + 'lg': 'text-sm', + 'xl': 'text-base', }, padding: { - "2xs": "px-2 py-1", - xs: "px-2.5 py-1.5", - sm: "px-2.5 py-1.5", - md: "px-3 py-2", - lg: "px-3.5 py-2.5", - xl: "px-3.5 py-2.5", + '2xs': 'px-2 py-1', + 'xs': 'px-2.5 py-1.5', + 'sm': 'px-2.5 py-1.5', + 'md': 'px-3 py-2', + 'lg': 'px-3.5 py-2.5', + 'xl': 'px-3.5 py-2.5', }, square: { - "2xs": "p-1", - xs: "p-1.5", - sm: "p-1.5", - md: "p-2", - lg: "p-2.5", - xl: "p-2.5", + '2xs': 'p-1', + 'xs': 'p-1.5', + 'sm': 'p-1.5', + 'md': 'p-2', + 'lg': 'p-2.5', + 'xl': 'p-2.5', }, icon: { - base: "flex-shrink-0", - loading: "animate-spin", + base: 'flex-shrink-0', + loading: 'animate-spin', size: { - "2xs": "h-4 w-4", - xs: "h-4 w-4", - sm: "h-5 w-5", - md: "h-5 w-5", - lg: "h-5 w-5", - xl: "h-6 w-6", + '2xs': 'h-4 w-4', + 'xs': 'h-4 w-4', + 'sm': 'h-5 w-5', + 'md': 'h-5 w-5', + 'lg': 'h-5 w-5', + 'xl': 'h-6 w-6', }, }, color: { match: { solid: - "shadow-sm active:shadow-none bg-white dark:bg-gray-900 hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-900 dark:text-white ring-1 ring-inset ring-gray-300 dark:ring-gray-700 disabled:bg-white disabled:active:shadow-sm focus-visible:ring-2 focus-visible:ring-primary-500 dark:focus-visible:ring-primary-400", + 'shadow-sm active:shadow-none bg-white dark:bg-gray-900 hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-900 dark:text-white ring-1 ring-inset ring-gray-300 dark:ring-gray-700 disabled:bg-white disabled:active:shadow-sm focus-visible:ring-2 focus-visible:ring-primary-500 dark:focus-visible:ring-primary-400', }, invert: { solid: - "shadow-sm active:shadow-none bg-gray-900 dark:bg-white hover:bg-gray-800 dark:hover:bg-gray-100 text-white dark:text-gray-900 ring-1 ring-inset ring-gray-900 dark:ring-white disabled:bg-white disabled:active:shadow-sm focus-visible:ring-2 focus-visible:ring-primary-500 dark:focus-visible:ring-primary-400", + 'shadow-sm active:shadow-none bg-gray-900 dark:bg-white hover:bg-gray-800 dark:hover:bg-gray-100 text-white dark:text-gray-900 ring-1 ring-inset ring-gray-900 dark:ring-white disabled:bg-white disabled:active:shadow-sm focus-visible:ring-2 focus-visible:ring-primary-500 dark:focus-visible:ring-primary-400', }, }, variant: { solid: - "shadow-sm hover:shadow-md disabled:hover:shadow-sm active:shadow-none bg-{color}-500 disabled:bg-{color}-500 aria-disabled:bg-{color}-500 hover:bg-{color}-600 text-white active:bg-{color}-700 dark:active:bg-{color}-500 focus:ring focus:ring-{color}-300 focus:ring-opacity-50 dark:focus:ring-opacity-20", + 'shadow-sm hover:shadow-md disabled:hover:shadow-sm active:shadow-none bg-{color}-500 disabled:bg-{color}-500 aria-disabled:bg-{color}-500 hover:bg-{color}-600 text-white active:bg-{color}-700 dark:active:bg-{color}-500 focus:ring focus:ring-{color}-300 focus:ring-opacity-50 dark:focus:ring-opacity-20', outline: - "ring-1 ring-inset ring-current ring-{color}-500 text-{color}-500 dark:hover:text-{color}-400 dark:hover:text-{color}-500 hover:bg-{color}-100 dark:hover:bg-{color}-900 disabled:bg-transparent disabled:hover:bg-transparent aria-disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400", - soft: "text-{color}-500 dark:text-{color}-400 bg-{color}-50 hover:bg-{color}-100 disabled:bg-{color}-50 aria-disabled:bg-{color}-50 dark:bg-{color}-950 dark:hover:bg-{color}-900 dark:disabled:bg-{color}-950 dark:aria-disabled:bg-{color}-950 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400 transition-none", + 'ring-1 ring-inset ring-current ring-{color}-500 text-{color}-500 dark:hover:text-{color}-400 dark:hover:text-{color}-500 hover:bg-{color}-100 dark:hover:bg-{color}-900 disabled:bg-transparent disabled:hover:bg-transparent aria-disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400', + soft: 'text-{color}-500 dark:text-{color}-400 bg-{color}-50 hover:bg-{color}-100 disabled:bg-{color}-50 aria-disabled:bg-{color}-50 dark:bg-{color}-950 dark:hover:bg-{color}-900 dark:disabled:bg-{color}-950 dark:aria-disabled:bg-{color}-950 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400 transition-none', ghost: - "text-{color}-500 dark:text-{color}-400 hover:bg-{color}-50 disabled:bg-transparent aria-disabled:bg-transparent dark:hover:bg-{color}-950 dark:disabled:bg-transparent dark:aria-disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400", - link: "text-{color}-500 hover:text-{color}-600 disabled:text-{color}-500 aria-disabled:text-{color}-500 dark:text-{color}-400 dark:hover:text-{color}-500 dark:disabled:text-{color}-400 dark:aria-disabled:text-{color}-400 underline-offset-4 hover:underline focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400", + 'text-{color}-500 dark:text-{color}-400 hover:bg-{color}-50 disabled:bg-transparent aria-disabled:bg-transparent dark:hover:bg-{color}-950 dark:disabled:bg-transparent dark:aria-disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400', + link: 'text-{color}-500 hover:text-{color}-600 disabled:text-{color}-500 aria-disabled:text-{color}-500 dark:text-{color}-400 dark:hover:text-{color}-500 dark:disabled:text-{color}-400 dark:aria-disabled:text-{color}-400 underline-offset-4 hover:underline focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400', }, default: { - size: "sm", - color: "primary", - variant: "solid", - loadingIcon: "loading", + size: 'sm', + color: 'primary', + variant: 'solid', + loadingIcon: 'loading', }, -}; +}