From d40e3a3464c05f13de3c28bafb7eeff939c0d9d2 Mon Sep 17 00:00:00 2001 From: AlpayY Date: Tue, 26 Jan 2021 12:59:38 +0100 Subject: [PATCH 1/2] Added file detection for *.SVG files when working with folders Currently, files named *.SVG are not being detected under Windows because of the case-sensitivity. This commit includes these in addition to *.svg files. --- lib/svgo/coa.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/svgo/coa.js b/lib/svgo/coa.js index 1ac62ad1e..d09d1a378 100644 --- a/lib/svgo/coa.js +++ b/lib/svgo/coa.js @@ -16,6 +16,7 @@ var FS = require('fs'), decodeSVGDatauri = require('./tools.js').decodeSVGDatauri, checkIsDir = require('./tools.js').checkIsDir, regSVGFile = /\.svg$/, + regSVGFileCapital = /\.SVG$/, noop = () => {}, svgo; @@ -413,7 +414,12 @@ function getFilesDescriptions(config, dir, files, output) { .map(name => ({ inputPath: PATH.resolve(dir, name), outputPath: PATH.resolve(output, name), - })); + })).concat(files + .filter(name => regSVGFileCapital.test(name)) + .map(name => ({ + inputPath: PATH.resolve(dir, name), + outputPath: PATH.resolve(output, name), + }))); return config.recursive ? [].concat( From 31dd2e8c902c824ec86571719495947e16831d36 Mon Sep 17 00:00:00 2001 From: AlpayY Date: Wed, 3 Feb 2021 15:01:33 +0100 Subject: [PATCH 2/2] Changed implementation to use just one regex Implemented suggestion of @janmoritz. --- lib/svgo/coa.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/svgo/coa.js b/lib/svgo/coa.js index d09d1a378..2428f259a 100644 --- a/lib/svgo/coa.js +++ b/lib/svgo/coa.js @@ -15,8 +15,7 @@ var FS = require('fs'), encodeSVGDatauri = require('./tools.js').encodeSVGDatauri, decodeSVGDatauri = require('./tools.js').decodeSVGDatauri, checkIsDir = require('./tools.js').checkIsDir, - regSVGFile = /\.svg$/, - regSVGFileCapital = /\.SVG$/, + regSVGFile = /\.svg$/i, noop = () => {}, svgo; @@ -414,12 +413,7 @@ function getFilesDescriptions(config, dir, files, output) { .map(name => ({ inputPath: PATH.resolve(dir, name), outputPath: PATH.resolve(output, name), - })).concat(files - .filter(name => regSVGFileCapital.test(name)) - .map(name => ({ - inputPath: PATH.resolve(dir, name), - outputPath: PATH.resolve(output, name), - }))); + })); return config.recursive ? [].concat(