From be94de0e8c379249873c6169f0a68b7854326264 Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 11 Jun 2025 11:24:11 -0700 Subject: [PATCH 1/4] update ci versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b9d3a7b..a01c183c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,10 +25,10 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v1.1.0 + uses: actions/checkout@v4 - name: Use Nodejs ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} From 41cb7dde009103bdb665107bfa757ff90cd60c69 Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 12 Jun 2025 13:16:43 -0700 Subject: [PATCH 2/4] ci: update typedoc action versions --- .github/workflows/typedoc.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/typedoc.yml b/.github/workflows/typedoc.yml index e5bc0ef8..336ab733 100644 --- a/.github/workflows/typedoc.yml +++ b/.github/workflows/typedoc.yml @@ -31,20 +31,20 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Use Nodejs ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: 20.x - name: Install dependencies run: npm install - name: Generate typedocs run: npm run typedoc - name: Setup Pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v4 - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: path: './docs' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 From 4fba25e32a2bc96d5d25d117369c30e0b89751d1 Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 12 Jun 2025 13:18:53 -0700 Subject: [PATCH 3/4] Use @isaacs/brace-expansion Fix: #257 --- package-lock.json | 44 ++++++++++++++++++++++---------------------- package.json | 8 ++++---- src/index.ts | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e45224f..fb986ef8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "10.0.2", "license": "ISC", "dependencies": { - "brace-expansion": "^4.0.1" + "@isaacs/brace-expansion": "^5.0.0" }, "devDependencies": { "@types/brace-expansion": "^1.1.2", @@ -85,6 +85,27 @@ "@shikijs/vscode-textmate": "^10.0.2" } }, + "node_modules/@isaacs/balanced-match": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", + "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", + "license": "MIT", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@isaacs/brace-expansion": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", + "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", + "license": "MIT", + "dependencies": { + "@isaacs/balanced-match": "^4.0.1" + }, + "engines": { + "node": "20 || >=22" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1394,15 +1415,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/balanced-match": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-3.0.1.tgz", - "integrity": "sha512-vjtV3hiLqYDNRoiAv0zC4QaGAMPomEoq83PRmYIofPswwZurCeWR5LByXm7SyoL0Zh5+2z0+HC7jG8gSZJUh0w==", - "license": "MIT", - "engines": { - "node": ">= 16" - } - }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -1416,18 +1428,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/brace-expansion": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-4.0.1.tgz", - "integrity": "sha512-YClrbvTCXGe70pU2JiEiPLYXO9gQkyxYeKpJIQHVS/gOs6EWMQP2RYBwjFLNT322Ji8TOC3IMPfsYCedNpzKfA==", - "license": "MIT", - "dependencies": { - "balanced-match": "^3.0.0" - }, - "engines": { - "node": ">= 18" - } - }, "node_modules/braces": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", diff --git a/package.json b/package.json index a055dd70..3352c7da 100644 --- a/package.json +++ b/package.json @@ -52,9 +52,6 @@ "engines": { "node": "20 || >=22" }, - "dependencies": { - "brace-expansion": "^4.0.1" - }, "devDependencies": { "@types/brace-expansion": "^1.1.2", "@types/node": "^24.0.0", @@ -75,5 +72,8 @@ } }, "type": "module", - "module": "./dist/esm/index.js" + "module": "./dist/esm/index.js", + "dependencies": { + "@isaacs/brace-expansion": "^5.0.0" + } } diff --git a/src/index.ts b/src/index.ts index 74efd1fc..9ad06c46 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import expand from 'brace-expansion' +import { expand } from '@isaacs/brace-expansion' import { assertValidPattern } from './assert-valid-pattern.js' import { AST, ExtglobType } from './ast.js' import { escape } from './escape.js' From 2c65ee2c57964cae0ad55a612e2c76dfff7cb16a Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 12 Jun 2025 13:19:10 -0700 Subject: [PATCH 4/4] 10.0.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb986ef8..cea64961 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "minimatch", - "version": "10.0.2", + "version": "10.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "minimatch", - "version": "10.0.2", + "version": "10.0.3", "license": "ISC", "dependencies": { "@isaacs/brace-expansion": "^5.0.0" diff --git a/package.json b/package.json index 3352c7da..bfa2423f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Isaac Z. Schlueter (http://blog.izs.me)", "name": "minimatch", "description": "a glob matcher in javascript", - "version": "10.0.2", + "version": "10.0.3", "repository": { "type": "git", "url": "git://github.com/isaacs/minimatch.git"