From 48c843c0875fdcc05a82219acef51082f8105ded Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Fri, 8 May 2020 10:24:57 +0200
Subject: [PATCH 1/2] fix setup on server edition

---
 src/routes/setup.js    | 3 +--
 src/services/window.js | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/routes/setup.js b/src/routes/setup.js
index d57b619b9..4ba55699c 100644
--- a/src/routes/setup.js
+++ b/src/routes/setup.js
@@ -6,9 +6,8 @@ const utils = require('../services/utils');
 
 async function setupPage(req, res) {
     if (await sqlInit.isDbInitialized()) {
-        const windowService = require('../services/window');
-
         if (utils.isElectron()) {
+            const windowService = require('../services/window');
             await windowService.createMainWindow();
             windowService.closeSetupWindow();
         }
diff --git a/src/services/window.js b/src/services/window.js
index f9f2c8b78..c85a02ad1 100644
--- a/src/services/window.js
+++ b/src/services/window.js
@@ -165,6 +165,5 @@ module.exports = {
     createMainWindow,
     createSetupWindow,
     closeSetupWindow,
-    createExtraWindow,
     registerGlobalShortcuts
 };
\ No newline at end of file

From 64c9734f05ce09e900183c1c299ba42a65524aa1 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Fri, 8 May 2020 20:50:53 +0200
Subject: [PATCH 2/2] transform setup.js to the webpacked version in the build

---
 Dockerfile          | 2 +-
 bin/build-server.sh | 2 +-
 bin/copy-trilium.sh | 3 ++-
 src/views/setup.ejs | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 204ea0b31..99534a78a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.16.2-alpine
+FROM node:12.16.3-alpine
 
 # Create app directory
 WORKDIR /usr/src/app
diff --git a/bin/build-server.sh b/bin/build-server.sh
index a6de256bb..2b5d512f2 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=12.16.2
+NODE_VERSION=12.16.3
 
 if [ "$1" != "DONTCOPY" ]
 then
diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh
index fe92ca912..dd7f128eb 100755
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -34,4 +34,5 @@ find $DIR/libraries -name "*.map" -type f -delete
 rm -r $DIR/src/public/app
 
 sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
-sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
\ No newline at end of file
+sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
+sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
\ No newline at end of file
diff --git a/src/views/setup.ejs b/src/views/setup.ejs
index 2225d1c7f..ddbd94cfd 100644
--- a/src/views/setup.ejs
+++ b/src/views/setup.ejs
@@ -210,7 +210,7 @@
 
 <script src="libraries/knockout.min.js"></script>
 
-<script src="app-dist/setup.js" crossorigin type="module"></script>
+<script src="app/setup.js" crossorigin type="module"></script>
 <link href="stylesheets/themes.css" rel="stylesheet">
 </body>
 </html>