Merge pull request #182 from bcomnes/beta

bcomnes · web-flow · commit afcc18a7c688 · 2025-05-25T07:24:17.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [v8.0.3](https://github.com/bcomnes/npm-run-all2/compare/v8.0.2...v8.0.3)
+## [v8.0.4-beta.0](https://github.com/bcomnes/npm-run-all2/compare/v8.0.3...v8.0.4-beta.0)
+
+### Merged
+
+- add tests for double stars [`#179`](https://github.com/bcomnes/npm-run-all2/pull/179)
+
+### Commits
+
+- Merge pull request #180 from bcomnes/simplify-lifecycles [`fb6721a`](https://github.com/bcomnes/npm-run-all2/commit/fb6721a1d537f0db9bb87645f158a573343c717a)
+- fix new test [`3c0d2b2`](https://github.com/bcomnes/npm-run-all2/commit/3c0d2b29e32c07f2a943d5c9451843a57664fcc8)
+- Improve npm lifecycles [`530288e`](https://github.com/bcomnes/npm-run-all2/commit/530288e7d2985dbb7dcc8f6f6347c0c761d3b4af)
+
+## [v8.0.3](https://github.com/bcomnes/npm-run-all2/compare/v8.0.2...v8.0.3) - 2025-05-20
 
 ### Commits
 
@@ -321,8 +333,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 ### Commits
 
-- 🐛 use pidtree [`1b41ac5`](https://github.com/bcomnes/npm-run-all2/commit/1b41ac569987c96e224f940ff59f9699322c7824)
 - ⬆️ update dependencies [`7ec542e`](https://github.com/bcomnes/npm-run-all2/commit/7ec542e95ceb922b9abe593270d9b6f8e0df4bc5)
+- 🐛 use pidtree [`1b41ac5`](https://github.com/bcomnes/npm-run-all2/commit/1b41ac569987c96e224f940ff59f9699322c7824)
 - 🔖 4.1.5 [`df15118`](https://github.com/bcomnes/npm-run-all2/commit/df1511851a2b5e8a406e4a2622829b360f671afc)
 
 ## [v4.1.4](https://github.com/bcomnes/npm-run-all2/compare/v4.1.3...v4.1.4) - 2018-11-24
diff --git a/lib/match-tasks.js b/lib/match-tasks.js
@@ -10,8 +10,7 @@
 // Requirements
 // ------------------------------------------------------------------------------
 
-const { minimatch } = require('minimatch')
-const Minimatch = minimatch.Minimatch
+const picomatch = require('picomatch')
 
 // ------------------------------------------------------------------------------
 // Helpers
@@ -21,7 +20,7 @@ const COLON_OR_SLASH = /[:/]/g
 const CONVERT_MAP = { ':': '/', '/': ':' }
 
 /**
- * Swaps ":" and "/", in order to use ":" as the separator in minimatch.
+ * Swaps ":" and "/", in order to use ":" as the separator in picomatch.
  *
  * @param {string} s - A text to swap.
  * @returns {string} The text which was swapped.
@@ -44,8 +43,10 @@ function createFilter (pattern) {
   const spacePos = trimmed.indexOf(' ')
   const task = spacePos < 0 ? trimmed : trimmed.slice(0, spacePos)
   const args = spacePos < 0 ? '' : trimmed.slice(spacePos)
-  const matcher = new Minimatch(swapColonAndSlash(task), { nonegate: true })
-  const match = matcher.match.bind(matcher)
+  const match = picomatch(swapColonAndSlash(task), {
+    nonegate: true,
+    strictSlashes: true,
+  })
 
   return { match, task, args }
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "npm-run-all2",
   "type": "commonjs",
-  "version": "8.0.3",
+  "version": "8.0.4-beta.0",
   "description": "A CLI tool to run multiple npm-scripts in parallel or sequential. (Maintenance fork)",
   "bin": {
     "run-p": "bin/run-p/index.js",
@@ -33,7 +33,7 @@
     "ansi-styles": "^6.2.1",
     "cross-spawn": "^7.0.6",
     "memorystream": "^0.3.1",
-    "minimatch": "^10.0.1",
+    "picomatch": "^4.0.2",
     "pidtree": "^0.6.0",
     "read-package-json-fast": "^4.0.0",
     "shell-quote": "^1.7.3",
diff --git a/test/pattern.js b/test/pattern.js
@@ -50,6 +50,24 @@ describe('[pattern] it should run matched tasks if glob like patterns are given.
     })
   })
 
+  describe('"test-task:append:**" to "test-task:append:a", "test-task:append:a:c", "test-task:append:a:d", and "test-task:append:b"', () => {
+    it('Node API', async () => {
+      await nodeApi('test-task:append:**')
+      assert(result() === 'aaacacadadbb')
+    })
+
+    it('npm-run-all command', async () => {
+      await runAll(['test-task:append:**'])
+      assert(result() === 'aaacacadadbb')
+    })
+
+    it('run-s command', async () => {
+      await runSeq(['test-task:append:**'])
+      assert(result() === 'aaacacadadbb')
+    })
+  })
+
+  // should act same way as section above
   describe('"test-task:append:**:*" to "test-task:append:a", "test-task:append:a:c", "test-task:append:a:d", and "test-task:append:b"', () => {
     it('Node API', async () => {
       await nodeApi('test-task:append:**:*')
