From b51fbb63916cf6d1be94d3f05538ec2d427da15d Mon Sep 17 00:00:00 2001 From: ilyakhd <14272298+IlyaKhD@users.noreply.github.com> Date: Tue, 6 Oct 2026 20:04:19 +0300 Subject: [PATCH] chore(deps): replace micromatch with picomatch (direct dep) --- packages/code-scanning/package.json | 4 +- .../code-scanning/src/validate-lock-files.ts | 4 +- packages/common/package.json | 3 +- packages/common/src/path-utils.ts | 7 +- pnpm-lock.yaml | 85 ++++++------------- 5 files changed, 34 insertions(+), 69 deletions(-) diff --git a/packages/code-scanning/package.json b/packages/code-scanning/package.json index 66c564d..691444f 100644 --- a/packages/code-scanning/package.json +++ b/packages/code-scanning/package.json @@ -19,10 +19,10 @@ }, "devDependencies": { "@types/jest": "catalog:", - "@types/micromatch": "^4.0.10", "@types/node": "catalog:", + "@types/picomatch": "^4.0.3", "json5": "^2.2.3", - "micromatch": "^4.0.8", + "picomatch": "^4.0.7", "rimraf": "catalog:", "ts-jest": "catalog:", "tsx": "^4.23.11", diff --git a/packages/code-scanning/src/validate-lock-files.ts b/packages/code-scanning/src/validate-lock-files.ts index cd05b07..a91bdbe 100644 --- a/packages/code-scanning/src/validate-lock-files.ts +++ b/packages/code-scanning/src/validate-lock-files.ts @@ -1,6 +1,6 @@ import * as path from 'path'; import * as yaml from 'yaml'; -import * as micromatch from 'micromatch'; +import * as picomatch from 'picomatch'; import { FileSystem, NodeFileSystem } from './file-system'; import { @@ -133,7 +133,7 @@ export async function discoverLockFiles( if (!relativePath || relativePath === '.') return false; const packageDir = path.dirname(relativePath); - return micromatch.isMatch(packageDir, workspace.patterns, { dot: true, matchBase: false }); + return picomatch.isMatch(packageDir, workspace.patterns, { dot: true, matchBase: false, posix: true }); } // Find lock files in current or parent directories up to rootPath diff --git a/packages/common/package.json b/packages/common/package.json index 67be061..3bb5a35 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -17,7 +17,8 @@ "@actions/github": "catalog:", "@types/jest": "catalog:", "@types/node": "catalog:", - "minimatch": "^10.2.5", + "@types/picomatch": "^4.0.3", + "picomatch": "^4.0.7", "rimraf": "catalog:", "typescript": "catalog:" } diff --git a/packages/common/src/path-utils.ts b/packages/common/src/path-utils.ts index 08989b1..4fadd5e 100644 --- a/packages/common/src/path-utils.ts +++ b/packages/common/src/path-utils.ts @@ -1,13 +1,14 @@ import * as core from '@actions/core' -import { MinimatchOptions, minimatch } from "minimatch"; +import * as picomatch from 'picomatch'; const NEGATION = '!'; -const matchOptions: MinimatchOptions = { +const matchOptions: picomatch.PicomatchOptions = { dot: true, + posix: true, } function match(path: string, pattern: string): boolean { - return minimatch(path.replace(/\\/g, '/'), pattern, matchOptions); + return picomatch.isMatch(path.replace(/\\/g, '/'), pattern, matchOptions); } export function filterPaths( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f85b26..3c32910 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -62,18 +62,18 @@ importers: '@types/jest': specifier: 'catalog:' version: 30.0.0 - '@types/micromatch': - specifier: ^4.0.10 - version: 4.0.10 '@types/node': specifier: 'catalog:' version: 24.13.2 + '@types/picomatch': + specifier: ^4.0.3 + version: 4.0.3 json5: specifier: ^2.2.3 version: 2.2.3 - micromatch: - specifier: ^4.0.8 - version: 4.0.8 + picomatch: + specifier: ^4.0.7 + version: 4.0.7 rimraf: specifier: 'catalog:' version: 6.1.3 @@ -107,9 +107,12 @@ importers: '@types/node': specifier: 'catalog:' version: 24.13.2 - minimatch: - specifier: ^10.2.5 - version: 10.2.5 + '@types/picomatch': + specifier: ^4.0.3 + version: 4.0.3 + picomatch: + specifier: ^4.0.7 + version: 4.0.7 rimraf: specifier: 'catalog:' version: 6.1.3 @@ -828,9 +831,6 @@ packages: '@types/babel__traverse@7.28.0': resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==} - '@types/braces@3.0.5': - resolution: {integrity: sha512-SQFof9H+LXeWNz8wDe7oN5zu7ket0qwMu5vZubW4GCJ8Kkeh6nBWUz87+KTz/G3Kqsrp0j/W253XJb3KMEeg3w==} - '@types/istanbul-lib-coverage@2.0.6': resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==} @@ -843,15 +843,15 @@ packages: '@types/jest@30.0.0': resolution: {integrity: sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==} - '@types/micromatch@4.0.10': - resolution: {integrity: sha512-5jOhFDElqr4DKTrTEbnW8DZ4Hz5LRUEmyrGpCMrD/NphYv3nUnaF08xmSLx1rGGnyEs/kFnhiw6dCgcDqMr5PQ==} - '@types/node@24.13.2': resolution: {integrity: sha512-fRa09kZTgu8o71KFcDjUFuc7F+dEbZYZmkI0mg5YBTRs0yMKjYHsq/c0urDKeDb+D5qVgXOdFcuu+DZPKOITwA==} '@types/node@26.0.0': resolution: {integrity: sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==} + '@types/picomatch@4.0.3': + resolution: {integrity: sha512-iG0T6+nYJ9FAPmx9SsUlnwcq1ZVRuCXcVEvWnntoPlrOpwtSTKNDC9uVAxTsC3PUvJ+99n4RpAcNgBbHX3JSnQ==} + '@types/semver@7.7.1': resolution: {integrity: sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==} @@ -1082,10 +1082,6 @@ packages: resolution: {integrity: sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==} engines: {node: 20 || >=22} - braces@3.0.3: - resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} - engines: {node: '>=8'} - browserslist@4.28.8: resolution: {integrity: sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -1278,10 +1274,6 @@ packages: fb-watchman@2.0.2: resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==} - fill-range@7.1.1: - resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} - engines: {node: '>=8'} - find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} @@ -1417,10 +1409,6 @@ packages: resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==} engines: {node: '>=6'} - is-number@7.0.0: - resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} - engines: {node: '>=0.12.0'} - is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} @@ -1643,10 +1631,6 @@ packages: merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - micromatch@4.0.8: - resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} - engines: {node: '>=8.6'} - mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} @@ -1770,6 +1754,10 @@ packages: resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==} engines: {node: '>=12'} + picomatch@4.0.7: + resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} + engines: {node: '>=12'} + pirates@4.0.7: resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} engines: {node: '>= 6'} @@ -1910,10 +1898,6 @@ packages: tmpl@1.0.5: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} - to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} - ts-jest@29.4.11: resolution: {integrity: sha512-IrFl7l9AuB/qrNw5quqvAv/hmKMb8dhWOH4jQOGo0Oq8tCeo1O86/iTFG1FaRimgUkF13l4PcepO8ATFT6Ns4g==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} @@ -2679,8 +2663,6 @@ snapshots: dependencies: '@babel/types': 7.29.7 - '@types/braces@3.0.5': {} - '@types/istanbul-lib-coverage@2.0.6': {} '@types/istanbul-lib-report@3.0.3': @@ -2696,10 +2678,6 @@ snapshots: expect: 30.4.1 pretty-format: 30.4.1 - '@types/micromatch@4.0.10': - dependencies: - '@types/braces': 3.0.5 - '@types/node@24.13.2': dependencies: undici-types: 7.18.2 @@ -2708,6 +2686,8 @@ snapshots: dependencies: undici-types: 8.3.0 + '@types/picomatch@4.0.3': {} + '@types/semver@7.7.1': {} '@types/stack-utils@2.0.3': {} @@ -2908,10 +2888,6 @@ snapshots: dependencies: balanced-match: 4.0.4 - braces@3.0.3: - dependencies: - fill-range: 7.1.1 - browserslist@4.28.8: dependencies: baseline-browser-mapping: 2.11.20 @@ -3101,10 +3077,6 @@ snapshots: dependencies: bser: 2.1.1 - fill-range@7.1.1: - dependencies: - to-regex-range: 5.0.1 - find-up@4.1.0: dependencies: locate-path: 5.0.0 @@ -3240,8 +3212,6 @@ snapshots: is-generator-fn@2.1.0: {} - is-number@7.0.0: {} - is-stream@2.0.1: {} isexe@2.0.0: {} @@ -3460,7 +3430,7 @@ snapshots: chalk: 4.1.2 graceful-fs: 4.2.11 jest-util: 30.4.1 - picomatch: 4.0.4 + picomatch: 4.0.7 pretty-format: 30.4.1 slash: 3.0.0 stack-utils: 2.0.6 @@ -3672,11 +3642,6 @@ snapshots: merge-stream@2.0.0: {} - micromatch@4.0.8: - dependencies: - braces: 3.0.3 - picomatch: 2.3.2 - mime-db@1.52.0: {} mime-types@2.1.35: @@ -3779,6 +3744,8 @@ snapshots: picomatch@4.0.4: {} + picomatch@4.0.7: {} + pirates@4.0.7: {} pkg-dir@4.2.0: @@ -3895,10 +3862,6 @@ snapshots: tmpl@1.0.5: {} - to-regex-range@5.0.1: - dependencies: - is-number: 7.0.0 - ts-jest@29.4.11(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.4.1(supports-color@8.1.1))(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.4.2(@types/node@24.13.2)(supports-color@8.1.1))(typescript@5.9.3): dependencies: bs-logger: 0.2.6