Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
*/

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';
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';
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/src/builders/karma/find-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/src/utils/load-proxy-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/src/utils/resolve-assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
9 changes: 6 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down