1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00

Desktop: Upgrade Electron from v10 to v14

This commit is contained in:
Laurent Cozic
2021-10-01 19:35:27 +01:00
parent 85e20a61d9
commit 4a7746beb2
58 changed files with 67261 additions and 60756 deletions

View File

@@ -10,6 +10,7 @@ import * as fs from 'fs-extra';
import { setEncryptionEnabled } from '../services/synchronizer/syncInfoUtils';
const { shimInit } = require('../shim-init-node');
const sharp = require('sharp');
const nodeSqlite = require('sqlite3');
const snapshotBaseDir = `${supportDir}/syncTargetSnapshots`;
@@ -108,7 +109,7 @@ export async function deploySyncTargetSnapshot(syncTargetType: string, syncVersi
}
export async function main(syncTargetType: string) {
shimInit(sharp);
shimInit({ sharp, nodeSqlite });
const validSyncTargetTypes = ['normal', 'e2ee'];
if (!validSyncTargetTypes.includes(syncTargetType)) throw new Error(`Sync target type must be: ${validSyncTargetTypes.join(', ')}`);