diff --git a/package.json b/package.json index 042702526e1..8cc65b7270f 100644 --- a/package.json +++ b/package.json @@ -148,7 +148,7 @@ "eslint-plugin-unicorn": "^52.0.0", "eslint-plugin-unused-imports": "^3.2.0", "execa": "^2.0.0", - "glob": "^7.2.0", + "glob": "^11.0.0", "globby": "^10.0.0", "husky": "^9.0.11", "js-yaml": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7930a201bcd..cb3da5a4295 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -163,8 +163,8 @@ importers: specifier: ^2.0.0 version: 2.1.0 glob: - specifier: ^7.2.0 - version: 7.2.3 + specifier: ^11.0.0 + version: 11.0.0 globby: specifier: ^10.0.0 version: 10.0.2 @@ -7541,6 +7541,11 @@ packages: resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==} hasBin: true + glob@11.0.0: + resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==} + engines: {node: 20 || >=22} + hasBin: true + glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} deprecated: Glob versions prior to v9 are no longer supported @@ -8260,6 +8265,10 @@ packages: jackspeak@3.4.3: resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==} + jackspeak@4.0.2: + resolution: {integrity: sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==} + engines: {node: 20 || >=22} + jake@10.9.2: resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==} engines: {node: '>=10'} @@ -8562,6 +8571,10 @@ packages: lru-cache@10.4.3: resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} + lru-cache@11.0.2: + resolution: {integrity: sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==} + engines: {node: 20 || >=22} + lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} @@ -8730,6 +8743,10 @@ packages: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} + minimatch@10.0.1: + resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==} + engines: {node: 20 || >=22} + minimatch@3.0.5: resolution: {integrity: sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==} @@ -9399,6 +9416,10 @@ packages: resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} engines: {node: '>=16 || 14 >=14.18'} + path-scurry@2.0.0: + resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==} + engines: {node: 20 || >=22} + path-to-regexp@0.1.10: resolution: {integrity: sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==} @@ -18703,6 +18724,15 @@ snapshots: package-json-from-dist: 1.0.0 path-scurry: 1.11.1 + glob@11.0.0: + dependencies: + foreground-child: 3.3.0 + jackspeak: 4.0.2 + minimatch: 10.0.1 + minipass: 7.1.2 + package-json-from-dist: 1.0.0 + path-scurry: 2.0.0 + glob@7.2.3: dependencies: fs.realpath: 1.0.0 @@ -19431,6 +19461,10 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 + jackspeak@4.0.2: + dependencies: + '@isaacs/cliui': 8.0.2 + jake@10.9.2: dependencies: async: 3.2.5 @@ -19851,6 +19885,8 @@ snapshots: lru-cache@10.4.3: {} + lru-cache@11.0.2: {} + lru-cache@5.1.1: dependencies: yallist: 3.1.1 @@ -20041,6 +20077,10 @@ snapshots: min-indent@1.0.1: {} + minimatch@10.0.1: + dependencies: + brace-expansion: 2.0.1 + minimatch@3.0.5: dependencies: brace-expansion: 1.1.11 @@ -20878,6 +20918,11 @@ snapshots: lru-cache: 10.4.3 minipass: 7.1.2 + path-scurry@2.0.0: + dependencies: + lru-cache: 11.0.2 + minipass: 7.1.2 + path-to-regexp@0.1.10: {} path-to-regexp@2.2.1: {} diff --git a/scripts/normalizeDependencyVersions.ts b/scripts/normalizeDependencyVersions.ts index 48c7508d193..994021de9bf 100644 --- a/scripts/normalizeDependencyVersions.ts +++ b/scripts/normalizeDependencyVersions.ts @@ -3,7 +3,7 @@ import fs from 'node:fs' import path from 'node:path' import chalk from 'chalk' -import glob from 'glob' +import {globSync} from 'glob' import semver from 'semver' interface LernaConfig { @@ -42,7 +42,7 @@ const sortRanges = (ranges: string[]) => const patterns = config.packages.map((pkg) => path.join(pkg, 'package.json')) const pkgs = patterns - .flatMap((pattern) => glob.sync(pattern)) + .flatMap((pattern) => globSync(pattern)) .map((file) => path.join(rootPath, file)) .map((file) => ({contents: fs.readFileSync(file, 'utf8'), file})) .map(({contents, file}) => ({file, pkg: JSON.parse(contents)})) diff --git a/scripts/utils/getPackagePaths.ts b/scripts/utils/getPackagePaths.ts index b99bd2196f2..cb7db0a4eea 100644 --- a/scripts/utils/getPackagePaths.ts +++ b/scripts/utils/getPackagePaths.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' -import glob from 'glob' +import {globSync} from 'glob' interface LernaConfig { packages: string[] @@ -22,7 +22,7 @@ const patterns = config.packages.map((pkg) => path.join(pkg, 'package.json')) * @internal */ export function getManifestPaths(): string[] { - return patterns.flatMap((pattern) => glob.sync(pattern)) + return patterns.flatMap((pattern) => globSync(pattern)) } /**