From 013fdc6cd2768589b05a1d5445c462b869f3f5d6 Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Wed, 13 Nov 2019 17:50:53 -0500 Subject: [PATCH 1/4] Update electon, criptext/electron-better-ipc and sqlite3 --- electron_app/package.json | 6 +- electron_app/src/dbExporter.js | 2 +- electron_app/src/ipc/backup.js | 2 +- electron_app/src/ipc/client.js | 2 +- electron_app/src/ipc/composer.js | 2 +- electron_app/src/ipc/dataTransfer.js | 2 +- electron_app/src/ipc/database.js | 2 +- electron_app/src/ipc/loading.js | 2 +- electron_app/src/ipc/login.js | 2 +- electron_app/src/ipc/mailbox.js | 2 +- electron_app/src/ipc/manager.js | 2 +- electron_app/src/ipc/nucleus.js | 2 +- electron_app/src/ipc/utils.js | 2 +- electron_app/src/windows/composer.js | 5 +- electron_app/src/windows/loading.js | 5 +- electron_app/src/windows/login.js | 5 +- electron_app/src/windows/mailbox.js | 4 +- electron_app/yarn.lock | 109 ++++++++++++++++++++++----- 18 files changed, 119 insertions(+), 39 deletions(-) diff --git a/electron_app/package.json b/electron_app/package.json index fdc073f7b..4123bdabd 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -135,14 +135,14 @@ }, "devDependencies": { "criptext-js-tools": "0.5.0", - "electron": "3.1.10", + "electron": "6.1.4", "electron-builder": "21.2.0", "electron-notarize": "^0.1.1" }, "dependencies": { "@criptext/api": "^0.15.22", "@criptext/data-transfer-client": "^0.1.1", - "@criptext/electron-better-ipc": "^0.1.2-rc5", + "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2", "@criptext/electron-push-receiver": "^2.1.2-rc1", "@criptext/news-api-client": "^1.0.1", "dotenv": "^6.2.0", @@ -159,7 +159,7 @@ "recursive-copy": "^2.0.10", "rimraf": "^2.6.3", "rmdir-recursive": "^0.0.1", - "sqlite3": "4.0.2", + "sqlite3": "^4.1.0", "unused-filename": "^2.1.0", "websocket": "^1.0.28" } diff --git a/electron_app/src/dbExporter.js b/electron_app/src/dbExporter.js index 43ac51a0f..74887ef83 100644 --- a/electron_app/src/dbExporter.js +++ b/electron_app/src/dbExporter.js @@ -15,7 +15,7 @@ const { const myAccount = require('./Account'); const { APP_DOMAIN, LINK_DEVICES_FILE_VERSION } = require('./utils/const'); -const CIPHER_ALGORITHM = 'aes128'; +const CIPHER_ALGORITHM = 'aes-128-cbc'; const STREAM_SIZE = 512 * 1024; const DEFAULT_KEY_LENGTH = 16; diff --git a/electron_app/src/ipc/backup.js b/electron_app/src/ipc/backup.js index 39d5ade4b..85ee1f0e2 100644 --- a/electron_app/src/ipc/backup.js +++ b/electron_app/src/ipc/backup.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const { shell } = require('electron'); const moment = require('moment'); const { diff --git a/electron_app/src/ipc/client.js b/electron_app/src/ipc/client.js index 955a10084..e6232384b 100644 --- a/electron_app/src/ipc/client.js +++ b/electron_app/src/ipc/client.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const clientManager = require('./../clientManager'); ipc.answerRenderer('client-acknowledge-events', params => diff --git a/electron_app/src/ipc/composer.js b/electron_app/src/ipc/composer.js index d9e252c8c..e0cdff7e2 100644 --- a/electron_app/src/ipc/composer.js +++ b/electron_app/src/ipc/composer.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const composerWindowManager = require('../windows/composer'); ipc.answerRenderer( diff --git a/electron_app/src/ipc/dataTransfer.js b/electron_app/src/ipc/dataTransfer.js index b8e31523a..97513ee22 100644 --- a/electron_app/src/ipc/dataTransfer.js +++ b/electron_app/src/ipc/dataTransfer.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const dataTransferManager = require('../dataTransferClient'); ipc.answerRenderer('data-transfer-clear-sync-data', () => diff --git a/electron_app/src/ipc/database.js b/electron_app/src/ipc/database.js index 6b1b2bf20..5e05d1528 100644 --- a/electron_app/src/ipc/database.js +++ b/electron_app/src/ipc/database.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const dbManager = require('./../DBManager'); ipc.answerRenderer('db-clean-data-logout', recipientId => diff --git a/electron_app/src/ipc/loading.js b/electron_app/src/ipc/loading.js index b08394cf0..1aa21b9d8 100644 --- a/electron_app/src/ipc/loading.js +++ b/electron_app/src/ipc/loading.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const loadingWindow = require('../windows/loading'); const globalManager = require('../globalManager'); diff --git a/electron_app/src/ipc/login.js b/electron_app/src/ipc/login.js index 8bec7b3b9..0a17592de 100644 --- a/electron_app/src/ipc/login.js +++ b/electron_app/src/ipc/login.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const loginWindow = require('../windows/login'); ipc.answerRenderer('close-login', ({ forceClose }) => { diff --git a/electron_app/src/ipc/mailbox.js b/electron_app/src/ipc/mailbox.js index 957518aa0..7d8cf932f 100644 --- a/electron_app/src/ipc/mailbox.js +++ b/electron_app/src/ipc/mailbox.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const { app } = require('electron'); const unusedFilename = require('unused-filename'); const { download } = require('electron-dl'); diff --git a/electron_app/src/ipc/manager.js b/electron_app/src/ipc/manager.js index 492eb6e46..a9200e447 100644 --- a/electron_app/src/ipc/manager.js +++ b/electron_app/src/ipc/manager.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const dbManager = require('./../DBManager'); const fileUtils = require('./../utils/FileUtils'); const myAccount = require('../../src/Account'); diff --git a/electron_app/src/ipc/nucleus.js b/electron_app/src/ipc/nucleus.js index c9b6ad289..478e68eab 100644 --- a/electron_app/src/ipc/nucleus.js +++ b/electron_app/src/ipc/nucleus.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const { addEventError, NUCLEUS_EVENTS } = require('./../nucleusManager'); ipc.answerRenderer('nucleups-report-content-unencrypted', error => diff --git a/electron_app/src/ipc/utils.js b/electron_app/src/ipc/utils.js index 9fdeb172e..d0df02c68 100644 --- a/electron_app/src/ipc/utils.js +++ b/electron_app/src/ipc/utils.js @@ -1,4 +1,4 @@ -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const { app, dialog } = require('electron'); const { getComputerName, diff --git a/electron_app/src/windows/composer.js b/electron_app/src/windows/composer.js index 9d05ce179..c18c913bc 100644 --- a/electron_app/src/windows/composer.js +++ b/electron_app/src/windows/composer.js @@ -46,7 +46,10 @@ const createComposerWindow = () => { show: false, title: ` ${windowTitle}`, minWidth: composerSize.minWidth, - minHeight: composerSize.minHeight + minHeight: composerSize.minHeight, + webPreferences: { + nodeIntegration: true + } }); globalManager.composerData.set(window.id, {}); window.loadURL(composerUrl); diff --git a/electron_app/src/windows/loading.js b/electron_app/src/windows/loading.js index 8e5bd114f..a954bf585 100644 --- a/electron_app/src/windows/loading.js +++ b/electron_app/src/windows/loading.js @@ -28,7 +28,10 @@ const create = () => { show: false, frame: false, transparent: true, - center: true + center: true, + webPreferences: { + nodeIntegration: true + } }); loadingWindow.loadURL(loadingUrl); loadingWindow.setMenu(null); diff --git a/electron_app/src/windows/login.js b/electron_app/src/windows/login.js index b81105230..d6f25cfa1 100644 --- a/electron_app/src/windows/login.js +++ b/electron_app/src/windows/login.js @@ -24,7 +24,10 @@ const create = () => { center: true, frame: false, show: false, - transparent: true + transparent: true, + webPreferences: { + nodeIntegration: true + } }); loginWindow.loadURL(loginUrl); loginWindow.setResizable(false); diff --git a/electron_app/src/windows/mailbox.js b/electron_app/src/windows/mailbox.js index 89d01888a..d11a307ba 100644 --- a/electron_app/src/windows/mailbox.js +++ b/electron_app/src/windows/mailbox.js @@ -1,6 +1,6 @@ const { app, BrowserWindow, shell } = require('electron'); const pushReceiver = require('@criptext/electron-push-receiver'); -const ipc = require('@criptext/electron-better-ipc'); +const { ipcMain: ipc } = require('@criptext/electron-better-ipc'); const windowStateManager = require('electron-window-state'); const path = require('path'); const { mailboxUrl } = require('./../window_routing'); @@ -45,7 +45,7 @@ const create = () => { show: false, title: 'Criptext', frame: !isWindows(), - webPreferences: { webSecurity: !isDev } + webPreferences: { webSecurity: !isDev, nodeIntegration: true } }); mailboxWindow.loadURL(mailboxUrl); if (isWindows()) mailboxWindow.setMenuBarVisibility(false); diff --git a/electron_app/yarn.lock b/electron_app/yarn.lock index 2c444b56c..5dc53a18b 100644 --- a/electron_app/yarn.lock +++ b/electron_app/yarn.lock @@ -117,9 +117,12 @@ dependencies: request "^2.88.0" -"@criptext/electron-better-ipc@^0.1.2-rc5": - version "0.1.2-rc5" - resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.1.2-rc5.tgz#4a51755de1168b441fe6a68872fe8b95eaa742ab" +"@criptext/electron-better-ipc@^0.7.0-rc1-0.2": + version "0.7.0-rc1-0.2" + resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.7.0-rc1-0.2.tgz#c17d10c90594beabb8c93938880b8b0ed05afe9a" + integrity sha512-18EyLzj6vA/1ZxpRZc5LG6Z826Ir/INBR5LwFi8Dq2RHVJKorsw4dVVU+fKa1Lh/NJCJVBysmT9xmwdf48NXZw== + dependencies: + serialize-error "^5.0.0" "@criptext/electron-push-receiver@^2.1.2-rc1": version "2.1.2-rc1" @@ -214,9 +217,10 @@ version "10.14.16" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.16.tgz#4d690c96cbb7b2728afea0e260d680501b3da5cf" -"@types/node@^8.0.24": - version "8.10.49" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.49.tgz#f331afc5efed0796798e5591d6e0ece636969b7b" +"@types/node@^10.12.18": + version "10.17.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.5.tgz#c1920150f7b90708a7d0f3add12a06bc9123c055" + integrity sha512-RElZIr/7JreF1eY6oD5RF3kpmdcreuQPjg5ri4oQ5g9sq7YWU8HkfB3eH8GwAwxf5OaCh0VPi7r4N/yoTGelrA== "@types/semver@^6.0.1": version "6.0.2" @@ -419,6 +423,7 @@ array-equal@^1.0.0: array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= array-includes@^3.0.3: version "3.0.3" @@ -869,6 +874,7 @@ callsites@^2.0.0: camelcase-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= dependencies: camelcase "^2.0.0" map-obj "^1.0.0" @@ -880,6 +886,7 @@ camelcase@^1.0.2: camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= camelcase@^4.1.0: version "4.1.0" @@ -1194,6 +1201,7 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= dependencies: array-find-index "^1.0.1" @@ -1226,6 +1234,7 @@ debug@4.1.1, debug@^4.1.1: debug@^3.0.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== dependencies: ms "^2.1.1" @@ -1451,6 +1460,7 @@ electron-dl@^1.12.0, electron-dl@^1.2.0: electron-download@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8" + integrity sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg== dependencies: debug "^3.0.0" env-paths "^1.0.0" @@ -1524,11 +1534,12 @@ electron-window-state@^4.1.1: jsonfile "^2.2.3" mkdirp "^0.5.1" -electron@3.1.10: - version "3.1.10" - resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.10.tgz#a2a4322e66e2fb40eca2317c51cc931c6a250088" +electron@6.1.4: + version "6.1.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-6.1.4.tgz#21cbcf5de74a0e284621dce1b8c0fe092c146c2d" + integrity sha512-QUN59E0dPmkAEYi+OU0jJG6tIAi8VDJpsHLRmdyL62oAuT3+CWJ/gefmNwAWQsIpNj/DieVTn5h+/t/Hke4T+Q== dependencies: - "@types/node" "^8.0.24" + "@types/node" "^10.12.18" electron-download "^4.1.0" extract-zip "^1.0.3" @@ -1841,6 +1852,7 @@ extglob@^2.0.4: extract-zip@^1.0.3: version "1.6.7" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" + integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= dependencies: concat-stream "1.6.2" debug "2.6.9" @@ -1880,6 +1892,7 @@ fb-watchman@^2.0.0: fd-slicer@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" + integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= dependencies: pend "~1.2.0" @@ -2030,6 +2043,7 @@ fragment-cache@^0.2.1: fs-extra@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" + integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== dependencies: graceful-fs "^4.1.2" jsonfile "^4.0.0" @@ -2093,6 +2107,7 @@ get-caller-file@^2.0.1: get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= get-stream@^3.0.0: version "3.0.0" @@ -2421,6 +2436,7 @@ imurmurhash@^0.1.4: indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= dependencies: repeating "^2.0.0" @@ -2431,10 +2447,15 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" +inherits@~2.0.1: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -2743,6 +2764,7 @@ is-yarn-global@^0.3.0: isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isarray@1.0.0, isarray@~1.0.0: version "1.0.0" @@ -3418,6 +3440,7 @@ loose-envify@^1.0.0, loose-envify@^1.3.1: loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" @@ -3476,6 +3499,7 @@ map-cache@^0.2.0, map-cache@^0.2.2: map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= map-visit@^1.0.0: version "1.0.0" @@ -3513,6 +3537,7 @@ mem@^4.0.0: meow@^3.1.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= dependencies: camelcase-keys "^2.0.0" decamelize "^1.1.2" @@ -3671,11 +3696,11 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.11.0: +nan@^2.11.0, nan@^2.12.1: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" -nan@^2.9.2, nan@~2.10.0: +nan@^2.9.2: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" @@ -3728,7 +3753,7 @@ node-notifier@^5.2.1: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@^0.10.0, node-pre-gyp@^0.10.3: +node-pre-gyp@^0.10.0: version "0.10.3" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" dependencies: @@ -3743,6 +3768,22 @@ node-pre-gyp@^0.10.0, node-pre-gyp@^0.10.3: semver "^5.3.0" tar "^4" +node-pre-gyp@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" + integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -3808,6 +3849,7 @@ npmlog@^4.0.2: nugget@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0" + integrity sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA= dependencies: debug "^2.1.3" minimist "^1.1.0" @@ -3852,6 +3894,7 @@ object-keys@^1.0.8: object-keys@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" + integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY= object-visit@^1.0.0: version "1.0.1" @@ -4109,6 +4152,7 @@ path-type@^1.0.0: pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= performance-now@^2.1.0: version "2.1.0" @@ -4186,6 +4230,7 @@ prettier@^1.8.2: pretty-bytes@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84" + integrity sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ= dependencies: get-stdin "^4.0.1" meow "^3.1.0" @@ -4208,6 +4253,7 @@ process-nextick-args@~2.0.0: progress-stream@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-1.2.0.tgz#2cd3cfea33ba3a89c9c121ec3347abe9ab125f77" + integrity sha1-LNPP6jO6OonJwSHsM0er6asSX3c= dependencies: speedometer "~0.1.2" through2 "~0.2.3" @@ -4357,6 +4403,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable readable-stream@~1.1.9: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= dependencies: core-util-is "~1.0.0" inherits "~2.0.1" @@ -4393,6 +4440,7 @@ recursive-copy@^2.0.10: redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" @@ -4715,6 +4763,13 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" +serialize-error@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-5.0.0.tgz#a7ebbcdb03a5d71a6ed8461ffe0fc1a1afed62ac" + integrity sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA== + dependencies: + type-fest "^0.8.0" + set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -4758,6 +4813,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: single-line-log@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-1.1.2.tgz#c2f83f273a3e1a16edb0995661da0ed5ef033364" + integrity sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q= dependencies: string-width "^1.0.1" @@ -4884,6 +4940,7 @@ spdx-license-ids@^3.0.0: speedometer@~0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d" + integrity sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0= split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -4895,12 +4952,13 @@ sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" -sqlite3@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.2.tgz#1bbeb68b03ead5d499e42a3a1b140064791c5a64" +sqlite3@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.0.tgz#e051fb9c133be15726322a69e2e37ec560368380" + integrity sha512-RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw== dependencies: - nan "~2.10.0" - node-pre-gyp "^0.10.3" + nan "^2.12.1" + node-pre-gyp "^0.11.0" request "^2.87.0" sshpk@^1.7.0: @@ -4972,6 +5030,7 @@ string-width@^3.0.0, string-width@^3.1.0: string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= string_decoder@~1.1.1: version "1.1.1" @@ -5015,6 +5074,7 @@ strip-eof@^1.0.0: strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" @@ -5025,6 +5085,7 @@ strip-json-comments@~2.0.1: sumchecker@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e" + integrity sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4= dependencies: debug "^2.2.0" @@ -5126,10 +5187,12 @@ throat@^4.0.0: throttleit@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf" + integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8= through2@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/through2/-/through2-0.2.3.tgz#eb3284da4ea311b6cc8ace3653748a52abf25a3f" + integrity sha1-6zKE2k6jEbbMis42U3SKUqvyWj8= dependencies: readable-stream "~1.1.9" xtend "~2.1.1" @@ -5211,6 +5274,7 @@ tr46@^1.0.1: trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= trim-right@^1.0.1: version "1.0.1" @@ -5248,6 +5312,11 @@ type-fest@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2" +type-fest@^0.8.0: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" @@ -5565,6 +5634,7 @@ xml-name-validator@^3.0.0: xtend@~2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" + integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os= dependencies: object-keys "~0.4.0" @@ -5648,5 +5718,6 @@ yargs@~3.10.0: yauzl@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" + integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU= dependencies: fd-slicer "~1.0.1" From 31ff81a80989ee3819522d6fbb765c5b719ccb49 Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Wed, 13 Nov 2019 17:56:25 -0500 Subject: [PATCH 2/4] Update criptext/electron-better-ipc and node-sass --- email_composer/package.json | 4 +- email_composer/src/utils/ipc.js | 69 ++--- email_composer/yarn.lock | 154 ++++++++--- email_loading/package.json | 4 +- .../src/components/LinkDeviceRequest.js | 1 + .../src/components/SyncMailboxWrapper.js | 2 +- .../src/components/linkingdevices.scss | 1 - email_loading/src/utils/ipc.js | 88 +++--- email_loading/yarn.lock | 167 +++++++++--- email_login/package.json | 4 +- email_login/src/utils/ipc.js | 46 ++-- email_login/yarn.lock | 167 +++++++++--- email_mailbox/package.json | 4 +- email_mailbox/src/app.scss | 9 + email_mailbox/src/styles/index.scss | 2 +- email_mailbox/src/utils/ipc.js | 252 +++++++++--------- email_mailbox/yarn.lock | 154 ++++++++--- 17 files changed, 730 insertions(+), 398 deletions(-) diff --git a/email_composer/package.json b/email_composer/package.json index 83593300d..c2cf3b83d 100644 --- a/email_composer/package.json +++ b/email_composer/package.json @@ -3,7 +3,7 @@ "version": "0.24.1", "private": true, "dependencies": { - "@criptext/electron-better-ipc": "^0.1.2-rc5", + "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2", "@criptext/trumbowyg": "^2.16.3", "autosuggest-highlight": "^3.1.1", "base64-js": "^1.3.0", @@ -31,7 +31,7 @@ "devDependencies": { "@criptext/react-scripts": "^2.0.6-rc1", "criptext-js-tools": "0.5.0", - "node-sass": "^4.10.0" + "node-sass": "^4.13.0" }, "homepage": "./", "browserslist": [ diff --git a/email_composer/src/utils/ipc.js b/email_composer/src/utils/ipc.js index 4d6b84eec..6190836f6 100644 --- a/email_composer/src/utils/ipc.js +++ b/email_composer/src/utils/ipc.js @@ -1,4 +1,4 @@ -import { callMain } from '@criptext/electron-better-ipc/renderer'; +import ipc from '@criptext/electron-better-ipc/renderer'; const electron = window.require('electron'); const { remote } = electron; const composerId = remote.getCurrentWindow().id; @@ -11,7 +11,7 @@ export const closeComposerWindow = ({ discard, hasExternalPassphrase }) => { - callMain('close-composer', { + ipc.callMain('close-composer', { composerId, discard, threadId, @@ -21,131 +21,134 @@ export const closeComposerWindow = ({ }; export const openFilledComposerWindow = data => { - callMain('open-filled-composer', data); + ipc.callMain('open-filled-composer', data); }; export const openFileExplorer = filename => { - callMain('open-file-explorer', filename); + ipc.callMain('open-file-explorer', filename); }; export const saveDraftChangesComposerWindow = data => { - callMain('save-draft-changes', { composerId, data }); + ipc.callMain('save-draft-changes', { composerId, data }); }; export const throwError = error => { - callMain('throwError', error); + ipc.callMain('throwError', error); }; /* Criptext Client ----------------------------- */ export const checkExpiredSession = async params => { - return await callMain('client-check-expired-session', params); + return await ipc.callMain('client-check-expired-session', params); }; export const findKeyBundles = async params => { - return await callMain('client-find-key-bundles', params); + return await ipc.callMain('client-find-key-bundles', params); }; export const isCriptextDomain = async domains => { - return await callMain('client-is-criptext-domain', domains); + return await ipc.callMain('client-is-criptext-domain', domains); }; export const postEmail = async params => { - return await callMain('client-post-email', params); + return await ipc.callMain('client-post-email', params); }; /* File System ----------------------------- */ export const saveEmailBody = async params => { - return await callMain('fs-save-email-body', params); + return await ipc.callMain('fs-save-email-body', params); }; export const getEmailByKeyWithbody = async params => { - return await callMain('db-get-email-with-body', params); + return await ipc.callMain('db-get-email-with-body', params); }; /* DataBase ----------------------------- */ export const createEmail = async params => { - return await callMain('db-create-email', params); + return await ipc.callMain('db-create-email', params); }; export const createEmailLabel = async params => { - return await callMain('db-create-email-label', params); + return await ipc.callMain('db-create-email-label', params); }; export const createFile = async params => { - return await callMain('db-create-file', params); + return await ipc.callMain('db-create-file', params); }; export const createIdentityKeyRecord = async params => { - return await callMain('db-create-identity-key-record', params); + return await ipc.callMain('db-create-identity-key-record', params); }; export const createPreKeyRecord = async params => { - return await callMain('db-create-prekey-record', params); + return await ipc.callMain('db-create-prekey-record', params); }; export const createSessionRecord = async params => { - return await callMain('db-create-session-record', params); + return await ipc.callMain('db-create-session-record', params); }; export const createSignedPreKeyRecord = async params => { - return await callMain('db-create-signed-prekey-record', params); + return await ipc.callMain('db-create-signed-prekey-record', params); }; export const deleteEmailsByIds = async ids => { - return await callMain('db-delete-emails-by-ids', ids); + return await ipc.callMain('db-delete-emails-by-ids', ids); }; export const deletePreKeyPair = async params => { - return await callMain('db-delete-prekey-pair', params); + return await ipc.callMain('db-delete-prekey-pair', params); }; export const deleteSessionRecord = async params => { - return await callMain('db-delete-session-record', params); + return await ipc.callMain('db-delete-session-record', params); }; export const getAllContacts = async () => { - return await callMain('db-get-all-contacts'); + return await ipc.callMain('db-get-all-contacts'); }; export const getContactsByEmailId = async emailId => { - return await callMain('db-get-contact-by-emailid', emailId); + return await ipc.callMain('db-get-contact-by-emailid', emailId); }; export const getEmailByKey = async key => { - return await callMain('db-get-email-by-key', key); + return await ipc.callMain('db-get-email-by-key', key); }; export const getFilesByEmailId = async emailId => { - return await callMain('db-get-files-by-emailid', emailId); + return await ipc.callMain('db-get-files-by-emailid', emailId); }; export const getIdentityKeyRecord = async params => { - return await callMain('db-get-identity-key-record', params); + return await ipc.callMain('db-get-identity-key-record', params); }; export const getPreKeyPair = async params => { - return await callMain('db-get-prekey-pair', params); + return await ipc.callMain('db-get-prekey-pair', params); }; export const getSessionRecord = async params => { - return await callMain('db-get-session-record', params); + return await ipc.callMain('db-get-session-record', params); }; export const getSessionRecordByRecipientIds = async recipientIds => { - return await callMain('db-get-session-record-by-recipientids', recipientIds); + return await ipc.callMain( + 'db-get-session-record-by-recipientids', + recipientIds + ); }; export const getSignedPreKey = async params => { - return await callMain('db-get-signed-prekey', params); + return await ipc.callMain('db-get-signed-prekey', params); }; export const updateEmail = async params => { - return await callMain('db-update-email', params); + return await ipc.callMain('db-update-email', params); }; export const updateIdentityKeyRecord = async params => { - return await callMain('db-update-identity-key-record', params); + return await ipc.callMain('db-update-identity-key-record', params); }; diff --git a/email_composer/yarn.lock b/email_composer/yarn.lock index c9711fcb4..0b5ad4e5f 100644 --- a/email_composer/yarn.lock +++ b/email_composer/yarn.lock @@ -797,9 +797,12 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@criptext/electron-better-ipc@^0.1.2-rc5": - version "0.1.2-rc5" - resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.1.2-rc5.tgz#4a51755de1168b441fe6a68872fe8b95eaa742ab" +"@criptext/electron-better-ipc@^0.7.0-rc1-0.2": + version "0.7.0-rc1-0.2" + resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.7.0-rc1-0.2.tgz#c17d10c90594beabb8c93938880b8b0ed05afe9a" + integrity sha512-18EyLzj6vA/1ZxpRZc5LG6Z826Ir/INBR5LwFi8Dq2RHVJKorsw4dVVU+fKa1Lh/NJCJVBysmT9xmwdf48NXZw== + dependencies: + serialize-error "^5.0.0" "@criptext/react-scripts@^2.0.6-rc1": version "2.0.6-rc1" @@ -1264,6 +1267,7 @@ array-filter@~0.0.0: array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= array-flatten@1.1.1: version "1.1.1" @@ -1355,6 +1359,7 @@ async-each@^1.0.0: async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" + integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= async-limiter@~1.0.0: version "1.0.0" @@ -1747,6 +1752,7 @@ binary-extensions@^1.0.0: block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= dependencies: inherits "~2.0.0" @@ -2030,6 +2036,7 @@ camel-case@3.0.x: camelcase-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= dependencies: camelcase "^2.0.0" map-obj "^1.0.0" @@ -2041,10 +2048,12 @@ camelcase@^1.0.2: camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= camelcase@^4.1.0: version "4.1.0" @@ -2199,6 +2208,7 @@ cliui@^2.1.0: cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -2518,6 +2528,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" + integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= dependencies: lru-cache "^4.0.1" which "^1.2.9" @@ -2737,6 +2748,7 @@ cssstyle@^1.1.1: currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= dependencies: array-find-index "^1.0.1" @@ -3985,9 +3997,10 @@ fsevents@1.2.4, fsevents@^1.2.2, fsevents@^1.2.3: nan "^2.9.2" node-pre-gyp "^0.10.0" -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" +fstream@^1.0.0, fstream@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -4018,6 +4031,7 @@ gauge@~2.7.3: gaze@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" + integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== dependencies: globule "^1.0.0" @@ -4032,6 +4046,7 @@ get-own-enumerable-property-symbols@^3.0.0: get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= get-stream@^3.0.0: version "3.0.0" @@ -4071,9 +4086,10 @@ glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" -glob@^7.0.0, glob@~7.1.1: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" +glob@^7.0.0, glob@^7.1.3, glob@~7.1.1: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -4164,6 +4180,7 @@ globby@^6.1.0: globule@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" + integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ== dependencies: glob "~7.1.1" lodash "~4.17.10" @@ -4579,10 +4596,12 @@ imurmurhash@^0.1.4: in-publish@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" + integrity sha1-4g/146KvwmkDILbcVSaCqcf631E= indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= dependencies: repeating "^2.0.0" @@ -4601,7 +4620,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -4609,6 +4628,11 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" +inherits@~2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -5674,8 +5698,9 @@ jquery@^3.4.0: integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== js-base64@^2.1.8: - version "2.4.9" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03" + version "2.5.1" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" + integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== js-levenshtein@^1.1.3: version "1.1.4" @@ -5995,18 +6020,10 @@ lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" -lodash.clonedeep@^4.3.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -6015,10 +6032,6 @@ lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" -lodash.mergewith@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -6048,7 +6061,12 @@ lodash.uniq@^4.5.0: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" -lodash@^4.0.0, lodash@^4.17.5, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.15, lodash@~4.17.10: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + +lodash@^4.17.5: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" @@ -6074,6 +6092,7 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4 loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" @@ -6125,6 +6144,7 @@ map-cache@^0.2.2: map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= map-visit@^1.0.0: version "1.0.0" @@ -6175,6 +6195,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= dependencies: camelcase-keys "^2.0.0" decamelize "^1.1.2" @@ -6427,9 +6448,10 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.10.0: - version "2.11.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" +nan@^2.13.2: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== nan@^2.9.2: version "2.10.0" @@ -6495,6 +6517,7 @@ node-forge@0.7.5: node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" + integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== dependencies: fstream "^1.0.0" glob "^7.0.3" @@ -6571,9 +6594,10 @@ node-releases@^1.0.0-alpha.11, node-releases@^1.0.1: dependencies: semver "^5.3.0" -node-sass@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4" +node-sass@^4.13.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" + integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -6582,12 +6606,10 @@ node-sass@^4.10.0: get-stdin "^4.0.1" glob "^7.0.3" in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" + lodash "^4.17.15" meow "^3.7.0" mkdirp "^0.5.1" - nan "^2.10.0" + nan "^2.13.2" node-gyp "^3.8.0" npmlog "^4.0.0" request "^2.88.0" @@ -6598,6 +6620,7 @@ node-sass@^4.10.0: "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= dependencies: abbrev "1" @@ -6608,7 +6631,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: +normalize-package-data@^2.3.2: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" dependencies: @@ -6617,6 +6640,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^2.3.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -6876,6 +6909,7 @@ os-homedir@^1.0.0: os-locale@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= dependencies: lcid "^1.0.0" @@ -8135,6 +8169,7 @@ recursive-readdir@2.2.2: redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" @@ -8378,6 +8413,13 @@ resolve@1.8.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: dependencies: path-parse "^1.0.5" +resolve@^1.10.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== + dependencies: + path-parse "^1.0.6" + resolve@^1.10.1: version "1.11.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" @@ -8410,7 +8452,14 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: +rimraf@2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -8489,6 +8538,7 @@ sane@^2.0.0: sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" + integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k= dependencies: glob "^7.0.0" lodash "^4.0.0" @@ -8541,6 +8591,7 @@ schema-utils@^1.0.0: scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= dependencies: js-base64 "^2.1.8" source-map "^0.4.2" @@ -8569,7 +8620,8 @@ semver@^5.5.1: semver@~5.3.0: version "5.3.0" - resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= send@0.16.2: version "0.16.2" @@ -8589,6 +8641,13 @@ send@0.16.2: range-parser "~1.2.0" statuses "~1.4.0" +serialize-error@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-5.0.0.tgz#a7ebbcdb03a5d71a6ed8461ffe0fc1a1afed62ac" + integrity sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA== + dependencies: + type-fest "^0.8.0" + serialize-javascript@^1.4.0: version "1.5.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe" @@ -8929,6 +8988,7 @@ statuses@~1.4.0: stdout-stream@^1.4.0: version "1.4.1" resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" + integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== dependencies: readable-stream "^2.0.1" @@ -9040,6 +9100,7 @@ strip-eof@^1.0.0: strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" @@ -9135,11 +9196,12 @@ tapable@^1.0.0, tapable@^1.1.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e" tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" - fstream "^1.0.2" + fstream "^1.0.12" inherits "2" tar@^4: @@ -9297,6 +9359,7 @@ tr46@^1.0.1: trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= trim-right@^1.0.1: version "1.0.1" @@ -9305,6 +9368,7 @@ trim-right@^1.0.1: "true-case-path@^1.0.2": version "1.0.3" resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" + integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== dependencies: glob "^7.1.2" @@ -9336,6 +9400,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.8.0: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@~1.6.16: version "1.6.16" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" @@ -9766,6 +9835,7 @@ whatwg-url@^7.0.0: which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= which-module@^2.0.0: version "2.0.0" @@ -9996,6 +10066,7 @@ yargs-parser@^10.1.0: yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" + integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo= dependencies: camelcase "^3.0.0" @@ -10067,6 +10138,7 @@ yargs@^11.0.0: yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" + integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg= dependencies: camelcase "^3.0.0" cliui "^3.2.0" diff --git a/email_loading/package.json b/email_loading/package.json index 51feaf806..de52368bf 100644 --- a/email_loading/package.json +++ b/email_loading/package.json @@ -3,7 +3,7 @@ "version": "0.24.1", "private": true, "dependencies": { - "@criptext/electron-better-ipc": "^0.1.2-rc5", + "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2", "react": "^16.2.0", "react-dom": "^16.2.0", "react-localization": "^1.0.13" @@ -18,7 +18,7 @@ "devDependencies": { "@criptext/react-scripts": "^2.0.6-rc1", "criptext-js-tools": "^0.5.0", - "node-sass": "^4.10.0" + "node-sass": "^4.13.0" }, "homepage": "./", "browserslist": [ diff --git a/email_loading/src/components/LinkDeviceRequest.js b/email_loading/src/components/LinkDeviceRequest.js index be5b225a8..7620b225b 100644 --- a/email_loading/src/components/LinkDeviceRequest.js +++ b/email_loading/src/components/LinkDeviceRequest.js @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { DEVICE_TYPE } from '../utils/const'; import string from './../lang'; +import './linkdevicerequest.scss'; const { linkDeviceRequest } = string; diff --git a/email_loading/src/components/SyncMailboxWrapper.js b/email_loading/src/components/SyncMailboxWrapper.js index 6d6bd573b..61d74fc00 100644 --- a/email_loading/src/components/SyncMailboxWrapper.js +++ b/email_loading/src/components/SyncMailboxWrapper.js @@ -26,7 +26,7 @@ import { import { loadingTypes } from './Panel'; import { defineDeviceIcon } from '../utils/linkDeviceUtils'; import string from './../lang'; -import './linkdevicerequest.scss'; +import './linkingdevices.scss'; const { messages } = string.linkOldDevice; const ANIMATION_DURATION = 1500; diff --git a/email_loading/src/components/linkingdevices.scss b/email_loading/src/components/linkingdevices.scss index 1f3688dac..60a7713e6 100644 --- a/email_loading/src/components/linkingdevices.scss +++ b/email_loading/src/components/linkingdevices.scss @@ -39,7 +39,6 @@ width: 305px; .content { - padding: 0.5px; opacity: 1; border-radius: 5px; transition: width 1.5s; diff --git a/email_loading/src/utils/ipc.js b/email_loading/src/utils/ipc.js index d327e2e59..ac3f721e2 100644 --- a/email_loading/src/utils/ipc.js +++ b/email_loading/src/utils/ipc.js @@ -1,177 +1,177 @@ -import { callMain } from '@criptext/electron-better-ipc/renderer'; +import ipc from '@criptext/electron-better-ipc/renderer'; export const closeCreatingKeysLoadingWindow = () => { - callMain('close-create-keys-loading'); + ipc.callMain('close-create-keys-loading'); }; -export const getComputerName = () => callMain('get-computer-name'); +export const getComputerName = () => ipc.callMain('get-computer-name'); export const openMailboxWindow = () => { - callMain('open-mailbox', { firstOpenApp: true }); + ipc.callMain('open-mailbox', { firstOpenApp: true }); }; export const throwError = error => { - callMain('throwError', error); + ipc.callMain('throwError', error); }; export const sendEndLinkDevicesEvent = () => { - callMain('end-link-devices-event'); + ipc.callMain('end-link-devices-event'); }; export const getSystemLanguage = async () => { - return await callMain('get-system-language'); + return await ipc.callMain('get-system-language'); }; /* Criptext Client ----------------------------- */ export const acknowledgeEvents = async eventIds => { - return await callMain('client-acknowledge-events', eventIds); + return await ipc.callMain('client-acknowledge-events', eventIds); }; export const getDataReady = async () => { - return await callMain('client-get-data-ready'); + return await ipc.callMain('client-get-data-ready'); }; export const getKeyBundle = async deviceId => { - return await callMain('client-get-key-bundle', deviceId); + return await ipc.callMain('client-get-key-bundle', deviceId); }; export const linkAccept = async randomId => { - return await callMain('client-link-accept', randomId); + return await ipc.callMain('client-link-accept', randomId); }; export const linkDeny = async randomId => { - return await callMain('client-link-deny', randomId); + return await ipc.callMain('client-link-deny', randomId); }; export const postDataReady = async params => { - return await callMain('client-post-data-ready', params); + return await ipc.callMain('client-post-data-ready', params); }; export const postKeyBundle = async params => { - return await callMain('client-post-key-bundle', params); + return await ipc.callMain('client-post-key-bundle', params); }; export const postUser = async params => { - return await callMain('client-post-user', params); + return await ipc.callMain('client-post-user', params); }; export const syncAccept = async randomId => { - return await callMain('client-sync-accept', randomId); + return await ipc.callMain('client-sync-accept', randomId); }; export const syncDeny = async randomId => { - return await callMain('client-sync-deny', randomId); + return await ipc.callMain('client-sync-deny', randomId); }; /* DataBase ----------------------------- */ export const cleanDatabase = async username => { - return await callMain('db-clean-database', username); + return await ipc.callMain('db-clean-database', username); }; export const createAccount = async params => { - return await callMain('db-create-account', params); + return await ipc.callMain('db-create-account', params); }; export const createContact = async params => { - return await callMain('db-create-contact', params); + return await ipc.callMain('db-create-contact', params); }; export const createIdentityKeyRecord = async params => { - return await callMain('db-create-identity-key-record', params); + return await ipc.callMain('db-create-identity-key-record', params); }; export const createLabel = async params => { - return await callMain('db-create-label', params); + return await ipc.callMain('db-create-label', params); }; export const createPreKeyRecord = async params => { - return await callMain('db-create-prekey-record', params); + return await ipc.callMain('db-create-prekey-record', params); }; export const createSessionRecord = async params => { - return await callMain('db-create-session-record', params); + return await ipc.callMain('db-create-session-record', params); }; export const createSignedPreKeyRecord = async params => { - return await callMain('db-create-signed-prekey-record', params); + return await ipc.callMain('db-create-signed-prekey-record', params); }; export const createTables = async () => { - return await callMain('db-create-tables'); + return await ipc.callMain('db-create-tables'); }; export const deletePreKeyPair = async params => { - return await callMain('db-delete-prekey-pair', params); + return await ipc.callMain('db-delete-prekey-pair', params); }; export const deleteSessionRecord = async params => { - return await callMain('db-delete-session-record', params); + return await ipc.callMain('db-delete-session-record', params); }; export const getAccount = async () => { - return await callMain('db-get-account'); + return await ipc.callMain('db-get-account'); }; export const getAllLabels = async () => { - return await callMain('db-get-all-labels'); + return await ipc.callMain('db-get-all-labels'); }; export const getContactByEmails = async emails => { - return await callMain('db-get-contact-by-emails', emails); + return await ipc.callMain('db-get-contact-by-emails', emails); }; export const getIdentityKeyRecord = async params => { - return await callMain('db-get-identity-key-record', params); + return await ipc.callMain('db-get-identity-key-record', params); }; export const getPreKeyPair = async params => { - return await callMain('db-get-prekey-pair', params); + return await ipc.callMain('db-get-prekey-pair', params); }; export const getSessionRecord = async params => { - return await callMain('db-get-session-record', params); + return await ipc.callMain('db-get-session-record', params); }; export const getSignedPreKey = async params => { - return await callMain('db-get-signed-prekey', params); + return await ipc.callMain('db-get-signed-prekey', params); }; export const updateAccount = async params => { - return await callMain('db-update-account', params); + return await ipc.callMain('db-update-account', params); }; export const updateIdentityKeyRecord = async params => { - return await callMain('db-update-identity-key-record', params); + return await ipc.callMain('db-update-identity-key-record', params); }; /* DataTransfer ----------------------------- */ export const downloadBackupFile = async address => { - return await callMain('data-transfer-download', address); + return await ipc.callMain('data-transfer-download', address); }; export const decryptBackupFile = async key => { - return await callMain('data-transfer-decrypt', key); + return await ipc.callMain('data-transfer-decrypt', key); }; export const importDatabase = async () => { - return await callMain('data-transfer-import'); + return await ipc.callMain('data-transfer-import'); }; export const clearSyncData = async () => { - return await callMain('data-transfer-clear-sync-data'); + return await ipc.callMain('data-transfer-clear-sync-data'); }; export const exportDatabase = async () => { - return await callMain('data-transfer-export-database'); + return await ipc.callMain('data-transfer-export-database'); }; export const encryptDatabaseFile = async () => { - return await callMain('data-transfer-encrypt'); + return await ipc.callMain('data-transfer-encrypt'); }; export const uploadDatabaseFile = async randomId => { - return await callMain('data-transfer-upload', randomId); + return await ipc.callMain('data-transfer-upload', randomId); }; diff --git a/email_loading/yarn.lock b/email_loading/yarn.lock index 4f623c707..96ce41c53 100644 --- a/email_loading/yarn.lock +++ b/email_loading/yarn.lock @@ -788,9 +788,12 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@criptext/electron-better-ipc@^0.1.2-rc5": - version "0.1.2-rc5" - resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.1.2-rc5.tgz#4a51755de1168b441fe6a68872fe8b95eaa742ab" +"@criptext/electron-better-ipc@^0.7.0-rc1-0.2": + version "0.7.0-rc1-0.2" + resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.7.0-rc1-0.2.tgz#c17d10c90594beabb8c93938880b8b0ed05afe9a" + integrity sha512-18EyLzj6vA/1ZxpRZc5LG6Z826Ir/INBR5LwFi8Dq2RHVJKorsw4dVVU+fKa1Lh/NJCJVBysmT9xmwdf48NXZw== + dependencies: + serialize-error "^5.0.0" "@criptext/react-scripts@^2.0.6-rc1": version "2.0.6-rc1" @@ -1133,6 +1136,7 @@ alphanum-sort@^1.0.0: amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= ansi-colors@^3.0.0: version "3.2.1" @@ -1236,6 +1240,7 @@ array-filter@~0.0.0: array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= array-flatten@1.1.1: version "1.1.1" @@ -1327,6 +1332,7 @@ async-each@^1.0.0: async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" + integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= async-limiter@~1.0.0: version "1.0.0" @@ -1705,6 +1711,7 @@ binary-extensions@^1.0.0: block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= dependencies: inherits "~2.0.0" @@ -1987,7 +1994,8 @@ camel-case@3.0.x: camelcase-keys@^2.0.0: version "2.1.0" - resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= dependencies: camelcase "^2.0.0" map-obj "^1.0.0" @@ -1995,10 +2003,12 @@ camelcase-keys@^2.0.0: camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= camelcase@^4.1.0: version "4.1.0" @@ -2137,6 +2147,7 @@ cli-width@^2.0.0: cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -2459,6 +2470,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" + integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= dependencies: lru-cache "^4.0.1" which "^1.2.9" @@ -2670,6 +2682,7 @@ cssstyle@^1.1.1: currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= dependencies: array-find-index "^1.0.1" @@ -3873,9 +3886,10 @@ fsevents@1.2.4, fsevents@^1.2.2, fsevents@^1.2.3: nan "^2.9.2" node-pre-gyp "^0.10.0" -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" +fstream@^1.0.0, fstream@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -3906,6 +3920,7 @@ gauge@~2.7.3: gaze@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" + integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== dependencies: globule "^1.0.0" @@ -3920,6 +3935,7 @@ get-own-enumerable-property-symbols@^3.0.0: get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= get-stream@^3.0.0: version "3.0.0" @@ -3959,9 +3975,10 @@ glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" -glob@^7.0.0, glob@~7.1.1: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" +glob@^7.0.0, glob@^7.1.3, glob@~7.1.1: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -4047,6 +4064,7 @@ globby@^6.1.0: globule@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" + integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ== dependencies: glob "~7.1.1" lodash "~4.17.10" @@ -4462,10 +4480,12 @@ imurmurhash@^0.1.4: in-publish@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" + integrity sha1-4g/146KvwmkDILbcVSaCqcf631E= indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= dependencies: repeating "^2.0.0" @@ -4484,7 +4504,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -4492,6 +4512,11 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" +inherits@~2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -5568,8 +5593,9 @@ joi@^11.1.1: topo "2.x.x" js-base64@^2.1.8: - version "2.4.9" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03" + version "2.5.1" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" + integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== js-levenshtein@^1.1.3: version "1.1.4" @@ -5873,18 +5899,10 @@ lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" -lodash.clonedeep@^4.3.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -5893,10 +5911,6 @@ lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" -lodash.mergewith@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -5922,10 +5936,15 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.5, lodash@~4.17.10: +"lodash@>=3.5 <5", lodash@^4.17.5: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" +lodash@^4.0.0, lodash@^4.17.15, lodash@~4.17.10: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -5943,6 +5962,7 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" @@ -5994,6 +6014,7 @@ map-cache@^0.2.2: map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= map-visit@^1.0.0: version "1.0.0" @@ -6044,7 +6065,8 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: meow@^3.7.0: version "3.7.0" - resolved "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= dependencies: camelcase-keys "^2.0.0" decamelize "^1.1.2" @@ -6293,9 +6315,10 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.10.0: - version "2.11.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" +nan@^2.13.2: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== nan@^2.9.2: version "2.10.0" @@ -6361,6 +6384,7 @@ node-forge@0.7.5: node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" + integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== dependencies: fstream "^1.0.0" glob "^7.0.3" @@ -6437,9 +6461,10 @@ node-releases@^1.0.0-alpha.11, node-releases@^1.0.1: dependencies: semver "^5.3.0" -node-sass@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4" +node-sass@^4.13.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" + integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -6448,12 +6473,10 @@ node-sass@^4.10.0: get-stdin "^4.0.1" glob "^7.0.3" in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" + lodash "^4.17.15" meow "^3.7.0" mkdirp "^0.5.1" - nan "^2.10.0" + nan "^2.13.2" node-gyp "^3.8.0" npmlog "^4.0.0" request "^2.88.0" @@ -6464,6 +6487,7 @@ node-sass@^4.10.0: "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= dependencies: abbrev "1" @@ -6474,7 +6498,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: +normalize-package-data@^2.3.2: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" dependencies: @@ -6483,6 +6507,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^2.3.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -6690,7 +6724,8 @@ os-homedir@^1.0.0: os-locale@^1.4.0: version "1.4.0" - resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= dependencies: lcid "^1.0.0" @@ -6873,6 +6908,11 @@ path-parse@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -7890,6 +7930,7 @@ recursive-readdir@2.2.2: redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" @@ -8132,6 +8173,13 @@ resolve@1.8.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: dependencies: path-parse "^1.0.5" +resolve@^1.10.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== + dependencies: + path-parse "^1.0.6" + restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -8151,7 +8199,14 @@ rgba-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: +rimraf@2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -8228,6 +8283,7 @@ sane@^2.0.0: sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" + integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k= dependencies: glob "^7.0.0" lodash "^4.0.0" @@ -8280,6 +8336,7 @@ schema-utils@^1.0.0: scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= dependencies: js-base64 "^2.1.8" source-map "^0.4.2" @@ -8304,7 +8361,8 @@ semver@^5.5.1: semver@~5.3.0: version "5.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= send@0.16.2: version "0.16.2" @@ -8324,6 +8382,13 @@ send@0.16.2: range-parser "~1.2.0" statuses "~1.4.0" +serialize-error@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-5.0.0.tgz#a7ebbcdb03a5d71a6ed8461ffe0fc1a1afed62ac" + integrity sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA== + dependencies: + type-fest "^0.8.0" + serialize-javascript@^1.4.0: version "1.5.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe" @@ -8540,6 +8605,7 @@ source-map-url@^0.4.0: source-map@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + integrity sha1-66T12pwNyZneaAMti092FzZSA2s= dependencies: amdefine ">=0.0.4" @@ -8659,6 +8725,7 @@ statuses@~1.4.0: stdout-stream@^1.4.0: version "1.4.1" resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" + integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== dependencies: readable-stream "^2.0.1" @@ -8776,6 +8843,7 @@ strip-eof@^1.0.0: strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" @@ -8870,11 +8938,12 @@ tapable@^1.0.0, tapable@^1.1.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e" tar@^2.0.0: - version "2.2.1" - resolved "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" - fstream "^1.0.2" + fstream "^1.0.12" inherits "2" tar@^4: @@ -9032,6 +9101,7 @@ tr46@^1.0.1: trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= trim-right@^1.0.1: version "1.0.1" @@ -9040,6 +9110,7 @@ trim-right@^1.0.1: "true-case-path@^1.0.2": version "1.0.3" resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" + integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== dependencies: glob "^7.1.2" @@ -9071,6 +9142,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.8.0: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@~1.6.16: version "1.6.16" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" @@ -9491,6 +9567,7 @@ whatwg-url@^7.0.0: which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= which-module@^2.0.0: version "2.0.0" @@ -9713,6 +9790,7 @@ yargs-parser@^10.1.0: yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" + integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo= dependencies: camelcase "^3.0.0" @@ -9782,6 +9860,7 @@ yargs@^11.0.0: yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" + integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg= dependencies: camelcase "^3.0.0" cliui "^3.2.0" diff --git a/email_login/package.json b/email_login/package.json index 06ef7bacd..2d14dd25b 100644 --- a/email_login/package.json +++ b/email_login/package.json @@ -3,7 +3,7 @@ "version": "0.24.1", "private": true, "dependencies": { - "@criptext/electron-better-ipc": "^0.1.2-rc5", + "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2", "crypto-js": "^3.1.9-1", "isemail": "^3.1.3", "moment": "^2.24.0", @@ -22,7 +22,7 @@ "devDependencies": { "@criptext/react-scripts": "^2.0.6-rc1", "criptext-js-tools": "0.7.2", - "node-sass": "^4.9.4", + "node-sass": "^4.13.0", "testcheck": "^1.0.0-rc.2" }, "homepage": "./", diff --git a/email_login/src/utils/ipc.js b/email_login/src/utils/ipc.js index e87044bc0..d79c61b12 100644 --- a/email_login/src/utils/ipc.js +++ b/email_login/src/utils/ipc.js @@ -1,87 +1,87 @@ -import { callMain } from '@criptext/electron-better-ipc/renderer'; +import ipc from '@criptext/electron-better-ipc/renderer'; export const closeLoginWindow = params => { - callMain('close-login', params); + ipc.callMain('close-login', params); }; -export const getComputerName = () => callMain('get-computer-name'); +export const getComputerName = () => ipc.callMain('get-computer-name'); -export const getOsAndArch = () => callMain('get-os-and-arch'); +export const getOsAndArch = () => ipc.callMain('get-os-and-arch'); -export const isWindows = () => callMain('get-isWindows'); +export const isWindows = () => ipc.callMain('get-isWindows'); export const minimizeLoginWindow = () => { - callMain('minimize-login'); + ipc.callMain('minimize-login'); }; export const openCreateKeysLoadingWindow = params => { - callMain('open-create-keys-loading', params); + ipc.callMain('open-create-keys-loading', params); }; export const throwError = error => { - callMain('throwError', error); + ipc.callMain('throwError', error); }; /* Database ----------------------------- */ export const getAccountByParams = async params => { - return await callMain('db-get-account-by-params', params); + return await ipc.callMain('db-get-account-by-params', params); }; export const updateAccount = async params => { - return await callMain('db-update-account', params); + return await ipc.callMain('db-update-account', params); }; /* Criptext Client ----------------------------- */ export const canLogin = async params => { - return await callMain('client-can-login', params); + return await ipc.callMain('client-can-login', params); }; export const checkAvailableUsername = async username => { - return await callMain('client-check-available-username', username); + return await ipc.callMain('client-check-available-username', username); }; export const deleteDeviceToken = async params => { - return await callMain('client-delete-device-token', params); + return await ipc.callMain('client-delete-device-token', params); }; export const linkAuth = async newDeviceData => { - return await callMain('client-link-auth', newDeviceData); + return await ipc.callMain('client-link-auth', newDeviceData); }; export const linkCancel = async newDeviceData => { - return await callMain('client-link-cancel', newDeviceData); + return await ipc.callMain('client-link-cancel', newDeviceData); }; export const findDevices = async params => { - return await callMain('client-find-devices', params); + return await ipc.callMain('client-find-devices', params); }; export const linkBegin = async params => { - return await callMain('client-link-begin', params); + return await ipc.callMain('client-link-begin', params); }; export const linkStatus = async () => { - return await callMain('client-link-status'); + return await ipc.callMain('client-link-status'); }; export const login = async params => { - return await callMain('client-login', params); + return await ipc.callMain('client-login', params); }; export const loginFirst = async params => { - return await callMain('client-login-first', params); + return await ipc.callMain('client-login-first', params); }; export const resetPassword = async params => { - return await callMain('client-reset-password', params); + return await ipc.callMain('client-reset-password', params); }; export const sendRecoveryCode = async params => { - return await callMain('client-send-recovery-code', params); + return await ipc.callMain('client-send-recovery-code', params); }; export const validateRecoveryCode = async params => { - return await callMain('client-validate-recovery-code', params); + return await ipc.callMain('client-validate-recovery-code', params); }; diff --git a/email_login/yarn.lock b/email_login/yarn.lock index cf879f263..72e2dda05 100644 --- a/email_login/yarn.lock +++ b/email_login/yarn.lock @@ -728,9 +728,12 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@criptext/electron-better-ipc@^0.1.2-rc5": - version "0.1.2-rc5" - resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.1.2-rc5.tgz#4a51755de1168b441fe6a68872fe8b95eaa742ab" +"@criptext/electron-better-ipc@^0.7.0-rc1-0.2": + version "0.7.0-rc1-0.2" + resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.7.0-rc1-0.2.tgz#c17d10c90594beabb8c93938880b8b0ed05afe9a" + integrity sha512-18EyLzj6vA/1ZxpRZc5LG6Z826Ir/INBR5LwFi8Dq2RHVJKorsw4dVVU+fKa1Lh/NJCJVBysmT9xmwdf48NXZw== + dependencies: + serialize-error "^5.0.0" "@criptext/react-scripts@^2.0.6-rc1": version "2.0.6-rc1" @@ -1036,6 +1039,7 @@ alphanum-sort@^1.0.0: amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= ansi-colors@^3.0.0: version "3.1.0" @@ -1133,6 +1137,7 @@ array-filter@~0.0.0: array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= array-flatten@1.1.1: version "1.1.1" @@ -1226,6 +1231,7 @@ async-each@^1.0.0: async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" + integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= async-limiter@~1.0.0: version "1.0.0" @@ -1582,6 +1588,7 @@ binary-extensions@^1.0.0: block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= dependencies: inherits "~2.0.0" @@ -1849,6 +1856,7 @@ camel-case@3.0.x: camelcase-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= dependencies: camelcase "^2.0.0" map-obj "^1.0.0" @@ -1856,10 +1864,12 @@ camelcase-keys@^2.0.0: camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= camelcase@^4.1.0: version "4.1.0" @@ -1994,6 +2004,7 @@ cli-width@^2.0.0: cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -2302,6 +2313,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" + integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= dependencies: lru-cache "^4.0.1" which "^1.2.9" @@ -2511,6 +2523,7 @@ cssstyle@^1.0.0, cssstyle@^1.1.1: currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= dependencies: array-find-index "^1.0.1" @@ -3578,9 +3591,10 @@ fsevents@1.2.4, fsevents@^1.2.2, fsevents@^1.2.3: nan "^2.9.2" node-pre-gyp "^0.10.0" -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" +fstream@^1.0.0, fstream@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -3611,6 +3625,7 @@ gauge@~2.7.3: gaze@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" + integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== dependencies: globule "^1.0.0" @@ -3625,6 +3640,7 @@ get-own-enumerable-property-symbols@^3.0.0: get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= get-stream@^3.0.0: version "3.0.0" @@ -3660,7 +3676,19 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: +glob@^7.0.0, glob@^7.1.3, glob@~7.1.1: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" dependencies: @@ -3721,6 +3749,7 @@ globby@^6.1.0: globule@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" + integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ== dependencies: glob "~7.1.1" lodash "~4.17.10" @@ -4107,10 +4136,12 @@ imurmurhash@^0.1.4: in-publish@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" + integrity sha1-4g/146KvwmkDILbcVSaCqcf631E= indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= dependencies: repeating "^2.0.0" @@ -4129,7 +4160,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -4137,6 +4168,11 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" +inherits@~2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -4867,8 +4903,9 @@ joi@^11.1.1: topo "2.x.x" js-base64@^2.1.8: - version "2.4.9" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03" + version "2.5.1" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" + integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== js-levenshtein@^1.1.3: version "1.1.4" @@ -5165,18 +5202,10 @@ lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" -lodash.clonedeep@^4.3.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -5189,10 +5218,6 @@ lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" -lodash.mergewith@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -5222,10 +5247,15 @@ lodash.zip@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020" -"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@~4.17.10: +"lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" +lodash@^4.0.0, lodash@^4.17.15, lodash@~4.17.10: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + loglevel@^1.4.1: version "1.6.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" @@ -5239,6 +5269,7 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" @@ -5283,6 +5314,7 @@ map-cache@^0.2.2: map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= map-visit@^1.0.0: version "1.0.0" @@ -5334,6 +5366,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= dependencies: camelcase-keys "^2.0.0" decamelize "^1.1.2" @@ -5574,7 +5607,12 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.10.0, nan@^2.9.2: +nan@^2.13.2: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== + +nan@^2.9.2: version "2.11.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" @@ -5632,6 +5670,7 @@ node-forge@0.7.5: node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" + integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== dependencies: fstream "^1.0.0" glob "^7.0.3" @@ -5708,9 +5747,10 @@ node-releases@^1.0.0-alpha.11, node-releases@^1.0.0-alpha.14: dependencies: semver "^5.3.0" -node-sass@^4.9.4: - version "4.9.4" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512" +node-sass@^4.13.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" + integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -5719,12 +5759,10 @@ node-sass@^4.9.4: get-stdin "^4.0.1" glob "^7.0.3" in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" + lodash "^4.17.15" meow "^3.7.0" mkdirp "^0.5.1" - nan "^2.10.0" + nan "^2.13.2" node-gyp "^3.8.0" npmlog "^4.0.0" request "^2.88.0" @@ -5735,6 +5773,7 @@ node-sass@^4.9.4: "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= dependencies: abbrev "1" @@ -5745,7 +5784,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: +normalize-package-data@^2.3.2: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" dependencies: @@ -5754,6 +5793,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^2.3.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -5954,7 +6003,8 @@ os-homedir@^1.0.0: os-locale@^1.4.0: version "1.4.0" - resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= dependencies: lcid "^1.0.0" @@ -6133,7 +6183,7 @@ path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" -path-parse@^1.0.5: +path-parse@^1.0.5, path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" @@ -7125,6 +7175,7 @@ recursive-readdir@2.2.2: redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" @@ -7342,6 +7393,13 @@ resolve@1.8.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: dependencies: path-parse "^1.0.5" +resolve@^1.10.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== + dependencies: + path-parse "^1.0.6" + restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -7361,7 +7419,14 @@ rgba-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: +rimraf@2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -7428,6 +7493,7 @@ sane@^2.0.0: sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" + integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k= dependencies: glob "^7.0.0" lodash "^4.0.0" @@ -7486,6 +7552,7 @@ schema-utils@^1.0.0: scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= dependencies: js-base64 "^2.1.8" source-map "^0.4.2" @@ -7506,7 +7573,8 @@ selfsigned@^1.9.1: semver@~5.3.0: version "5.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= send@0.16.2: version "0.16.2" @@ -7526,6 +7594,13 @@ send@0.16.2: range-parser "~1.2.0" statuses "~1.4.0" +serialize-error@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-5.0.0.tgz#a7ebbcdb03a5d71a6ed8461ffe0fc1a1afed62ac" + integrity sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA== + dependencies: + type-fest "^0.8.0" + serialize-javascript@^1.4.0: version "1.5.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe" @@ -7731,6 +7806,7 @@ source-map-url@^0.4.0: source-map@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + integrity sha1-66T12pwNyZneaAMti092FzZSA2s= dependencies: amdefine ">=0.0.4" @@ -7850,6 +7926,7 @@ statuses@~1.4.0: stdout-stream@^1.4.0: version "1.4.1" resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" + integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== dependencies: readable-stream "^2.0.1" @@ -7961,6 +8038,7 @@ strip-eof@^1.0.0: strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" @@ -8038,11 +8116,12 @@ tapable@^1.0.0, tapable@^1.1.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c" tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" - fstream "^1.0.2" + fstream "^1.0.12" inherits "2" tar@^4: @@ -8191,6 +8270,7 @@ tr46@^1.0.1: trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= trim-right@^1.0.1: version "1.0.1" @@ -8199,6 +8279,7 @@ trim-right@^1.0.1: "true-case-path@^1.0.2": version "1.0.3" resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" + integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== dependencies: glob "^7.1.2" @@ -8230,6 +8311,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.8.0: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@~1.6.16: version "1.6.16" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" @@ -8625,6 +8711,7 @@ whatwg-url@^7.0.0: which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= which-module@^2.0.0: version "2.0.0" @@ -8847,6 +8934,7 @@ yargs-parser@^10.1.0: yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" + integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo= dependencies: camelcase "^3.0.0" @@ -8916,6 +9004,7 @@ yargs@^11.0.0: yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" + integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg= dependencies: camelcase "^3.0.0" cliui "^3.2.0" diff --git a/email_mailbox/package.json b/email_mailbox/package.json index fd7b8aaf2..786b560cd 100644 --- a/email_mailbox/package.json +++ b/email_mailbox/package.json @@ -3,7 +3,7 @@ "version": "0.24.1", "private": true, "dependencies": { - "@criptext/electron-better-ipc": "^0.1.2-rc5", + "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2", "animejs": "^2.2.0", "base64-js": "^1.3.0", "criptext-files-sdk": "^0.8.0", @@ -44,7 +44,7 @@ "devDependencies": { "@criptext/react-scripts": "^2.0.6-rc1", "criptext-js-tools": "0.5.0", - "node-sass": "^4.10.0" + "node-sass": "^4.13.0" }, "homepage": "./", "browserslist": [ diff --git a/email_mailbox/src/app.scss b/email_mailbox/src/app.scss index 2772899b9..e30bcb265 100644 --- a/email_mailbox/src/app.scss +++ b/email_mailbox/src/app.scss @@ -503,11 +503,19 @@ TABLE OF CONTENTS } html{ + height: 100%; + width: 100%; + body { height: 100%; margin: 0; overflow: hidden; padding: 0; + + #root{ + height: 100%; + width: 100%; + } } } @@ -535,6 +543,7 @@ h2{ flex-grow: 1; flex-shrink: 1; flex-basis: 100%; + height: 100%; position: relative; width: 100%; } diff --git a/email_mailbox/src/styles/index.scss b/email_mailbox/src/styles/index.scss index a506b84ef..7d56c6d29 100644 --- a/email_mailbox/src/styles/index.scss +++ b/email_mailbox/src/styles/index.scss @@ -19,7 +19,7 @@ $_PATH_TO_FONTS: "./fonts"; /* 2.- SIZES ----------------------------- */ -$_HEIGHT_HEADER: 61px; +$_HEIGHT_HEADER: 60px; $_MAX_WIDTH_SCREEN: 800px; /* 3.- ANIMATION diff --git a/email_mailbox/src/utils/ipc.js b/email_mailbox/src/utils/ipc.js index 0ee05f023..8db413a46 100644 --- a/email_mailbox/src/utils/ipc.js +++ b/email_mailbox/src/utils/ipc.js @@ -1,109 +1,109 @@ -import { callMain } from '@criptext/electron-better-ipc/renderer'; +import ipc from '@criptext/electron-better-ipc/renderer'; /* Windows call ----------------------------- */ export const checkForUpdates = showDialog => { - callMain('check-for-updates', showDialog); + ipc.callMain('check-for-updates', showDialog); }; export const closeMailboxWindow = () => { - callMain('close-mailbox'); + ipc.callMain('close-mailbox'); }; export const generateLabelUUID = async () => { - return await callMain('generate-label-uuid'); + return await ipc.callMain('generate-label-uuid'); }; -export const getOsAndArch = () => callMain('get-os-and-arch'); +export const getOsAndArch = () => ipc.callMain('get-os-and-arch'); export const installUpdate = () => { - callMain('install-update'); + ipc.callMain('install-update'); }; export const logoutApp = () => { - callMain('logout-app'); + ipc.callMain('logout-app'); }; export const maximizeMailboxWindow = () => { - callMain('maximize-mailbox'); + ipc.callMain('maximize-mailbox'); }; export const minimizeMailboxWindow = () => { - callMain('minimize-mailbox'); + ipc.callMain('minimize-mailbox'); }; export const openEmptyComposerWindow = () => { - callMain('open-empty-composer'); + ipc.callMain('open-empty-composer'); }; export const openFilledComposerWindow = data => { - callMain('open-filled-composer', data); + ipc.callMain('open-filled-composer', data); }; export const openFileExplorer = filename => { - callMain('open-file-explorer', filename); + ipc.callMain('open-file-explorer', filename); }; export const processPendingEvents = () => { setTimeout(() => { - callMain('process-pending-events'); + ipc.callMain('process-pending-events'); }, 1000); }; export const restartConnection = async jwt => { - await callMain('restart-connection', jwt); + await ipc.callMain('restart-connection', jwt); }; export const sendEndSyncDevicesEvent = async () => { - await callMain('close-create-keys-loading'); - return await callMain('end-sync-mailbox-event'); + await ipc.callMain('close-create-keys-loading'); + return await ipc.callMain('end-sync-mailbox-event'); }; export const sendEndLinkDevicesEvent = async () => { - await callMain('end-link-devices-event'); - return await callMain('close-create-keys-loading'); + await ipc.callMain('end-link-devices-event'); + return await ipc.callMain('close-create-keys-loading'); }; export const sendOpenEmailSource = metadataKey => { - callMain('open-email-source', metadataKey); + ipc.callMain('open-email-source', metadataKey); }; export const sendPrintEmailEvent = emailId => { - callMain('print-to-pdf', { emailId }); + ipc.callMain('print-to-pdf', { emailId }); }; export const sendPrintThreadEvent = threadId => { - callMain('print-to-pdf', { threadId }); + ipc.callMain('print-to-pdf', { threadId }); }; export const sendStartLinkDevicesEvent = data => { - callMain('start-link-devices-event', data); + ipc.callMain('start-link-devices-event', data); }; export const sendStartSyncDeviceEvent = data => { - callMain('start-sync-mailbox-event', data); + ipc.callMain('start-sync-mailbox-event', data); }; export const showNotificationApp = ({ title, message, threadId }) => { - callMain('show-notification', { title, message, threadId }); + ipc.callMain('show-notification', { title, message, threadId }); }; export const throwError = error => { - callMain('throwError', error); + ipc.callMain('throwError', error); }; export const updateDockBadgeApp = value => { - callMain('update-dock-badge', value); + ipc.callMain('update-dock-badge', value); }; /* File System ----------------------------- */ export const saveEmailBody = async params => { - return await callMain('fs-save-email-body', params); + return await ipc.callMain('fs-save-email-body', params); }; export const deleteEmailContent = async params => { - return await callMain('fs-delete-email-content', params); + return await ipc.callMain('fs-delete-email-content', params); }; export const downloadFileInFileSystem = async ({ @@ -113,7 +113,7 @@ export const downloadFileInFileSystem = async ({ metadataKey, filesize }) => { - return await callMain('fs-download-file', { + return await ipc.callMain('fs-download-file', { url, filename, downloadType, @@ -123,7 +123,7 @@ export const downloadFileInFileSystem = async ({ }; export const checkFileDownloaded = async ({ filename, metadataKey, type }) => { - return await callMain('fs-check-file-downloaded', { + return await ipc.callMain('fs-check-file-downloaded', { filename, metadataKey, type @@ -133,350 +133,350 @@ export const checkFileDownloaded = async ({ filename, metadataKey, type }) => { /* Criptext Client ----------------------------- */ export const acknowledgeEvents = async eventIds => { - return await callMain('client-acknowledge-events', eventIds); + return await ipc.callMain('client-acknowledge-events', eventIds); }; export const changePassword = async params => { - return await callMain('client-change-password', params); + return await ipc.callMain('client-change-password', params); }; export const changeRecoveryEmail = async params => { - return await callMain('client-change-recovery-email', params); + return await ipc.callMain('client-change-recovery-email', params); }; export const checkExpiredSession = async params => { - return await callMain('client-check-expired-session', params); + return await ipc.callMain('client-check-expired-session', params); }; export const deleteMyAccount = async password => { - return await callMain('client-delete-my-account', password); + return await ipc.callMain('client-delete-my-account', password); }; export const getUserSettings = async () => { - return await callMain('client-get-user-settings'); + return await ipc.callMain('client-get-user-settings'); }; export const insertPreKeys = async preKeys => { - return await callMain('client-insert-prekeys', preKeys); + return await ipc.callMain('client-insert-prekeys', preKeys); }; export const logout = async () => { - return await callMain('client-logout'); + return await ipc.callMain('client-logout'); }; export const postPeerEvent = async params => { - return await callMain('client-post-peer-event', params); + return await ipc.callMain('client-post-peer-event', params); }; export const removeAvatar = async params => { - return await callMain('client-remove-avatar', params); + return await ipc.callMain('client-remove-avatar', params); }; export const removeDevice = async params => { - return await callMain('client-remove-device', params); + return await ipc.callMain('client-remove-device', params); }; export const resendConfirmationEmail = async () => { - return await callMain('client-resend-confirmation-email'); + return await ipc.callMain('client-resend-confirmation-email'); }; export const resetPassword = async recipientId => { - return await callMain('client-reset-password', recipientId); + return await ipc.callMain('client-reset-password', recipientId); }; export const setReadTracking = async enabled => { - return await callMain('client-set-read-tracking', enabled); + return await ipc.callMain('client-set-read-tracking', enabled); }; export const setReplyTo = async params => { - return await callMain('client-set-reply-to', params); + return await ipc.callMain('client-set-reply-to', params); }; export const setTwoFactorAuth = async enable => { - return await callMain('client-set-two-factor-auth', enable); + return await ipc.callMain('client-set-two-factor-auth', enable); }; export const syncBegin = async () => { - return await callMain('client-sync-begin'); + return await ipc.callMain('client-sync-begin'); }; export const syncCancel = async () => { - return await callMain('client-sync-cancel'); + return await ipc.callMain('client-sync-cancel'); }; export const syncStatus = async () => { - return await callMain('client-sync-status'); + return await ipc.callMain('client-sync-status'); }; export const unlockDevice = async params => { - return await callMain('client-unlock-device', params); + return await ipc.callMain('client-unlock-device', params); }; export const unsendEmailEvent = async metadataKey => { - return await callMain('client-unsend-email', metadataKey); + return await ipc.callMain('client-unsend-email', metadataKey); }; export const updateDeviceType = async newDeviceType => { - return await callMain('client-update-device-type', newDeviceType); + return await ipc.callMain('client-update-device-type', newDeviceType); }; export const updateNameEvent = async params => { - return await callMain('client-update-name-event', params); + return await ipc.callMain('client-update-name-event', params); }; export const updatePushToken = async pushToken => { - return await callMain('client-update-push-token', pushToken); + return await ipc.callMain('client-update-push-token', pushToken); }; export const uploadAvatar = async params => { - return await callMain('client-upload-avatar', params); + return await ipc.callMain('client-upload-avatar', params); }; /* DataBase ----------------------------- */ export const cleanDatabase = async () => { - return await callMain('db-clean-database'); + return await ipc.callMain('db-clean-database'); }; export const cleanDataLogout = async recipientId => { - return await callMain('db-clean-data-logout', recipientId); + return await ipc.callMain('db-clean-data-logout', recipientId); }; export const createEmail = async params => { - return await callMain('db-create-email', params); + return await ipc.callMain('db-create-email', params); }; export const createEmailLabel = async params => { - return await callMain('db-create-email-label', params); + return await ipc.callMain('db-create-email-label', params); }; export const createFeedItem = async params => { - return await callMain('db-create-feed-item', params); + return await ipc.callMain('db-create-feed-item', params); }; export const createIdentityKeyRecord = async params => { - return await callMain('db-create-identity-key-record', params); + return await ipc.callMain('db-create-identity-key-record', params); }; export const createLabel = async params => { - return await callMain('db-create-label', params); + return await ipc.callMain('db-create-label', params); }; export const createPreKeyRecord = async params => { - return await callMain('db-create-prekey-record', params); + return await ipc.callMain('db-create-prekey-record', params); }; export const createSessionRecord = async params => { - return await callMain('db-create-session-record', params); + return await ipc.callMain('db-create-session-record', params); }; export const createSignalTables = async () => { - return await callMain('db-create-signal-tables'); + return await ipc.callMain('db-create-signal-tables'); }; export const createSignedPreKeyRecord = async params => { - return await callMain('db-create-signed-prekey-record', params); + return await ipc.callMain('db-create-signed-prekey-record', params); }; export const deleteEmailByKeys = async keys => { - return await callMain('db-delete-email-by-keys', keys); + return await ipc.callMain('db-delete-email-by-keys', keys); }; export const deleteEmailLabel = async params => { - return await callMain('db-delete-email-label', params); + return await ipc.callMain('db-delete-email-label', params); }; export const deleteEmailsByIds = async ids => { - return await callMain('db-delete-emails-by-ids', ids); + return await ipc.callMain('db-delete-emails-by-ids', ids); }; export const deleteEmailsByThreadIdAndLabelId = async ({ threadIds, labelId }) => { - return await callMain('db-delete-emails-by-threadid-and-labelid', { + return await ipc.callMain('db-delete-emails-by-threadid-and-labelid', { threadIds, labelId }); }; export const deleteFeedItemById = async feedItemId => { - return await callMain('db-delete-feed-item-by-id', feedItemId); + return await ipc.callMain('db-delete-feed-item-by-id', feedItemId); }; export const deleteLabelById = async labelId => { - return await callMain('db-delete-label-by-id', labelId); + return await ipc.callMain('db-delete-label-by-id', labelId); }; export const deletePreKeyPair = async params => { - return await callMain('db-delete-prekey-pair', params); + return await ipc.callMain('db-delete-prekey-pair', params); }; export const deleteSessionRecord = async params => { - return await callMain('db-delete-session-record', params); + return await ipc.callMain('db-delete-session-record', params); }; export const getAccount = async () => { - return await callMain('db-get-account'); + return await ipc.callMain('db-get-account'); }; export const getAllFeedItems = async () => { - return await callMain('db-get-all-feed-items'); + return await ipc.callMain('db-get-all-feed-items'); }; export const getDataReady = async () => { - return await callMain('client-get-data-ready'); + return await ipc.callMain('client-get-data-ready'); }; export const getAllLabels = async () => { - return await callMain('db-get-all-labels'); + return await ipc.callMain('db-get-all-labels'); }; export const getContactByEmails = async emails => { - return await callMain('db-get-contact-by-emails', emails); + return await ipc.callMain('db-get-contact-by-emails', emails); }; export const getContactByIds = async ids => { - return await callMain('db-get-contact-by-ids', ids); + return await ipc.callMain('db-get-contact-by-ids', ids); }; export const getEmailByKey = async key => { - return await callMain('db-get-email-by-key', key); + return await ipc.callMain('db-get-email-by-key', key); }; export const getEmailByParams = async params => { - return await callMain('db-get-email-by-params', params); + return await ipc.callMain('db-get-email-by-params', params); }; export const getEmailLabelsByEmailId = async emailId => { - return await callMain('db-get-email-labels-by-emailid', emailId); + return await ipc.callMain('db-get-email-labels-by-emailid', emailId); }; export const getEmailsByArrayParam = async emailIds => { - return await callMain('db-get-emails-by-array-param', emailIds); + return await ipc.callMain('db-get-emails-by-array-param', emailIds); }; export const getEmailsByIds = async emailIds => { - return await callMain('db-get-emails-by-ids', emailIds); + return await ipc.callMain('db-get-emails-by-ids', emailIds); }; export const getEmailsByLabelIds = async labelIds => { - return await callMain('db-get-emails-by-labelids', labelIds); + return await ipc.callMain('db-get-emails-by-labelids', labelIds); }; export const getEmailsByThreadId = async params => { - return await callMain('db-get-emails-by-threadid', params); + return await ipc.callMain('db-get-emails-by-threadid', params); }; export const getEmailsByThreadIdAndLabelId = async ({ threadIds, labelId }) => { - return await callMain('db-get-emails-by-threadid-and-labelid', { + return await ipc.callMain('db-get-emails-by-threadid-and-labelid', { threadIds, labelId }); }; export const getEmailsCounterByLabelId = async labelId => { - return await callMain('db-get-emails-counter-by-labelid', labelId); + return await ipc.callMain('db-get-emails-counter-by-labelid', labelId); }; export const getEmailsGroupByThreadByParams = async params => { - return await callMain('db-get-emails-group-by-thread-by-params', params); + return await ipc.callMain('db-get-emails-group-by-thread-by-params', params); }; export const getEmailsUnredByLabelId = async params => { - return await callMain('db-get-emails-unread-by-labelid', params); + return await ipc.callMain('db-get-emails-unread-by-labelid', params); }; export const getFilesByTokens = async tokens => { - return await callMain('db-get-files-by-tokens', tokens); + return await ipc.callMain('db-get-files-by-tokens', tokens); }; export const getFeedItemsCounterBySeen = async seen => { - return await callMain('db-get-feeditems-counter-by-seen', seen); + return await ipc.callMain('db-get-feeditems-counter-by-seen', seen); }; export const getIdentityKeyRecord = async params => { - return await callMain('db-get-identity-key-record', params); + return await ipc.callMain('db-get-identity-key-record', params); }; export const getLabelById = async id => { - return await callMain('db-get-labelid', id); + return await ipc.callMain('db-get-labelid', id); }; export const getLabelsByText = async text => { - return await callMain('db-get-labesls-by-text', text); + return await ipc.callMain('db-get-labesls-by-text', text); }; export const getLabelByUuid = async uuid => { - return await callMain('db-get-label-by-uuid', uuid); + return await ipc.callMain('db-get-label-by-uuid', uuid); }; export const getPreKeyPair = async params => { - return await callMain('db-get-prekey-pair', params); + return await ipc.callMain('db-get-prekey-pair', params); }; export const getSessionRecord = async params => { - return await callMain('db-get-session-record', params); + return await ipc.callMain('db-get-session-record', params); }; export const getSessionRecordIds = async () => { - return await callMain('db-get-prekeys-ids'); + return await ipc.callMain('db-get-prekeys-ids'); }; export const getSignedPreKey = async params => { - return await callMain('db-get-signed-prekey', params); + return await ipc.callMain('db-get-signed-prekey', params); }; export const getTrashExpiredEmails = async () => { - return await callMain('db-get-trash-expired-emails'); + return await ipc.callMain('db-get-trash-expired-emails'); }; export const unsendEmail = async params => { - return await callMain('db-unsend-email', params); + return await ipc.callMain('db-unsend-email', params); }; export const updateAccount = async params => { - return await callMain('db-update-account', params); + return await ipc.callMain('db-update-account', params); }; export const updateContactByEmail = async ({ email, name }) => { - return await callMain('db-update-contact-by-email', { email, name }); + return await ipc.callMain('db-update-contact-by-email', { email, name }); }; export const updateContactSpamScore = async params => { - return await callMain('db-update-contact-spam-acore', params); + return await ipc.callMain('db-update-contact-spam-acore', params); }; export const updateEmail = async params => { - return await callMain('db-update-email', params); + return await ipc.callMain('db-update-email', params); }; export const updateEmails = async params => { - return await callMain('db-update-emails', params); + return await ipc.callMain('db-update-emails', params); }; export const updateFeedItems = async params => { - return await callMain('db-update-feed-items', params); + return await ipc.callMain('db-update-feed-items', params); }; export const updateFilesByEmailId = async ({ emailId, status }) => { - return await callMain('db-update-files-by-emailid', { emailId, status }); + return await ipc.callMain('db-update-files-by-emailid', { emailId, status }); }; export const updateIdentityKeyRecord = async params => { - return await callMain('db-update-identity-key-record', params); + return await ipc.callMain('db-update-identity-key-record', params); }; export const updateLabel = async params => { - return await callMain('db-update-label', params); + return await ipc.callMain('db-update-label', params); }; export const updateSettings = async params => { - return await callMain('db-update-settings', params); + return await ipc.callMain('db-update-settings', params); }; export const updateUnreadEmailByThreadIds = async ({ threadIds, unread }) => { - return await callMain('db-update-unread-email-by-threadids', { + return await ipc.callMain('db-update-unread-email-by-threadids', { threadIds, unread }); @@ -485,53 +485,53 @@ export const updateUnreadEmailByThreadIds = async ({ threadIds, unread }) => { /* DataTransfer ----------------------------- */ export const downloadBackupFile = async address => { - return await callMain('data-transfer-download', address); + return await ipc.callMain('data-transfer-download', address); }; export const decryptBackupFile = async key => { - return await callMain('data-transfer-decrypt', key); + return await ipc.callMain('data-transfer-decrypt', key); }; export const importDatabase = async () => { - return await callMain('data-transfer-import'); + return await ipc.callMain('data-transfer-import'); }; export const clearSyncData = async () => { - return await callMain('data-transfer-clear-sync-data'); + return await ipc.callMain('data-transfer-clear-sync-data'); }; /* Backup ----------------------------- */ export const createDefaultBackupFolder = async () => { - return await callMain('create-default-backup-folder'); + return await ipc.callMain('create-default-backup-folder'); }; export const exportBackupUnencrypted = async params => { - return await callMain('export-backup-unencrypted', params); + return await ipc.callMain('export-backup-unencrypted', params); }; export const exportBackupEncrypted = async params => { - return await callMain('export-backup-encrypted', params); + return await ipc.callMain('export-backup-encrypted', params); }; export const getDefaultBackupFolder = async () => { - return await callMain('get-default-backup-folder'); + return await ipc.callMain('get-default-backup-folder'); }; export const initAutoBackupMonitor = async () => { - return await callMain('init-autobackup-monitor'); + return await ipc.callMain('init-autobackup-monitor'); }; export const restoreBackupEncrypted = async params => { - return await callMain('restore-backup-encrypted', params); + return await ipc.callMain('restore-backup-encrypted', params); }; export const restoreBackupUnencrypted = async params => { - return await callMain('restore-backup-unencrypted', params); + return await ipc.callMain('restore-backup-unencrypted', params); }; /* Nucleus ----------------------------- */ export const reportContentUnencrypted = async error => { - return await callMain('nucleups-report-content-unencrypted', error); + return await ipc.callMain('nucleups-report-content-unencrypted', error); }; diff --git a/email_mailbox/yarn.lock b/email_mailbox/yarn.lock index aeb71b6c0..3a071ac6f 100644 --- a/email_mailbox/yarn.lock +++ b/email_mailbox/yarn.lock @@ -797,9 +797,12 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@criptext/electron-better-ipc@^0.1.2-rc5": - version "0.1.2-rc5" - resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.1.2-rc5.tgz#4a51755de1168b441fe6a68872fe8b95eaa742ab" +"@criptext/electron-better-ipc@^0.7.0-rc1-0.2": + version "0.7.0-rc1-0.2" + resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.7.0-rc1-0.2.tgz#c17d10c90594beabb8c93938880b8b0ed05afe9a" + integrity sha512-18EyLzj6vA/1ZxpRZc5LG6Z826Ir/INBR5LwFi8Dq2RHVJKorsw4dVVU+fKa1Lh/NJCJVBysmT9xmwdf48NXZw== + dependencies: + serialize-error "^5.0.0" "@criptext/react-scripts@^2.0.6-rc1": version "2.0.6-rc1" @@ -1268,6 +1271,7 @@ array-filter@~0.0.0: array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= array-find@^1.0.0: version "1.0.0" @@ -1363,6 +1367,7 @@ async-each@^1.0.0: async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" + integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= async-limiter@~1.0.0: version "1.0.0" @@ -1761,6 +1766,7 @@ binary-extensions@^1.0.0: block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= dependencies: inherits "~2.0.0" @@ -2047,7 +2053,8 @@ camel-case@3.0.x: camelcase-keys@^2.0.0: version "2.1.0" - resolved "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= dependencies: camelcase "^2.0.0" map-obj "^1.0.0" @@ -2059,10 +2066,12 @@ camelcase@^1.0.2: camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= camelcase@^4.1.0: version "4.1.0" @@ -2221,6 +2230,7 @@ cliui@^2.1.0: cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -2544,6 +2554,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" + integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= dependencies: lru-cache "^4.0.1" which "^1.2.9" @@ -2771,6 +2782,7 @@ cssstyle@^1.1.1: currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= dependencies: array-find-index "^1.0.1" @@ -4054,9 +4066,10 @@ fsevents@1.2.4, fsevents@^1.2.2, fsevents@^1.2.3: nan "^2.9.2" node-pre-gyp "^0.10.0" -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" +fstream@^1.0.0, fstream@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -4087,6 +4100,7 @@ gauge@~2.7.3: gaze@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" + integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== dependencies: globule "^1.0.0" @@ -4101,6 +4115,7 @@ get-own-enumerable-property-symbols@^3.0.0: get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= get-stream@^3.0.0: version "3.0.0" @@ -4140,9 +4155,10 @@ glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" -glob@^7.0.0, glob@~7.1.1: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" +glob@^7.0.0, glob@^7.1.3, glob@~7.1.1: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -4240,6 +4256,7 @@ globby@^6.1.0: globule@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" + integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ== dependencies: glob "~7.1.1" lodash "~4.17.10" @@ -4686,10 +4703,12 @@ imurmurhash@^0.1.4: in-publish@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" + integrity sha1-4g/146KvwmkDILbcVSaCqcf631E= indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= dependencies: repeating "^2.0.0" @@ -4708,7 +4727,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -4716,6 +4735,11 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" +inherits@~2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -5787,8 +5811,9 @@ joi@^11.1.1: topo "2.x.x" js-base64@^2.1.8: - version "2.4.9" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03" + version "2.5.1" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" + integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== js-levenshtein@^1.1.3: version "1.1.4" @@ -6118,15 +6143,11 @@ lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" -lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: +lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -6179,10 +6200,15 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10: +"lodash@>=3.5 <5", lodash@^4.2.0, lodash@^4.3.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" +lodash@^4.0.0, lodash@^4.17.15, lodash@~4.17.10: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -6208,6 +6234,7 @@ lottie-web@^5.1.17: loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" @@ -6252,6 +6279,7 @@ map-cache@^0.2.2: map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= map-visit@^1.0.0: version "1.0.0" @@ -6306,7 +6334,8 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: meow@^3.7.0: version "3.7.0" - resolved "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= dependencies: camelcase-keys "^2.0.0" decamelize "^1.1.2" @@ -6565,9 +6594,10 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.10.0: - version "2.11.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" +nan@^2.13.2: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== nan@^2.9.2: version "2.10.0" @@ -6637,6 +6667,7 @@ node-forge@0.7.5: node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" + integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== dependencies: fstream "^1.0.0" glob "^7.0.3" @@ -6713,9 +6744,10 @@ node-releases@^1.0.0-alpha.11, node-releases@^1.0.1: dependencies: semver "^5.3.0" -node-sass@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4" +node-sass@^4.13.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" + integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -6724,12 +6756,10 @@ node-sass@^4.10.0: get-stdin "^4.0.1" glob "^7.0.3" in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" + lodash "^4.17.15" meow "^3.7.0" mkdirp "^0.5.1" - nan "^2.10.0" + nan "^2.13.2" node-gyp "^3.8.0" npmlog "^4.0.0" request "^2.88.0" @@ -6740,6 +6770,7 @@ node-sass@^4.10.0: "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= dependencies: abbrev "1" @@ -6750,7 +6781,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: +normalize-package-data@^2.3.2: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" dependencies: @@ -6759,6 +6790,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^2.3.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -7001,7 +7042,8 @@ os-homedir@^1.0.0: os-locale@^1.4.0: version "1.4.0" - resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= dependencies: lcid "^1.0.0" @@ -8330,6 +8372,7 @@ recursive-readdir@2.2.2: redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" @@ -8599,6 +8642,13 @@ resolve@1.8.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: dependencies: path-parse "^1.0.5" +resolve@^1.10.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== + dependencies: + path-parse "^1.0.6" + resolve@^1.10.1: version "1.11.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" @@ -8631,7 +8681,14 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: +rimraf@2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -8725,6 +8782,7 @@ sanitize-html@^1.19.1: sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" + integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k= dependencies: glob "^7.0.0" lodash "^4.0.0" @@ -8791,6 +8849,7 @@ scrollparent@^2.0.1: scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= dependencies: js-base64 "^2.1.8" source-map "^0.4.2" @@ -8815,7 +8874,8 @@ semver@^5.5.1: semver@~5.3.0: version "5.3.0" - resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= send@0.16.2: version "0.16.2" @@ -8835,6 +8895,13 @@ send@0.16.2: range-parser "~1.2.0" statuses "~1.4.0" +serialize-error@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-5.0.0.tgz#a7ebbcdb03a5d71a6ed8461ffe0fc1a1afed62ac" + integrity sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA== + dependencies: + type-fest "^0.8.0" + serialize-javascript@^1.4.0: version "1.5.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe" @@ -9178,6 +9245,7 @@ statuses@~1.4.0: stdout-stream@^1.4.0: version "1.4.1" resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" + integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== dependencies: readable-stream "^2.0.1" @@ -9289,6 +9357,7 @@ strip-eof@^1.0.0: strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" @@ -9411,11 +9480,12 @@ tapable@^1.0.0, tapable@^1.1.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c" tar@^2.0.0: - version "2.2.1" - resolved "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" - fstream "^1.0.2" + fstream "^1.0.12" inherits "2" tar@^4: @@ -9573,6 +9643,7 @@ tree-changes@^0.3.2: trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= trim-right@^1.0.1: version "1.0.1" @@ -9581,6 +9652,7 @@ trim-right@^1.0.1: "true-case-path@^1.0.2": version "1.0.3" resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" + integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== dependencies: glob "^7.1.2" @@ -9612,6 +9684,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.8.0: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@~1.6.16: version "1.6.16" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" @@ -10042,6 +10119,7 @@ whatwg-url@^7.0.0: which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= which-module@^2.0.0: version "2.0.0" @@ -10271,6 +10349,7 @@ yargs-parser@^10.1.0: yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" + integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo= dependencies: camelcase "^3.0.0" @@ -10342,6 +10421,7 @@ yargs@^11.0.0: yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" + integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg= dependencies: camelcase "^3.0.0" cliui "^3.2.0" From c3c0f6fa58a637777a620949e51555343cf624b5 Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Wed, 13 Nov 2019 17:59:08 -0500 Subject: [PATCH 3/4] Update preview length --- email_composer/src/utils/const.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/email_composer/src/utils/const.js b/email_composer/src/utils/const.js index 591298d44..2ff9a9af3 100644 --- a/email_composer/src/utils/const.js +++ b/email_composer/src/utils/const.js @@ -19,7 +19,7 @@ export const composerEvents = { export const defaultEmptyMimetypeValue = 'application/octet-stream'; -export const previewLength = 100; +export const previewLength = 300; export const externalDomains = [ /* Default domains included */ From babefb91ae2cc7037c4afdc27df58906a1ac61fc Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Wed, 13 Nov 2019 18:02:25 -0500 Subject: [PATCH 4/4] Update version 0.25.0 --- README.md | 4 ++-- electron_app/package.json | 2 +- email_composer/package.json | 2 +- email_loading/package.json | 2 +- email_login/package.json | 2 +- email_mailbox/package.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 51bd021ca..e05c02a23 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ We use Lokalise for translations. If you are interested in helping please write To build Criptext on your machine you'll need: -* Node.js (Recommended 8.15+) -* Yarn (Recommended 1.13+) +* Node.js (Recommended 12.12+) +* Yarn (Recommended 1.19.1+) ## Run locally diff --git a/electron_app/package.json b/electron_app/package.json index 4123bdabd..2b5ef3f5e 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -1,6 +1,6 @@ { "name": "criptext", - "version": "0.24.1", + "version": "0.25.0", "author": { "name": "Criptext Inc", "email": "support@criptext.com", diff --git a/email_composer/package.json b/email_composer/package.json index c2cf3b83d..b49b67f0b 100644 --- a/email_composer/package.json +++ b/email_composer/package.json @@ -1,6 +1,6 @@ { "name": "email_composer", - "version": "0.24.1", + "version": "0.25.0", "private": true, "dependencies": { "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2", diff --git a/email_loading/package.json b/email_loading/package.json index de52368bf..044039d61 100644 --- a/email_loading/package.json +++ b/email_loading/package.json @@ -1,6 +1,6 @@ { "name": "email_loading", - "version": "0.24.1", + "version": "0.25.0", "private": true, "dependencies": { "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2", diff --git a/email_login/package.json b/email_login/package.json index 2d14dd25b..42957646c 100644 --- a/email_login/package.json +++ b/email_login/package.json @@ -1,6 +1,6 @@ { "name": "email_login", - "version": "0.24.1", + "version": "0.25.0", "private": true, "dependencies": { "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2", diff --git a/email_mailbox/package.json b/email_mailbox/package.json index 786b560cd..364fb6655 100644 --- a/email_mailbox/package.json +++ b/email_mailbox/package.json @@ -1,6 +1,6 @@ { "name": "email_mailbox", - "version": "0.24.1", + "version": "0.25.0", "private": true, "dependencies": { "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",