From 576b514d3afa6990be2552c728f1cc4d50f33761 Mon Sep 17 00:00:00 2001 From: pengzhanbo Date: Mon, 10 Apr 2023 20:57:13 +0800 Subject: [PATCH] style: import order --- docs/.vuepress/config.ts | 2 +- packages/plugin-caniuse/src/node/plugin.ts | 2 +- packages/plugin-page-collection/src/node/plugin.ts | 2 +- packages/theme/src/client/composables/sidebar.ts | 4 ++-- packages/theme/src/node/autoFrontmatter.ts | 2 +- packages/theme/src/node/plugins.ts | 14 +++++++------- packages/theme/src/shared/options/locale.ts | 2 +- packages/theme/src/shared/options/plugins.ts | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts index 950d5f9a..df9c3f63 100644 --- a/docs/.vuepress/config.ts +++ b/docs/.vuepress/config.ts @@ -1,8 +1,8 @@ import * as path from 'path' -import themePlume from '@vuepress-plume/vuepress-theme-plume' import { viteBundler } from '@vuepress/bundler-vite' import { webpackBundler } from '@vuepress/bundler-webpack' import { defineUserConfig } from '@vuepress/cli' +import themePlume from '@vuepress-plume/vuepress-theme-plume' import notes from './notes.js' export default defineUserConfig({ diff --git a/packages/plugin-caniuse/src/node/plugin.ts b/packages/plugin-caniuse/src/node/plugin.ts index b66effc8..0ed7d69b 100644 --- a/packages/plugin-caniuse/src/node/plugin.ts +++ b/packages/plugin-caniuse/src/node/plugin.ts @@ -1,7 +1,7 @@ import type { Plugin, PluginObject } from '@vuepress/core' import { getDirname, path } from '@vuepress/utils' -import container from 'markdown-it-container' import type Token from 'markdown-it/lib/token.js' +import container from 'markdown-it-container' import type { CanIUseMode, CanIUsePluginOptions } from '../shared/index.js' import { resolveCanIUse } from './resolveCanIUse.js' diff --git a/packages/plugin-page-collection/src/node/plugin.ts b/packages/plugin-page-collection/src/node/plugin.ts index f914c431..f6403bda 100644 --- a/packages/plugin-page-collection/src/node/plugin.ts +++ b/packages/plugin-page-collection/src/node/plugin.ts @@ -6,9 +6,9 @@ // 通过引入 '@vuepress-plume/vuepress-plugin-netlify-functions' 插件，来为本插件提供 // netlify functions 开发时支持 -import { useNetlifyFunctionsPlugin } from '@vuepress-plume/vuepress-plugin-netlify-functions' import type { App, Plugin } from '@vuepress/core' import { getDirname, path } from '@vuepress/utils' +import { useNetlifyFunctionsPlugin } from '@vuepress-plume/vuepress-plugin-netlify-functions' import type { PageCollectionOptions } from '../shared/index.js' const __dirname = getDirname(import.meta.url) diff --git a/packages/theme/src/client/composables/sidebar.ts b/packages/theme/src/client/composables/sidebar.ts index cf23a64d..43b22a05 100644 --- a/packages/theme/src/client/composables/sidebar.ts +++ b/packages/theme/src/client/composables/sidebar.ts @@ -1,10 +1,10 @@ +import type { PageData } from '@vuepress/client' +import { usePageData, usePageFrontmatter, withBase } from '@vuepress/client' import type { NotesData, NotesSidebarItem, } from '@vuepress-plume/vuepress-plugin-notes-data' import { useNotesData } from '@vuepress-plume/vuepress-plugin-notes-data/client' -import type { PageData } from '@vuepress/client' -import { usePageData, usePageFrontmatter, withBase } from '@vuepress/client' import { useMediaQuery } from '@vueuse/core' import type { ComputedRef, Ref } from 'vue' import { computed, onMounted, onUnmounted, ref, watchEffect } from 'vue' diff --git a/packages/theme/src/node/autoFrontmatter.ts b/packages/theme/src/node/autoFrontmatter.ts index 555466cc..e9b42dc3 100644 --- a/packages/theme/src/node/autoFrontmatter.ts +++ b/packages/theme/src/node/autoFrontmatter.ts @@ -1,5 +1,6 @@ import { createRequire } from 'node:module' import path from 'node:path' +import type { App } from '@vuepress/core' import type { AutoFrontmatterOptions, FormatterArray, @@ -8,7 +9,6 @@ import type { NotesDataOptions, NotesItem, } from '@vuepress-plume/vuepress-plugin-notes-data' -import type { App } from '@vuepress/core' import { format } from 'date-fns' import { customAlphabet } from 'nanoid' import type { PlumeThemeLocaleOptions } from '../shared/index.js' diff --git a/packages/theme/src/node/plugins.ts b/packages/theme/src/node/plugins.ts index c014a3f4..a8d9e646 100644 --- a/packages/theme/src/node/plugins.ts +++ b/packages/theme/src/node/plugins.ts @@ -1,10 +1,3 @@ -import { autoFrontmatterPlugin } from '@vuepress-plume/vuepress-plugin-auto-frontmatter' -import { baiduTongjiPlugin } from '@vuepress-plume/vuepress-plugin-baidu-tongji' -import { blogDataPlugin } from '@vuepress-plume/vuepress-plugin-blog-data' -import { caniusePlugin } from '@vuepress-plume/vuepress-plugin-caniuse' -import { copyCodePlugin } from '@vuepress-plume/vuepress-plugin-copy-code' -import { iconifyPlugin } from '@vuepress-plume/vuepress-plugin-iconify' -import { notesDataPlugin } from '@vuepress-plume/vuepress-plugin-notes-data' import type { App, PluginConfig } from '@vuepress/core' import { activeHeaderLinksPlugin } from '@vuepress/plugin-active-header-links' import { docsearchPlugin } from '@vuepress/plugin-docsearch' @@ -17,6 +10,13 @@ import { prismjsPlugin } from '@vuepress/plugin-prismjs' import { searchPlugin } from '@vuepress/plugin-search' import { shikiPlugin } from '@vuepress/plugin-shiki' import { themeDataPlugin } from '@vuepress/plugin-theme-data' +import { autoFrontmatterPlugin } from '@vuepress-plume/vuepress-plugin-auto-frontmatter' +import { baiduTongjiPlugin } from '@vuepress-plume/vuepress-plugin-baidu-tongji' +import { blogDataPlugin } from '@vuepress-plume/vuepress-plugin-blog-data' +import { caniusePlugin } from '@vuepress-plume/vuepress-plugin-caniuse' +import { copyCodePlugin } from '@vuepress-plume/vuepress-plugin-copy-code' +import { iconifyPlugin } from '@vuepress-plume/vuepress-plugin-iconify' +import { notesDataPlugin } from '@vuepress-plume/vuepress-plugin-notes-data' import { commentPlugin } from 'vuepress-plugin-comment2' import { mdEnhancePlugin } from 'vuepress-plugin-md-enhance' import { seoPlugin } from 'vuepress-plugin-seo2' diff --git a/packages/theme/src/shared/options/locale.ts b/packages/theme/src/shared/options/locale.ts index 25cd19c1..27d6104f 100644 --- a/packages/theme/src/shared/options/locale.ts +++ b/packages/theme/src/shared/options/locale.ts @@ -1,5 +1,5 @@ -import type { NotesDataOptions } from '@vuepress-plume/vuepress-plugin-notes-data' import type { LocaleData } from '@vuepress/core' +import type { NotesDataOptions } from '@vuepress-plume/vuepress-plugin-notes-data' import type { NavItem } from './navbar.js' // import type { NavbarConfig, NavLink } from '../layout/index.js' // import type { PlumeThemeNotesOptions } from './notes.js' diff --git a/packages/theme/src/shared/options/plugins.ts b/packages/theme/src/shared/options/plugins.ts index 102a313d..4c83a05e 100644 --- a/packages/theme/src/shared/options/plugins.ts +++ b/packages/theme/src/shared/options/plugins.ts @@ -1,9 +1,9 @@ -import type { BaiduTongjiOptions } from '@vuepress-plume/vuepress-plugin-baidu-tongji' -import type { CanIUsePluginOptions } from '@vuepress-plume/vuepress-plugin-caniuse' -import type { CopyCodeOptions } from '@vuepress-plume/vuepress-plugin-copy-code' import type { DocsearchOptions } from '@vuepress/plugin-docsearch' import type { SearchPluginOptions } from '@vuepress/plugin-search' import type { ShikiPluginOptions } from '@vuepress/plugin-shiki' +import type { BaiduTongjiOptions } from '@vuepress-plume/vuepress-plugin-baidu-tongji' +import type { CanIUsePluginOptions } from '@vuepress-plume/vuepress-plugin-caniuse' +import type { CopyCodeOptions } from '@vuepress-plume/vuepress-plugin-copy-code' import type { CommentOptions } from 'vuepress-plugin-comment2' import type { MarkdownEnhanceOptions } from 'vuepress-plugin-md-enhance'