From 01712c3f237019b6b676d3421a80e46c33900a6c Mon Sep 17 00:00:00 2001
From: Bruno Windels <bruno@windels.cloud>
Date: Tue, 5 Oct 2021 19:28:19 +0200
Subject: [PATCH] make tests run again

---
 package.json                                  |  2 +-
 .../session/room/timeline/deserialize.js      |  3 ++-
 src/mocks/Storage.ts                          |  4 +--
 yarn.lock                                     | 25 ++++++++-----------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index edf2e673..e9c9e991 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "lint-ci": "eslint src/",
     "test": "impunity --entry-point src/platform/web/main.js --force-esm-dirs src/",
     "start": "snowpack dev --port 3000",
-    "build": "node --experimental-modules scripts/build.mjs"
+    "test": "impunity --entry-point src/platform/web/main.js --force-esm-dirs src/ --root-dir src/",
   },
   "repository": {
     "type": "git",
diff --git a/src/domain/session/room/timeline/deserialize.js b/src/domain/session/room/timeline/deserialize.js
index ecddb5b7..9421f8f1 100644
--- a/src/domain/session/room/timeline/deserialize.js
+++ b/src/domain/session/room/timeline/deserialize.js
@@ -352,7 +352,8 @@ export function parseHTMLBody(platform, mediaRepository, allowReplies, html) {
     return new MessageBody(html, parts);
 }
 
-import parse from "node-html-parser";
+import nodeHtmlParser from "node-html-parser";
+const {parse} = nodeHtmlParser;
 
 export function tests() {
     class HTMLParseResult {
diff --git a/src/mocks/Storage.ts b/src/mocks/Storage.ts
index 0d8db7f0..2760c061 100644
--- a/src/mocks/Storage.ts
+++ b/src/mocks/Storage.ts
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {FDBFactory} from "fake-indexeddb/lib/FDBFactory.js";
-import {FDBKeyRange} from "fake-indexeddb/lib/FDBKeyRange.js";
+import FDBFactory from "fake-indexeddb/lib/FDBFactory.js";
+import FDBKeyRange from "fake-indexeddb/lib/FDBKeyRange.js";
 import {StorageFactory} from "../matrix/storage/idb/StorageFactory";
 import {IDOMStorage} from "../matrix/storage/idb/types";
 import {Storage} from "../matrix/storage/idb/Storage";
diff --git a/yarn.lock b/yarn.lock
index 93747878..d2e3035d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1847,9 +1847,9 @@ commander@^6.0.0:
   integrity sha512-s7EA+hDtTYNhuXkTlhqew4txMZVdszBmKWSPEMxGr8ru8JXR7bLUFIAtPhcSuFdJQ0ILMxnJi8GkQL0yvDy/YA==
 
 commander@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
-  integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 common-ancestor-path@^1.0.1:
   version "1.0.1"
@@ -2349,11 +2349,11 @@ esbuild-linux-ppc64le@0.13.4:
   integrity sha512-E1+oJPP7A+j23GPo3CEpBhGwG1bni4B8IbTA3/3rvzjURwUMZdcN3Fhrz24rnjzdLSHmULtOE4VsbT42h1Om4Q==
 
 esbuild-node-loader@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/esbuild-node-loader/-/esbuild-node-loader-0.3.1.tgz#fa761e020eff316549ddc3c51a25ec9ffc159ff2"
-  integrity sha512-75xPOySulti9R5LwYOMmKiwHyXGr/f89I7UkHolLxRqeBiUNqcyCmNTjv+fO2WV9G3f7LDKVZJlbWoYh5LBpfQ==
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/esbuild-node-loader/-/esbuild-node-loader-0.3.2.tgz#39918776ece52da31f771be9dbcedc459ccf814b"
+  integrity sha512-4Y6sTwvB5pH+A7gmpd/xzyPkOZC4nmEWRoGBi4BQoE0DhZvrrzHqSmT+jb4x7m1rwv4BCuNbajN13LN8D0PGoA==
   dependencies:
-    esbuild "^0.12.6"
+    esbuild "^0.13.2"
 
 esbuild-openbsd-64@0.13.4:
   version "0.13.4"
@@ -2380,11 +2380,6 @@ esbuild-windows-arm64@0.13.4:
   resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.4.tgz#fb239532f07b764d158f4cc787178ef4c6fadb5c"
   integrity sha512-vA6GLvptgftRcDcWngD5cMlL4f4LbL8JjU2UMT9yJ0MT5ra6hdZNFWnOeOoEtY4GtJ6OjZ0i+81sTqhAB0fMkg==
 
-esbuild@^0.12.6:
-  version "0.12.20"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.20.tgz#4d3c9d83c99a4031e027b42a4c398c23b6827cb0"
-  integrity sha512-u7+0qTo9Z64MD9PhooEngCmzyEYJ6ovFhPp8PLNh3UasR5Ihjv6HWVXqm8uHmasdQlpsAf0IsY4U0YVUfCpt4Q==
-
 esbuild@^0.13.2:
   version "0.13.4"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.4.tgz#ce2deb56c4fb360938311cbfc67f8e467bb6841b"
@@ -3124,9 +3119,9 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     resolve-from "^4.0.0"
 
 impunity@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/impunity/-/impunity-1.0.1.tgz#e1d19c468bd7b8ae3dc7ad44ccbe81f17c626fde"
-  integrity sha512-MbQ6+UcLNdpMZPBYvr0OLY3pQCr8UMjMK45YCIrRFsZUO9hj/eMurLjpjiO3HBgCkZcw+5FlU6JCHjm5Q3u7mw==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/impunity/-/impunity-1.0.2.tgz#17819562cef60a4e74dd095438012131211687f4"
+  integrity sha512-tv61TSxBUd02Tap2IFajD8pQ+PCo4/lZG4DOd4nWmRYyH/KyxKEU6I0u4jn3mqWhCF6ECdRh5g98abWcvNPcHA==
   dependencies:
     colors "^1.3.3"
     commander "^6.1.0"