diff --git a/jest.config.ts b/jest.config.ts index ceb58288cac942..6f7aef640e3471 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -40,7 +40,6 @@ function jestGithubRunnerSpecs(): JestConfig { const config: JestConfig = { cacheDirectory: '.cache/jest', clearMocks: true, - coverageDirectory: './coverage', collectCoverage: true, collectCoverageFrom: [ 'lib/**/*.{js,ts}', @@ -48,6 +47,7 @@ const config: JestConfig = { '!lib/**/{__fixtures__,__mocks__,__testutil__,test}/**/*.{js,ts}', '!lib/**/types.ts', ], + coverageDirectory: './coverage', coverageReporters: ci ? ['html', 'json', 'text-summary'] : ['html', 'text-summary'], diff --git a/lib/modules/manager/hermit/default-config.spec.ts b/lib/modules/manager/hermit/default-config.spec.ts index 3eacc00f3c1eb0..d2a7053771f729 100644 --- a/lib/modules/manager/hermit/default-config.spec.ts +++ b/lib/modules/manager/hermit/default-config.spec.ts @@ -1,4 +1,4 @@ -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { regexMatches } from '../../../../test/util'; import { defaultConfig } from './default-config'; diff --git a/lib/modules/manager/hermit/extract.ts b/lib/modules/manager/hermit/extract.ts index d279676e428fd6..a1b0b2064dac24 100644 --- a/lib/modules/manager/hermit/extract.ts +++ b/lib/modules/manager/hermit/extract.ts @@ -1,4 +1,4 @@ -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import upath from 'upath'; import { logger } from '../../../logger'; import { readLocalDirectory } from '../../../util/fs'; diff --git a/lib/modules/manager/npm/extract/utils.ts b/lib/modules/manager/npm/extract/utils.ts index ea29a889e0c9b6..629d643ae5e7fe 100644 --- a/lib/modules/manager/npm/extract/utils.ts +++ b/lib/modules/manager/npm/extract/utils.ts @@ -1,4 +1,4 @@ -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { logger } from '../../../../logger'; export function matchesAnyPattern(val: string, patterns: string[]): boolean { diff --git a/lib/modules/manager/npm/post-update/npm.ts b/lib/modules/manager/npm/post-update/npm.ts index fa41fdad02601a..7eb5e647b71c3e 100644 --- a/lib/modules/manager/npm/post-update/npm.ts +++ b/lib/modules/manager/npm/post-update/npm.ts @@ -1,6 +1,6 @@ // TODO: types (#7154) import is from '@sindresorhus/is'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import upath from 'upath'; import { GlobalConfig } from '../../../../config/global'; import { diff --git a/lib/modules/manager/nuget/package-tree.ts b/lib/modules/manager/nuget/package-tree.ts index 5dbdd01b1318c0..0da8c32a6929b8 100644 --- a/lib/modules/manager/nuget/package-tree.ts +++ b/lib/modules/manager/nuget/package-tree.ts @@ -1,6 +1,6 @@ import is from '@sindresorhus/is'; import { Graph } from 'graph-data-structure'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import upath from 'upath'; import { logger } from '../../../logger'; import { getFileList } from '../../../util/git'; diff --git a/lib/util/package-rules/paths.ts b/lib/util/package-rules/paths.ts index f7e13f8d6e1e0c..7bd882c56966e0 100644 --- a/lib/util/package-rules/paths.ts +++ b/lib/util/package-rules/paths.ts @@ -1,5 +1,5 @@ import is from '@sindresorhus/is'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import type { PackageRule, PackageRuleInputConfig } from '../../config/types'; import { logger } from '../../logger'; import { Matcher } from './base'; diff --git a/lib/workers/global/autodiscover.ts b/lib/workers/global/autodiscover.ts index 99d1bc87925b41..332961b82e1506 100644 --- a/lib/workers/global/autodiscover.ts +++ b/lib/workers/global/autodiscover.ts @@ -1,5 +1,5 @@ import is from '@sindresorhus/is'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import type { AllConfig } from '../../config/types'; import { logger } from '../../logger'; import { platform } from '../../modules/platform'; diff --git a/lib/workers/repository/extract/file-match.ts b/lib/workers/repository/extract/file-match.ts index eb0901c40ec2a2..01187497f90d49 100644 --- a/lib/workers/repository/extract/file-match.ts +++ b/lib/workers/repository/extract/file-match.ts @@ -1,4 +1,4 @@ -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import type { RenovateConfig } from '../../../config/types'; import { logger } from '../../../logger'; import { regEx } from '../../../util/regex'; diff --git a/lib/workers/repository/update/branch/commit.ts b/lib/workers/repository/update/branch/commit.ts index 0798c9cee5618c..58d11d4ef3224e 100644 --- a/lib/workers/repository/update/branch/commit.ts +++ b/lib/workers/repository/update/branch/commit.ts @@ -1,6 +1,6 @@ // TODO #7154 import is from '@sindresorhus/is'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { GlobalConfig } from '../../../../config/global'; import { CONFIG_SECRETS_EXPOSED } from '../../../../constants/error-messages'; import { logger } from '../../../../logger'; diff --git a/lib/workers/repository/update/branch/execute-post-upgrade-commands.ts b/lib/workers/repository/update/branch/execute-post-upgrade-commands.ts index 68d2335c8e4ff8..be8b39f4ec65c6 100644 --- a/lib/workers/repository/update/branch/execute-post-upgrade-commands.ts +++ b/lib/workers/repository/update/branch/execute-post-upgrade-commands.ts @@ -1,6 +1,6 @@ // TODO #7154 import is from '@sindresorhus/is'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { mergeChildConfig } from '../../../../config'; import { GlobalConfig } from '../../../../config/global'; import { addMeta, logger } from '../../../../logger'; diff --git a/package.json b/package.json index 52403ff99a914f..0c0f72a41c92e7 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,7 @@ "luxon": "3.3.0", "markdown-it": "13.0.1", "markdown-table": "2.0.0", - "minimatch": "5.1.6", + "minimatch": "9.0.0", "moo": "0.5.2", "ms": "2.1.3", "nanoid": "3.3.6", @@ -276,7 +276,6 @@ "@types/markdown-it": "12.2.3", "@types/markdown-table": "2.0.0", "@types/marshal": "0.5.1", - "@types/minimatch": "5.1.2", "@types/moo": "0.5.5", "@types/nock": "10.0.3", "@types/node": "18.16.0", diff --git a/tools/check-re2.mjs b/tools/check-re2.mjs index 861206f74fa9d6..b86559956b8e6a 100644 --- a/tools/check-re2.mjs +++ b/tools/check-re2.mjs @@ -1,5 +1,5 @@ await (async () => { - console.log('-n', 'Checking re2 ... '); + console.log('Checking re2 ... '); try { const { default: RE2 } = await import('re2'); new RE2('.*').exec('test'); diff --git a/tools/generate-imports.mjs b/tools/generate-imports.mjs index 076ee8bf9c809c..0e076c69e25ff4 100644 --- a/tools/generate-imports.mjs +++ b/tools/generate-imports.mjs @@ -1,7 +1,7 @@ import fs from 'fs-extra'; import { glob } from 'glob'; import hasha from 'hasha'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import upath from 'upath'; console.log('generating imports'); diff --git a/yarn.lock b/yarn.lock index 5eee49bfcd0bff..00e1689c7d45b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3043,11 +3043,6 @@ resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== -"@types/minimatch@5.1.2": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - "@types/minimist@^1.2.0": version "1.2.2" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" @@ -7616,13 +7611,6 @@ minimalistic-assert@^1.0.0: dependencies: brace-expansion "^1.1.7" -minimatch@5.1.6, minimatch@^5.0.1: - version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - minimatch@6.1.6: version "6.1.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.1.6.tgz#5384bb324be5b5dae12a567c03d22908febd0ddd" @@ -7630,6 +7618,20 @@ minimatch@6.1.6: dependencies: brace-expansion "^2.0.1" +minimatch@9.0.0, minimatch@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.0.tgz#bfc8e88a1c40ffd40c172ddac3decb8451503b56" + integrity sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w== + dependencies: + brace-expansion "^2.0.1" + +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + minimatch@^7.4.2, minimatch@^7.4.6: version "7.4.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb" @@ -7644,13 +7646,6 @@ minimatch@^8.0.2: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.0.tgz#bfc8e88a1c40ffd40c172ddac3decb8451503b56" - integrity sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w== - dependencies: - brace-expansion "^2.0.1" - minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"