From d67fa3f45a114e9ea23d8d9bcf2196d35219e8bc Mon Sep 17 00:00:00 2001 From: isaacs Date: Mon, 13 Feb 2023 00:20:09 -0800 Subject: [PATCH 1/2] do not create empty patterns via .. --- src/index.ts | 7 ++++--- test/basic.js | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index 89cbff06..8f4084c8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -397,8 +397,8 @@ export class Minimatch { } } while (swapped) } - this.globParts = rawGlobParts.map(parts => - parts.reduce((set: string[], part) => { + this.globParts = rawGlobParts.map(parts => { + parts = parts.reduce((set: string[], part) => { const prev = set[set.length - 1] if (part === '**' && prev === '**') { return set @@ -412,7 +412,8 @@ export class Minimatch { set.push(part) return set }, []) - ) + return parts.length === 0 ? [''] : parts + }) } this.debug(this.pattern, this.globParts) diff --git a/test/basic.js b/test/basic.js index 6bc30ea4..5b3e9940 100644 --- a/test/basic.js +++ b/test/basic.js @@ -221,3 +221,9 @@ t.test('globstar re matches zero or more path portions', t => { } t.end() }) + +t.test('do not create empty pattern via ..', t =>{ + const m = new mm.Minimatch('*/..') + t.same(m.globParts, [['']]) + t.end() +}) From 6b9f9b0d4db3e214835279deeb355a989887b440 Mon Sep 17 00:00:00 2001 From: isaacs Date: Mon, 13 Feb 2023 00:20:17 -0800 Subject: [PATCH 2/2] 6.1.10 --- 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 3cf1d8b3..cceedcf6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "minimatch", - "version": "6.1.9", + "version": "6.1.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "minimatch", - "version": "6.1.9", + "version": "6.1.10", "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" diff --git a/package.json b/package.json index 6c9a55e6..d90d6ebd 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": "6.1.9", + "version": "6.1.10", "repository": { "type": "git", "url": "git://github.com/isaacs/minimatch.git"