diff --git a/package-lock.json b/package-lock.json index dbeab8d1f4..dd6d3d8fbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30125,7 +30125,6 @@ "es-module-lexer": "^1.0.0", "esbuild": "0.19.11", "execa": "^7.0.0", - "fast-glob": "^3.3.2", "filter-obj": "^5.0.0", "find-up": "^6.0.0", "is-builtin-module": "^3.1.0", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index 7e4e369ff8..be754a5852 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -52,7 +52,6 @@ "es-module-lexer": "^1.0.0", "esbuild": "0.19.11", "execa": "^7.0.0", - "fast-glob": "^3.3.2", "filter-obj": "^5.0.0", "find-up": "^6.0.0", "is-builtin-module": "^3.1.0", diff --git a/packages/zip-it-and-ship-it/src/runtimes/node/utils/included_files.ts b/packages/zip-it-and-ship-it/src/runtimes/node/utils/included_files.ts index ef4e543da6..1d625930b4 100644 --- a/packages/zip-it-and-ship-it/src/runtimes/node/utils/included_files.ts +++ b/packages/zip-it-and-ship-it/src/runtimes/node/utils/included_files.ts @@ -56,12 +56,13 @@ export const getPathsOfIncludedFiles = async ( onlyFiles: false, // get directories as well to get symlinked directories, // to filter the regular non symlinked directories out mark them with a slash at the end to filter them out. + // TODO(serhalp) If we can find a better way to do this, we can use tinyglobby here and remove fast-glob entirely. markDirectories: true, followSymbolicLinks: false, }) + // now filter the non symlinked directories out that got marked with a trailing slash const paths = pathGroups.filter((path) => !path.endsWith('/')).map(normalize) - // now filter the non symlinked directories out that got marked with a trailing slash return { excludePatterns, paths } } diff --git a/packages/zip-it-and-ship-it/tests/main.test.ts b/packages/zip-it-and-ship-it/tests/main.test.ts index e25a1c99bc..28ef1836c0 100644 --- a/packages/zip-it-and-ship-it/tests/main.test.ts +++ b/packages/zip-it-and-ship-it/tests/main.test.ts @@ -6,10 +6,10 @@ import cpy from 'cpy' import decompress from 'decompress' import merge from 'deepmerge' import { execa, execaNode } from 'execa' -import glob from 'fast-glob' import isCI from 'is-ci' import { pathExists } from 'path-exists' import semver from 'semver' +import { glob } from 'tinyglobby' import { dir as getTmpDir, tmpName } from 'tmp-promise' import unixify from 'unixify' import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest' diff --git a/packages/zip-it-and-ship-it/tests/telemetry.test.ts b/packages/zip-it-and-ship-it/tests/telemetry.test.ts index e72dcb1d13..f368e70467 100644 --- a/packages/zip-it-and-ship-it/tests/telemetry.test.ts +++ b/packages/zip-it-and-ship-it/tests/telemetry.test.ts @@ -1,7 +1,7 @@ import { join } from 'path' import decompress from 'decompress' -import glob from 'fast-glob' +import { glob } from 'tinyglobby' import { dir as getTmpDir } from 'tmp-promise' import { expect, test } from 'vitest'