@varlet/cli 3.8.2 → 3.8.3

package/site/pc/App.vue

@@ -1,7 +1,7 @@
 <script lang="ts">
-import config from '@config'
 import { defineComponent, onMounted, ref } from 'vue'
-import { getPCLocationInfo, getMobileIndex } from '@varlet/cli/client'
+import config from '@config'
+import { getMobileIndex, getPCLocationInfo } from '@varlet/cli/client'
 import { isPhone } from '../utils'
 
 export default defineComponent({
@@ -31,10 +31,14 @@ export default defineComponent({
 
 <style lang="less">
 body {
-  transition: background-color 0.25s, box-shadow 0.25s;
+  transition:
+    background-color 0.25s,
+    box-shadow 0.25s;
 
   * {
-    transition: background-color 0.25s, box-shadow 0.25s;
+    transition:
+      background-color 0.25s,
+      box-shadow 0.25s;
   }
 }
 </style>

package/site/pc/Layout.vue

@@ -1,15 +1,15 @@
 <script lang="ts" setup>
+import { nextTick, onMounted, ref, watch, type Ref } from 'vue'
 import config from '@config'
-import AppAd from './components/AppAd.vue'
-import AppMobile from './components/AppMobile.vue'
-import AppHeader from './components/AppHeader.vue'
-import AppSidebar from './components/AppSidebar.vue'
+import { getPCLocationInfo } from '@varlet/cli/client'
 import { Context } from '@varlet/ui'
-import { nextTick, onMounted, ref, watch, type Ref } from 'vue'
 import { useRoute } from 'vue-router'
-import { getPCLocationInfo } from '@varlet/cli/client'
-import { MenuTypes, type Menu } from '../utils'
 import { type SiteContext } from '../types'
+import { MenuTypes, type Menu } from '../utils'
+import AppAd from './components/AppAd.vue'
+import AppHeader from './components/AppHeader.vue'
+import AppMobile from './components/AppMobile.vue'
+import AppSidebar from './components/AppSidebar.vue'
 
 const context = Context as SiteContext
 const menu: Ref<Menu[]> = ref(config?.pc?.menu ?? [])
@@ -91,7 +91,7 @@ watch(
     useMobile.value = menu.value.find((item) => item.doc === _menuName)?.useMobile ?? config?.useMobile
     document.title = config?.pc?.title[lang] as string
   },
-  { immediate: true }
+  { immediate: true },
 )
 </script>
 
@@ -227,7 +227,10 @@ iframe {
     border-top: 6px solid var(--site-config-color-introduce-border);
     border-radius: 2px;
     background: var(--site-config-color-bar);
-    box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+    box-shadow:
+      0 3px 1px -2px rgba(0, 0, 0, 0.2),
+      0 2px 2px 0 rgba(0, 0, 0, 0.14),
+      0 1px 5px 0 rgba(0, 0, 0, 0.12);
 
     &__row {
       display: flex;
@@ -448,7 +451,10 @@ iframe {
         background: var(--site-config-color-bar);
         padding: 20px;
         margin-bottom: 30px;
-        box-shadow: 0 2px 1px -1px rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+        box-shadow:
+          0 2px 1px -1px rgba(0, 0, 0, 0.2),
+          0 1px 1px 0 rgba(0, 0, 0, 0.14),
+          0 1px 3px 0 rgba(0, 0, 0, 0.12);
 
         &:first-child {
           margin-top: 30px;

package/site/pc/components/AppAd.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import config from '@config'
 import { ref } from 'vue'
+import config from '@config'
 
 defineProps({
   language: {

package/site/pc/components/AppHeader.vue

@@ -114,12 +114,12 @@
 </template>
 
 <script lang="ts">
+import { computed, defineComponent, ref } from 'vue'
+import type { ComputedRef, Ref } from 'vue'
 import config from '@config'
-import { ref, computed, defineComponent } from 'vue'
-import { getBrowserTheme, getPCLocationInfo, Theme, watchTheme, setTheme } from '@varlet/cli/client'
-import { removeEmpty } from '../../utils'
+import { getBrowserTheme, getPCLocationInfo, setTheme, Theme, watchTheme } from '@varlet/cli/client'
 import { useRouter } from 'vue-router'
-import type { Ref, ComputedRef } from 'vue'
+import { removeEmpty } from '../../utils'
 
 export default defineComponent({
   name: 'AppHeader',
@@ -136,7 +136,7 @@ export default defineComponent({
     const versions = config?.pc?.header?.versions
     const isShowVersion: Ref<boolean> = ref(!!versions)
     const versionItems: Ref<Array<Record<string, any>>> = ref(
-      (versions ?? []).find((i: any) => window.location.host.includes(i.name))?.items ?? versions?.[0]?.items ?? []
+      (versions ?? []).find((i: any) => window.location.host.includes(i.name))?.items ?? versions?.[0]?.items ?? [],
     )
     const playground: Ref<string> = ref(config?.pc?.header?.playground)
     const github: Ref<string> = ref(config?.pc?.header?.github)

package/site/pc/components/AppSidebar.vue

@@ -31,8 +31,8 @@
 </template>
 
 <script setup lang="ts">
-import { MenuTypes, type Menu } from '../../utils'
 import { reactive } from 'vue'
+import { MenuTypes, type Menu } from '../../utils'
 
 const props = defineProps<{ menu: Menu[]; menuName: string; language: string }>()
 const emit = defineEmits(['change'])

package/site/pc/components/code-example/CodeExample.vue

@@ -40,14 +40,14 @@
 </template>
 
 <script lang="ts">
+import { defineComponent, nextTick, onMounted, ref, type Ref } from 'vue'
 import config from '@config'
-import Clipboard from 'clipboard'
-import { Context, Snackbar } from '@varlet/ui'
-import { defineComponent, nextTick, ref, onMounted, type Ref } from 'vue'
-import { doubleRaf } from '@varlet/shared'
 import { getBrowserTheme, getPCLocationInfo } from '@varlet/cli/client'
-import { utoa } from '../../../utils'
+import { doubleRaf } from '@varlet/shared'
+import { Context, Snackbar } from '@varlet/ui'
+import Clipboard from 'clipboard'
 import { type SiteContext } from '../../../types'
+import { utoa } from '../../../utils'
 
 const context = Context as SiteContext
 
@@ -70,7 +70,7 @@ export default defineComponent({
     const clipboard: Ref = ref(config?.pc?.clipboard || {})
     const height: Ref<number> = ref(-1)
     const playground: Ref<string | undefined> = ref(
-      !props.playgroundIgnore ? config?.pc?.header?.playground : undefined
+      !props.playgroundIgnore ? config?.pc?.header?.playground : undefined,
     )
     let timer: any = null
 

package/site/pc/main.ts

@@ -1,11 +1,10 @@
-import App from './App.vue'
-import routes from '@pc-routes'
+import { createApp } from 'vue'
 import config from '@config'
+import routes from '@pc-routes'
 import Varlet, { Snackbar } from '@varlet/ui'
-import CodeExample from './components/code-example'
-import { createApp } from 'vue'
 import { createRouter, createWebHashHistory } from 'vue-router'
-
+import App from './App.vue'
+import CodeExample from './components/code-example'
 import '@varlet/ui/es/style'
 import '@varlet/touch-emulator'
 

package/site/pc/pages/index/index.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import config from '@config'
-import AppHeader from '../../components/AppHeader.vue'
-import AppAd from '../../components/AppAd.vue'
 import { ref, watch, type Ref } from 'vue'
+import config from '@config'
+import { getBrowserTheme, getPCLocationInfo, onThemeChange, setTheme, watchTheme, type Theme } from '@varlet/cli/client'
 import { useRoute, useRouter } from 'vue-router'
-import { getPCLocationInfo, watchTheme, onThemeChange, getBrowserTheme, setTheme, type Theme } from '@varlet/cli/client'
+import AppAd from '../../components/AppAd.vue'
+import AppHeader from '../../components/AppHeader.vue'
 
 const route = useRoute()
 const router = useRouter()
@@ -58,7 +58,7 @@ watch(
     language.value = getPCLocationInfo().language
     setLocale()
   },
-  { immediate: true }
+  { immediate: true },
 )
 </script>
 
@@ -275,7 +275,10 @@ watch(
     padding: 20px;
     border-radius: 12px;
     background: var(--site-config-color-index-page-feature-background);
-    box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+    box-shadow:
+      0 3px 1px -2px rgba(0, 0, 0, 0.2),
+      0 2px 2px 0 rgba(0, 0, 0, 0.14),
+      0 1px 5px 0 rgba(0, 0, 0, 0.12);
   }
 
   &__feature-description {
@@ -321,7 +324,10 @@ watch(
     padding: 30px 20px;
     border-radius: 12px;
     background: var(--site-config-color-index-page-feature-background);
-    box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+    box-shadow:
+      0 3px 1px -2px rgba(0, 0, 0, 0.2),
+      0 2px 2px 0 rgba(0, 0, 0, 0.14),
+      0 1px 5px 0 rgba(0, 0, 0, 0.12);
 
     &-avatar {
       width: 80px;

package/template/create/example/locale/_index.ts

@@ -1,6 +1,6 @@
 import { Locale } from '@varlet/ui'
-import zhCN from './zh-CN'
 import enUS from './en-US'
+import zhCN from './zh-CN'
 
 const { add, use: exampleUse, t, merge } = Locale.useLocale()
 

package/template/create/example/locale/index.ts

@@ -1,11 +1,11 @@
 // @ts-nocheck
 // lib
-import _zhCN from '../../../locale/zh-CN'
+import { add as _add, use as _use, useLocale } from '../../../locale'
 import _enCN from '../../../locale/en-US'
+import _zhCN from '../../../locale/zh-CN'
+import enUS from './en-US'
 // mobile example doc
 import zhCN from './zh-CN'
-import enUS from './en-US'
-import { useLocale, add as _add, use as _use } from '../../../locale'
 
 const { add, use: exampleUse, t, merge } = useLocale()
 

package/template/generators/base/{.eslintrc → eslint.config.js}

@@ -1,16 +1,15 @@
-{
-  "root": true,
-  "ignorePatterns": [
+const { defineConfig } = require("@configurajs/eslint");
+
+module.export = defineConfig({
+  ignores: [
     "lib/**",
     "es/**",
     "umd/**",
     "site/**",
     "public/**",
-    "src/*/__tests__/**",
     "coverage/**",
     "highlight/**",
     "types/index.d.ts",
-    ".varlet/**"
+    ".varlet/**",
   ],
-  "extends": ["@varlet"]
-}
+});

package/template/generators/base/package.json

@@ -25,7 +25,8 @@
     "build": "varlet-cli build",
     "preview": "varlet-cli preview",
     "compile": "varlet-cli compile",
-    "lint": "varlet-cli lint",
+    "lint": "eslint . --fix",
+    "format": "prettier --write .",
     "changelog": "varlet-cli changelog",
     "release": "pnpm compile && varlet-cli release",
     "test": "varlet-cli test",
@@ -38,7 +39,6 @@
   },
   "devDependencies": {
     "@varlet/cli": "workspace:*",
-    "@varlet/eslint-config": "workspace:*",
     "@varlet/icons": "workspace:*",
     "@varlet/touch-emulator": "workspace:*",
     "@varlet/shared": "workspace:*",
@@ -46,10 +46,12 @@
     "@vue/test-utils": "2.4.1",
     "@vue/runtime-core": "3.4.21",
     "@vitest/coverage-istanbul": "2.0.5",
+    "@configurajs/eslint": "*",
+    "@configurajs/prettier": "*",
     "jsdom": "24.1.1",
     "vitest": "2.0.5",
     "clipboard": "^2.0.6",
-    "eslint": "^8.43.0",
+    "eslint": "^9.17.0",
     "lint-staged": "^10.5.0",
     "live-server": "^1.2.1",
     "prettier": "^2.8.8",

package/template/generators/base/prettier.config.js

@@ -0,0 +1,3 @@
+const { defineConfig } = require("@configurajs/prettier");
+
+module.export = defineConfig();

package/template/generators/base/shims/shims-md.d.ts

@@ -1,4 +1,4 @@
-declare module '*.md' {
-  const content: string
-  export default content
+declare module "*.md" {
+  const content: string;
+  export default content;
 }

package/template/generators/base/shims/shims-vue.d.ts

@@ -1,6 +1,6 @@
-declare module '*.vue' {
-  import { defineComponent } from 'vue'
+declare module "*.vue" {
+  import { defineComponent } from "vue";
 
-  const component: ReturnType<typeof defineComponent>
-  export default component
+  const component: ReturnType<typeof defineComponent>;
+  export default component;
 }

package/template/generators/config/default/sfc/src/button/__tests__/index.spec.js

@@ -1,6 +1,6 @@
-import Button from '..'
 import { createApp } from 'vue'
 import { expect, test } from 'vitest'
+import Button from '..'
 
 test('test button use', () => {
   const app = createApp({}).use(Button)

package/template/generators/config/default/sfc/src/button/example/index.vue

@@ -1,6 +1,6 @@
 <script setup>
-import VaButton from '..'
 import { AppType } from '@varlet/cli/client'
+import VaButton from '..'
 </script>
 
 <template>

package/template/generators/config/default/sfc/src/button/index.ts

@@ -1,5 +1,5 @@
-import Button from './Button.vue'
 import { withInstall } from '../utils/components'
+import Button from './Button.vue'
 
 withInstall(Button)
 

package/template/generators/config/default/sfc/src/utils/components.ts

@@ -1,4 +1,4 @@
-import type { Component, Plugin, App } from 'vue'
+import type { App, Component, Plugin } from 'vue'
 import { createNamespaceFn } from '@varlet/shared'
 
 export type ComponentWithInstall<T> = T & Plugin

package/template/generators/config/default/tsx/src/button/Button.tsx

@@ -1,6 +1,5 @@
 import { defineComponent, PropType } from 'vue'
 import { createNamespace } from '../utils/components'
-
 import './button.less'
 
 const { name, n, classes } = createNamespace('button')

package/template/generators/config/default/tsx/src/button/__tests__/index.spec.js

@@ -1,6 +1,6 @@
-import Button from '..'
 import { createApp } from 'vue'
 import { expect, test } from 'vitest'
+import Button from '..'
 
 test('test button use', () => {
   const app = createApp({}).use(Button)

package/template/generators/config/default/tsx/src/button/example/index.vue

@@ -1,6 +1,6 @@
 <script setup>
-import VaButton from '..'
 import { AppType } from '@varlet/cli/client'
+import VaButton from '..'
 </script>
 
 <template>

package/template/generators/config/default/tsx/src/button/index.ts

@@ -1,5 +1,5 @@
-import Button from './Button'
 import { withInstall } from '../utils/components'
+import Button from './Button'
 
 withInstall(Button)
 

package/template/generators/config/default/tsx/src/utils/components.ts

@@ -1,4 +1,4 @@
-import type { Component, Plugin, App } from 'vue'
+import type { App, Component, Plugin } from 'vue'
 import { createNamespaceFn } from '@varlet/shared'
 
 export type ComponentWithInstall<T> = T & Plugin

package/template/generators/config/i18n/sfc/src/button/Button.vue

@@ -7,10 +7,9 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue'
-import { createNamespace } from '../utils/components'
-
 // i18n for component's internal
 import { t } from '../locale'
+import { createNamespace } from '../utils/components'
 
 const { name, n, classes } = createNamespace('button')
 

package/template/generators/config/i18n/sfc/src/button/__tests__/index.spec.js

@@ -1,6 +1,6 @@
-import Button from '../index'
 import { createApp } from 'vue'
 import { expect, test } from 'vitest'
+import Button from '../index'
 
 test('test button use', () => {
   const app = createApp({}).use(Button)

package/template/generators/config/i18n/sfc/src/button/example/BasicUse.vue

@@ -1,6 +1,6 @@
 <script setup>
-import VaButton from '..'
 import { watchLang } from '@varlet/cli/client'
+import VaButton from '..'
 import { t, use } from './locale'
 
 watchLang(use, 'pc')

package/template/generators/config/i18n/sfc/src/button/example/ModifyColor.vue

@@ -1,6 +1,6 @@
 <script setup>
-import VaButton from '..'
 import { watchLang } from '@varlet/cli/client'
+import VaButton from '..'
 import { t, use } from './locale'
 
 watchLang(use, 'pc')

package/template/generators/config/i18n/sfc/src/button/example/index.vue

@@ -1,6 +1,6 @@
 <script setup>
+import { AppType, watchLang } from '@varlet/cli/client'
 import VaButton from '..'
-import { watchLang, AppType } from '@varlet/cli/client'
 import { t, use } from './locale'
 
 watchLang(use)

package/template/generators/config/i18n/sfc/src/button/example/locale/index.ts

@@ -1,10 +1,10 @@
 // lib
-import _zhCN from '../../../locale/zh-CN'
+import { add as _add, use as _use, useLocale } from '../../../locale'
 import _enCN from '../../../locale/en-US'
+import _zhCN from '../../../locale/zh-CN'
+import enUS from './en-US'
 // mobile example doc
 import zhCN from './zh-CN'
-import enUS from './en-US'
-import { useLocale, add as _add, use as _use } from '../../../locale'
 
 const { add, use: exampleUse, t, merge } = useLocale()
 

package/template/generators/config/i18n/sfc/src/button/index.ts

@@ -1,5 +1,5 @@
-import Button from './Button.vue'
 import { withInstall } from '../utils/components'
+import Button from './Button.vue'
 
 withInstall(Button)
 

package/template/generators/config/i18n/sfc/src/locale/__tests__/index.spec.js

@@ -1,6 +1,6 @@
+import { expect, test, vi } from 'vitest'
 import enUS from '../en-US'
 import { useLocale } from '../index'
-import { expect, vi, test } from 'vitest'
 
 function mockConsole(method, fn = () => {}) {
   const originMethod = console[method]

package/template/generators/config/i18n/sfc/src/utils/components.ts

@@ -1,4 +1,4 @@
-import type { Component, Plugin, App } from 'vue'
+import type { App, Component, Plugin } from 'vue'
 import { createNamespaceFn } from '@varlet/shared'
 
 export type ComponentWithInstall<T> = T & Plugin

package/template/generators/config/i18n/tsx/src/button/Button.tsx

@@ -1,8 +1,6 @@
 import { defineComponent, PropType } from 'vue'
 import { createNamespace } from '../utils/components'
-
 import './button.less'
-
 // i18n for component's internal
 import { t } from '../locale'
 

package/template/generators/config/i18n/tsx/src/button/__tests__/index.spec.js

@@ -1,6 +1,6 @@
-import Button from '../index'
 import { createApp } from 'vue'
 import { expect, test } from 'vitest'
+import Button from '../index'
 
 test('test button use', () => {
   const app = createApp({}).use(Button)

package/template/generators/config/i18n/tsx/src/button/example/BasicUse.vue

@@ -1,6 +1,6 @@
 <script setup>
-import VaButton from '..'
 import { watchLang } from '@varlet/cli/client'
+import VaButton from '..'
 import { t, use } from './locale'
 
 watchLang(use, 'pc')

package/template/generators/config/i18n/tsx/src/button/example/ModifyColor.vue

@@ -1,6 +1,6 @@
 <script setup>
-import VaButton from '..'
 import { watchLang } from '@varlet/cli/client'
+import VaButton from '..'
 import { t, use } from './locale'
 
 watchLang(use, 'pc')

package/template/generators/config/i18n/tsx/src/button/example/index.vue

@@ -1,6 +1,6 @@
 <script setup>
+import { AppType, watchLang } from '@varlet/cli/client'
 import VaButton from '..'
-import { watchLang, AppType } from '@varlet/cli/client'
 import { t, use } from './locale'
 
 watchLang(use)

package/template/generators/config/i18n/tsx/src/button/example/locale/index.ts

@@ -1,10 +1,10 @@
 // lib
-import _zhCN from '../../../locale/zh-CN'
+import { add as _add, use as _use, useLocale } from '../../../locale'
 import _enCN from '../../../locale/en-US'
+import _zhCN from '../../../locale/zh-CN'
+import enUS from './en-US'
 // mobile example doc
 import zhCN from './zh-CN'
-import enUS from './en-US'
-import { useLocale, add as _add, use as _use } from '../../../locale'
 
 const { add, use: exampleUse, t, merge } = useLocale()
 

package/template/generators/config/i18n/tsx/src/button/index.ts

@@ -1,5 +1,5 @@
-import Button from './Button'
 import { withInstall } from '../utils/components'
+import Button from './Button'
 
 withInstall(Button)
 

package/template/generators/config/i18n/tsx/src/locale/__tests__/index.spec.js

@@ -1,6 +1,6 @@
+import { expect, test, vi } from 'vitest'
 import enUS from '../en-US'
 import { useLocale } from '../index'
-import { expect, vi, test } from 'vitest'
 
 function mockConsole(method, fn = () => {}) {
   const originMethod = console[method]

package/template/generators/config/i18n/tsx/src/utils/components.ts

@@ -1,4 +1,4 @@
-import type { Component, Plugin, App } from 'vue'
+import type { App, Component, Plugin } from 'vue'
 import { createNamespaceFn } from '@varlet/shared'
 
 export type ComponentWithInstall<T> = T & Plugin

package/lib/node/commands/lint.d.ts

@@ -1 +0,0 @@
-export declare function lint(): Promise<void>;

package/lib/node/commands/lint.js

@@ -1,42 +0,0 @@
-import { x } from 'tinyexec';
-import { createSpinner } from 'nanospinner';
-import { CWD, ESLINT_EXTENSIONS } from '../shared/constant.js';
-import { isDir } from '../shared/fsUtils.js';
-import { resolve } from 'path';
-export async function lint() {
-    const spinner = createSpinner();
-    try {
-        spinner.start({ text: 'prettier starting...' });
-        await x('prettier', ['--write', '--cache', '.'], { nodeOptions: { stdio: 'inherit' }, throwOnError: true });
-        spinner.success({ text: 'prettier success' });
-        spinner.start({ text: 'eslint starting...' });
-        const eslintPatterns = [
-            './src',
-            './packages/varlet-cli/src',
-            './packages/varlet-ui/src',
-            './packages/varlet-shared/src',
-            './packages/varlet-vite-plugins/src',
-            './packages/varlet-use/src',
-            './packages/varlet-touch-emulator',
-            './packages/varlet-vscode-extension/src',
-            './packages/varlet-ui-playground/src',
-            './packages/varlet-import-resolver/src',
-            './packages/varlet-vite-plugins/src',
-            './packages/varlet-preset-unocss/src',
-            './packages/varlet-preset-tailwindcss/src',
-        ];
-        const { stdout } = await x('eslint', [
-            ...eslintPatterns.filter((pattern) => isDir(resolve(CWD, pattern))),
-            '--fix',
-            '--cache',
-            '--ext',
-            ESLINT_EXTENSIONS.join(),
-        ], { nodeOptions: { stdio: 'inherit' }, throwOnError: true });
-        const type = stdout ? 'warn' : 'success';
-        spinner[type]({ text: stdout || 'eslint success' });
-    }
-    catch (e) {
-        spinner.error({ text: e.toString() });
-        process.exit(1);
-    }
-}

package/template/generators/base/.prettierrc

@@ -1,5 +0,0 @@
-{
-  "printWidth": 120,
-  "singleQuote": true,
-  "semi": false
-}