feat: Add css.fileName options. #48

jaywcjlove · Dec 7, 2020 · 33936cc · 33936cc
1 parent f64fe17
commit 33936cc
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,8 @@
   "jest": {},
   "svgtofont": {
     "css": {
-      "fontSize": "12px"
+      "fontSize": "12px",
+      "fileName": "wcj"
     }
   },
   "keywords": [

diff --git a/src/index.ts b/src/index.ts
@@ -201,7 +201,7 @@ export default async (options: SvgToFontOptions = {}) => {
         fontSize: fontSize,
         timestamp: new Date().getTime(),
         prefix: options.classNamePrefix || options.fontName,
-        _opts: typeof options.css === 'boolean' ? {} : {...options.css}
+        _opts: typeof options.css === 'boolean' ? {} : { ...options.css }
       });
     }
 
@@ -239,7 +239,7 @@ export default async (options: SvgToFontOptions = {}) => {
         fontname: options.fontName,
         classNamePrefix: options.classNamePrefix,
         _type: 'font-class',
-        _link: `${options.fontName}.css`,
+        _link: `${(options.css && typeof options.css !== 'boolean' && options.css.fileName) || options.fontName}.css`,
         _IconHtml: cssIconHtml.join(''),
         _title: options.website.title || options.fontName
       };

diff --git a/src/styles/_{{fontname}}.css → src/styles/_{{filename}}.css b/src/styles/_{{fontname}}.css → src/styles/_{{filename}}.css
diff --git a/src/styles/_{{fontname}}.less → src/styles/_{{filename}}.less b/src/styles/_{{fontname}}.less → src/styles/_{{filename}}.less
diff --git a/src/styles/_{{fontname}}.module.less → src/styles/_{{filename}}.module.less b/src/styles/_{{fontname}}.module.less → src/styles/_{{filename}}.module.less
diff --git a/src/styles/_{{fontname}}.scss → src/styles/_{{filename}}.scss b/src/styles/_{{fontname}}.scss → src/styles/_{{filename}}.scss
diff --git a/src/styles/_{{fontname}}.styl → src/styles/_{{filename}}.styl b/src/styles/_{{fontname}}.styl → src/styles/_{{filename}}.styl
diff --git a/src/utils.ts b/src/utils.ts
@@ -214,6 +214,11 @@ export type CSSOptions = {
    * https://github.com/jaywcjlove/svgtofont/issues/48#issuecomment-739547189
    */
   cssPath?: string
+  /**
+   * Set file name
+   * https://github.com/jaywcjlove/svgtofont/issues/48#issuecomment-739547189
+   */
+  fileName?: string
 }
 
 /**
@@ -223,8 +228,9 @@ export function copyTemplate(inDir: string, outDir: string, { _opts, ...vars }:
   const removeFiles: Array<string> = [];
   return new Promise((resolve, reject) => {
     copy(inDir, outDir, {
+      ...vars,
       cssPath: _opts.cssPath || '',
-      ...vars
+      filename: _opts.fileName || vars.fontname,
     }, async (err, createdFiles) => {
       if (err) reject(err);
       createdFiles = createdFiles.map(filePath => {