From 1ada47bc60e686c0e97533233eb64e10567e18b0 Mon Sep 17 00:00:00 2001
From: Mark Stosberg <mark@rideamigos.com>
Date: Sun, 3 Sep 2023 14:40:52 -0400
Subject: [PATCH] refactor: remove bluebird dep

Also, update eslintrc to support arrow notation.

Ref: https://github.com/TryGhost/Ghost/issues/14882
---
 .eslintrc       |  4 ++++
 lib/resolver.js | 21 ++++++++++++++-------
 package.json    |  4 +++-
 yarn.lock       |  5 -----
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index c2c756f..68aa8c2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,6 +3,10 @@
     "node": true
   },
 
+  "parserOptions": {
+    "ecmaVersion": 2022,
+  },
+
   "globals": {
     "describe": true,
     "beforeEach": true,
diff --git a/lib/resolver.js b/lib/resolver.js
index 5a51331..7620329 100644
--- a/lib/resolver.js
+++ b/lib/resolver.js
@@ -1,7 +1,5 @@
 'use strict';
 
-var Promise = require('bluebird');
-
 var generateId = require('./generate-id');
 
 var ID_LENGTH = 8;
@@ -28,12 +26,21 @@ function resolve(cache, fn, context) {
   return id;
 }
 
+// cache is an object where the keys are cache keys and values are promises. See above.
 function done(cache, callback) {
-  Promise.props(cache).then(function(values) {
-    callback(null, values);
-  }).catch(function(error) {
-    callback(error);
-  });
+  return Promise.all(Object.values(cache)).then((values) => {
+    const resolvedCache = {};
+    const keys = Object.keys(cache);
+    if (typeof values != 'undefined') {
+      values.forEach((value, index) => {
+        resolvedCache[keys[index]] = value;
+      });
+      return callback(null, resolvedCache);
+    }
+    return callback(null, {});
+  }).catch((error) => {
+    return callback(error);
+  })
 }
 
 function hasResolvers(text) {
diff --git a/package.json b/package.json
index 3a9e0df..113c45d 100644
--- a/package.json
+++ b/package.json
@@ -39,12 +39,14 @@
     "supertest": "6.3.3"
   },
   "dependencies": {
-    "bluebird": "^3.5.3",
     "handlebars": "^4.7.7",
     "lodash": "^4.17.21",
     "readdirp": "^3.6.0"
   },
   "optionalDependencies": {
     "js-beautify": "^1.13.11"
+  },
+  "engines": {
+    "node": ">=16"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c60ece9..1e2d6a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -477,11 +477,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bluebird@^3.5.3:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 body-parser@1.20.1:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"