@varlet/cli 3.2.13 → 3.2.14

package/lib/node/compiler/compileStyleVars.d.ts

@@ -1,3 +1,3 @@
 export declare function compileMD(path: string, keys: Set<string>): void;
-export declare function compileDir(path: string, keys: Set<string>): void;
-export declare function compileStyleVars(): void;
+export declare function compileDir(path: string, keys: Set<string>, defaultLanguage: 'zh-CN' | 'en-US'): void;
+export declare function compileStyleVars(): Promise<void>;

package/lib/node/compiler/compileStyleVars.js

@@ -2,7 +2,8 @@ import fse from 'fs-extra';
 import { SRC_DIR, TYPES_DIR } from '../shared/constant.js';
 import { resolve } from 'path';
 import { isDir, isMD } from '../shared/fsUtils.js';
-import { camelize } from '@varlet/shared';
+import { getVarletConfig } from '../config/varlet.config.js';
+import { get } from 'lodash-es';
 const { ensureDirSync, readdirSync, readFileSync, writeFileSync } = fse;
 export function compileMD(path, keys) {
     const content = readFileSync(path, 'utf-8');
@@ -11,23 +12,36 @@ export function compileMD(path, keys) {
         keys.add(key.replace(/`/g, ''));
     });
 }
-export function compileDir(path, keys) {
+export function compileDir(path, keys, defaultLanguage) {
     const dir = readdirSync(path);
     dir.forEach((filename) => {
         const filePath = resolve(path, filename);
-        isDir(filePath) && compileDir(filePath, keys);
-        isMD(filePath) && compileMD(filePath, keys);
+        isDir(filePath) && compileDir(filePath, keys, defaultLanguage);
+        if (isMD(filePath) && filename.includes(defaultLanguage)) {
+            compileMD(filePath, keys);
+        }
     });
 }
-export function compileStyleVars() {
+export async function compileStyleVars() {
     ensureDirSync(TYPES_DIR);
+    const defaultLanguage = get(await getVarletConfig(), 'defaultLanguage');
     const keys = new Set();
-    compileDir(SRC_DIR, keys);
-    let template = [...keys].reduce((template, key) => {
+    compileDir(SRC_DIR, keys, defaultLanguage);
+    const assistanceType = `type RemoveTwoDashes<T extends string> = T extends \`--$\{infer Rest}\` ? Rest : T
+
+type CamelCase<S extends string> =
+  S extends \`$\{infer P1}-$\{infer P2}\`
+    ? \`$\{P1}$\{CamelCase<Capitalize<P2>>}\`
+    : S
+
+type FormatStyleVars<T> = {
+  [K in keyof T as  CamelCase<RemoveTwoDashes<K & string>>]?: T[K];
+} & T`;
+    let baseStyleVars = [...keys].reduce((template, key) => {
         template += `  '${key}'?: string\n`;
-        template += `  ${camelize(key.slice(2))}?: string\n`;
         return template;
-    }, 'export interface StyleVars {\n');
-    template += '  [key: PropertyKey]: string\n';
-    writeFileSync(resolve(TYPES_DIR, 'styleVars.d.ts'), template + '}');
+    }, '\n\ninterface BaseStyleVars {\n');
+    baseStyleVars += '  [key: PropertyKey]: string\n}\n';
+    writeFileSync(resolve(TYPES_DIR, 'styleVars.d.ts'), `${assistanceType}${baseStyleVars}
+export interface StyleVars extends FormatStyleVars<BaseStyleVars> {}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "3.2.13",
+  "version": "3.2.14",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -64,8 +64,8 @@
     "semver": "^7.3.5",
     "sharp": "0.31.1",
     "typescript": "^5.1.5",
-    "@varlet/shared": "3.2.13",
-    "@varlet/vite-plugins": "3.2.13"
+    "@varlet/shared": "3.2.14",
+    "@varlet/vite-plugins": "3.2.14"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -80,9 +80,9 @@
     "@types/semver": "^7.3.9",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/ui": "3.2.13",
-    "@varlet/touch-emulator": "3.2.13",
-    "@varlet/icons": "3.2.13"
+    "@varlet/ui": "3.2.14",
+    "@varlet/icons": "3.2.14",
+    "@varlet/touch-emulator": "3.2.14"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.4.21",
@@ -95,9 +95,9 @@
     "lodash-es": "^4.17.21",
     "vue": "3.4.21",
     "vue-router": "4.2.0",
-    "@varlet/icons": "3.2.13",
-    "@varlet/touch-emulator": "3.2.13",
-    "@varlet/ui": "3.2.13"
+    "@varlet/ui": "3.2.14",
+    "@varlet/icons": "3.2.14",
+    "@varlet/touch-emulator": "3.2.14"
   },
   "scripts": {
     "dev": "tsc --watch",

package/site/mobile/AppHome.vue

@@ -53,7 +53,7 @@ export default {
         query: {
           language: lang.value,
           platform: platform.value,
-          replace: component.doc
+          replace: component.doc,
         },
       })
 
@@ -77,9 +77,7 @@ export default {
 
 <style lang="less">
 .varlet-logo {
-  height: 100px;
   padding-top: 30px;
-  margin-bottom: 20px;
 }
 
 .varlet-home__title {
@@ -96,9 +94,9 @@ export default {
 }
 
 .varlet-home__desc {
-  margin: 0 0 40px;
   color: var(--site-config-color-sub-text);
   font-size: 14px;
+  line-height: 22px;
 }
 
 .varlet-home__image {