@varlet/cli 2.15.1 → 2.16.0-alpha.1693852004525

package/lib/node/config/varlet.config.js

@@ -9,7 +9,8 @@ export function defineConfig(config) {
     return config;
 }
 export function mergeStrategy(value, srcValue, key) {
-    if (key === 'features' && isArray(srcValue)) {
+    const keys = ['features', 'members'];
+    if (keys.includes(key) && isArray(srcValue)) {
         return srcValue;
     }
 }

package/lib/node/config/varlet.default.config.js

@@ -4,8 +4,8 @@ const title = {
     'en-US': 'Material design mobile components built for Vue3',
 };
 const description = {
-    'zh-CN': 'Varlet 是一个基于 Vue3 开发的 Material 风格移动端组件库，全面拥抱 Vue3 生态，由社区团队维护。支持 Typescript、按需引入、暗黑模式、主题定制、国际化，并提供 VSCode 插件保障良好的开发体验',
-    'en-US': 'Varlet is a Material design mobile component library developed based on Vue3, developed and maintained by partners in the community. Support Typescript, import on demand, dark mode, theme customization, internationalization, and provide VSCode plugin to ensure a good development experience',
+    'zh-CN': 'Varlet 是一个基于 Vue3 开发的 Material 风格移动端组件库，全面拥抱 Vue3 生态，由社区团队维护。支持 Typescript、按需引入、暗黑模式、主题定制、国际化，并提供 VSCode 插件保障良好的开发体验。',
+    'en-US': 'Varlet is a Material design mobile component library developed based on Vue3, developed and maintained by partners in the community. Support Typescript, import on demand, dark mode, theme customization, internationalization, and provide VSCode plugin to ensure a good development experience.',
 };
 const keywords = {
     'zh-CN': 'Varlet,Vue3 移动端组件库,Material Design',
@@ -38,8 +38,12 @@ export default defineConfig({
         indexPage: {
             description,
             started: {
-                'zh-CN': '起步',
-                'en-US': 'GET STARTED',
+                'zh-CN': '快速开始',
+                'en-US': 'Get Started',
+            },
+            viewOnGithub: {
+                'zh-CN': '查看仓库',
+                'en-US': 'View On Github',
             },
             features: [
                 {
@@ -133,6 +137,257 @@ export default defineConfig({
                     },
                 },
             ],
+            teamMembers: {
+                label: {
+                    'zh-CN': '团队成员',
+                    'en-US': 'Team Members',
+                },
+                members: [
+                    {
+                        name: {
+                            'zh-CN': 'haoziqaq',
+                            'en-US': 'haoziqaq',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 核心团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/24223652',
+                        github: 'https://github.com/haoziqaq',
+                        twitter: 'https://twitter.com/haozijunqaq',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'BeADre',
+                            'en-US': 'BeADre',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 核心团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/34639100',
+                        github: 'https://github.com/BeADre',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'zhangmo8',
+                            'en-US': 'zhangmo8',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs & ikun-ui 核心团队成员',
+                            'en-US': 'Core team member of varletjs & ikun-ui',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/43628500',
+                        github: 'https://github.com/zhangmo8',
+                        twitter: 'https://twitter.com/wegi8666',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'chouchouji',
+                            'en-US': 'chouchouji',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 核心团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/70570907',
+                        github: 'https://github.com/chouchouji',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'tiny-dust',
+                            'en-US': 'tiny-dust',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 核心团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/49502875',
+                        github: 'https://github.com/tiny-dust',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'songjianet',
+                            'en-US': 'songjianet',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs & apache & w3c & naiveui & ikun-ui 团队成员',
+                            'en-US': 'Core team member of varletjs & apache & w3c & naiveui & ikun-ui',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/19239641',
+                        github: 'https://github.com/songjianet',
+                        twitter: 'https://twitter.com/songjianet',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'running snail',
+                            'en-US': 'running snail',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs & dcloud 团队成员',
+                            'en-US': 'Core team member of varletjs & dcloud',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/37523000',
+                        github: 'https://github.com/zhenyuWang',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'qytayh',
+                            'en-US': 'qytayh',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/39668309',
+                        github: 'https://github.com/qytayh',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'Erkelost',
+                            'en-US': 'Erkelost',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs & unplugin & farm & devui & wujie 团队成员',
+                            'en-US': 'Core team member of varletjs & unplugin & farm & devui & wujie',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/66500121',
+                        github: 'https://github.com/ErKeLost',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'EmberSpirit',
+                            'en-US': 'EmberSpirit',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/85718018',
+                        github: 'https://github.com/wangKBweb',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'ayangweb',
+                            'en-US': 'ayangweb',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者 & B 站 UP 主',
+                            'en-US': 'Open Source Developer & Bilibili UP',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/75017711',
+                        github: 'https://github.com/ayangweb',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'jiechen66',
+                            'en-US': 'jiechen66',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/42862411',
+                        github: 'https://github.com/jiechen66',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'dyggod',
+                            'en-US': 'dyggod',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/49914353',
+                        github: 'https://github.com/dyggod',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'clen cat',
+                            'en-US': 'clen cat',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/37403253',
+                        github: 'https://github.com/a145789',
+                    },
+                    {
+                        name: {
+                            'zh-CN': 'gaoting',
+                            'en-US': 'gaoting',
+                        },
+                        title: {
+                            'zh-CN': '开源开发者',
+                            'en-US': 'Open Source Developer',
+                        },
+                        description: {
+                            'zh-CN': 'varletjs 团队成员',
+                            'en-US': 'Core team member of varletjs',
+                        },
+                        avatar: 'https://avatars.githubusercontent.com/u/7401170',
+                        github: 'https://github.com/gaoting',
+                    },
+                ],
+            },
             contributors: {
                 label: {
                     'zh-CN': '贡献者',
@@ -194,7 +449,9 @@ export default defineConfig({
     themeKey: 'VARLET_THEME',
     lightTheme: {
         'color-body': '#fff',
-        'color-index-page-background': '#f2f2f2',
+        'color-index-page-background': '#fff',
+        'color-index-page-get-started-button': '#3a7afe',
+        'color-index-page-github-button': '#212121',
         'color-index-page-feature-background': '#fff',
         'color-index-page-logo-mask-background': 'linear-gradient(-45deg, #8baff8 50%, #84e0ff 50%)',
         'color-index-page-second-text-color': 'rgba(60, 60, 60, .7)',
@@ -217,7 +474,6 @@ export default defineConfig({
         'color-mobile-cell-hover': '#3a7afe',
         'color-pc-language-active': '#3a7afe',
         'color-pc-language-active-background': '#edf5ff',
-        'color-pc-github-active-background': '#212121',
         'color-mobile-language-active': '#3a7afe',
         'color-mobile-language-active-background': '#edf5ff',
         'color-hl-background': '#fafafa',
@@ -236,6 +492,8 @@ export default defineConfig({
     darkTheme: {
         'color-body': '#121212',
         'color-index-page-background': '#1e1e1e',
+        'color-index-page-get-started-button': '#4a7afe',
+        'color-index-page-github-button': '#303030',
         'color-index-page-feature-background': '#303030',
         'color-index-page-logo-mask-background': 'linear-gradient(-45deg, #729dfc 50%, #6859f4 50%)',
         'color-index-page-second-text-color': 'rgba(255, 255, 255, .75)',
@@ -258,7 +516,6 @@ export default defineConfig({
         'color-mobile-cell-hover': '#4a7afe',
         'color-pc-language-active': '#4a7afe',
         'color-pc-language-active-background': '#4a7afe20',
-        'color-pc-github-active-background': '#303030',
         'color-mobile-language-active': '#4a7afe',
         'color-mobile-language-active-background': '#4a7afe20',
         'color-hl-background': '#272727',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.15.1",
+  "version": "2.16.0-alpha.1693852004525",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -67,8 +67,8 @@
     "vite": "4.3.5",
     "vue": "3.3.4",
     "webfont": "^9.0.0",
-    "@varlet/shared": "2.15.1",
-    "@varlet/vite-plugins": "2.15.1"
+    "@varlet/vite-plugins": "2.16.0-alpha.1693852004525",
+    "@varlet/shared": "2.16.0-alpha.1693852004525"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -83,8 +83,9 @@
     "@types/semver": "^7.3.9",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/icons": "2.15.1",
-    "@varlet/touch-emulator": "2.15.1"
+    "@varlet/icons": "2.16.0-alpha.1693852004525",
+    "@varlet/ui": "2.16.0-alpha.1693852004525",
+    "@varlet/touch-emulator": "2.16.0-alpha.1693852004525"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.3.4",
@@ -97,8 +98,8 @@
     "lodash-es": "^4.17.21",
     "vue": "3.3.4",
     "vue-router": "4.2.0",
-    "@varlet/icons": "2.15.1",
-    "@varlet/touch-emulator": "2.15.1"
+    "@varlet/icons": "2.16.0-alpha.1693852004525",
+    "@varlet/touch-emulator": "2.16.0-alpha.1693852004525"
   },
   "scripts": {
     "dev": "tsc --watch",

package/site/mobile/App.vue

@@ -3,46 +3,47 @@
     <header>
       <var-app-bar class="app-bar" title-position="left" :title="bigCamelizeComponentName">
         <template #left>
-          <var-button v-if="showBackIcon" text round @click="back" color="transparent" text-color="#fff">
+          <var-button v-if="showBackIcon" style="margin-right: 6px;" text round @click="back" color="transparent" text-color="#fff">
             <var-icon name="chevron-left" class="arrow-left" style="margin-top: 1px"/>
           </var-button>
           <var-button
             v-if="!showBackIcon && github"
-            style="margin-left: 2px"
+            style="margin-left: 2px; margin-right: 6px;"
             text
             round
-            @click="toGithub"
             color="transparent"
             text-color="#fff"
+            @click="toGithub"
           >
-            <var-icon name="github" class="github" style="margin-top: 1px"/>
+            <var-icon name="github" class="github" style="margin-top: 1px;"/>
           </var-button>
         </template>
         <template #right>
           <var-button
+            v-if="darkMode"
             text
             round
             color="transparent"
             text-color="#fff"
             :style="{
-              transform: languages ? 'translateX(2px)' : 'translateX(-4px)',
+              transform: languages ? 'translateX(-4px)' : 'translateX(-6px)',
             }"
-            v-if="darkMode"
             @click="toggleTheme"
           >
             <var-icon
               class="theme"
               color="#fff"
+              :size="24"
               :name="currentTheme === 'lightTheme' ? 'white-balance-sunny' : 'weather-night'"
             />
           </var-button>
           <var-button
+            v-if="languages"
             class="i18n-button"
             text
             color="transparent"
             text-color="#fff"
             @click.stop="showMenu = true"
-            v-if="languages"
           >
             <var-icon name="translate" class="i18n"/>
             <var-icon name="chevron-down" class="arrow-down"/>
@@ -55,7 +56,7 @@
     </div>
 
     <transition name="site-menu">
-      <div class="settings var-site-elevation--3" v-if="showMenu">
+      <div class="settings var-elevation--3" v-if="showMenu">
         <var-cell
           v-for="(value, key) in nonEmptyLanguages"
           :key="key"
@@ -206,6 +207,19 @@ body {
   transition: background-color 0.25s, color 0.25s;
 }
 
+::-webkit-scrollbar {
+  display: none;
+  width: 0;
+  background: transparent;
+}
+
+.app-type {
+  width: 100%;
+  padding: 15px 0;
+  color: var(--site-config-color-sub-text);
+  font-size: 14px;
+}
+
 header {
   position: fixed;
   z-index: 99;
@@ -213,12 +227,6 @@ header {
   font-weight: bold;
 }
 
-::-webkit-scrollbar {
-  display: none;
-  width: 0;
-  background: transparent;
-}
-
 .site {
   &-menu-enter-from,
   &-menu-leave-to {
@@ -248,7 +256,7 @@ header {
 .mobile-language-cell {
   color: var(--site-config-color-text) !important;
   background: var(--site-config-color-bar) !important;
-  cursor: pointer;
+  cursor: pointer !important;
 
   &--active {
     color: var(--site-config-color-mobile-language-active) !important;
@@ -278,13 +286,8 @@ header {
 
 .i18n-button {
   padding-right: 6px !important;
-}
-
-.app-type {
-  width: 100%;
-  padding: 15px 0;
-  color: var(--site-config-color-sub-text);
-  font-size: 14px;
+  margin-right: 4px;
+  padding-left: 12px !important;
 }
 
 .app-bar {

package/site/mobile/{components/AppHome.vue → AppHome.vue}

@@ -1,5 +1,5 @@
 <template>
-  <div class="logo">
+  <div class="varlet-logo">
     <h1 class="varlet-home__title">
       <img class="varlet-home__image" :src="logo" />
       <span>{{ title }}</span>
@@ -19,12 +19,12 @@
   </div>
 </template>
 
-<script lang='ts'>
+<script lang="ts">
 import config from '@config'
 import { useRouter } from 'vue-router'
 import { reactive, ref } from 'vue'
 import { watchLang, watchPlatform } from '@varlet/cli/client'
-import { inIframe, isPhone } from '../../utils'
+import { inIframe, isPhone } from '../utils'
 
 export default {
   name: 'AppHome',
@@ -34,7 +34,7 @@ export default {
     const description = ref(config?.mobile?.title ?? {})
     const menu = ref(config?.pc?.menu ?? [])
     const configComponents = menu.value.filter((item: any) => item.type === 2)
-    const components = reactive(configComponents)
+    const components = reactive<any>(configComponents)
     const lang = ref('zh-CN')
     const platform = ref('mobile')
     const router = useRouter()
@@ -75,8 +75,8 @@ export default {
 }
 </script>
 
-<style scoped lang="less">
-.logo {
+<style lang="less">
+.varlet-logo {
   height: 100px;
   padding-top: 30px;
   margin-bottom: 20px;

package/site/mobile/main.ts

@@ -1,21 +1,15 @@
 import routes from '@mobile-routes'
 import config from '@config'
 import App from './App.vue'
-import '@varlet/touch-emulator'
+import Varlet from '@varlet/ui'
 import { createApp } from 'vue'
 import { createRouter, createWebHashHistory } from 'vue-router'
-
-import Icon from '../components/icon'
-import AppBar from './components/app-bar'
-import Button from '../components/button'
-import Cell from '../components/cell'
-import Ripple from '../components/ripple'
-import '../components/styles/common.less'
-import '../components/styles/elevation.less'
-
 import { get } from 'lodash-es'
 import { inIframe, isPhone } from '../utils'
 
+import '@varlet/touch-emulator'
+import '@varlet/ui/es/style'
+
 const redirect = get(config, 'mobile.redirect')
 const defaultLanguage = get(config, 'defaultLanguage')
 
@@ -27,7 +21,7 @@ redirect &&
 
 routes.push({
   path: '/home',
-  component: () => import('./components/AppHome.vue')
+  component: () => import('./AppHome.vue')
 })
 
 const router = createRouter({
@@ -63,16 +57,7 @@ router.beforeEach((to: any) => {
   }
 })
 
-// @ts-ignore
 createApp(App)
   .use(router)
-  // @ts-ignore
-  .use(Icon)
-  // @ts-ignore
-  .use(AppBar)
-  // @ts-ignore
-  .use(Cell)
-  .use(Ripple)
-  // @ts-ignore
-  .use(Button)
+  .use(Varlet)
   .mount('#app')

package/site/pc/App.vue

@@ -1,15 +1,11 @@
 <script lang="ts">
 import config from '@config'
-import LogoAnimation from './components/LogoAnimation.vue'
 import { defineComponent, onMounted, ref } from 'vue'
 import { getPCLocationInfo } from '@varlet/cli/client'
 import { isPhone } from '../utils'
 import { get } from 'lodash-es'
 
 export default defineComponent({
-  components: {
-    LogoAnimation
-  },
   setup() {
     const useMobile = ref(get(config, 'useMobile'))
     const defaultLanguage = get(config, 'defaultLanguage')
@@ -30,7 +26,6 @@ export default defineComponent({
 
 <template>
   <router-view></router-view>
-  <logo-animation />
 </template>
 
 <style lang="less">