release 0.48.2

Merge remote-tracking branch 'origin/master'
allow async scripts in runOnBackend(), fixes #2243
2025-11-02 03:16:11 +01:00 · 2021-10-20 22:12:20 +02:00 · 2021-10-20 21:30:39 +02:00 · 2021-10-20 21:27:47 +02:00 · 2021-10-20 08:57:05 +02:00 · 2021-10-15 21:37:16 +02:00
16 changed files with 202 additions and 74 deletions
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -0,0 +1,53 @@
+name: Publish Docker image
+on:
+  push:
+    tags: [v*]
+jobs:
+  push_to_registries:
+    name: Push Docker image to multiple registries
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            zadam/trilium
+            ghcr.io/zadam/trilium
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}-latest
+            type=match,pattern=(\d+.\d+).\d+\-beta,enable=${{ endsWith(github.ref, 'beta') }},group=1,suffix=-latest
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Log in to GitHub Docker Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create server-package.json
+        run: cat package.json | grep -v electron > server-package.json
+      - name: Build and Push
+        uses: docker/build-push-action@v2.7.0
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          push: true
+          cache-from: type=registry,ref=zadam/trilium:buildcache
+          cache-to: type=registry,ref=zadam/trilium:buildcache,mode=max
+          tags: ${{ steps.meta.outputs.tags }}
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -2,10 +2,10 @@ image:
  file: .gitpod.dockerfile

 tasks:
-    - before: nvm install 14.17.6 && nvm use 14.17.6
+    - before: nvm install 14.18.1 && nvm use 14.18.1
      init: npm install
      command: npm run start-server

 ports:
    - port: 8080
-      onOpen: open-preview
+      onOpen: open-preview
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM node:14.17.6-alpine
+FROM node:14.18.1-alpine

 # Create app directory
 WORKDIR /usr/src/app
--- 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=14.17.6
+NODE_VERSION=14.18.1

 if [ "$1" != "DONTCOPY" ]
 then
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then
    exit 1
 fi

-n exec 14.17.6 npm run webpack
+n exec 14.18.1 npm run webpack

 DIR=$1

@@ -27,7 +27,7 @@ cp -r electron.js $DIR/
 cp webpack-* $DIR/

 # run in subshell (so we return to original dir)
-(cd $DIR && n exec 14.17.6 npm install --only=prod)
+(cd $DIR && n exec 14.18.1 npm install --only=prod)

 # cleanup of useless files in dependencies
 rm -r $DIR/node_modules/image-q/demo
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -69,13 +69,3 @@ gh release create "$TAG" \
    "dist/$WINDOWS_X64_BUILD" \
    "dist/$MAC_X64_BUILD" \
    "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!"
