diff --git a/package.json b/package.json index b91597222a3..1fd0e173887 100644 --- a/package.json +++ b/package.json @@ -171,6 +171,7 @@ "cldrjs": "0.5.5", "conventional-changelog": "^3.1.24", "firebase-tools": "^12.0.0", + "fast-glob": "3.2.12", "glob": "8.1.0", "gulp": "^4.0.2", "gulp-conventional-changelog": "^3.0.0", diff --git a/packages/localize/package.json b/packages/localize/package.json index ba77a0ab22f..1dec25dcd7a 100644 --- a/packages/localize/package.json +++ b/packages/localize/package.json @@ -35,7 +35,7 @@ ], "dependencies": { "@babel/core": "7.21.8", - "glob": "8.1.0", + "fast-glob": "3.2.12", "yargs": "^17.2.1" }, "peerDependencies": { diff --git a/packages/localize/tools/BUILD.bazel b/packages/localize/tools/BUILD.bazel index c68ec556c92..6eea7a6c0e0 100644 --- a/packages/localize/tools/BUILD.bazel +++ b/packages/localize/tools/BUILD.bazel @@ -16,10 +16,9 @@ ts_library( "@npm//@babel/core", "@npm//@types/babel__core", "@npm//@types/babel__traverse", - "@npm//@types/glob", "@npm//@types/node", "@npm//@types/yargs", - "@npm//glob", + "@npm//fast-glob", ], ) @@ -43,7 +42,7 @@ esbuild( "@angular/compiler-cli/private/localize", "@babel/core", "yargs", - "glob", + "fast-glob", ], format = "esm", platform = "node", diff --git a/packages/localize/tools/src/extract/cli.ts b/packages/localize/tools/src/extract/cli.ts index 12235bef1f9..83b7938d9c2 100644 --- a/packages/localize/tools/src/extract/cli.ts +++ b/packages/localize/tools/src/extract/cli.ts @@ -8,7 +8,7 @@ */ import {ConsoleLogger, LogLevel, NodeJSFileSystem, setFileSystem} from '@angular/compiler-cli/private/localize'; -import glob from 'glob'; +import glob from 'fast-glob'; import yargs from 'yargs'; import {DiagnosticHandlingStrategy} from '../diagnostics'; @@ -94,7 +94,7 @@ const fileSystem = new NodeJSFileSystem(); setFileSystem(fileSystem); const rootPath = options.r; -const sourceFilePaths = glob.sync(options.s, {cwd: rootPath, nodir: true}); +const sourceFilePaths = glob.sync(options.s, {cwd: rootPath}); const logLevel = options.loglevel as (keyof typeof LogLevel) | undefined; const logger = new ConsoleLogger(logLevel ? LogLevel[logLevel] : LogLevel.warn); const duplicateMessageHandling = options.d as DiagnosticHandlingStrategy; diff --git a/packages/localize/tools/src/migrate/cli.ts b/packages/localize/tools/src/migrate/cli.ts index cb94b448dad..85556dc6d36 100644 --- a/packages/localize/tools/src/migrate/cli.ts +++ b/packages/localize/tools/src/migrate/cli.ts @@ -8,7 +8,7 @@ */ import {ConsoleLogger, LogLevel, NodeJSFileSystem, setFileSystem} from '@angular/compiler-cli/private/localize'; -import glob from 'glob'; +import glob from 'fast-glob'; import yargs from 'yargs'; import {migrateFiles} from './index'; @@ -44,7 +44,7 @@ const fs = new NodeJSFileSystem(); setFileSystem(fs); const rootPath = options.r; -const translationFilePaths = glob.sync(options.f, {cwd: rootPath, nodir: true}); +const translationFilePaths = glob.sync(options.f, {cwd: rootPath, onlyFiles: true}); const logger = new ConsoleLogger(LogLevel.warn); migrateFiles({rootPath, translationFilePaths, mappingFilePath: options.m, logger}); diff --git a/packages/localize/tools/src/translate/cli.ts b/packages/localize/tools/src/translate/cli.ts index 8e20bc77fea..00f15439b46 100644 --- a/packages/localize/tools/src/translate/cli.ts +++ b/packages/localize/tools/src/translate/cli.ts @@ -7,7 +7,7 @@ * found in the LICENSE file at https://angular.io/license */ import {NodeJSFileSystem, setFileSystem} from '@angular/compiler-cli/private/localize'; -import glob from 'glob'; +import glob from 'fast-glob'; import yargs from 'yargs'; import {DiagnosticHandlingStrategy, Diagnostics} from '../diagnostics'; @@ -94,7 +94,7 @@ const fs = new NodeJSFileSystem(); setFileSystem(fs); const sourceRootPath = options.r; -const sourceFilePaths = glob.sync(options.s, {cwd: sourceRootPath, nodir: true}); +const sourceFilePaths = glob.sync(options.s, {cwd: sourceRootPath, onlyFiles: true}); const translationFilePaths: (string|string[])[] = convertArraysFromArgs(options.t); const outputPathFn = getOutputPathFn(fs, fs.resolve(options.o)); const diagnostics = new Diagnostics(); diff --git a/packages/localize/tools/test/BUILD.bazel b/packages/localize/tools/test/BUILD.bazel index 8d7b4c30fb9..d7d3a9aa835 100644 --- a/packages/localize/tools/test/BUILD.bazel +++ b/packages/localize/tools/test/BUILD.bazel @@ -22,7 +22,7 @@ ts_library( "@npm//@babel/template", "@npm//@types/babel__generator", "@npm//@types/babel__template", - "@npm//@types/glob", + "@npm//fast-glob", ], ) @@ -31,6 +31,6 @@ jasmine_node_test( bootstrap = ["//tools/testing:node_no_angular"], deps = [ ":test_lib", - "@npm//glob", + "@npm//fast-glob", ], ) diff --git a/packages/localize/tools/test/extract/integration/BUILD.bazel b/packages/localize/tools/test/extract/integration/BUILD.bazel index 023d745c062..17fc3ff4c89 100644 --- a/packages/localize/tools/test/extract/integration/BUILD.bazel +++ b/packages/localize/tools/test/extract/integration/BUILD.bazel @@ -29,7 +29,7 @@ jasmine_node_test( ], deps = [ ":test_lib", - "@npm//glob", + "@npm//fast-glob", "@npm//yargs", ], ) diff --git a/packages/localize/tools/test/migrate/integration/BUILD.bazel b/packages/localize/tools/test/migrate/integration/BUILD.bazel index 6d9020a522c..53d4b660c39 100644 --- a/packages/localize/tools/test/migrate/integration/BUILD.bazel +++ b/packages/localize/tools/test/migrate/integration/BUILD.bazel @@ -34,7 +34,7 @@ jasmine_node_test( ], deps = [ ":test_lib", - "@npm//glob", + "@npm//fast-glob", "@npm//yargs", ], ) diff --git a/packages/localize/tools/test/translate/integration/BUILD.bazel b/packages/localize/tools/test/translate/integration/BUILD.bazel index 33140b3c1c7..7ea5721978a 100644 --- a/packages/localize/tools/test/translate/integration/BUILD.bazel +++ b/packages/localize/tools/test/translate/integration/BUILD.bazel @@ -25,7 +25,7 @@ jasmine_node_test( ], deps = [ ":test_lib", - "@npm//glob", + "@npm//fast-glob", "@npm//yargs", ], ) diff --git a/yarn.lock b/yarn.lock index 69bf553fc2a..330ab183bfa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8014,7 +8014,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.11, fast-glob@^3.2.9: +fast-glob@3.2.12, fast-glob@^3.2.11, fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==