From e9d38de24c7abc352392f52656ed4ca9a2640e28 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 17 Oct 2021 00:04:21 +0300 Subject: [PATCH 1/2] Install wildcard-match package --- package-lock.json | 11 +++++++++++ package.json | 1 + 2 files changed, 12 insertions(+) diff --git a/package-lock.json b/package-lock.json index 48975140..3fd36fcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "parse-duration": "^1.0.0", "srcset": "^4.0.0", "tabletojson": "^2.0.7", + "wildcard-match": "^5.1.2", "xml-js": "^1.6.11" } }, @@ -1605,6 +1606,11 @@ "node": ">=10" } }, + "node_modules/wildcard-match": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/wildcard-match/-/wildcard-match-5.1.2.tgz", + "integrity": "sha512-qNXwI591Z88c8bWxp+yjV60Ch4F8Riawe3iGxbzquhy8Xs9m+0+SLFBGb/0yCTIDElawtaImC37fYZ+dr32KqQ==" + }, "node_modules/word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -2874,6 +2880,11 @@ "webidl-conversions": "^6.1.0" } }, + "wildcard-match": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/wildcard-match/-/wildcard-match-5.1.2.tgz", + "integrity": "sha512-qNXwI591Z88c8bWxp+yjV60Ch4F8Riawe3iGxbzquhy8Xs9m+0+SLFBGb/0yCTIDElawtaImC37fYZ+dr32KqQ==" + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", diff --git a/package.json b/package.json index 2411d0ba..a59fc2d4 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "parse-duration": "^1.0.0", "srcset": "^4.0.0", "tabletojson": "^2.0.7", + "wildcard-match": "^5.1.2", "xml-js": "^1.6.11" } } From 04bbec5e9026116881183d099138f9012032efc6 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 17 Oct 2021 00:04:25 +0300 Subject: [PATCH 2/2] Update file.js --- scripts/file.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/file.js b/scripts/file.js index 5f857f41..d0601b44 100644 --- a/scripts/file.js +++ b/scripts/file.js @@ -1,16 +1,17 @@ const glob = require('glob') const fs = require('fs') const path = require('path') +const wcmatch = require('wildcard-match') function list(pattern, include = [], exclude = []) { return new Promise(resolve => { glob(pattern, function (err, files) { if (include.length) { - files = files.filter(filename => include.includes(filename)) + files = files.filter(filename => include.some(item => wcmatch(item)(filename))) } if (exclude.length) { - files = files.filter(filename => !exclude.includes(filename)) + files = files.filter(filename => !exclude.some(item => wcmatch(item)(filename))) } resolve(files)