release 0.17.0

bin/build-docker.sh

@@ -5,4 +5,4 @@ if [[ $# -eq 0 ]] ; then
     exit 1
 fi
 
-docker build -t zadam/trilium:latest -t zadam/trilium:$1 .
+sudo docker build -t zadam/trilium:latest -t zadam/trilium:$1 .

bin/push-docker-image.sh

@@ -5,5 +5,5 @@ if [[ $# -eq 0 ]] ; then
     exit 1
 fi
 
-docker push zadam/trilium:latest
+sudo docker push zadam/trilium:latest
-docker push zadam/trilium:$1
+sudo docker push zadam/trilium:$1

bin/release.sh

@@ -47,6 +47,7 @@ bin/package.sh
 LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z
 LINUX_IA32_BUILD=trilium-linux-ia32-$VERSION.7z
 WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z
+SERVER_BUILD=trilium-linux-x64-server.elf
 
 echo "Creating release in GitHub"
 
@@ -75,8 +76,21 @@ github-release upload \
     --name "$WINDOWS_X64_BUILD" \
     --file "dist/$WINDOWS_X64_BUILD"
 
+echo "Packaging server version"
+
+npm run build-pkg
+
+github-release upload \
+    --tag $TAG \
+    --name "$SERVER_BUILD" \
+    --file "dist/$SERVER_BUILD"
+
+echo "Building docker image"
+
 bin/build-docker.sh $VERSION
 
+echo "Pushing docker image to dockerhub"
+
 bin/push-docker-image.sh $VERSION
 
 echo "Release finished!"

package.json

@@ -1,9 +1,12 @@
 {
   "name": "trilium",
   "description": "Trilium Notes",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
+  "bin": {
+    "trilium": "./src/www"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/zadam/trilium.git"
@@ -17,7 +20,8 @@
     "start-forge": "electron-forge start",
     "package-forge": "electron-forge package",
     "make-forge": "electron-forge make",
-    "publish-forge": "electron-forge publish"
+    "publish-forge": "electron-forge publish",
+    "build-pkg": "pkg . --targets node8-linux-x64 --output dist/trilium-linux-x64-server.elf"
   },
   "dependencies": {
     "async-mutex": "^0.1.3",
@@ -28,7 +32,7 @@
     "debug": "~3.1.0",
     "devtron": "^1.4.0",
     "ejs": "~2.6.1",
-    "electron-debug": "^1.5.0",
+    "electron-debug": "^2.0.0",
     "electron-dl": "^1.12.0",
     "electron-in-page-search": "^1.3.2",
     "express": "~4.16.3",
@@ -43,8 +47,8 @@
     "imagemin-pngquant": "^5.1.0",
     "ini": "^1.3.5",
     "jimp": "^0.2.28",
-    "moment": "^2.22.1",
+    "moment": "^2.22.2",
-    "multer": "^1.3.0",
+    "multer": "^1.3.1",
     "open": "0.0.5",
     "rand-token": "^0.4.0",
     "rcedit": "^1.1.0",
@@ -59,18 +63,19 @@
     "sqlite": "^2.9.2",
     "tar-stream": "^1.6.1",
     "unescape": "^1.0.1",
-    "ws": "^5.2.0",
+    "ws": "^5.2.1",
     "xml2js": "^0.4.19"
   },
   "devDependencies": {
-    "electron": "^2.0.1",
+    "electron": "^2.0.4",
-    "electron-compile": "^6.4.2",
+    "electron-compile": "^6.4.3",
     "electron-packager": "^12.1.0",
-    "electron-prebuilt-compile": "2.0.0",
+    "electron-prebuilt-compile": "2.0.4",
-    "electron-rebuild": "^1.7.3",
+    "electron-rebuild": "^1.8.1",
-    "lorem-ipsum": "^1.0.4",
+    "lorem-ipsum": "^1.0.5",
-    "tape": "^4.9.0",
+    "tape": "^4.9.1",
-    "xo": "^0.21.1"
+    "xo": "^0.21.1",
+    "pkg": "^4.3.3"
   },
   "config": {
     "forge": {
@@ -109,5 +114,12 @@
       "node",
       "browser"
     ]
+  },
+  "pkg": {
+    "assets": [
+      "./db/**/*",
+      "./src/public/**/*",
+      "./src/views/**/*"
+    ]
   }
 }

src/public/javascripts/dialogs/note_source.js

@@ -29,7 +29,7 @@ function formatNode(node, level) {
     const indentAfter  = new Array(level - 1).join('  ');
     let textNode;
 
-    for (const i = 0; i < node.children.length; i++) {
+    for (let i = 0; i < node.children.length; i++) {
         textNode = document.createTextNode('\n' + indentBefore);
         node.insertBefore(textNode, node.children[i]);
 

src/public/javascripts/services/bootstrap.js

@@ -47,7 +47,12 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
 
     let message = "Uncaught error: ";
 
-    if (string.indexOf("script error") > -1){
+    if (string.includes("Cannot read property 'defaultView' of undefined")) {
+        // ignore this specific error which is very common but we don't know where it comes from
+        // and it seems to be harmless
+        return true;
+    }
+    else if (string.includes("script error")) {
         message += 'No details available';
     }
     else {

src/public/javascripts/services/entrypoints.js

@@ -29,7 +29,6 @@ function registerEntrypoints() {
     $("#show-note-revisions-button").click(noteRevisionsDialog.showCurrentNoteRevisions);
 
     $("#show-source-button").click(noteSourceDialog.showDialog);
-    utils.bindShortcut('ctrl+u', noteSourceDialog.showDialog);
 
     $("#recent-changes-button").click(recentChangesDialog.showDialog);
 

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2018-06-16T13:34:39-04:00", buildRevision: "3a95c9e1bc4d608a2135c9412732c2c7fbb2834c" };
+module.exports = { buildDate:"2018-07-09T21:22:12+02:00", buildRevision: "14cffbbe625036d7284056f6a37a5e748e397148" };

src/views/index.ejs

@@ -171,7 +171,7 @@
               <ul class="dropdown-menu dropdown-menu-right">
                 <li><a id="show-note-revisions-button">Note revisions</a></li>
                 <li><a class="show-labels-button"><kbd>Alt+L</kbd> Labels</a></li>
-                <li><a id="show-source-button"><kbd>Ctrl+U</kbd> HTML source</a></li>
+                <li><a id="show-source-button">HTML source</a></li>
                 <li><a id="upload-file-button">Upload file</a></li>
               </ul>
             </div>