diff options
author | 2025-02-24 20:50:08 +0800 | |
---|---|---|
committer | 2025-02-24 12:50:08 +0000 | |
commit | 2e1321e9d5b27da3e86bc4021e4136661a8055aa (patch) | |
tree | 3b06e3e2d3ac67a06487da4286b1e70045014b07 /scripts/cmd | |
parent | baf0c405dd9be1a13b1739bee45bb4aa258b3cab (diff) | |
download | astro-2e1321e9d5b27da3e86bc4021e4136661a8055aa.tar.gz astro-2e1321e9d5b27da3e86bc4021e4136661a8055aa.tar.zst astro-2e1321e9d5b27da3e86bc4021e4136661a8055aa.zip |
Replace globby/fast-glob/tiny-glob with tinyglobby (#13299)
Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>
Co-authored-by: florian-lefebvre <69633530+florian-lefebvre@users.noreply.github.com>
Co-authored-by: ematipico <602478+ematipico@users.noreply.github.com>
Diffstat (limited to 'scripts/cmd')
-rw-r--r-- | scripts/cmd/build.js | 14 | ||||
-rw-r--r-- | scripts/cmd/prebuild.js | 2 | ||||
-rw-r--r-- | scripts/cmd/test.js | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/scripts/cmd/build.js b/scripts/cmd/build.js index 2cc99b7d3..3eb982e10 100644 --- a/scripts/cmd/build.js +++ b/scripts/cmd/build.js @@ -1,7 +1,7 @@ import fs from 'node:fs/promises'; import esbuild from 'esbuild'; -import glob from 'fast-glob'; import { dim, green, red, yellow } from 'kleur/colors'; +import { glob } from 'tinyglobby'; import prebuild from './prebuild.js'; /** @type {import('esbuild').BuildOptions} */ @@ -38,10 +38,13 @@ export default async function build(...args) { const prebuilds = getPrebuilds(isDev, args); const patterns = args .filter((f) => !!f) // remove empty args + .filter((f) => !f.startsWith('--')) // remove flags .map((f) => f.replace(/^'/, '').replace(/'$/, '')); // Needed for Windows: glob strings contain surrounding string chars??? remove these let entryPoints = [].concat( ...(await Promise.all( - patterns.map((pattern) => glob(pattern, { filesOnly: true, absolute: true })), + patterns.map((pattern) => + glob(pattern, { filesOnly: true, expandDirectories: false, absolute: true }), + ), )), ); @@ -115,7 +118,12 @@ export default async function build(...args) { } async function clean(outdir) { - const files = await glob([`${outdir}/**`, `!${outdir}/**/*.d.ts`], { filesOnly: true }); + const files = await glob('**', { + cwd: outdir, + filesOnly: true, + ignore: ['**/*.d.ts'], + absolute: true, + }); await Promise.all(files.map((file) => fs.rm(file, { force: true }))); } diff --git a/scripts/cmd/prebuild.js b/scripts/cmd/prebuild.js index 7c4174abf..1c62e8135 100644 --- a/scripts/cmd/prebuild.js +++ b/scripts/cmd/prebuild.js @@ -2,8 +2,8 @@ import fs from 'node:fs'; import path from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; import esbuild from 'esbuild'; -import glob from 'fast-glob'; import { red } from 'kleur/colors'; +import { glob } from 'tinyglobby'; function escapeTemplateLiterals(str) { return str.replace(/\`/g, '\\`').replace(/\$\{/g, '\\${'); diff --git a/scripts/cmd/test.js b/scripts/cmd/test.js index 3b266ff1c..ed8d0e45e 100644 --- a/scripts/cmd/test.js +++ b/scripts/cmd/test.js @@ -4,7 +4,7 @@ import { run } from 'node:test'; import { spec } from 'node:test/reporters'; import { pathToFileURL } from 'node:url'; import { parseArgs } from 'node:util'; -import glob from 'fast-glob'; +import { glob } from 'tinyglobby'; const isCI = !!process.env.CI; const defaultTimeout = isCI ? 1400000 : 600000; |