From 4365dddf57fd6395044bada4b0fca08c7cb983bc Mon Sep 17 00:00:00 2001 From: Eric Fennis Date: Sat, 18 Jul 2020 12:53:05 +0200 Subject: [PATCH] Improve optimize script --- scripts/build/generateExportsFile.js | 2 +- scripts/optimizeSvgs.js | 20 +++++++++++--------- scripts/render/processSvg.js | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/build/generateExportsFile.js b/scripts/build/generateExportsFile.js index d59160442..34058b025 100644 --- a/scripts/build/generateExportsFile.js +++ b/scripts/build/generateExportsFile.js @@ -20,7 +20,7 @@ export default function(fileName, outputDirectory, componentGetter, iconNodes) { // Generate export for all the icons // - // output: export const myIcon = getComponent(myIconVNode); + // (output): export const myIcon = getComponent(myIconVNode); icons.forEach(iconName => { const componentName = generateComponentName(iconName); const constantString = `export const ${componentName} = ${componentGetter}(${componentName}VNode);\n`; diff --git a/scripts/optimizeSvgs.js b/scripts/optimizeSvgs.js index 4ba16022c..8101e955d 100644 --- a/scripts/optimizeSvgs.js +++ b/scripts/optimizeSvgs.js @@ -1,16 +1,18 @@ import fs from 'fs'; import path from 'path'; -const OUT_DIR = path.resolve(__dirname, '../dist/icons'); +const ICONS_DIR = path.resolve(__dirname, '../icons'); -console.log(`Optimizing SVGs in ${OUT_DIR}...`); +console.log(`Optimizing SVGs in ${ICONS_DIR}...`); -const svgFiles = fs.readdirSync(IN_DIR).filter(file => path.extname(file) === '.svg'); +const svgFiles = fs.readdirSync(ICONS_DIR).filter(file => path.extname(file) === '.svg'); console.log(svgFiles); - -// Object.keys(icons).forEach(name => { -// const svg = icons[name].toSvg(); - -// fs.writeFileSync(path.join(OUT_DIR, `${name}.svg`), svg); -// }); +svgFiles + .filter(file => path.extname(file) === '.svg') + .forEach(svgFile => { + const svg = fs.readFileSync(path.join(ICONS_DIR, svgFile)); + processSvg(svg).then(svg => + fs.writeFileSync(path.join(ICONS_DIR, svgFile), svg), + ); + }); diff --git a/scripts/render/processSvg.js b/scripts/render/processSvg.js index 44d3ec6b4..fddd2c7da 100644 --- a/scripts/render/processSvg.js +++ b/scripts/render/processSvg.js @@ -2,7 +2,7 @@ import Svgo from 'svgo'; import cheerio from 'cheerio'; import { format } from 'prettier'; -import DEFAULT_ATTRS from '../src/default-attrs.json'; +import DEFAULT_ATTRS from './default-attrs.json'; /** * Process SVG string.