From 6306a433e8e2b5093ef23c5743e37274ec1ff54a Mon Sep 17 00:00:00 2001
From: timvisee <tim@visee.me>
Date: Sun, 4 Sep 2022 12:26:09 +0200
Subject: [PATCH] Revert "More dependency cleanups"

This reverts commit e1d62245707eb38e60175e2cc1474c5491408626.
---
 Dockerfile        | 1 +
 package.json      | 1 +
 webpack.config.js | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e9603e98..53220098 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,7 @@ COPY --chown=app:app server server
 COPY --chown=app:app --from=builder /app/dist dist
 
 RUN npm ci --production && npm cache clean --force
+RUN mkdir -p /app/.config/configstore
 RUN ln -s dist/version.json version.json
 
 ENV PORT=1443
diff --git a/package.json b/package.json
index a1526bef..1a839003 100644
--- a/package.json
+++ b/package.json
@@ -134,6 +134,7 @@
     "body-parser": "^1.20.0",
     "choo": "^7.0.0",
     "cldr-core": "^35.1.0",
+    "configstore": "github:dannycoates/configstore#master",
     "convict": "^6.2.3",
     "convict-format-with-validator": "^6.2.0",
     "double-ended-queue": "^2.1.0-0",
diff --git a/webpack.config.js b/webpack.config.js
index 9bcb9ee3..83d469a8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -111,6 +111,10 @@ const web = {
               path.resolve(__dirname, 'common'),
               // some dependencies need to get re-babeled because we
               // have different targets than their default configs
+              path.resolve(
+                __dirname,
+                'node_modules/@dannycoates/webcrypto-liner'
+              ),
               path.resolve(__dirname, 'node_modules/@fluent'),
               path.resolve(__dirname, 'node_modules/intl-pluralrules')
             ],
@@ -123,7 +127,8 @@ const web = {
               path.resolve(__dirname, 'node_modules/crc'),
               path.resolve(__dirname, 'node_modules/@fluent'),
               path.resolve(__dirname, 'node_modules/@sentry'),
-              path.resolve(__dirname, 'node_modules/tslib')
+              path.resolve(__dirname, 'node_modules/tslib'),
+              path.resolve(__dirname, 'node_modules/webcrypto-core')
             ],
             loader: 'webpack-unassert-loader'
           }