@varlet/cli 2.20.3 → 2.20.4-alpha.1703144664203

package/lib/node/commands/icons.js

@@ -3,18 +3,18 @@ import sharp from 'sharp';
 import webfont from 'webfont';
 import logger from '../shared/logger.js';
 import { parse, resolve } from 'path';
-import { ICONS_DIST_DIR, ICONS_CSS_DIR, ICONS_PNG_DIR, ICONS_FONTS_DIR, ICONS_SVG_DIR } from '../shared/constant.js';
+import { ICONS_CSS_DIR_NAME, ICONS_FONTS_DIR_NAME, ICONS_PNG_DIR_NAME, CWD } from '../shared/constant.js';
 import { getVarletConfig } from '../config/varlet.config.js';
 import { get } from 'lodash-es';
 const { removeSync, ensureDir, writeFile, readdirSync } = fse;
-async function removeDir() {
-    removeSync(ICONS_DIST_DIR);
-    await Promise.all([ensureDir(ICONS_FONTS_DIR), ensureDir(ICONS_CSS_DIR), ensureDir(ICONS_PNG_DIR)]);
+async function removeDir(output, fontsDir, cssDir, pngDir) {
+    removeSync(output);
+    await Promise.all([ensureDir(fontsDir), ensureDir(cssDir), ensureDir(pngDir)]);
 }
-async function buildPNG(svgFiles) {
+async function buildPNG(entry, pngDir, svgFiles) {
     await Promise.all(svgFiles.map((svg) => new Promise((done) => {
         const { name } = parse(svg);
-        sharp(resolve(ICONS_SVG_DIR, svg))
+        sharp(resolve(entry, svg))
             .resize({ height: 100 })
             .toBuffer()
             .then((buffer) => {
@@ -33,16 +33,16 @@ async function buildPNG(svgFiles) {
                 },
             ])
                 .png()
-                .toFile(resolve(ICONS_PNG_DIR, `${name}.png`))
+                .toFile(resolve(pngDir, `${name}.png`))
                 .then(() => {
                 done();
             });
         });
     })));
 }