--- a/images/icon.svg
+++ b/images/icon.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg2163"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   sodipodi:docname="cropped.svg">
+  <defs
+     id="defs2157" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.5099157"
+     inkscape:cx="386.95033"
+     inkscape:cy="314.49555"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1245"
+     inkscape:window-height="846"
+     inkscape:window-x="60"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2160">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       d="m 139.19968,46.483949 c -5.40456,-0.16722 -8.20491,2.3622 -8.88118,2.5968 0.61524,-1.16523 1.02694,-1.89936 2.60032,-3.53766 -5.35164,-0.0561 -10.31381,1.10208 -14.09982,4.64397 -5.07788,4.75015 -4.68312,8.68574 -4.69335,8.66634 0.001,0.002 -0.80116,-2.56646 -1.04176,-5.31354 -5.52591,7.64928 -7.70784,17.78459 -3.51825,25.34532 2.60068,-6.2738 6.73029,-11.68083 12.0523,-15.9445 0.17533,-4.47393 1.9752,-8.25394 4.82,-11.04477 -2.56716,3.0727 -3.69993,6.57331 -3.58563,10.10144 6.19019,-4.61821 13.77738,-7.6962 22.11141,-8.7062 -6.03391,1.10878 -11.50091,3.51367 -16.27929,6.7938 2.99085,1.36595 6.40645,1.58009 9.99631,0.32984 -3.4417,1.6129 -7.26228,1.87678 -11.12731,0.47202 -3.43041,2.51213 -6.48124,5.4804 -9.10343,8.74254 4.65525,1.52188 9.74725,1.2072 14.81455,-1.37548 -4.65173,3.00461 -10.11661,4.13138 -15.95614,2.85185 -2.32798,3.1242 -4.2792,6.47983 -5.80426,9.93811 1.87855,1.385 10.03089,5.73052 24.01465,-4.58153 -1.9745,-0.58349 -3.5747,-1.40864 -3.57541,-1.41005 0.0445,0.0198 1.4411,0.14817 5.52556,-2.2987 3.61104,-2.11173 6.71724,-5.9369 9.0103,-8.91434 -1.95051,-0.71861 -3.46957,-1.47285 -3.47028,-1.47461 -0.001,-10e-4 2.5206,0.16968 6.4322,-2.8247 3.48897,-2.67088 7.38399,-6.54261 7.39599,-6.43325 0.0247,0.0233 -8.59226,-6.3433 -17.63748,-6.6227"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0352778"
+       id="path1983" />
+    <path
+       d="m 76.908921,60.394149 c 4.10149,-1.19228 6.7131,0.18422 7.27437,0.22948 -0.68748,-0.76706 -1.13907,-1.24548 -2.64709,-2.18406 4.08133,-1.09739 8.09089,-1.19268 11.64521,0.76111 4.7672,2.6204 5.19783,5.69818 5.20227,5.68151 -8.1e-4,0.002 0.13467,-2.11419 -0.19274,-4.25578 5.649429,4.74214 9.204969,12.03797 7.409049,18.6271 -3.15635,-4.27007 -7.320749,-7.57773 -12.183899,-9.77927 -0.96691,-3.37555 -3.04709,-5.90265 -5.74177,-7.46934 2.535,1.83627 4.0527,4.28158 4.62244,6.9933 -5.59297,-2.30039 -11.96698,-3.15163 -18.52727,-2.27895 4.82002,-0.34383 15.0298,0.35455 23.31423,7.22913 -3.27571,2.07767 -7.22761,2.84155 -11.58272,1.87121 4.116,1.37333 8.50418,1.15576 12.73066,-0.97074 2.361629,1.92282 4.478499,4.09616 6.288529,6.4319 -1.1786,1.42613 -6.602629,6.34494 -19.214749,1.23993 1.40117,-0.83377 2.47089,-1.77831 2.47129,-1.7795 -0.0302,0.0238 -1.07415,0.39703 -4.65308,-0.66304 -3.15394,-0.89808 -6.24094,-3.20205 -8.54894,-5.02006 1.35762,-0.93183 2.37896,-1.80609 2.37896,-1.80768 3.9e-4,-8.1e-4 -1.89551,0.62612 -5.44379,-0.88538 -3.16522,-1.34871 -6.86431,-3.53238 -6.85302,-3.44662 -0.0145,0.0226 5.38855,-6.52877 12.25206,-8.52425"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.040011"
+       id="path1985" />
+    <path
+       d="m 106.35028,116.78676 c -2.99089,-2.78316 -3.11891,-5.61706 -3.35465,-6.10128 -0.30328,0.94728 -0.48119,1.55657 -0.5271,3.26459 -2.902599,-2.81363 -4.935969,-6.06629 -5.042799,-9.9638 -0.14303,-5.226251 2.20774,-7.111581 2.19185,-7.106711 0.002,0 -1.82455,0.94068 -3.44692,2.27518 1.19194,-7.00825 5.529279,-13.56279 11.887189,-15.36164 -2.01438,4.72154 -2.73705,9.79389 -2.19847,14.89152 -2.33709,2.474751 -3.42573,5.443121 -3.41602,8.440321 0.29225,-2.99941 1.58705,-5.46485 3.56567,-7.282331 0.81185,5.747411 3.21074,11.417161 7.13399,16.382681 -2.63507,-3.79648 -7.03025,-12.54682 -5.34828,-22.784661 3.32507,1.66359 5.88686,4.53616 7.20241,8.603531 -0.86349,-4.070921 -3.18336,-7.574601 -7.01259,-9.996131 0.44853,-2.89963 1.2255,-5.72253 2.28632,-8.37424 1.76099,0.26123 8.49766,2.27917 10.39682,15.19844 -1.37647,-0.73844 -2.68363,-1.14912 -2.68496,-1.14868 0.0349,0.0129 0.85422,0.68654 1.7164,4.159181 0.78977,3.04292 0.37789,6.72937 -0.0102,9.53311 -1.43739,-0.65417 -2.66244,-1.05988 -2.66332,-1.059 -0.001,0 1.44445,1.24891 1.91637,4.92099 0.42071,3.27585 0.40659,7.40616 0.47236,7.35418 0.026,8.4e-4 -8.0584,-1.18846 -13.06411,-5.84525"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0442482"
+       id="path1987" />
+  </g>
+</svg>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "trilium",
-  "version": "0.48.0-beta",
+  "version": "0.48.1-beta",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1606,16 +1606,16 @@
      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
    },
    "browserslist": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz",
