Merge pull request #769 from thundersdata-frontend/svgicon-issue

fix: 修复 svgicon 工具包运行失败的问题
thundersdata-frontend · Nov 21, 2023 · 4486a67 · 4486a67
2 parents e2d96c7 + 81a24e2
commit 4486a67
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.changeset/three-pants-burn.md b/.changeset/three-pants-burn.md
@@ -0,0 +1,5 @@
+---
+'@td-design/svgicon-cli': minor
+---
+
+修复执行命令报错的问题
diff --git a/packages/svgicon-cli/gulpfile.js b/packages/svgicon-cli/gulpfile.js
@@ -30,4 +30,8 @@ function copyTemplate() {
   return gulp.src('./src/templates/**/*').pipe(gulp.dest('lib/templates'));
 }
 
-exports.default = gulp.series(clean, buildCJS, copyTemplate);
+function copyJson() {
+  return gulp.src('./svgicon.json').pipe(gulp.dest('lib/libs'));
+}
+
+exports.default = gulp.series(clean, buildCJS, copyTemplate, copyJson);
diff --git a/packages/svgicon-cli/src/libs/parseLocalSvg.ts b/packages/svgicon-cli/src/libs/parseLocalSvg.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import glob from 'glob';
+import { globSync } from 'glob';
 import path from 'path';
 
 import { Config } from '../libs/getConfig';
@@ -18,7 +18,7 @@ const parseLocalSvg = ({ icon_svg }: Config) => {
 
   const localDir = path.resolve(icon_svg);
 
-  const localSvg = glob.sync(path.join(localDir, '**/*.svg'));
+  const localSvg = globSync(path.join(localDir, '**/*.svg'));
 
   return localSvg.reduce<ILocalSvg[]>((previousValue, currentValue) => {
     let svgStr = fs.readFileSync(currentValue, 'utf-8');