Merge remote-tracking branch 'origin/stable'

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.16.2-alpine
+FROM node:12.16.3-alpine
 
 # Create app directory
 WORKDIR /usr/src/app

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

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
+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

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();
         }

src/services/window.js

@@ -165,6 +165,5 @@ module.exports = {
     createMainWindow,
     createSetupWindow,
     closeSetupWindow,
-    createExtraWindow,
     registerGlobalShortcuts
 };

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>