From 376f200a9f162b9bd91f210522bbb7369e000bda Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 27 Nov 2023 19:10:21 -0800
Subject: [PATCH] fix: update esmock and remove --loader option

---
 .aegir.js         |  2 +-
 package-lock.json | 37 ++++++++-----------------------------
 package.json      |  2 +-
 3 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/.aegir.js b/.aegir.js
index 9c0dea8..6e4e8a8 100644
--- a/.aegir.js
+++ b/.aegir.js
@@ -48,7 +48,7 @@ export default {
         server,
         env: {
           IPFS_GATEWAY: gwUrl,
-          NODE_OPTIONS: '--loader=esmock'
+          // NODE_OPTIONS: `--import 'data:text/javascript,import { register } from "node:module"; import { pathToFileURL } from "node:url"; register("esmock", pathToFileURL("./"));`
         }
       }
     },
diff --git a/package-lock.json b/package-lock.json
index ac79fbc..518d383 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "chai-as-promised": "^7.1.1",
         "cross-fetch": "^3.1.5",
         "csv-parse": "^5.3.0",
-        "esmock": "^2.0.6",
+        "esmock": "^2.6.0",
         "gauge": "^4.0.4",
         "ip": "^2.0.0",
         "it-concat": "^2.0.0",
@@ -8340,13 +8340,10 @@
       }
     },
     "node_modules/esmock": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/esmock/-/esmock-2.0.6.tgz",
-      "integrity": "sha512-2EY6isqPxZ9xm/nPz7DE5u/M5Nt3Xq4WUTOT5Dv9sfaqim6HZ6hitpEEfrSKAryA1JsnF/YljSRo2MZCtx0LTw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/esmock/-/esmock-2.6.0.tgz",
+      "integrity": "sha512-PFcxAm5bzPckh9V6s78FW+WaR/J+1R9K6vlItFOIFqNn+3w1pgo/HEEOJ2HBwVdrEnO7xXBgGUcFoNsdTU599A==",
       "dev": true,
-      "dependencies": {
-        "resolvewithplus": "^1.0.2"
-      },
       "engines": {
         "node": ">=14.16.0"
       }
@@ -19817,15 +19814,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/resolvewithplus": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/resolvewithplus/-/resolvewithplus-1.0.2.tgz",
-      "integrity": "sha512-UNvTSqWpe1lhKvXb+Qo97Q/dFUtA0kDuUG/gO7S+P9H/xYZ+A9pwlAbY6Dqp2tgAeQNdHmQG5MdNL6d9/FWo6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.16.0"
-      }
-    },
     "node_modules/responselike": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
@@ -28954,13 +28942,10 @@
       "dev": true
     },
     "esmock": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/esmock/-/esmock-2.0.6.tgz",
-      "integrity": "sha512-2EY6isqPxZ9xm/nPz7DE5u/M5Nt3Xq4WUTOT5Dv9sfaqim6HZ6hitpEEfrSKAryA1JsnF/YljSRo2MZCtx0LTw==",
-      "dev": true,
-      "requires": {
-        "resolvewithplus": "^1.0.2"
-      }
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/esmock/-/esmock-2.6.0.tgz",
+      "integrity": "sha512-PFcxAm5bzPckh9V6s78FW+WaR/J+1R9K6vlItFOIFqNn+3w1pgo/HEEOJ2HBwVdrEnO7xXBgGUcFoNsdTU599A==",
+      "dev": true
     },
     "espree": {
       "version": "7.3.1",
@@ -37092,12 +37077,6 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "resolvewithplus": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/resolvewithplus/-/resolvewithplus-1.0.2.tgz",
-      "integrity": "sha512-UNvTSqWpe1lhKvXb+Qo97Q/dFUtA0kDuUG/gO7S+P9H/xYZ+A9pwlAbY6Dqp2tgAeQNdHmQG5MdNL6d9/FWo6Q==",
-      "dev": true
-    },
     "responselike": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
diff --git a/package.json b/package.json
index 33b3d0b..dfb4ffd 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "chai-as-promised": "^7.1.1",
     "cross-fetch": "^3.1.5",
     "csv-parse": "^5.3.0",
-    "esmock": "^2.0.6",
+    "esmock": "^2.6.0",
     "gauge": "^4.0.4",
     "ip": "^2.0.0",
     "it-concat": "^2.0.0",