@varlet/cli 1.27.15 → 1.27.17

package/generators/config/default/base/package.json

@@ -38,6 +38,7 @@
     "@varlet/icons": "workspace:*",
     "@varlet/stylelint-config": "workspace:*",
     "@varlet/touch-emulator": "workspace:*",
+    "@varlet/shared": "workspace:*",
     "@vue/test-utils": "2.0.0-rc.6",
     "clipboard": "^2.0.6",
     "eslint": "^7.30.0",

package/generators/config/i18n/base/package.json

@@ -38,6 +38,7 @@
     "@varlet/icons": "workspace:*",
     "@varlet/stylelint-config": "workspace:*",
     "@varlet/touch-emulator": "workspace:*",
+    "@varlet/shared": "workspace:*",
     "@vue/test-utils": "2.0.0-rc.6",
     "clipboard": "^2.0.6",
     "eslint": "^7.30.0",

package/lib/commands/create.js

@@ -66,7 +66,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 var logger_1 = __importDefault(require("../shared/logger"));
-var fsUtils_1 = require("../shared/fsUtils");
+var shared_1 = require("@varlet/shared");
 var fs_extra_1 = require("fs-extra");
 var path_1 = require("path");
 var constant_1 = require("../shared/constant");
@@ -80,8 +80,8 @@ function create(name, cmd) {
                 case 0:
                     i18nFiles = [];
                     namespace = (0, lodash_1.get)((0, varlet_config_1.getVarletConfig)(), 'namespace');
-                    bigCamelizeName = (0, fsUtils_1.bigCamelize)(name);
-                    vueTemplate = "<template>\n  <div class=\"".concat(namespace, "-").concat(name, "\"></div>\n</template>\n\n<script lang=\"ts\">\nimport { defineComponent } from 'vue'\n\nexport default defineComponent({\n  name: '").concat((0, fsUtils_1.bigCamelize)(namespace)).concat(bigCamelizeName, "'\n})\n</script>\n\n<style lang=\"less\">\n.").concat(namespace, "-").concat(name, " {\n  display: flex;\n}\n</style>\n");
+                    bigCamelizeName = (0, shared_1.bigCamelize)(name);
+                    vueTemplate = "<template>\n  <div class=\"".concat(namespace, "-").concat(name, "\"></div>\n</template>\n\n<script lang=\"ts\">\nimport { defineComponent } from 'vue'\n\nexport default defineComponent({\n  name: '").concat((0, shared_1.bigCamelize)(namespace)).concat(bigCamelizeName, "'\n})\n</script>\n\n<style lang=\"less\">\n.").concat(namespace, "-").concat(name, " {\n  display: flex;\n}\n</style>\n");
                     indexTemplate = "import ".concat(bigCamelizeName, " from './").concat(bigCamelizeName, ".vue'\nimport type { App } from 'vue'\n\n").concat(bigCamelizeName, ".install = function(app: App) {\n  app.component(").concat(bigCamelizeName, ".name, ").concat(bigCamelizeName, ")\n}\n\nexport const _").concat(bigCamelizeName, "Component = ").concat(bigCamelizeName, "\n\nexport default ").concat(bigCamelizeName, "\n");
                     testsTemplate = "import ".concat(bigCamelizeName, " from '..'\nimport { createApp } from 'vue'\nimport { mount } from '@vue/test-utils'\n\ntest('test ").concat(name, " use', () => {\n  const app = createApp({}).use(").concat(bigCamelizeName, ")\n  expect(app.component(").concat(bigCamelizeName, ".name)).toBeTruthy()\n})\n");
                     exampleTemplate = "<script setup>\nimport ".concat(bigCamelizeName, " from '..'\nimport AppType from '@varlet/cli/site/mobile/components/AppType'\n</script>\n\n<template>\n  <app-type></app-type>\n  <").concat(namespace, "-").concat(name, "/>\n</template>\n");

package/lib/compiler/compileScript.js

@@ -38,6 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileCommonJSEntry = exports.compileESEntry = exports.compileScriptFile = exports.compileScript = exports.moduleCompatible = exports.replaceTSXExt = exports.replaceJSXExt = exports.replaceTSExt = exports.replaceVueExt = exports.REQUIRE_TSX_PATH_RE = exports.REQUIRE_JSX_PATH_RE = exports.REQUIRE_TS_PATH_RE = exports.REQUIRE_VUE_PATH_RE = exports.IMPORT_TSX_PATH_RE = exports.IMPORT_JSX_PATH_RE = exports.IMPORT_TS_PATH_RE = exports.IMPORT_VUE_PATH_RE = void 0;
 var core_1 = require("@babel/core");
+var shared_1 = require("@varlet/shared");
 var fsUtils_1 = require("../shared/fsUtils");
 var fs_extra_1 = require("fs-extra");
 var compileStyle_1 = require("./compileStyle");
@@ -136,7 +137,7 @@ function compileESEntry(dir, publicDirs) {
                     lessImports = [];
                     publicComponents = [];
                     publicDirs.forEach(function (dirname) {
-                        var publicComponent = (0, fsUtils_1.bigCamelize)(dirname);
+                        var publicComponent = (0, shared_1.bigCamelize)(dirname);
                         publicComponents.push(publicComponent);
                         imports.push("import ".concat(publicComponent, ", * as ").concat(publicComponent, "Module from './").concat(dirname, "'"));
                         constInternalComponents.push("export const _".concat(publicComponent, "Component = ").concat(publicComponent, "Module._").concat(publicComponent, "Component || {}"));
@@ -175,7 +176,7 @@ function compileCommonJSEntry(dir, publicDirs) {
                     lessRequires = [];
                     publicComponents = [];
                     publicDirs.forEach(function (dirname) {
-                        var publicComponent = (0, fsUtils_1.bigCamelize)(dirname);
+                        var publicComponent = (0, shared_1.bigCamelize)(dirname);
                         publicComponents.push(publicComponent);
                         requires.push("var ".concat(publicComponent, " = require('./").concat(dirname, "')['default']"));
                         plugins.push("".concat(publicComponent, ".install && app.use(").concat(publicComponent, ")"));

package/lib/compiler/compileTypes.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileTypes = exports.generateReference = void 0;
 var fs_extra_1 = require("fs-extra");
 var constant_1 = require("../shared/constant");
-var fsUtils_1 = require("../shared/fsUtils");
+var shared_1 = require("@varlet/shared");
 var path_1 = require("path");
 var varlet_config_1 = require("../config/varlet.config");
 var lodash_1 = require("lodash");
@@ -69,7 +69,7 @@ function compileTypes() {
                         var componentName = filename.slice(0, filename.indexOf('.d.ts'));
                         exports.push("export * from './".concat(componentName, "'"));
                         if (!componentName.startsWith(namespace)) {
-                            declares.push("".concat((0, fsUtils_1.bigCamelize)(namespace)).concat((0, fsUtils_1.bigCamelize)(componentName), ": typeof import('").concat(name, "')['_").concat((0, fsUtils_1.bigCamelize)(componentName), "Component']"));
+                            declares.push("".concat((0, shared_1.bigCamelize)(namespace)).concat((0, shared_1.bigCamelize)(componentName), ": typeof import('").concat(name, "')['_").concat((0, shared_1.bigCamelize)(componentName), "Component']"));
                         }
                     });
                     template = "import type { App } from 'vue'\n\nexport const install: (app: App) => void\n\n".concat(exports.join('\n'), "\n");

package/lib/shared/fsUtils.d.ts

@@ -2,15 +2,11 @@ export declare function getPublicDirs(): Promise<string[]>;
 export declare const isMD: (file: string) => boolean;
 export declare const isDir: (file: string) => boolean;
 export declare const isSFC: (file: string) => boolean;
-export declare const isJSX: (file: string) => boolean;
-export declare const isTSX: (file: string) => boolean;
 export declare const isDTS: (file: string) => boolean;
 export declare const isScript: (file: string) => boolean;
 export declare const isLess: (file: string) => boolean;
 export declare const isPublicDir: (dir: string) => boolean;
 export declare const replaceExt: (file: string, ext: string) => string;
-export declare const bigCamelize: (s: string) => string;
-export declare const camelize: (s: string) => string;
 export declare function smartAppendFileSync(file: string, code: string): void;
 export declare function outputFileSyncOnChange(path: string, code: string): void;
 export declare function glob(pattern: string): Promise<string[]>;

package/lib/shared/fsUtils.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.glob = exports.outputFileSyncOnChange = exports.smartAppendFileSync = exports.camelize = exports.bigCamelize = exports.replaceExt = exports.isPublicDir = exports.isLess = exports.isScript = exports.isDTS = exports.isTSX = exports.isJSX = exports.isSFC = exports.isDir = exports.isMD = exports.getPublicDirs = void 0;
+exports.glob = exports.outputFileSyncOnChange = exports.smartAppendFileSync = exports.replaceExt = exports.isPublicDir = exports.isLess = exports.isScript = exports.isDTS = exports.isSFC = exports.isDir = exports.isMD = exports.getPublicDirs = void 0;
 var path_1 = require("path");
 var fs_extra_1 = require("fs-extra");
 var constant_1 = require("./constant");
@@ -64,10 +64,6 @@ var isDir = function (file) { return (0, fs_extra_1.pathExistsSync)(file) && (0,
 exports.isDir = isDir;
 var isSFC = function (file) { return (0, fs_extra_1.pathExistsSync)(file) && (0, path_1.extname)(file) === '.vue'; };
 exports.isSFC = isSFC;
-var isJSX = function (file) { return (0, fs_extra_1.pathExistsSync)(file) && (0, path_1.extname)(file) === '.jsx'; };
-exports.isJSX = isJSX;
-var isTSX = function (file) { return (0, fs_extra_1.pathExistsSync)(file) && (0, path_1.extname)(file) === '.tsx'; };
-exports.isTSX = isTSX;
 var isDTS = function (file) { return (0, fs_extra_1.pathExistsSync)(file) && file.endsWith('.d.ts'); };
 exports.isDTS = isDTS;
 var isScript = function (file) { return (0, fs_extra_1.pathExistsSync)(file) && constant_1.SCRIPTS_EXTENSIONS.includes((0, path_1.extname)(file)); };
@@ -80,10 +76,6 @@ var isPublicDir = function (dir) {
 exports.isPublicDir = isPublicDir;
 var replaceExt = function (file, ext) { return file.replace((0, path_1.extname)(file), ext); };
 exports.replaceExt = replaceExt;
-var bigCamelize = function (s) { return (0, exports.camelize)(s).replace(s.charAt(0), s.charAt(0).toUpperCase()); };
-exports.bigCamelize = bigCamelize;
-var camelize = function (s) { return s.replace(/-(\w)/g, function (_, p) { return p.toUpperCase(); }); };
-exports.camelize = camelize;
 function smartAppendFileSync(file, code) {
     if ((0, fs_extra_1.pathExistsSync)(file)) {
         var content = (0, fs_extra_1.readFileSync)(file, 'utf-8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "1.27.15",
+  "version": "1.27.17",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/index.js"
@@ -28,10 +28,10 @@
     "url": "https://github.com/varletjs/varlet/issues"
   },
   "dependencies": {
-    "@varlet/icons": "1.27.15",
-    "@varlet/shared": "1.27.15",
-    "@varlet/markdown-vite-plugin": "1.27.15",
-    "@varlet/touch-emulator": "1.27.15",
+    "@varlet/icons": "1.27.17",
+    "@varlet/shared": "1.27.17",
+    "@varlet/markdown-vite-plugin": "1.27.17",
+    "@varlet/touch-emulator": "1.27.17",
     "@babel/core": "^7.14.8",
     "@babel/helper-plugin-utils": "^7.14.5",
     "@babel/preset-env": "^7.14.8",
@@ -76,7 +76,7 @@
     "@types/semver": "^7.3.9"
   },
   "peerDependencies": {
-    "@varlet/touch-emulator": "1.27.15",
+    "@varlet/touch-emulator": "1.27.17",
     "@vue/test-utils": "^2.0.0-rc.6",
     "clipboard": "^2.0.6",
     "live-server": "^1.2.1",

package/site/components/icon/Icon.vue

@@ -21,7 +21,7 @@
 
 <script lang="ts">
 import { defineComponent, watch, ref, nextTick } from 'vue'
-import { isURL, toNumber } from '../utils/shared'
+import { isURL, toNumber } from '@varlet/shared'
 import { toSizeUnit } from '../utils/elements'
 import { props } from './props'
 import type { Ref } from 'vue'

package/site/components/progress/Progress.vue

@@ -60,7 +60,7 @@
 <script lang="ts">
 import { defineComponent, computed } from 'vue'
 import { props } from './props'
-import { toNumber } from '../utils/shared'
+import { toNumber } from '@varlet/shared'
 
 export default defineComponent({
   name: 'VarSiteProgress',

package/site/components/snackbar/index.tsx

@@ -3,7 +3,7 @@ import VarSiteSnackbar from './Snackbar.vue'
 import context from '../context'
 import { reactive, TransitionGroup } from 'vue'
 import { mountInstance } from '../utils/components'
-import { isPlainObject, toNumber } from '../utils/shared'
+import { isPlainObject, toNumber } from '@varlet/shared'
 import type { LoadingType, LoadingSize } from '../loading/props'
 import type { App, Component, TeleportProps } from 'vue'
 

package/site/components/utils/elements.ts

@@ -1,4 +1,4 @@
-import { isNumber, isString, toNumber, kebabCase } from './shared'
+import { isNumber, isString, toNumber, kebabCase } from '@varlet/shared'
 import type { StyleVars } from '../../utils'
 
 export function getLeft(element: HTMLElement): number {

package/site/mobile/App.vue

@@ -76,7 +76,6 @@ import config from '@config'
 import { computed, ComputedRef, defineComponent, ref, Ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import {
-  bigCamelize,
   getBrowserThemes,
   inIframe,
   isPhone,
@@ -85,6 +84,7 @@ import {
   watchLang,
   watchThemes,
 } from '../utils'
+import { bigCamelize } from '@varlet/shared'
 import { get } from 'lodash-es'
 
 export default defineComponent({

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

@@ -4,19 +4,19 @@ import config from '@config'
 import VarSiteButton from '../../../components/button'
 import VarSiteIcon from '../../../components/icon'
 import { get } from 'lodash-es'
-import { ref, watch } from 'vue'
+import { ref, watch, computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { getBrowserThemes, setThemes } from '../../../utils'
 import { getPCLocationInfo, watchThemes } from '@varlet/cli/site/utils'
 import en_US from './locale/en-US'
 import zh_CN from './locale/zh-CN'
-import type { Ref } from 'vue'
+import type { Ref, ComputedRef } from 'vue'
 
 const route = useRoute()
 const router = useRouter()
 const packs = {
   'zh-CN': zh_CN,
-  'en-US': en_US
+  'en-US': en_US,
 } as any
 
 const github = get(config, 'pc.header.github')
@@ -24,16 +24,28 @@ const themesKey = get(config, 'themesKey')
 const currentThemes = ref(getBrowserThemes(themesKey))
 const darkMode: Ref<boolean> = ref(get(config, 'pc.header.darkMode'))
 const title: Ref<string> = ref(get(config, 'title'))
+const language: Ref<string> = ref(get(config, 'defaultLanguage'))
 const languages: Ref<Record<string, string>> = ref(get(config, 'pc.header.i18n'))
 const pack: Ref<Record<string, string>> = ref({})
 
+const description: ComputedRef<string> = computed(() => {
+  const { indexPage = {} } = get(config, 'pc')
+
+  return indexPage?.description?.[language.value] || pack.value.description
+})
+
+const started: ComputedRef<string> = computed(() => {
+  const { indexPage = {} } = get(config, 'pc')
+
+  return indexPage?.started?.[language.value] || pack.value.started
+})
+
 const goGithub = () => {
   window.open(github)
 }
 
 const getStar = () => {
-  const { language: lang } = getPCLocationInfo()
-  router.push(`/${lang}/home`)
+  router.push(`/${language.value}/home`)
 }
 
 const getThemesMessage = () => ({ action: 'themesChange', from: 'pc', data: currentThemes.value })
@@ -54,6 +66,7 @@ const setLocale = () => {
   const { language: lang } = getPCLocationInfo()
   if (!lang) return
 
+  language.value = lang
   pack.value = packs[lang]
   document.title = get(config, 'pc.title')[lang] as string
 }
@@ -63,6 +76,8 @@ const toggleLanguages = () => {
 
   const { menuName } = getPCLocationInfo()
   const replaceStr = `/${lang === 'zh-CN' ? 'en-US' : 'zh-CN'}/${menuName}`
+
+  language.value = lang
   router.replace(replaceStr)
 }
 
@@ -90,13 +105,13 @@ watch(() => route.path, setLocale, { immediate: true })
           <animation-box class="logo" />
           <div class="base-title">{{ title }}</div>
         </div>
-        <div class="base-description">{{ pack.description }}</div>
+        <div class="base-description">{{ description }}</div>
 
         <div class="button-group">
           <var-site-button class="common-button github-button" block @click="goGithub">
             <div class="block-button-content">
               <span>GITHUB</span>
-              <var-site-icon style="margin-left: 10px;" name="github" size="24px" />
+              <var-site-icon style="margin-left: 10px" name="github" size="24px" />
             </div>
           </var-site-button>
           <var-site-button class="common-button extra-button margin-left" text v-if="darkMode" @click="toggleTheme">
@@ -107,11 +122,16 @@ watch(() => route.path, setLocale, { immediate: true })
         <div class="button-group">
           <var-site-button type="primary" class="common-button primary-button" block @click="getStar">
             <div class="block-button-content">
-              <span>{{ pack.started }}</span>
+              <span>{{ started }}</span>
               <var-site-icon style="margin-left: 10px; transform: rotate(-90deg)" name="arrow-down" size="24px" />
             </div>
           </var-site-button>
-          <var-site-button class="common-button extra-button margin-left" text v-if="languages" @click="toggleLanguages">
+          <var-site-button
+            class="common-button extra-button margin-left"
+            text
+            v-if="languages"
+            @click="toggleLanguages"
+          >
             <var-site-icon name="translate" size="24px" />
           </var-site-button>
         </div>
@@ -121,5 +141,5 @@ watch(() => route.path, setLocale, { immediate: true })
 </template>
 
 <style lang="less" scoped>
-@import "./index";
+@import './index';
 </style>

package/site/utils.ts

@@ -4,7 +4,6 @@ import { formatStyleVars } from './components/utils/elements'
 
 export * from './components/utils/components'
 export * from './components/utils/elements'
-export * from './components/utils/shared'
 
 export type StyleVars = Record<string, string>
 
@@ -21,14 +20,6 @@ function StyleProvider(styleVars: StyleVars | null = {}) {
   })
 }
 
-export function camelize(str: string): string {
-  return str.replace(/-(\w)/g, (_: any, p: string) => p.toUpperCase())
-}
-
-export function bigCamelize(str: string): string {
-  return camelize(str).replace(str.charAt(0), str.charAt(0).toUpperCase())
-}
-
 export interface PCLocationInfo {
   language: string
   menuName: string

package/site/components/utils/shared.ts

@@ -1,29 +0,0 @@
-export const toNumber = (val: number | string | boolean | undefined | null): number => {
-  if (val == null) return 0
-
-  if (isString(val)) {
-    val = parseFloat(val)
-    val = Number.isNaN(val) ? 0 : val
-    return val
-  }
-
-  if (isBool(val)) return Number(val)
-
-  return val
-}
-
-export const isPlainObject = (val: unknown): val is Record<string, any> =>
-  Object.prototype.toString.call(val) === '[object Object]'
-
-export function kebabCase(str: string): string {
-  const ret = str.replace(/([A-Z])/g, ' $1').trim()
-  return ret.split(' ').join('-').toLowerCase()
-}
-
-export const isString = (val: unknown): val is string => typeof val === 'string'
-
-export const isBool = (val: unknown): val is boolean => typeof val === 'boolean'
-
-export const isNumber = (val: unknown): val is number => typeof val === 'number'
-
-export const isURL = (val: string) => /^(http)|(\.*\/)/.test(val)