From 98d12e7f87909f2aa4d6b5d82e850979650b8d9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 21:22:05 -0600 Subject: [PATCH] Bump minimatch from 9.0.3 to 10.0.1 (#805) * Bump minimatch from 9.0.3 to 10.0.1 Bumps [minimatch](https://github.com/isaacs/minimatch) from 9.0.3 to 10.0.1. - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](https://github.com/isaacs/minimatch/compare/v9.0.3...v10.0.1) --- updated-dependencies: - dependency-name: minimatch dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * check failues fix --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aparna Jyothi --- .licenses/npm/minimatch.dep.yml | 2 +- dist/index.js | 51 +++++++++++++++++++-------------- package-lock.json | 31 ++++++++++++++------ package.json | 2 +- 4 files changed, 55 insertions(+), 31 deletions(-) diff --git a/.licenses/npm/minimatch.dep.yml b/.licenses/npm/minimatch.dep.yml index b446c8a2..09eb8141 100644 --- a/.licenses/npm/minimatch.dep.yml +++ b/.licenses/npm/minimatch.dep.yml @@ -1,6 +1,6 @@ --- name: minimatch -version: 9.0.3 +version: 10.0.1 type: npm summary: a glob matcher in javascript homepage: diff --git a/dist/index.js b/dist/index.js index 60e2be43..de1de574 100644 --- a/dist/index.js +++ b/dist/index.js @@ -564,7 +564,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.checkIfAllGlobsMatchAllFiles = exports.checkIfAnyGlobMatchesAllFiles = exports.checkIfAllGlobsMatchAnyFile = exports.checkIfAnyGlobMatchesAnyFile = exports.checkAllChangedFiles = exports.checkAnyChangedFiles = exports.toChangedFilesMatchConfig = exports.getChangedFiles = void 0; const core = __importStar(__nccwpck_require__(2186)); const github = __importStar(__nccwpck_require__(5438)); -const minimatch_1 = __nccwpck_require__(1953); +const minimatch_1 = __nccwpck_require__(4501); const utils_1 = __nccwpck_require__(918); const ALLOWED_FILES_CONFIG_KEYS = [ 'any-glob-to-any-file', @@ -39810,7 +39810,7 @@ module.exports = require("zlib"); /***/ }), -/***/ 903: +/***/ 4149: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -39831,7 +39831,7 @@ exports.assertValidPattern = assertValidPattern; /***/ }), -/***/ 3839: +/***/ 5136: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -39839,8 +39839,8 @@ exports.assertValidPattern = assertValidPattern; // parse a single path portion Object.defineProperty(exports, "__esModule", ({ value: true })); exports.AST = void 0; -const brace_expressions_js_1 = __nccwpck_require__(5822); -const unescape_js_1 = __nccwpck_require__(7305); +const brace_expressions_js_1 = __nccwpck_require__(1812); +const unescape_js_1 = __nccwpck_require__(5698); const types = new Set(['!', '?', '+', '*', '@']); const isExtglobType = (c) => types.has(c); // Patterns that get prepended to bind to the start of either the @@ -40175,6 +40175,9 @@ class AST { _glob: glob, }); } + get options() { + return this.#options; + } // returns the string match, the regexp source, whether there's magic // in the regexp (so a regular expression is required) and whether or // not the uflag is needed for the regular expression (for posix classes) @@ -40427,7 +40430,7 @@ exports.AST = AST; /***/ }), -/***/ 5822: +/***/ 1812: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -40586,7 +40589,7 @@ exports.parseClass = parseClass; /***/ }), -/***/ 9004: +/***/ 2804: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -40615,7 +40618,7 @@ exports.escape = escape; /***/ }), -/***/ 1953: +/***/ 4501: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { "use strict"; @@ -40626,10 +40629,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.unescape = exports.escape = exports.AST = exports.Minimatch = exports.match = exports.makeRe = exports.braceExpand = exports.defaults = exports.filter = exports.GLOBSTAR = exports.sep = exports.minimatch = void 0; const brace_expansion_1 = __importDefault(__nccwpck_require__(3717)); -const assert_valid_pattern_js_1 = __nccwpck_require__(903); -const ast_js_1 = __nccwpck_require__(3839); -const escape_js_1 = __nccwpck_require__(9004); -const unescape_js_1 = __nccwpck_require__(7305); +const assert_valid_pattern_js_1 = __nccwpck_require__(4149); +const ast_js_1 = __nccwpck_require__(5136); +const escape_js_1 = __nccwpck_require__(2804); +const unescape_js_1 = __nccwpck_require__(5698); const minimatch = (p, pattern, options = {}) => { (0, assert_valid_pattern_js_1.assertValidPattern)(pattern); // shortcut: comments match nothing. @@ -40965,6 +40968,7 @@ class Minimatch { globParts = this.levelOneOptimize(globParts); } else { + // just collapse multiple ** portions into one globParts = this.adjascentGlobstarOptimize(globParts); } return globParts; @@ -41151,10 +41155,11 @@ class Minimatch { for (let i = 0; i < globParts.length - 1; i++) { for (let j = i + 1; j < globParts.length; j++) { const matched = this.partsMatch(globParts[i], globParts[j], !this.preserveMultipleSlashes); - if (!matched) - continue; - globParts[i] = matched; - globParts[j] = []; + if (matched) { + globParts[i] = []; + globParts[j] = matched; + break; + } } } return globParts.filter(gs => gs.length); @@ -41454,7 +41459,11 @@ class Minimatch { fastTest = dotStarTest; } const re = ast_js_1.AST.fromGlob(pattern, this.options).toMMPattern(); - return fastTest ? Object.assign(re, { test: fastTest }) : re; + if (fastTest && typeof re === 'object') { + // Avoids overriding in frozen environments + Reflect.defineProperty(re, 'test', { value: fastTest }); + } + return re; } makeRe() { if (this.regexp || this.regexp === false) @@ -41618,11 +41627,11 @@ class Minimatch { } exports.Minimatch = Minimatch; /* c8 ignore start */ -var ast_js_2 = __nccwpck_require__(3839); +var ast_js_2 = __nccwpck_require__(5136); Object.defineProperty(exports, "AST", ({ enumerable: true, get: function () { return ast_js_2.AST; } })); -var escape_js_2 = __nccwpck_require__(9004); +var escape_js_2 = __nccwpck_require__(2804); Object.defineProperty(exports, "escape", ({ enumerable: true, get: function () { return escape_js_2.escape; } })); -var unescape_js_2 = __nccwpck_require__(7305); +var unescape_js_2 = __nccwpck_require__(5698); Object.defineProperty(exports, "unescape", ({ enumerable: true, get: function () { return unescape_js_2.unescape; } })); /* c8 ignore stop */ exports.minimatch.AST = ast_js_1.AST; @@ -41633,7 +41642,7 @@ exports.minimatch.unescape = unescape_js_1.unescape; /***/ }), -/***/ 7305: +/***/ 5698: /***/ ((__unused_webpack_module, exports) => { "use strict"; diff --git a/package-lock.json b/package-lock.json index 46f8ff62..c2b71f9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@octokit/plugin-retry": "^6.0.0", "js-yaml": "^4.1.0", "lodash.isequal": "^4.5.0", - "minimatch": "^9.0.3" + "minimatch": "^10.0.1" }, "devDependencies": { "@types/jest": "^29.5.12", @@ -1806,6 +1806,21 @@ } } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@typescript-eslint/utils": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.3.1.tgz", @@ -2354,9 +2369,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -4333,14 +4348,14 @@ } }, "node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" diff --git a/package.json b/package.json index d30acf32..b1f2858d 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@octokit/plugin-retry": "^6.0.0", "js-yaml": "^4.1.0", "lodash.isequal": "^4.5.0", - "minimatch": "^9.0.3" + "minimatch": "^10.0.1" }, "devDependencies": { "@types/jest": "^29.5.12",