diff --git a/packages/cli-upload/package.json b/packages/cli-upload/package.json index ac222db48..100bbd19c 100644 --- a/packages/cli-upload/package.json +++ b/packages/cli-upload/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@percy/cli-command": "1.31.0", - "fast-glob": "^3.2.11", - "image-size": "^1.0.0" + "image-size": "^1.0.0", + "tinyglobby": "^0.2.14" } } diff --git a/packages/cli-upload/src/upload.js b/packages/cli-upload/src/upload.js index abd3106fe..8ac595694 100644 --- a/packages/cli-upload/src/upload.js +++ b/packages/cli-upload/src/upload.js @@ -68,10 +68,11 @@ export const upload = command('upload', { if (!percy) exit(0, 'Percy is disabled'); let config = percy.config.upload; - let { default: glob } = await import('fast-glob'); + let { glob } = await import('tinyglobby'); let pathnames = yield glob(config.files, { ignore: [].concat(config.ignore || []), cwd: args.dirname, + expandDirectories: false, fs }); diff --git a/packages/core/package.json b/packages/core/package.json index f15328e24..460652d52 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -52,12 +52,12 @@ "content-disposition": "^0.5.4", "cross-spawn": "^7.0.3", "extract-zip": "^2.0.1", - "fast-glob": "^3.2.11", "micromatch": "^4.0.8", "mime-types": "^2.1.34", "pako": "^2.1.0", "path-to-regexp": "^6.3.0", "rimraf": "^3.0.2", + "tinyglobby": "^0.2.14", "ws": "^8.17.1", "yaml": "^2.4.1" } diff --git a/packages/core/src/api.js b/packages/core/src/api.js index 23e29f601..0b62fb056 100644 --- a/packages/core/src/api.js +++ b/packages/core/src/api.js @@ -270,8 +270,8 @@ export function createStaticServer(options) { // include automatic sitemap route server.route('get', `${baseUrl}/sitemap.xml`, async (req, res) => { - let { default: glob } = await import('fast-glob'); - let files = await glob('**/*.html', { cwd: dir, fs }); + let { glob } = await import('tinyglobby'); + let files = await glob('**/*.html', { cwd: dir, expandDirectories: false, fs }); return res.send(200, 'application/xml', [ '', diff --git a/yarn.lock b/yarn.lock index 8c098f766..03df02b95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4366,7 +4366,7 @@ fast-glob@3.2.7: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.2.11, fast-glob@^3.2.9: +fast-glob@^3.2.9: version "3.3.3" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818" integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg== @@ -4406,6 +4406,11 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +fdir@^6.4.4: + version "6.4.5" + resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.5.tgz#328e280f3a23699362f95f2e82acf978a0c0cb49" + integrity sha512-4BG7puHpVsIYxZUbiUE3RqGloLaSSwzYie5jvasC4LWuBWzZawynvYouhjbQKw2JuIGYdm0DzIxl8iVidKlUEw== + figures@3.2.0, figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -7138,6 +7143,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +picomatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" + integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg== + pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -8258,6 +8268,14 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= +tinyglobby@^0.2.14: + version "0.2.14" + resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d" + integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ== + dependencies: + fdir "^6.4.4" + picomatch "^4.0.2" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"