@varlet/cli 3.18.2 → 3.19.0

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

@@ -1 +1 @@
-export declare function styleVars(): void;
+export declare function styleVars(): Promise<void>;

package/lib/node/commands/styleVars.js

@@ -1,6 +1,6 @@
 import { compileStyleVars } from '../compiler/compileStyleVars.js';
 import logger from '../shared/logger.js';
-export function styleVars() {
-    compileStyleVars();
+export async function styleVars() {
+    await compileStyleVars();
     logger.success('style vars compilation success!');
 }

package/lib/node/commands/test.js

@@ -2,7 +2,7 @@ import { x } from 'tinyexec';
 import { VITEST_CONFIG } from '../shared/constant.js';
 export async function test({ component, watch, coverage }) {
     process.env.NODE_ENV = 'test';
-    const args = [watch ? 'watch' : 'run', '--config', VITEST_CONFIG];
+    const args = [watch ? 'watch' : 'run', '--config', VITEST_CONFIG, '--update=none'];
     if (coverage) {
         args.push('--coverage');
     }

package/lib/node/compiler/compileStyleVars.js

@@ -23,7 +23,7 @@ export function compileDir(path, keys, defaultLanguage) {
 }
 export async function compileStyleVars() {
     ensureDirSync(TYPES_DIR);
-    const { defaultLanguage } = await getVarletConfig();
+    const { defaultLanguage = 'zh-CN' } = await getVarletConfig();
     const keys = new Set();
     compileDir(SRC_DIR, keys, defaultLanguage);
     const assistanceType = `type RemoveTwoDashes<T extends string> = T extends \`--$\{infer Rest}\` ? Rest : T

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

@@ -9,6 +9,11 @@ export interface TemplateHighlightCompilerOptions {
 export declare const replaceDot: (s: string) => string;
 export declare const replaceVersion: (s: string) => string;
 export declare const replaceUnderline: (s: string) => string;
+export declare const camelize: (s: string) => string;
+export declare function parseVModelName(name: string): {
+    attribute: string;
+    event: string;
+} | null;
 export declare function parseTable(table: string): string[][];
 export declare function compileTable(md: string, titleRe: RegExp): string;
 export declare function compileWebTypes(table: Record<string, any>, webTypes: Record<string, any>, componentName: string, varletConfig: Required<VarletConfig>): void;

package/lib/node/compiler/compileTemplateHighlight.js

@@ -9,6 +9,18 @@ const TABLE_FOOT_RE = /(\|\s*$)|(\|\s*\n(?!\s*\|))/;
 export const replaceDot = (s) => s.replace(/`/g, '');
 export const replaceVersion = (s) => s.replace(/\*\*\*.+\*\*\*/g, '').trim();
 export const replaceUnderline = (s) => s.replace(/_/g, '');
+export const camelize = (s) => s.replace(/-(\w)/g, (_, c) => (c ? c.toUpperCase() : ''));
+export function parseVModelName(name) {
+    if (name === 'v-model') {
+        return { attribute: 'model-value', event: 'update:modelValue' };
+    }
+    const matched = name.match(/^v-model:(.+)$/);
+    if (matched) {
+        const arg = matched[1];
+        return { attribute: arg, event: `update:${camelize(arg)}` };
+    }
+    return null;
+}
 export function parseTable(table) {
     const rows = table.split('\n').filter(Boolean);
     return rows.map((row) => {
@@ -43,19 +55,32 @@ export function compileTable(md, titleRe) {
 }
 export function compileWebTypes(table, webTypes, componentName, varletConfig) {
     const { attributesTable, eventsTable, slotsTable } = table;
-    const attributes = attributesTable.map((row) => ({
-        name: replaceVersion(replaceDot(row[0])),
-        description: row[1],
-        default: replaceDot(row[3]),
-        value: {
-            type: replaceUnderline(row[2]),
-            kind: 'expression',
-        },
-    }));
+    const modelEvents = [];
+    const attributes = attributesTable.map((row) => {
+        const name = replaceVersion(replaceDot(row[0]));
+        const vModel = parseVModelName(name);
+        if (vModel) {
+            modelEvents.push({ name: vModel.event, description: row[1] });
+        }
+        return {
+            name: vModel ? vModel.attribute : name,
+            description: row[1],
+            default: replaceDot(row[3]),
+            value: {
+                type: replaceUnderline(row[2]),
+                kind: 'expression',
+            },
+        };
+    });
     const events = eventsTable.map((row) => ({
         name: replaceVersion(replaceDot(row[0])),
         description: row[1],
     }));
+    modelEvents.forEach((modelEvent) => {
+        if (!events.some((event) => event.name === modelEvent.name)) {
+            events.push(modelEvent);
+        }
+    });
     const slots = slotsTable.map((row) => ({
         name: replaceVersion(replaceDot(row[0])),
         description: row[1],

package/lib/node/compiler/compileTypes.js

@@ -12,7 +12,7 @@ export * from '${relative(moduleDir, TYPES_DIR)}'
 }
 export async function compileTypes() {
     await ensureDir(TYPES_DIR);
-    compileStyleVars();
+    await compileStyleVars();
     const { namespace = '', directives = '' } = await getVarletConfig();
     const { name: libraryName } = readJSONSync(UI_PACKAGE_JSON);
     const filenames = await readdir(TYPES_DIR);

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

@@ -6,7 +6,6 @@ export default defineConfig({
     port: 8080,
     title: 'VARLET',
     logo: 'varlet_icon.png',
-    defaultLanguage: 'zh-CN',
     themeKey: 'VARLET_V3_THEME',
     defaultLightTheme: 'md3LightTheme',
     defaultDarkTheme: 'md3DarkTheme',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "3.18.2",
+  "version": "3.19.0",
   "description": "cli of varlet",
   "keywords": [
     "cli",
@@ -56,8 +56,8 @@
     "typescript": "5.6.3",
     "vite-plus": "0.1.18",
     "vue": "3.5.21",
-    "@varlet/shared": "3.18.2",
-    "@varlet/vite-plugins": "3.18.2"
+    "@varlet/shared": "3.19.0",
+    "@varlet/vite-plugins": "3.19.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -69,9 +69,9 @@
     "@types/node": "^20.19.0",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/ui": "3.18.2",
-    "@varlet/icons": "3.18.2",
-    "@varlet/touch-emulator": "3.18.2"
+    "@varlet/ui": "3.19.0",
+    "@varlet/icons": "3.19.0",
+    "@varlet/touch-emulator": "3.19.0"
   },
   "peerDependencies": {
     "@vitest/coverage-istanbul": "4.1.4",
@@ -82,9 +82,9 @@
     "live-server": "^1.2.1",
     "vue": "3.5.21",
     "vue-router": "4.5.1",
-    "@varlet/icons": "3.18.2",
-    "@varlet/touch-emulator": "3.18.2",
-    "@varlet/ui": "3.18.2"
+    "@varlet/icons": "3.19.0",
+    "@varlet/ui": "3.19.0",
+    "@varlet/touch-emulator": "3.19.0"
   },
   "engines": {
     "node": "^14.18.0 || >=16.0.0"

package/site/mobile/main.ts

@@ -3,13 +3,13 @@ import config from '@config'
 import routes from '@mobile-routes'
 import Varlet from '@varlet/ui'
 import { createRouter, createWebHashHistory } from 'vue-router'
-import { inIframe, isPhone } from '../utils'
+import { getBrowserLanguage, inIframe, isPhone } from '../utils'
 import App from './App.vue'
 import '@varlet/touch-emulator'
 import '@varlet/ui/es/style'
 
 const redirect = config?.mobile?.redirect
-const defaultLanguage = config?.defaultLanguage
+const defaultLanguage = config?.defaultLanguage ?? getBrowserLanguage()
 
 redirect &&
   routes.push({

package/site/pc/App.vue

@@ -2,12 +2,12 @@
 import { defineComponent, onMounted, ref } from 'vue'
 import config from '@config'
 import { getMobileIndex, getPCLocationInfo } from '@varlet/cli/client'
-import { isPhone } from '../utils'
+import { getBrowserLanguage, isPhone } from '../utils'
 
 export default defineComponent({
   setup() {
     const useMobile = ref(config?.useMobile)
-    const defaultLanguage = config?.defaultLanguage
+    const defaultLanguage = config?.defaultLanguage ?? getBrowserLanguage()
 
     const init = () => {
       const { language, menuName } = getPCLocationInfo()

package/site/pc/main.ts

@@ -5,10 +5,11 @@ import Varlet, { Snackbar } from '@varlet/ui'
 import { createRouter, createWebHashHistory } from 'vue-router'
 import App from './App.vue'
 import CodeExample from './components/code-example'
+import { getBrowserLanguage } from '../utils'
 import '@varlet/ui/es/style'
 import '@varlet/touch-emulator'
 
-const defaultLanguage = config?.defaultLanguage
+const defaultLanguage = config?.defaultLanguage ?? getBrowserLanguage()
 const redirect = config?.pc?.redirect
 const mobileRedirect = config?.mobile?.redirect
 

package/site/utils.ts

@@ -30,3 +30,7 @@ export function inIframe() {
 export function utoa(data: string): string {
   return btoa(unescape(encodeURIComponent(data)))
 }
+
+export function getBrowserLanguage(): string {
+  return navigator.language.startsWith('zh') ? 'zh-CN' : 'en-US'
+}