Merge remote-tracking branch 'origin/master' into canvas

package.json

@@ -16,11 +16,7 @@
     "test-electron": "xo",
     "rebuild-electron": "electron-rebuild",
     "start-electron": "electron . --disable-gpu",
-    "build-electron": "electron-packager . --out=dist --asar --overwrite --platform=win32,linux --arch=ia32,x64 --app-version=",
+    "build-electron": "electron-packager . --out=dist --asar --overwrite --platform=win32,linux --arch=ia32,x64 --app-version= --icon=src/public/app-icons/win/icon.ico",
-    "start-forge": "electron-forge start",
-    "package-forge": "electron-forge package",
-    "make-forge": "electron-forge make",
-    "publish-forge": "electron-forge publish",
     "build-backend-docs": "jsdoc -d ./docs/backend_api src/entities/*.js src/services/backend_script_api.js",
     "build-frontend-docs": "jsdoc -d ./docs/frontend_api src/public/javascripts/entities/*.js src/public/javascripts/services/frontend_script_api.js",
     "build-docs": "npm run build-backend-docs && npm run build-frontend-docs"
@@ -50,7 +46,7 @@
     "imagemin-mozjpeg": "7.0.0",
     "imagemin-pngquant": "6.0.0",
     "ini": "1.3.5",
-    "jimp": "0.5.4",
+    "jimp": "0.5.6",
     "moment": "2.22.2",
     "multer": "1.4.1",
     "open": "0.0.5",
@@ -71,7 +67,7 @@
     "xml2js": "0.4.19"
   },
   "devDependencies": {
-    "electron": "4.0.0-beta.3",
+    "electron": "4.0.0-beta.5",
     "electron-compile": "6.4.3",
     "electron-packager": "12.2.0",
     "electron-rebuild": "1.8.2",
@@ -79,38 +75,6 @@
     "tape": "4.9.1",
     "xo": "0.23.0"
   },
-  "config": {
-    "forge": {
-      "make_targets": {
-        "win32": [
-          "squirrel"
-        ],
-        "darwin": [
-          "zip"
-        ],
-        "linux": [
-          "deb",
-          "rpm"
-        ]
-      },
-      "electronPackagerConfig": {
-        "packageManager": "npm"
-      },
-      "electronWinstallerConfig": {
-        "name": "trilium"
-      },
-      "electronInstallerDebian": {},
-      "electronInstallerRedhat": {},
-      "github_repository": {
-        "owner": "",
-        "name": ""
-      },
-      "windowsStoreConfig": {
-        "packageName": "",
-        "name": "trilium"
-      }
-    }
-  },
   "xo": {
     "envs": [
       "node",

src/anonymize.js

@@ -0,0 +1,7 @@
+const anonymizationService = require('./services/anonymization');
+
+anonymizationService.anonymize().then(filePath => {
+    console.log("Anonymized file has been saved to:", filePath);
+
+    process.exit(0);
+});

src/services/anonymization.js

@@ -19,12 +19,15 @@ async function anonymize() {
     await db.run("UPDATE notes SET title = 'title', content = 'text'");
     await db.run("UPDATE note_revisions SET title = 'title', content = 'text'");
     await db.run("UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL");
+    await db.run("UPDATE images SET data = NULL");
     await db.run(`UPDATE options SET value = 'anonymized' WHERE name IN 
                     ('documentSecret', 'encryptedDataKey', 'passwordVerificationHash', 
                      'passwordVerificationSalt', 'passwordDerivedKeySalt')`);
     await db.run("VACUUM");
 
     await db.close();
+
+    return anonymizedFile;
 }
 
 module.exports = {