-      "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==",
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.4.tgz",
+      "integrity": "sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==",
      "dev": true,
      "requires": {
-        "caniuse-lite": "^1.0.30001264",
-        "electron-to-chromium": "^1.3.857",
+        "caniuse-lite": "^1.0.30001265",
+        "electron-to-chromium": "^1.3.867",
        "escalade": "^3.1.1",
-        "node-releases": "^1.1.77",
-        "picocolors": "^0.2.1"
+        "node-releases": "^2.0.0",
+        "picocolors": "^1.0.0"
      }
    },
    "buffer": {
@@ -2188,11 +2188,6 @@
      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
    },
-    "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
-    },
    "colors": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
@@ -3551,9 +3546,9 @@
      }
    },
    "electron-to-chromium": {
-      "version": "1.3.864",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz",
-      "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==",
+      "version": "1.3.867",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.867.tgz",
+      "integrity": "sha512-WbTXOv7hsLhjJyl7jBfDkioaY++iVVZomZ4dU6TMe/SzucV6mUAs2VZn/AehBwuZMiNEQDaPuTGn22YK5o+aDw==",
      "dev": true
    },
    "electron-window-state": {
@@ -4944,19 +4939,19 @@
      }
    },
    "jasmine": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.9.0.tgz",
-      "integrity": "sha512-JgtzteG7xnqZZ51fg7N2/wiQmXon09szkALcRMTgCMX4u/m17gVJFjObnvw5FXkZOWuweHPaPRVB6DI2uN0wVA==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.10.0.tgz",
+      "integrity": "sha512-2Y42VsC+3CQCTzTwJezOvji4qLORmKIE0kwowWC+934Krn6ZXNQYljiwK5st9V3PVx96BSiDYXSB60VVah3IlQ==",
      "dev": true,
      "requires": {
        "glob": "^7.1.6",
-        "jasmine-core": "~3.9.0"
+        "jasmine-core": "~3.10.0"
      }
    },
    "jasmine-core": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.9.0.tgz",
-      "integrity": "sha512-Tv3kVbPCGVrjsnHBZ38NsPU3sDOtNa0XmbG2baiyJqdb5/SPpDO6GVwJYtUryl6KB4q1Ssckwg612ES9Z0dreQ==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.10.0.tgz",
+      "integrity": "sha512-XWGaJ25RUdOQnjGiLoQa9QG/R4u1e9Bk4uhLdn9F4JCBco84L4SKM52bxci4vWTSUzhmhuHNAkAHFN/6Cox9wQ==",
      "dev": true
    },
    "jest-worker": {
@@ -5782,9 +5777,9 @@
      }
    },
    "nanoid": {
-      "version": "3.1.25",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="
+      "version": "3.1.30",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
+      "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="
    },
    "napi-build-utils": {
      "version": "1.0.2",
@@ -5844,9 +5839,9 @@
      "dev": true
    },
    "node-releases": {
-      "version": "1.1.77",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz",
-      "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.0.tgz",
+      "integrity": "sha512-aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA==",
      "dev": true
    },
    "nopt": {
@@ -6308,9 +6303,9 @@
      "integrity": "sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="
    },
    "picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
      "dev": true
    },
    "picomatch": {
@@ -6380,13 +6375,20 @@
      }
    },
    "postcss": {
-      "version": "8.3.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
-      "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
+      "version": "8.3.9",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz",
+      "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==",
      "requires": {
-        "colorette": "^1.2.2",
-        "nanoid": "^3.1.23",
+        "nanoid": "^3.1.28",
+        "picocolors": "^0.2.1",
        "source-map-js": "^0.6.2"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+        }
      }
    },
    "prebuild-install": {
@@ -6862,9 +6864,9 @@
      }
    },
    "sanitize-html": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.1.tgz",
