From b492214a9529158c140bd12f83f8c885b31b4fc9 Mon Sep 17 00:00:00 2001
From: Diego Avalon <diego.avalon@ehealth.com>
Date: Tue, 29 Oct 2024 14:26:40 -0500
Subject: [PATCH] fix(cli): #1966 Migrates blockset command dependency to use
 glob now supporting Promises and resolving error coming from now deprecated
 glob-promise dependency

---
 .changeset/tender-beers-shout.md     |  5 +++++
 package-lock.json                    | 29 ++--------------------------
 packages/faustwp-cli/package.json    |  1 -
 packages/faustwp-cli/src/blockset.ts |  2 +-
 4 files changed, 8 insertions(+), 29 deletions(-)
 create mode 100644 .changeset/tender-beers-shout.md

diff --git a/.changeset/tender-beers-shout.md b/.changeset/tender-beers-shout.md
new file mode 100644
index 000000000..78cf303ca
--- /dev/null
+++ b/.changeset/tender-beers-shout.md
@@ -0,0 +1,5 @@
+---
+'@faustwp/cli': patch
+---
+
+Migrates blockset command dependency to use glob now supporting Promises and resolving error coming from now deprecated glob-promise dependency
diff --git a/package-lock.json b/package-lock.json
index 676c0e74e..88aa1e0ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9357,6 +9357,7 @@
     },
     "node_modules/@types/minimatch": {
       "version": "5.1.2",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/@types/minimist": {
@@ -16516,31 +16517,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob-promise": {
-      "version": "6.0.5",
-      "license": "MIT",
-      "dependencies": {
-        "@types/glob": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://github.com/sponsors/ahmadnassri"
-      },
-      "peerDependencies": {
-        "glob": "^8.0.3"
-      }
-    },
-    "node_modules/glob-promise/node_modules/@types/glob": {
-      "version": "8.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "@types/minimatch": "^5.1.2",
-        "@types/node": "*"
-      }
-    },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "license": "BSD-2-Clause"
@@ -31646,7 +31622,6 @@
         "form-data": "^4.0.0",
         "fs-extra": "^11.1.1",
         "glob": "^10.3",
-        "glob-promise": "^6.0.5",
         "isomorphic-fetch": "^3.0.0",
         "lodash": "^4.17.21",
         "webpack-cli": "5.1.4"
@@ -36085,7 +36060,7 @@
     },
     "plugins/faustwp": {
       "name": "@faustwp/wordpress-plugin",
-      "version": "1.4.1"
+      "version": "1.5.0"
     }
   }
 }
diff --git a/packages/faustwp-cli/package.json b/packages/faustwp-cli/package.json
index b50e3e9e3..fca7e69ca 100644
--- a/packages/faustwp-cli/package.json
+++ b/packages/faustwp-cli/package.json
@@ -30,7 +30,6 @@
     "form-data": "^4.0.0",
     "fs-extra": "^11.1.1",
     "glob": "^10.3",
-    "glob-promise": "^6.0.5",
     "isomorphic-fetch": "^3.0.0",
     "lodash": "^4.17.21",
     "webpack-cli": "5.1.4"
diff --git a/packages/faustwp-cli/src/blockset.ts b/packages/faustwp-cli/src/blockset.ts
index b9dd4649e..07f50722c 100644
--- a/packages/faustwp-cli/src/blockset.ts
+++ b/packages/faustwp-cli/src/blockset.ts
@@ -1,7 +1,7 @@
 import fetch from 'isomorphic-fetch';
 import path from 'path';
 import fs from 'fs-extra';
-import glob from 'glob-promise';
+import { glob } from 'glob';
 import FormData from 'form-data';
 import archiver from 'archiver';
 import { spawnSync } from 'child_process';