From 37e94982574283542019972f7363f9746595c9f1 Mon Sep 17 00:00:00 2001
From: Vinicius Fortuna <fortuna@users.noreply.github.com>
Date: Fri, 8 May 2020 15:51:46 -0400
Subject: [PATCH 1/4] Remove commented out line

---
 src/server_manager/base.webpack.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/server_manager/base.webpack.js b/src/server_manager/base.webpack.js
index bf8ab080..697bd48c 100644
--- a/src/server_manager/base.webpack.js
+++ b/src/server_manager/base.webpack.js
@@ -28,13 +28,11 @@ exports.makeConfig = (options) => {
       require.resolve('@webcomponents/webcomponentsjs/webcomponents-loader.js'),
       path.resolve(__dirname, './web_app/ui_components/style.css'),
       options.main,
-      // path.resolve(__dirname, './web_app/main.ts'),
     ],
     target: options.target,
     devtool: 'inline-source-map',
     // Run the dev server with `yarn workspace outline-manager run webpack-dev-server --open`
     devServer: {
-      // contentBase: OUTPUT_BASE,
       overlay: true,
     },
     output: {

From fdc6cdbbbea1a6fff0de4515ad7b2252837fb755 Mon Sep 17 00:00:00 2001
From: alalamav <2132122+alalamav@users.noreply.github.com>
Date: Fri, 8 May 2020 15:53:51 -0400
Subject: [PATCH 2/4] Update shadowbox docker node image to v12.16.3 (#643)

---
 src/shadowbox/docker/Dockerfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/shadowbox/docker/Dockerfile b/src/shadowbox/docker/Dockerfile
index 02df1d8b..3c60dbc5 100644
--- a/src/shadowbox/docker/Dockerfile
+++ b/src/shadowbox/docker/Dockerfile
@@ -12,14 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# See versions at https://hub.docker.com/_/node/
-FROM node:8.15.0-alpine
+# Newer node images have no valid content trust data.
+# Pin the image node:12.16.3-alpine (linux/amd64) by hash.
+# See versions at https://hub.docker.com/_/node?tab=tags&name=alpine
+FROM node@sha256:12b2154fb459fa5f42c54771524609db041e7ef3465935d0ca82940d2d72669d
 
 # Versions can be found at https://github.com/Jigsaw-Code/outline-ss-server/releases
 ARG SS_VERSION=1.1.0
 
 # Save metadata on the software versions we are using.
-LABEL shadowbox.node_version=8.15.0
+LABEL shadowbox.node_version=12.16.3
 LABEL shadowbox.outline-ss-server_version="${SS_VERSION}"
 
 ARG GITHUB_RELEASE
@@ -40,9 +42,8 @@ RUN mkdir bin && curl -SsL https://github.com/Jigsaw-Code/outline-ss-server/rele
 COPY third_party/prometheus/prometheus ./bin/
 COPY src/shadowbox/package.json .
 COPY yarn.lock .
-# TODO: Replace with plain old "yarn" once the base image is fixed:
-#       https://github.com/nodejs/docker-node/pull/639
-RUN /opt/yarn-v$YARN_VERSION/bin/yarn install --prod
+
+RUN yarn install --prod
 
 # Install management service
 COPY build/shadowbox/app app/

From 5d6efd32873d6664c8d9f39b98b5b9755e1760e9 Mon Sep 17 00:00:00 2001
From: Vinicius Fortuna <fortuna@users.noreply.github.com>
Date: Fri, 8 May 2020 15:55:37 -0400
Subject: [PATCH 3/4] Add webpack comment

---
 src/server_manager/base.webpack.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server_manager/base.webpack.js b/src/server_manager/base.webpack.js
index 697bd48c..ff6e0f13 100644
--- a/src/server_manager/base.webpack.js
+++ b/src/server_manager/base.webpack.js
@@ -71,6 +71,9 @@ exports.makeConfig = (options) => {
         // Statically link the Roboto font, rather than link to fonts.googleapis.com
         'window.polymerSkipLoadingFontRoboto': JSON.stringify(true),
       }),
+      // @sentry/electron depends on electron code, even though it's never activated
+      // in the browser. Webpack still tries to build it, but fails with missing APIs.
+      // The IgnorePlugin prevents the compilation of the electron dependency.
       new webpack.IgnorePlugin(/^electron$/),
       new CopyPlugin(
           [

From 7bc6b8ca5b63ee3dbf19b2f901dd48e087d30a04 Mon Sep 17 00:00:00 2001
From: Vinicius Fortuna <fortuna@users.noreply.github.com>
Date: Fri, 8 May 2020 15:56:08 -0400
Subject: [PATCH 4/4] Formating

---
 src/server_manager/base.webpack.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/server_manager/base.webpack.js b/src/server_manager/base.webpack.js
index ff6e0f13..7cf47d42 100644
--- a/src/server_manager/base.webpack.js
+++ b/src/server_manager/base.webpack.js
@@ -35,10 +35,7 @@ exports.makeConfig = (options) => {
     devServer: {
       overlay: true,
     },
-    output: {
-      path: OUTPUT_BASE,
-      filename: 'main.js'
-    },
+    output: {path: OUTPUT_BASE, filename: 'main.js'},
     module: {
       rules: [
         {