diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json index fdca0c229483..5f1761a78a62 100644 --- a/packages/build-utils/package.json +++ b/packages/build-utils/package.json @@ -26,7 +26,6 @@ "@types/glob": "7.2.0", "@types/jest": "27.4.1", "@types/js-yaml": "3.12.1", - "@types/minimatch": "^5.1.2", "@types/ms": "0.7.31", "@types/multistream": "2.1.1", "@types/node": "14.18.33", @@ -46,7 +45,7 @@ "into-stream": "5.0.0", "jest-junit": "16.0.0", "js-yaml": "3.13.1", - "minimatch": "3.1.2", + "minimatch": "9.0.5", "multistream": "2.1.1", "node-fetch": "2.6.7", "semver": "6.3.1", diff --git a/packages/build-utils/src/lambda.ts b/packages/build-utils/src/lambda.ts index 43719d6cc95d..612eccbd2be0 100644 --- a/packages/build-utils/src/lambda.ts +++ b/packages/build-utils/src/lambda.ts @@ -1,7 +1,7 @@ import assert from 'assert'; import Sema from 'async-sema'; import { ZipFile } from 'yazl'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { readlink } from 'fs-extra'; import { isSymbolicLink, isDirectory } from './fs/download'; import streamToBuffer from './fs/stream-to-buffer'; diff --git a/packages/cli/package.json b/packages/cli/package.json index f4dd4d55642e..63a0c485d0e0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -76,7 +76,6 @@ "@types/json-parse-better-errors": "1.0.0", "@types/load-json-file": "2.0.7", "@types/mime-types": "2.1.0", - "@types/minimatch": "3.0.3", "@types/ms": "0.7.30", "@types/node": "14.18.33", "@types/node-fetch": "2.5.10", @@ -143,7 +142,7 @@ "line-async-iterator": "3.0.0", "load-json-file": "3.0.0", "mime-types": "2.1.24", - "minimatch": "3.1.2", + "minimatch": "9.0.5", "ms": "2.1.2", "node-fetch": "2.6.7", "npm-package-arg": "6.1.0", diff --git a/packages/cli/src/commands/build/index.ts b/packages/cli/src/commands/build/index.ts index 787a16c92c8a..d82c033d0f11 100644 --- a/packages/cli/src/commands/build/index.ts +++ b/packages/cli/src/commands/build/index.ts @@ -2,7 +2,7 @@ import fs from 'fs-extra'; import chalk from 'chalk'; import dotenv from 'dotenv'; import semver from 'semver'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { join, normalize, relative, resolve, sep } from 'path'; import { frameworkList, type Framework } from '@vercel/frameworks'; import { diff --git a/packages/cli/src/util/build/static-builder.ts b/packages/cli/src/util/build/static-builder.ts index f01b8bca6249..63bd0aa279a8 100644 --- a/packages/cli/src/util/build/static-builder.ts +++ b/packages/cli/src/util/build/static-builder.ts @@ -1,4 +1,4 @@ -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { shouldServe as defaultShouldServe } from '@vercel/build-utils'; import type { BuildV2, Files, ShouldServe } from '@vercel/build-utils'; diff --git a/packages/cli/src/util/dev/builder.ts b/packages/cli/src/util/dev/builder.ts index bcc11de21e88..d2469835f656 100644 --- a/packages/cli/src/util/dev/builder.ts +++ b/packages/cli/src/util/dev/builder.ts @@ -17,7 +17,7 @@ import { } from '@vercel/build-utils'; import { isStaticRuntime } from '@vercel/fs-detectors'; import plural from 'pluralize'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { Output } from '../output'; import highlight from '../output/highlight'; diff --git a/packages/cli/src/util/dev/server.ts b/packages/cli/src/util/dev/server.ts index 894e897073a0..0ff936fdf9ae 100644 --- a/packages/cli/src/util/dev/server.ts +++ b/packages/cli/src/util/dev/server.ts @@ -7,7 +7,7 @@ import fetch from 'node-fetch'; import plural from 'pluralize'; import rawBody from 'raw-body'; import { listen } from 'async-listen'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import httpProxy from 'http-proxy'; import { randomBytes } from 'crypto'; import serveHandler from 'serve-handler'; diff --git a/packages/client/package.json b/packages/client/package.json index de9af03c4977..0379b244fc39 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -27,7 +27,6 @@ "@types/async-retry": "1.4.5", "@types/fs-extra": "7.0.0", "@types/jest": "27.4.1", - "@types/minimatch": "3.0.5", "@types/ms": "0.7.30", "@types/node": "14.18.33", "@types/node-fetch": "2.5.4", @@ -44,7 +43,7 @@ "async-sema": "3.0.0", "fs-extra": "8.0.1", "ignore": "4.0.6", - "minimatch": "5.0.1", + "minimatch": "9.0.5", "ms": "2.1.2", "node-fetch": "2.6.7", "querystring": "^0.2.0", diff --git a/packages/client/src/utils/readdir-recursive.ts b/packages/client/src/utils/readdir-recursive.ts index 0e7122956b46..15e8ada1cb0a 100644 --- a/packages/client/src/utils/readdir-recursive.ts +++ b/packages/client/src/utils/readdir-recursive.ts @@ -30,7 +30,7 @@ THE SOFTWARE. import fs from 'fs'; import p from 'path'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; function patternMatcher(pattern: string) { return function (path: string, stats: fs.Stats) { diff --git a/packages/fs-detectors/package.json b/packages/fs-detectors/package.json index bf1ffd4d7f05..a41ea14d1afa 100644 --- a/packages/fs-detectors/package.json +++ b/packages/fs-detectors/package.json @@ -27,14 +27,13 @@ "glob": "8.0.3", "js-yaml": "4.1.0", "json5": "2.2.2", - "minimatch": "3.1.2", + "minimatch": "9.0.5", "semver": "6.3.1" }, "devDependencies": { "@types/glob": "7.2.0", "@types/jest": "27.5.1", "@types/js-yaml": "4.0.5", - "@types/minimatch": "3.0.5", "@types/node": "14.18.33", "@types/semver": "7.3.10", "@vercel/build-utils": "8.4.11", diff --git a/packages/fs-detectors/src/detect-builders.ts b/packages/fs-detectors/src/detect-builders.ts index 01c24e866389..b3673ba56e0b 100644 --- a/packages/fs-detectors/src/detect-builders.ts +++ b/packages/fs-detectors/src/detect-builders.ts @@ -1,4 +1,4 @@ -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { valid as validSemver } from 'semver'; import { parse as parsePath, extname } from 'path'; import type { Route, RouteWithSrc } from '@vercel/routing-utils'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9a1000898e1..41227567a5d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -240,9 +240,6 @@ importers: '@types/js-yaml': specifier: 3.12.1 version: 3.12.1 - '@types/minimatch': - specifier: ^5.1.2 - version: 5.1.2 '@types/ms': specifier: 0.7.31 version: 0.7.31 @@ -304,8 +301,8 @@ importers: specifier: 2.2.3 version: 2.2.3 minimatch: - specifier: 3.1.2 - version: 3.1.2 + specifier: 9.0.5 + version: 9.0.5 multistream: specifier: 2.1.1 version: 2.1.1 @@ -445,9 +442,6 @@ importers: '@types/mime-types': specifier: 2.1.0 version: 2.1.0 - '@types/minimatch': - specifier: 3.0.3 - version: 3.0.3 '@types/ms': specifier: 0.7.30 version: 0.7.30 @@ -647,8 +641,8 @@ importers: specifier: 2.1.24 version: 2.1.24 minimatch: - specifier: 3.1.2 - version: 3.1.2 + specifier: 9.0.5 + version: 9.0.5 ms: specifier: 2.1.2 version: 2.1.2 @@ -767,8 +761,8 @@ importers: specifier: 4.0.6 version: 4.0.6 minimatch: - specifier: 5.0.1 - version: 5.0.1 + specifier: 9.0.5 + version: 9.0.5 ms: specifier: 2.1.2 version: 2.1.2 @@ -794,9 +788,6 @@ importers: '@types/jest': specifier: 27.4.1 version: 27.4.1 - '@types/minimatch': - specifier: 3.0.5 - version: 3.0.5 '@types/ms': specifier: 0.7.30 version: 0.7.30 @@ -952,8 +943,8 @@ importers: specifier: 2.2.2 version: 2.2.2 minimatch: - specifier: 3.1.2 - version: 3.1.2 + specifier: 9.0.5 + version: 9.0.5 semver: specifier: 6.3.1 version: 6.3.1 @@ -967,9 +958,6 @@ importers: '@types/js-yaml': specifier: 4.0.5 version: 4.0.5 - '@types/minimatch': - specifier: 3.0.5 - version: 3.0.5 '@types/node': specifier: 14.18.33 version: 14.18.33 @@ -6059,10 +6047,6 @@ packages: resolution: {integrity: sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==} dev: true - /@types/minimatch@3.0.5: - resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} - dev: true - /@types/minimatch@5.1.2: resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} dev: true @@ -11599,7 +11583,7 @@ packages: dependencies: foreground-child: 3.1.1 jackspeak: 2.2.0 - minimatch: 9.0.0 + minimatch: 9.0.5 minipass: 5.0.0 path-scurry: 1.8.0 dev: true @@ -11611,7 +11595,7 @@ packages: dependencies: foreground-child: 3.1.1 jackspeak: 3.1.2 - minimatch: 9.0.4 + minimatch: 9.0.5 minipass: 7.0.4 path-scurry: 1.11.1 dev: true @@ -14309,39 +14293,17 @@ packages: dependencies: brace-expansion: 1.1.11 - /minimatch@5.0.1: - resolution: {integrity: sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==} - engines: {node: '>=10'} - dependencies: - brace-expansion: 2.0.1 - dev: false - /minimatch@5.1.2: resolution: {integrity: sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==} engines: {node: '>=10'} dependencies: brace-expansion: 2.0.1 - /minimatch@9.0.0: - resolution: {integrity: sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - brace-expansion: 2.0.1 - dev: true - - /minimatch@9.0.4: - resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - brace-expansion: 2.0.1 - dev: true - /minimatch@9.0.5: resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} engines: {node: '>=16 || 14 >=14.17'} dependencies: brace-expansion: 2.0.1 - dev: true /minimist@1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}