-function buildWebFont(name) {
+function buildWebFont(name, entry) {
     return webfont.default({
-        files: `${ICONS_SVG_DIR}/*.svg`,
+        files: `${entry}/*.svg`,
         fontName: name,
         formats: ['ttf'],
         fontHeight: 512,
@@ -51,10 +51,20 @@ function buildWebFont(name) {
 }
 export async function icons() {
     const varletConfig = await getVarletConfig();
-    const { name, namespace, base64, publicPath, fontFamilyClassName, fontWeight, fontStyle } = get(varletConfig, 'icons');
-    await removeDir();
-    const svgFiles = readdirSync(ICONS_SVG_DIR).filter((svgFile) => svgFile.startsWith('u') && svgFile.endsWith('.svg'));
-    const [{ ttf }] = await Promise.all([buildWebFont(name), buildPNG(svgFiles)]);
+    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),
+    };
+    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([
+        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('.');
@@ -92,10 +102,10 @@ ${icons
         .join('\n\n')}
 `;
     await Promise.all([
-        writeFile(resolve(ICONS_FONTS_DIR, `${name}-webfont.ttf`), ttf),
-        writeFile(resolve(ICONS_CSS_DIR, `${name}.css`), cssTemplate),
-        writeFile(resolve(ICONS_CSS_DIR, `${name}.less`), cssTemplate),
-        writeFile(resolve(ICONS_DIST_DIR, 'index.js'), indexTemplate),
+        writeFile(resolve(fontsDir, `${name}-webfont.ttf`), ttf),
+        writeFile(resolve(cssDir, `${name}.css`), cssTemplate),
+        writeFile(resolve(cssDir, `${name}.less`), cssTemplate),
+        writeFile(resolve(io.output, 'index.js'), indexTemplate),
     ]);
     logger.success('build success!');
 }

package/lib/node/config/varlet.config.d.ts

@@ -15,6 +15,21 @@ export interface VarletConfigIcons {
      * Output base64
      */
     base64?: boolean;
+    /**
+     * @default `./svg`
+     * SVG icons folder path.
+     */
+    entry?: string;
+    /**
+     * @default `./dist`
+     * SVG icons folder path.
+     */
+    output?: string;
+    /**
+     * @default true
+     * Whether to generate png
+     */
+    genPng?: boolean;
     publicPath?: string;
     fontFamilyClassName?: string;
     fontWeight?: string;

package/lib/node/shared/constant.d.ts

@@ -44,9 +44,7 @@ export declare const HL_ZH_TITLE_EVENTS_RE: RegExp;
 export declare const HL_ZH_TITLE_SLOTS_RE: RegExp;
 export declare const HL_ZH_MD = "zh-CN.md";
 export declare const HL_ZH_WEB_TYPES_JSON: string;
-export declare const ICONS_DIST_DIR: string;
-export declare const ICONS_CSS_DIR: string;
-export declare const ICONS_PNG_DIR: string;
-export declare const ICONS_FONTS_DIR: string;
-export declare const ICONS_SVG_DIR: string;
+export declare const ICONS_CSS_DIR_NAME = "css";
+export declare const ICONS_PNG_DIR_NAME = "png";
+export declare const ICONS_FONTS_DIR_NAME = "fonts";
 export declare const EXTENSION_ENTRY: string;

package/lib/node/shared/constant.js

@@ -49,10 +49,8 @@ export const HL_ZH_TITLE_SLOTS_RE = /###\s*插槽(?:\r\n|\n)+/;
 export const HL_ZH_MD = 'zh-CN.md';
 export const HL_ZH_WEB_TYPES_JSON = resolve(HL_DIR, 'web-types.zh-CN.json');
 // icons
-export const ICONS_DIST_DIR = resolve(CWD, 'dist');
-export const ICONS_CSS_DIR = resolve(ICONS_DIST_DIR, 'css');
-export const ICONS_PNG_DIR = resolve(ICONS_DIST_DIR, 'png');
-export const ICONS_FONTS_DIR = resolve(ICONS_DIST_DIR, 'fonts');
-export const ICONS_SVG_DIR = resolve(CWD, 'svg');
+export const ICONS_CSS_DIR_NAME = 'css';
+export const ICONS_PNG_DIR_NAME = 'png';
+export const ICONS_FONTS_DIR_NAME = 'fonts';
 // extension
 export const EXTENSION_ENTRY = resolve(CWD, 'src/extension.ts');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.20.3",
+  "version": "2.20.4-alpha.1703144664203",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -63,9 +63,9 @@
     "typescript": "^5.1.5",
     "vite": "4.3.5",
     "vue": "3.3.4",
-    "webfont": "^9.0.0",
-    "@varlet/shared": "2.20.3",
-    "@varlet/vite-plugins": "2.20.3"
+    "webfont": "11.2.26",
+    "@varlet/vite-plugins": "2.20.4-alpha.1703144664203",
+    "@varlet/shared": "2.20.4-alpha.1703144664203"
   },
   "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": "2.20.3",
-    "@varlet/touch-emulator": "2.20.3",
-    "@varlet/icons": "2.20.3"
+    "@varlet/icons": "2.20.4-alpha.1703144664203",
+    "@varlet/ui": "2.20.4-alpha.1703144664203",
+    "@varlet/touch-emulator": "2.20.4-alpha.1703144664203"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.3.4",
@@ -95,9 +95,9 @@
     "lodash-es": "^4.17.21",
     "vue": "3.3.4",
     "vue-router": "4.2.0",
-    "@varlet/ui": "2.20.3",
-    "@varlet/icons": "2.20.3",
-    "@varlet/touch-emulator": "2.20.3"
+    "@varlet/ui": "2.20.4-alpha.1703144664203",
+    "@varlet/icons": "2.20.4-alpha.1703144664203",
+    "@varlet/touch-emulator": "2.20.4-alpha.1703144664203"
   },
   "scripts": {
     "dev": "tsc --watch",