From 3e77fc289b631f1d611fd0ae0e4831ce04685e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
 <dani-garcia@users.noreply.github.com>
Date: Mon, 18 Oct 2021 21:52:04 +0200
Subject: [PATCH] Fix compilation error

---
 Dockerfile           | 7 ++++---
 package_web_vault.sh | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5e7f89d..82ae751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ USER node
 # https://github.com/bitwarden/web/commit/$VAULT_VERSION
 #
 # Using https://github.com/bitwarden/web/releases/tag/v2.23.0
-ARG VAULT_VERSION=cfa3d81cf87ed59c471021608b9b922023c825f1
+ARG VAULT_VERSION=cfa3d81cf87ed59c471021608b9b922023c825f1 # TODO: When updating to a newer image, remove the package.json patch below
 
 RUN git clone https://github.com/bitwarden/web.git /vault
 WORKDIR /vault
@@ -40,8 +40,9 @@ COPY --chown=node:node apply_patches.sh /apply_patches.sh
 RUN bash /apply_patches.sh
 
 # Build
-RUN npm ci
-RUN npm audit fix || true
+RUN sed -i 's/"gulp-google-webfonts": "^4.0.0"/"gulp-google-webfonts": "^4.1.0"/' package.json
+RUN npm ci --legacy-peer-deps
+RUN npm audit fix --legacy-peer-deps || true
 RUN npm run dist
 
 RUN printf '{"version":"%s"}' \
diff --git a/package_web_vault.sh b/package_web_vault.sh
index 2ac50bb..534145e 100755
--- a/package_web_vault.sh
+++ b/package_web_vault.sh
@@ -47,8 +47,9 @@ git submodule update --recursive --init
 . ../apply_patches.sh
 
 # Build
-npm ci
-npm audit fix || true
+sed -i 's/"gulp-google-webfonts": "^4.0.0"/"gulp-google-webfonts": "^4.1.0"/' package.json
+npm ci --legacy-peer-deps
+npm audit fix --legacy-peer-deps || true
 npm run dist
 
 # Delete debugging map files, optional