diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx index d91c8ed4bcd9..d72d212ddfb0 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx @@ -3,8 +3,8 @@ # This file should be checked into version control along with the pnpm-lock.yaml file. .npmrc=-1406867100 modules/testing/builder/package.json=973445093 -package.json=52575479 -packages/angular/build/package.json=-42220606 +package.json=1411918173 +packages/angular/build/package.json=1920607808 packages/angular/cli/package.json=-1917515334 packages/angular/pwa/package.json=1108903917 packages/angular/ssr/package.json=-2027233365 @@ -17,7 +17,7 @@ packages/angular_devkit/schematics/package.json=-1133510866 packages/angular_devkit/schematics_cli/package.json=-2026655035 packages/ngtools/webpack/package.json=884391309 packages/schematics/angular/package.json=251715148 -pnpm-lock.yaml=2092314161 +pnpm-lock.yaml=2112966384 pnpm-workspace.yaml=-1264044456 tests/package.json=700948366 -yarn.lock=-1083761442 +yarn.lock=1484073494 diff --git a/package.json b/package.json index 55aecd70bd6d..5c2aaf6582cc 100644 --- a/package.json +++ b/package.json @@ -194,6 +194,7 @@ "symbol-observable": "4.0.0", "tar": "^7.0.0", "terser": "5.39.0", + "tinyglobby": "0.2.12", "tree-kill": "1.2.2", "ts-node": "^10.9.1", "tslib": "2.8.1", diff --git a/packages/angular/build/BUILD.bazel b/packages/angular/build/BUILD.bazel index 3d1c7e7c135a..77677355c546 100644 --- a/packages/angular/build/BUILD.bazel +++ b/packages/angular/build/BUILD.bazel @@ -102,7 +102,6 @@ ts_project( "//:node_modules/browserslist", "//:node_modules/esbuild", "//:node_modules/esbuild-wasm", - "//:node_modules/fast-glob", "//:node_modules/https-proxy-agent", "//:node_modules/istanbul-lib-instrument", "//:node_modules/jsonc-parser", @@ -121,6 +120,7 @@ ts_project( "//:node_modules/sass", "//:node_modules/semver", "//:node_modules/source-map-support", + "//:node_modules/tinyglobby", "//:node_modules/tslib", "//:node_modules/typescript", "//:node_modules/vite", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 25c81e6d2c4f..b3dd7d30a7b7 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -29,7 +29,6 @@ "beasties": "0.2.0", "browserslist": "^4.23.0", "esbuild": "0.25.0", - "fast-glob": "3.3.3", "https-proxy-agent": "7.0.6", "istanbul-lib-instrument": "6.0.3", "listr2": "8.2.5", @@ -42,6 +41,7 @@ "sass": "1.85.1", "semver": "7.7.1", "source-map-support": "0.5.21", + "tinyglobby": "0.2.12", "vite": "6.2.0", "watchpack": "2.4.2" }, diff --git a/packages/angular/build/src/builders/karma/application_builder.ts b/packages/angular/build/src/builders/karma/application_builder.ts index 24c81b777f0a..f0ef620c692e 100644 --- a/packages/angular/build/src/builders/karma/application_builder.ts +++ b/packages/angular/build/src/builders/karma/application_builder.ts @@ -7,7 +7,6 @@ */ import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect'; -import glob from 'fast-glob'; import type { Config, ConfigOptions, FilePattern, InlinePluginDef, Server } from 'karma'; import { randomUUID } from 'node:crypto'; import * as fs from 'node:fs/promises'; @@ -15,6 +14,7 @@ import type { IncomingMessage, ServerResponse } from 'node:http'; import { createRequire } from 'node:module'; import * as path from 'node:path'; import { ReadableStreamController } from 'node:stream/web'; +import { globSync } from 'tinyglobby'; import { BuildOutputFileType } from '../../tools/esbuild/bundler-context'; import { emitFilesToDisk } from '../../tools/esbuild/utils'; import { buildApplicationInternal } from '../application/index'; @@ -614,7 +614,7 @@ function getInstrumentationExcludedPaths(root: string, excludedPaths: string[]): for (const excludeGlob of excludedPaths) { const excludePath = excludeGlob[0] === '/' ? excludeGlob.slice(1) : excludeGlob; - glob.sync(excludePath, { cwd: root }).forEach((p) => excluded.add(path.join(root, p))); + globSync(excludePath, { absolute: true, cwd: root }).forEach((p) => excluded.add(p)); } return excluded; diff --git a/packages/angular/build/src/builders/karma/find-tests.ts b/packages/angular/build/src/builders/karma/find-tests.ts index ef7fddfd27de..ec25d56cf9d2 100644 --- a/packages/angular/build/src/builders/karma/find-tests.ts +++ b/packages/angular/build/src/builders/karma/find-tests.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.dev/license */ -import glob, { isDynamicPattern } from 'fast-glob'; import { PathLike, constants, promises as fs } from 'node:fs'; import { basename, dirname, extname, join, relative } from 'node:path'; +import { glob, isDynamicPattern } from 'tinyglobby'; /* Go through all patterns and find unique list of files */ export async function findTests( diff --git a/packages/angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.ts b/packages/angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.ts index ac03c602e658..0e99212adbc8 100644 --- a/packages/angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.ts +++ b/packages/angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.ts @@ -7,11 +7,11 @@ */ import type { OnLoadResult, Plugin, PluginBuild } from 'esbuild'; -import glob from 'fast-glob'; import assert from 'node:assert'; import { readFile } from 'node:fs/promises'; import { extname } from 'node:path'; import type { Options } from 'sass'; +import { glob } from 'tinyglobby'; import type { PostcssConfiguration } from '../../../utils/postcss-configuration'; import { LoadResultCache, createCachedLoad } from '../load-result-cache'; diff --git a/packages/angular/build/src/utils/load-proxy-config.ts b/packages/angular/build/src/utils/load-proxy-config.ts index 2ed21c05ba2a..b0882187d0c2 100644 --- a/packages/angular/build/src/utils/load-proxy-config.ts +++ b/packages/angular/build/src/utils/load-proxy-config.ts @@ -6,12 +6,12 @@ * found in the LICENSE file at https://angular.dev/license */ -import { isDynamicPattern } from 'fast-glob'; import { existsSync } from 'node:fs'; import { readFile } from 'node:fs/promises'; import { extname, resolve } from 'node:path'; import { pathToFileURL } from 'node:url'; import { makeRe as makeRegExpFromGlob } from 'picomatch'; +import { isDynamicPattern } from 'tinyglobby'; import { assertIsError } from './error'; import { loadEsmModule } from './load-esm'; diff --git a/packages/angular/build/src/utils/resolve-assets.ts b/packages/angular/build/src/utils/resolve-assets.ts index c9732501ce29..e98879e58de7 100644 --- a/packages/angular/build/src/utils/resolve-assets.ts +++ b/packages/angular/build/src/utils/resolve-assets.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import glob from 'fast-glob'; import path from 'node:path'; +import { glob } from 'tinyglobby'; export async function resolveAssets( entries: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba89ce54e107..de87bd9577a5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -472,6 +472,9 @@ importers: terser: specifier: 5.39.0 version: 5.39.0 + tinyglobby: + specifier: 0.2.12 + version: 0.2.12 tree-kill: specifier: 1.2.2 version: 1.2.2 @@ -582,9 +585,6 @@ importers: esbuild: specifier: 0.25.0 version: 0.25.0 - fast-glob: - specifier: 3.3.3 - version: 3.3.3 https-proxy-agent: specifier: 7.0.6 version: 7.0.6(supports-color@10.0.0) @@ -621,6 +621,9 @@ importers: source-map-support: specifier: 0.5.21 version: 0.5.21 + tinyglobby: + specifier: 0.2.12 + version: 0.2.12 vite: specifier: 6.2.0 version: 6.2.0(@types/node@20.17.19)(less@4.2.2)(sass@1.85.1)(terser@5.39.0) diff --git a/yarn.lock b/yarn.lock index 67c7b44d175a..f27e98e79a70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -449,6 +449,7 @@ __metadata: symbol-observable: "npm:4.0.0" tar: "npm:^7.0.0" terser: "npm:5.39.0" + tinyglobby: "npm:0.2.12" tree-kill: "npm:1.2.2" ts-node: "npm:^10.9.1" tslib: "npm:2.8.1" @@ -17623,7 +17624,7 @@ __metadata: languageName: node linkType: hard -"tinyglobby@npm:^0.2.12": +"tinyglobby@npm:0.2.12, tinyglobby@npm:^0.2.12": version: 0.2.12 resolution: "tinyglobby@npm:0.2.12" dependencies: