From a5415fd8309e9572de428f002f5819b9d32b8f5f Mon Sep 17 00:00:00 2001 From: Scott Twiname Date: Mon, 11 Aug 2025 13:34:40 +1200 Subject: [PATCH] Update minimatch and add dependency to the correct packages --- packages/parser/package.json | 1 - packages/telescope/package.json | 2 +- packages/telescope/src/utils/files.ts | 2 +- packages/utils/package.json | 3 ++- packages/utils/src/proto.ts | 2 +- packages/utils/src/utils.ts | 2 +- yarn.lock | 26 +++++++++++++++++++------- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/packages/parser/package.json b/packages/parser/package.json index 2875b40ba9..944287eecd 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -79,7 +79,6 @@ "dotty": "0.1.2", "fast-json-patch": "3.1.1", "glob": "8.0.3", - "minimatch": "5.1.0", "mkdirp": "3.0.0" } } diff --git a/packages/telescope/package.json b/packages/telescope/package.json index d363be31d9..00469a3f20 100644 --- a/packages/telescope/package.json +++ b/packages/telescope/package.json @@ -104,7 +104,7 @@ "glob": "8.0.3", "inquirerer": "0.1.3", "long": "^5.2.1", - "minimatch": "5.1.0", + "minimatch": "10.0.3", "minimist": "1.2.8", "mkdirp": "3.0.0", "parse-package-name": "1.0.0", diff --git a/packages/telescope/src/utils/files.ts b/packages/telescope/src/utils/files.ts index 54e170ace1..a917828eea 100644 --- a/packages/telescope/src/utils/files.ts +++ b/packages/telescope/src/utils/files.ts @@ -4,7 +4,7 @@ import { TelescopeOptions } from "@cosmology/types"; import { mkdirp } from "mkdirp"; import { writeFileSync } from "fs"; import { dirname } from "path"; -import minimatch from "minimatch"; +import { minimatch } from "minimatch"; import generate from "@babel/generator"; import { unused } from "./unused"; import traverse from "@babel/traverse"; diff --git a/packages/utils/package.json b/packages/utils/package.json index 9f0ef438ad..d4cf27dfa3 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -75,6 +75,7 @@ }, "dependencies": { "@cosmology/types": "^1.13.0", - "dotty": "0.1.2" + "dotty": "0.1.2", + "minimatch": "10.0.3" } } diff --git a/packages/utils/src/proto.ts b/packages/utils/src/proto.ts index f93a58db29..d5e4d244b6 100644 --- a/packages/utils/src/proto.ts +++ b/packages/utils/src/proto.ts @@ -1,6 +1,6 @@ import { camel, variableSlug } from "."; import { pascal, snake } from "case"; -import minimatch from "minimatch"; +import { minimatch } from "minimatch"; import { ProtoField, ProtoRef, diff --git a/packages/utils/src/utils.ts b/packages/utils/src/utils.ts index 7bf07bfded..de306d1cee 100644 --- a/packages/utils/src/utils.ts +++ b/packages/utils/src/utils.ts @@ -1,4 +1,4 @@ -import minimatch from "minimatch"; +import { minimatch } from "minimatch"; import { TelescopeOptions, TelescopeOption, diff --git a/yarn.lock b/yarn.lock index c692d5beb9..b504646169 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1958,6 +1958,18 @@ resolved "https://registry.npmjs.org/@iov/utils/-/utils-2.0.2.tgz" integrity sha512-4D8MEvTcFc/DVy5q25vHxRItmgJyeX85dixMH+MxdKr+yy71h3sYk+sVBEIn70uqGP7VqAJkGOPNFs08/XYELw== +"@isaacs/balanced-match@^4.0.1": + version "4.0.1" + resolved "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29" + integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ== + +"@isaacs/brace-expansion@^5.0.0": + version "5.0.0" + resolved "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3" + integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA== + dependencies: + "@isaacs/balanced-match" "^4.0.1" + "@isaacs/cliui@^8.0.2": version "8.0.2" resolved "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz" @@ -7064,6 +7076,13 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz" integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== +minimatch@10.0.3: + version "10.0.3" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz#cf7a0314a16c4d9ab73a7730a0e8e3c3502d47aa" + integrity sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw== + dependencies: + "@isaacs/brace-expansion" "^5.0.0" + minimatch@3.0.5: version "3.0.5" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz" @@ -7071,13 +7090,6 @@ minimatch@3.0.5: dependencies: brace-expansion "^1.1.7" -minimatch@5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== - dependencies: - brace-expansion "^2.0.1" - minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"