-      "integrity": "sha512-hUITPitQk+eFNLtr4dEkaaiAJndG2YE87IOpcfBSL1XdklWgwcNDJdr9Ppe8QKL/C3jFt1xH/Mbj20e0GZQOfg==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.2.tgz",
+      "integrity": "sha512-sJ1rO2YixFIqs2kIcEUb6PTrCjvz8DMq1XqWWuy0kjgjrn58GNLK1DKSIRybFZDO1WNgsEgD+WiEzTEYS8xEug==",
      "requires": {
        "deepmerge": "^4.2.2",
        "escape-string-regexp": "^4.0.0",
@@ -8030,9 +8032,9 @@
      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="
    },
    "webpack": {
-      "version": "5.58.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.58.1.tgz",
-      "integrity": "sha512-4Z/dmbTU+VmkCb2XNgW7wkE5TfEcSooclprn/UEuVeAkwHhn07OcgUsyaKHGtCY/VobjnsYBlyhKeMLiSoOqPg==",
+      "version": "5.58.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.58.2.tgz",
+      "integrity": "sha512-3S6e9Vo1W2ijk4F4PPWRIu6D/uGgqaPmqw+av3W3jLDujuNkdxX5h5c+RQ6GkjVR+WwIPOfgY8av+j5j4tMqJw==",
      "dev": true,
      "requires": {
        "@types/eslint-scope": "^3.7.0",
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "trilium",
  "productName": "Trilium Notes",
  "description": "Trilium Notes",
-  "version": "0.48.1-beta",
+  "version": "0.48.2",
  "license": "AGPL-3.0-only",
  "main": "electron.js",
  "bin": {
@@ -66,7 +66,7 @@
    "request": "^2.88.2",
    "rimraf": "3.0.2",
    "sanitize-filename": "1.6.3",
-    "sanitize-html": "2.5.1",
+    "sanitize-html": "2.5.2",
    "sax": "1.2.4",
    "semver": "7.3.5",
    "serve-favicon": "2.5.0",
@@ -86,11 +86,11 @@
    "electron-packager": "15.4.0",
    "electron-rebuild": "3.2.3",
    "esm": "3.2.25",
-    "jasmine": "3.9.0",
+    "jasmine": "3.10.0",
    "jsdoc": "3.6.7",
    "lorem-ipsum": "2.0.4",
    "rcedit": "3.0.1",
-    "webpack": "5.58.1",
+    "webpack": "5.58.2",
    "webpack-cli": "4.9.0"
  },
  "optionalDependencies": {
--- a/src/becca/becca.js
+++ b/src/becca/becca.js
@@ -1,8 +1,6 @@
 "use strict";

 const sql = require("../services/sql.js");
-const NoteRevision = require("./entities/note_revision.js");
-const RecentNote = require("./entities/recent_note.js");
 const NoteSet = require("../services/search/note_set");

 class Becca {
@@ -102,6 +100,7 @@ class Becca {
    getNoteRevision(noteRevisionId) {
        const row = sql.getRow("SELECT * FROM note_revisions WHERE noteRevisionId = ?", [noteRevisionId]);

+        const NoteRevision = require("./entities/note_revision.js"); // avoiding circular dependency problems
        return row ? new NoteRevision(row) : null;
    }

@@ -131,12 +130,14 @@ class Becca {
    getRecentNotesFromQuery(query, params = []) {
        const rows = sql.getRows(query, params);

+        const RecentNote = require("./entities/recent_note.js"); // avoiding circular dependency problems
        return rows.map(row => new RecentNote(row));
    }

    getNoteRevisionsFromQuery(query, params = []) {
        const rows = sql.getRows(query, params);

+        const NoteRevision = require("./entities/note_revision.js"); // avoiding circular dependency problems
        return rows.map(row => new NoteRevision(row));
    }

--- a/src/public/app/widgets/buttons/button_widget.js
+++ b/src/public/app/widgets/buttons/button_widget.js
@@ -26,9 +26,17 @@ export default class ButtonWidget extends NoteContextAwareWidget {
        this.$widget = $(TPL);

        if (this.settings.onClick) {
-            this.$widget.on("click", () => this.settings.onClick(this));
+            this.$widget.on("click", e => {
+                this.$widget.tooltip("hide");
+
+                this.settings.onClick(this, e);
+            });
        } else {
-            this.$widget.on("click", () => this.triggerCommand(this.settings.command));
+            this.$widget.on("click", () => {
+                this.$widget.tooltip("hide");
+
+                this.triggerCommand(this.settings.command);
+            });
        }

        this.$widget.attr("data-placement", this.settings.titlePlacement);
--- a/src/public/app/widgets/buttons/close_pane_button.js
+++ b/src/public/app/widgets/buttons/close_pane_button.js
@@ -13,6 +13,12 @@ export default class ClosePaneButton extends ButtonWidget {
        this.icon("bx-x")
            .title("Close this pane")
            .titlePlacement("bottom")
-            .onClick(widget => widget.triggerCommand("closeThisNoteSplit", { ntxId: widget.getNtxId() }));
+            .onClick((widget, e) => {
+                // to avoid split pane container detecting click within the pane which would try to activate this
+                // pane (which is being removed)
+                e.stopPropagation();
+
+                widget.triggerCommand("closeThisNoteSplit", { ntxId: widget.getNtxId() });
+            });
    }
 }
--- a/src/routes/api/clipper.js
+++ b/src/routes/api/clipper.js
@@ -59,6 +59,7 @@ function addClipping(req) {

        clippingNote.setLabel('clipType', 'clippings');
        clippingNote.setLabel('pageUrl', pageUrl);
+        clippingNote.setLabel('iconClass', 'bx bx-globe');
    }

    const rewrittenContent = processContent(images, clippingNote, content);
--- a/src/routes/api/script.js
+++ b/src/routes/api/script.js
@@ -5,11 +5,11 @@ const attributeService = require('../../services/attributes');
 const becca = require('../../becca/becca');
 const syncService = require('../../services/sync');

-function exec(req) {
+async function exec(req) {
    try {
        const {body} = req;

-        const result = scriptService.executeScript(
+        const result = await scriptService.executeScript(
            body.script,
            body.params,
            body.startNoteId,
--- a/src/services/backend_script_api.js
+++ b/src/services/backend_script_api.js
@@ -58,21 +58,21 @@ function BackendScriptApi(currentNote, apiParams) {
     * @param {string} noteId
     * @returns {Note|null}
     */
-    this.getNote = becca.getNote;
+    this.getNote = noteId => becca.getNote(noteId);

    /**
     * @method
     * @param {string} branchId
     * @returns {Branch|null}
     */
-    this.getBranch = becca.getBranch;
+    this.getBranch = branchId => becca.getBranch(branchId);

    /**
     * @method
     * @param {string} attributeId
     * @returns {Attribute|null}
     */
-    this.getAttribute = becca.getAttribute;
+    this.getAttribute = attributeId => becca.getAttribute(attributeId);

    /**
     * This is a powerful search method - you can search by attributes and their values, e.g.:
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2021-10-12T22:42:48+02:00", buildRevision: "64a3a8b561f614a1940551bb3feb9e035f7cb475" };
+module.exports = { buildDate:"2021-10-20T22:12:20+02:00", buildRevision: "a22e4d60b643542c72d0fd164b8096dfde026e18" };
Author	SHA1	Message	Date
zadam	3d98644bf6	release 0.48.2	2021-10-20 22:12:20 +02:00
zadam	a22e4d60b6	Merge remote-tracking branch 'origin/master'	2021-10-20 21:30:39 +02:00
zadam	069fbee3a6	allow async scripts in runOnBackend(), fixes #2243	2021-10-20 21:27:47 +02:00
Matt	8b21867c5c	Set default icon for clipped notes (#2246 ) * Set default icon for clipped notes I like being able to differentiate between clipped notes and regular notes * Globe	2021-10-20 08:57:05 +02:00
zadam	2cc4367b37	fix restoring note revision, closes #2232	2021-10-15 21:37:16 +02:00
zadam	241d1b1035	node 14.18.1	2021-10-14 22:22:27 +02:00
zadam	449081807e	fix backend API's getNote, getBranch, getAttribute, closes #2230	2021-10-14 21:19:03 +02:00
zadam	dc0d6d24bd	Merge remote-tracking branch 'origin/master'	2021-10-14 21:09:32 +02:00
zadam	4111a2f0e8	docker image build/push is now handled by github actions	2021-10-14 20:49:48 +02:00
TrAnn3l	8ef4b2bf50	Add tag based multi arch docker build. (#2229 )	2021-10-14 20:42:27 +02:00
zadam	53875d26bc	don't try to activate the pane being currently removed	2021-10-13 23:27:58 +02:00
zadam	f505f9d65a	hide tooltip after clicking on a button, fixes #2228	2021-10-13 23:05:47 +02:00
zadam	6434889cd6	added SVG icon	2021-10-13 19:54:26 +02:00