@varlet/cli 3.1.0-alpha.1709537939980 → 3.1.0-alpha.1709717246484

package/README.md

@@ -168,6 +168,7 @@ varlet-cli build:extension
 
 ```shell
 # playground-ignore
+varlet-cli build:icons -w
 varlet-cli build:icons
 ```
 

package/README.zh-CN.md

@@ -167,6 +167,7 @@ varlet-cli build:extension
 
 ```shell
 # playground-ignore
+varlet-cli build:icons -w
 varlet-cli build:icons
 ```
 

package/lib/node/bin.js

@@ -49,10 +49,11 @@ program
 });
 program
     .command('build:icons')
+    .option('-w --watch', 'Watch icons for changes and rebuild')
     .description('Build icons')
-    .action(async () => {
+    .action(async (options) => {
     const { icons } = await import('./commands/icons.js');
-    return icons();
+    return icons(options);
 });
 program
     .command('preview')

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

@@ -1 +1,10 @@
-export declare function icons(): Promise<void>;
+import { VarletConfig } from '../config/varlet.config.js';
+export interface IconsIo {
+    entry: string;
+    output: string;
+}
+export declare function buildIcons(varletConfig: Required<VarletConfig>, io: IconsIo): Promise<void>;
+export interface IconsCommandOptions {
+    watch?: boolean;
+}
+export declare function icons({ watch }?: IconsCommandOptions): Promise<void>;

package/lib/node/commands/icons.js

@@ -1,6 +1,7 @@
 import fse from 'fs-extra';
 import sharp from 'sharp';
 import slash from 'slash';
+import chokidar from 'chokidar';
 import webfont from 'webfont';
 import logger from '../shared/logger.js';
 import { parse, resolve } from 'path';
@@ -50,30 +51,21 @@ function buildWebFont(name, entry) {
         descent: 64,
     });
 }
-export async function icons() {
-    const varletConfig = await getVarletConfig();
-    const { name, namespace, base64, publicPath, fontFamilyClassName, fontWeight, fontStyle, genPng = true, entry = './svg', output = './dist', } = get(varletConfig, 'icons');
-    const io = {
-        entry: resolve(CWD, entry),
-        output: resolve(CWD, output),
-    };
+export async function buildIcons(varletConfig, io) {
+    const { name, namespace, base64, publicPath, fontFamilyClassName, fontWeight, fontStyle, genPng = true, } = get(varletConfig, 'icons');
     const fontsDir = resolve(io.output, ICONS_FONTS_DIR_NAME);
     const cssDir = resolve(io.output, ICONS_CSS_DIR_NAME);
     const pngDir = resolve(io.output, ICONS_PNG_DIR_NAME);
     await removeDir(io.output, fontsDir, cssDir, pngDir);
-    const svgFiles = readdirSync(io.entry).filter((svgFile) => svgFile.startsWith('u') && svgFile.endsWith('.svg'));
-    const [{ ttf }] = await Promise.all([
+    const svgFiles = readdirSync(io.entry).filter((svgFile) => svgFile.endsWith('.svg'));
+    const [{ ttf, glyphsData }] = await Promise.all([
         buildWebFont(name, io.entry),
         genPng ? buildPNG(io.entry, pngDir, svgFiles) : Promise.resolve(),
     ]);
-    const icons = svgFiles.map((svgName) => {
-        const i = svgName.indexOf('-');
-        const extIndex = svgName.lastIndexOf('.');
-        return {
-            name: svgName.slice(i + 1, extIndex),
-            pointCode: svgName.slice(1, i),
-        };
-    });
+    const icons = glyphsData.map((i) => ({
+        name: i.metadata.name,
+        pointCode: i.metadata.unicode[0].charCodeAt(0).toString(16),
+    }));
     const iconNames = icons.map((iconName) => `  '${iconName.name}'`);
     const indexTemplate = `\
 export const pointCodes = {
@@ -110,3 +102,19 @@ ${icons
     ]);
     logger.success('build success!');
 }
+export async function icons({ watch = false } = {}) {
+    const varletConfig = await getVarletConfig();
+    const { entry = './svg', output = './dist' } = varletConfig.icons;
+    const io = {
+        entry: resolve(CWD, entry),
+        output: resolve(CWD, output),
+    };
+    const task = () => buildIcons(varletConfig, io);
+    if (watch) {
+        await buildIcons(varletConfig, io);
+        chokidar.watch(io.entry, { ignoreInitial: true }).on('all', task);
+        logger.info(`watching for ${io.entry} changes...`);
+        return;
+    }
+    await task();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "3.1.0-alpha.1709537939980",
+  "version": "3.1.0-alpha.1709717246484",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -64,8 +64,8 @@
     "slash": "^3.0.0",
     "typescript": "^5.1.5",
     "webfont": "11.2.26",
-    "@varlet/shared": "3.1.0-alpha.1709537939980",
-    "@varlet/vite-plugins": "3.1.0-alpha.1709537939980"
+    "@varlet/shared": "3.1.0-alpha.1709717246484",
+    "@varlet/vite-plugins": "3.1.0-alpha.1709717246484"
   },
   "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.1.0-alpha.1709537939980",
-    "@varlet/icons": "3.1.0-alpha.1709537939980",
-    "@varlet/touch-emulator": "3.1.0-alpha.1709537939980"
+    "@varlet/ui": "3.1.0-alpha.1709717246484",
+    "@varlet/icons": "3.1.0-alpha.1709717246484",
+    "@varlet/touch-emulator": "3.1.0-alpha.1709717246484"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.4.15",
@@ -95,9 +95,9 @@
     "lodash-es": "^4.17.21",
     "vue": "3.4.15",
     "vue-router": "4.2.0",
-    "@varlet/ui": "3.1.0-alpha.1709537939980",
-    "@varlet/touch-emulator": "3.1.0-alpha.1709537939980",
-    "@varlet/icons": "3.1.0-alpha.1709537939980"
+    "@varlet/ui": "3.1.0-alpha.1709717246484",
+    "@varlet/icons": "3.1.0-alpha.1709717246484",
+    "@varlet/touch-emulator": "3.1.0-alpha.1709717246484"
   },
   "scripts": {
     "dev": "tsc --watch",