diff options
Diffstat (limited to 'packages/integrations')
8 files changed, 14 insertions, 15 deletions
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 6f1e6a810..aa1b3ba49 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -40,7 +40,7 @@ "estree-walker": "^3.0.3", "magic-string": "^0.30.17", "miniflare": "^3.20241230.1", - "tiny-glob": "^0.2.9", + "tinyglobby": "^0.2.12", "vite": "^6.0.7", "wrangler": "^3.101.0" }, @@ -52,7 +52,6 @@ "astro-scripts": "workspace:*", "cheerio": "1.0.0", "execa": "^8.0.1", - "fast-glob": "^3.3.3", "rollup": "^4.30.1", "strip-ansi": "^7.1.0" }, diff --git a/packages/integrations/cloudflare/src/utils/generate-routes-json.ts b/packages/integrations/cloudflare/src/utils/generate-routes-json.ts index eea7c38e1..f1d9e4384 100644 --- a/packages/integrations/cloudflare/src/utils/generate-routes-json.ts +++ b/packages/integrations/cloudflare/src/utils/generate-routes-json.ts @@ -14,7 +14,7 @@ import { removeLeadingForwardSlash, removeTrailingForwardSlash, } from '@astrojs/internal-helpers/path'; -import glob from 'tiny-glob'; +import { glob } from 'tinyglobby'; // Copied from https://github.com/withastro/astro/blob/3776ecf0aa9e08a992d3ae76e90682fd04093721/packages/astro/src/core/routing/manifest/create.ts#L45-L70 // We're not sure how to improve this regex yet @@ -205,9 +205,8 @@ export async function createRoutesFile( } if (existsSync(fileURLToPath(_config.publicDir))) { - const staticFiles = await glob(`${fileURLToPath(_config.publicDir)}/**/*`, { + const staticFiles = await glob(`**/*`, { cwd: fileURLToPath(_config.publicDir), - filesOnly: true, dot: true, }); for (const staticFile of staticFiles) { diff --git a/packages/integrations/cloudflare/test/external-image-service.test.js b/packages/integrations/cloudflare/test/external-image-service.test.js index 80ff2140f..28ef544ca 100644 --- a/packages/integrations/cloudflare/test/external-image-service.test.js +++ b/packages/integrations/cloudflare/test/external-image-service.test.js @@ -2,7 +2,7 @@ import * as assert from 'node:assert/strict'; import { readFileSync } from 'node:fs'; import { describe, it } from 'node:test'; import { fileURLToPath } from 'node:url'; -import glob from 'tiny-glob'; +import { glob } from 'tinyglobby'; import { astroCli } from './_test-utils.js'; const root = new URL('./fixtures/external-image-service/', import.meta.url); diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 5af65b3a8..cd1edc7cc 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -42,6 +42,7 @@ "@netlify/functions": "^2.8.0", "@vercel/nft": "^0.29.0", "esbuild": "^0.24.0", + "tinyglobby": "^0.2.12", "vite": "^6.0.7" }, "peerDependencies": { @@ -56,7 +57,6 @@ "cheerio": "1.0.0", "devalue": "^5.1.1", "execa": "^8.0.1", - "fast-glob": "^3.3.3", "strip-ansi": "^7.1.0", "typescript": "^5.7.3" }, diff --git a/packages/integrations/netlify/src/index.ts b/packages/integrations/netlify/src/index.ts index 3f016a5e1..3a447f5fd 100644 --- a/packages/integrations/netlify/src/index.ts +++ b/packages/integrations/netlify/src/index.ts @@ -13,7 +13,7 @@ import type { IntegrationResolvedRoute, } from 'astro'; import { build } from 'esbuild'; -import glob from 'fast-glob'; +import { glob, globSync } from 'tinyglobby'; import { copyDependenciesToFunction } from './lib/nft.js'; import type { Args } from './ssr-function.js'; @@ -283,6 +283,7 @@ export default function netlifyIntegration( cwd: fileURLToPath(rootDir), absolute: true, ignore: exclude, + expandDirectories: false, }); return files.map((file) => pathToFileURL(file)); } @@ -306,7 +307,7 @@ export default function netlifyIntegration( if (_config.vite.assetsInclude) { const mergeGlobbedIncludes = (globPattern: unknown) => { if (typeof globPattern === 'string') { - const entries = glob.sync(globPattern).map((p) => pathToFileURL(p)); + const entries = globSync(globPattern).map((p) => pathToFileURL(p)); extraFilesToInclude.push(...entries); } else if (Array.isArray(globPattern)) { for (const pattern of globPattern) { diff --git a/packages/integrations/netlify/test/functions/include-files.test.js b/packages/integrations/netlify/test/functions/include-files.test.js index f88f1319d..e54e116a7 100644 --- a/packages/integrations/netlify/test/functions/include-files.test.js +++ b/packages/integrations/netlify/test/functions/include-files.test.js @@ -3,7 +3,7 @@ import { existsSync } from 'node:fs'; import { after, before, describe, it } from 'node:test'; import netlify from '@astrojs/netlify'; import * as cheerio from 'cheerio'; -import glob from 'fast-glob'; +import { globSync } from 'tinyglobby'; import { loadFixture } from '../../../../astro/test/test-utils.js'; describe( @@ -32,7 +32,7 @@ describe( it('Emits vite assets files', async () => { for (const pattern of expectedAssetsInclude) { - const files = glob.sync(pattern); + const files = globSync(pattern); for (const file of files) { assert.ok( existsSync(new URL(file, expectedCwd)), @@ -158,7 +158,7 @@ describe( it('Does not include files when excluded', async () => { for (const pattern of includeFiles) { - const files = glob.sync(pattern, { ignore: excludedTxt }); + const files = globSync(pattern, { ignore: excludedTxt }); for (const file of files) { assert.ok( existsSync(new URL(file, expectedCwd)), diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index c171806db..73b515649 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -52,7 +52,7 @@ "@vercel/nft": "^0.29.0", "@vercel/routing-utils": "^5.0.4", "esbuild": "^0.24.0", - "fast-glob": "^3.3.3" + "tinyglobby": "^0.2.12" }, "peerDependencies": { "astro": "^5.0.0" diff --git a/packages/integrations/vercel/src/index.ts b/packages/integrations/vercel/src/index.ts index 4aeb3e568..58a2a1740 100644 --- a/packages/integrations/vercel/src/index.ts +++ b/packages/integrations/vercel/src/index.ts @@ -12,7 +12,7 @@ import type { IntegrationResolvedRoute, } from 'astro'; import { AstroError } from 'astro/errors'; -import glob from 'fast-glob'; +import { globSync } from 'tinyglobby'; import { type DevImageService, type VercelImageConfig, @@ -353,7 +353,7 @@ export default function vercelAdapter({ if (_config.vite.assetsInclude) { const mergeGlobbedIncludes = (globPattern: unknown) => { if (typeof globPattern === 'string') { - const entries = glob.sync(globPattern).map((p) => pathToFileURL(p)); + const entries = globSync(globPattern).map((p) => pathToFileURL(p)); extraFilesToInclude.push(...entries); } else if (Array.isArray(globPattern)) { for (const pattern of globPattern) { |