From b65f8ddf78ac06fc22cba1e7b4465574f6f7a6cc Mon Sep 17 00:00:00 2001
From: alexpietsch <54153428+alexpietsch@users.noreply.github.com>
Date: Tue, 28 May 2024 19:41:51 +0200
Subject: [PATCH] enable docker build

---
 bin/build-docker.sh |  6 +++---
 package.json        |  3 +--
 webpack.config.js   | 41 ++++++++++++++++++++++++++---------------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/bin/build-docker.sh b/bin/build-docker.sh
index c77850eba..92c8706d4 100755
--- a/bin/build-docker.sh
+++ b/bin/build-docker.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-VERSION=`jq -r ".version" package.json`
+VERSION='develop'
 SERIES=${VERSION:0:4}-latest
 
 cat package.json | grep -v electron > server-package.json
 
-sudo docker build -t zadam/trilium:$VERSION --network host -t zadam/trilium:$SERIES .
+sudo docker build -t notes:$VERSION --network host -t notes:$SERIES .
 
 if [[ $VERSION != *"beta"* ]]; then
-  sudo docker tag zadam/trilium:$VERSION zadam/trilium:latest
+  sudo docker tag notes:$VERSION notes:latest
 fi
diff --git a/package.json b/package.json
index 9e6506d8a..e37e6204c 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "start-test-server": "npm run qswitch-server; rm -rf ./data-test; cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/www.ts",
     "switch-server": "rm -rf ./node_modules/better-sqlite3 && npm install",
     "switch-electron": "./node_modules/.bin/electron-rebuild",
-    "rebuild": "electron-rebuild",
     "qswitch-server": "rm -rf ./node_modules/better-sqlite3/bin ; mkdir -p ./node_modules/better-sqlite3/build ; cp ./bin/better-sqlite3/linux-server-better_sqlite3.node ./node_modules/better-sqlite3/build/better_sqlite3.node",
     "qswitch-electron": "rm -rf ./node_modules/better-sqlite3/bin ; mkdir -p ./node_modules/better-sqlite3/build ; cp ./bin/better-sqlite3/linux-desktop-better_sqlite3.node ./node_modules/better-sqlite3/build/better_sqlite3.node",
     "build-backend-docs": "rm -rf ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js",
@@ -32,7 +31,7 @@
     "test-jasmine": "TRILIUM_DATA_DIR=~/trilium/data-test jasmine",
     "test-es6": "node -r esm spec-es6/attribute_parser.spec.js ",
     "test": "npm run test-jasmine && npm run test-es6",
-    "postinstall": "rimraf ./node_modules/canvas && npm run rebuild"
+    "postinstall": "rimraf ./node_modules/canvas"
   },
   "dependencies": {
     "@braintree/sanitize-url": "6.0.4",
diff --git a/webpack.config.js b/webpack.config.js
index 2e3bd7b17..5b407fa8b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,18 +1,29 @@
-const path = require('path');
-const assetPath = require('./src/services/asset_path');
+const path = require("path");
 
 module.exports = {
-    mode: 'production',
-    entry: {
-        setup: './src/public/app/setup.ts',
-        mobile: './src/public/app/mobile.js',
-        desktop: './src/public/app/desktop.js',
-    },
-    output: {
-        publicPath: `${assetPath}/app-dist/`,
-        path: path.resolve(__dirname, 'src/public/app-dist'),
-        filename: '[name].js',
-    },
-    devtool: 'source-map',
-    target: 'electron-renderer',
+  mode: "production",
+  module: {
+    rules: [
+      {
+        test: /\.ts?$/,
+        use: "ts-loader",
+        exclude: /node_modules/,
+      },
+    ],
+  },
+  resolve: {
+    extensions: [".ts", ".js"],
+  },
+  entry: {
+    setup: "./src/public/app/setup.js",
+    mobile: "./src/public/app/mobile.js",
+    desktop: "./src/public/app/desktop.js",
+  },
+  output: {
+    publicPath: `assets/v0.63.5/app-dist/`,
+    path: path.resolve(__dirname, "src/public/app-dist"),
+    filename: "[name].js",
+  },
+  devtool: "source-map",
+  target: "electron-renderer",
 };