diff options
author | 2019-10-04 15:57:58 +0700 | |
---|---|---|
committer | 2019-10-04 15:57:58 +0700 | |
commit | faa49894b1600e6cb4d3bc2b7cf27e621ab2005a (patch) | |
tree | c9dc58b795d7af2a98b4aa9bffa39d0632057771 | |
parent | Merge branch 'develop' of github.com:getferdi/ferdi into develop (diff) | |
download | ferdium-app-faa49894b1600e6cb4d3bc2b7cf27e621ab2005a.tar.gz ferdium-app-faa49894b1600e6cb4d3bc2b7cf27e621ab2005a.tar.zst ferdium-app-faa49894b1600e6cb4d3bc2b7cf27e621ab2005a.zip |
Fix dependencies issues after introducing develop branch
-rw-r--r-- | package-lock.json | 48 | ||||
-rw-r--r-- | package.json | 2 |
2 files changed, 25 insertions, 25 deletions
diff --git a/package-lock.json b/package-lock.json index 4b5c5cca9..b2622361b 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -7382,21 +7382,11 @@ | |||
7382 | } | 7382 | } |
7383 | }, | 7383 | }, |
7384 | "electron-hunspell": { | 7384 | "electron-hunspell": { |
7385 | "version": "0.1.1", | 7385 | "version": "1.0.0", |
7386 | "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-0.1.1.tgz", | 7386 | "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-1.0.0.tgz", |
7387 | "integrity": "sha512-B3nOQqHexIX+8bz72FZkNk+iFBrdqS9DpV2SaH+t7T9SLbONBVBRLJ2Jj2ytXFUzvw81q7vz2dfxPCddh/E3ww==", | 7387 | "integrity": "sha512-egyioCtGkkNMOYdKBrZsva63JxbPmNjmQVFCZCcmr+uIUs6et6OUvqd6ac9/ujuchiEPDrTfF9gdR9+lPbVyPA==", |
7388 | "requires": { | 7388 | "requires": { |
7389 | "hunspell-asm": "1.0.2", | 7389 | "hunspell-asm": "^4.0.0" |
7390 | "lodash": "^4.17.11", | ||
7391 | "tslib": "1.9.3", | ||
7392 | "unixify": "1.0.0" | ||
7393 | }, | ||
7394 | "dependencies": { | ||
7395 | "tslib": { | ||
7396 | "version": "1.9.3", | ||
7397 | "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", | ||
7398 | "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" | ||
7399 | } | ||
7400 | } | 7390 | } |
7401 | }, | 7391 | }, |
7402 | "electron-is-dev": { | 7392 | "electron-is-dev": { |
@@ -12653,14 +12643,24 @@ | |||
12653 | } | 12643 | } |
12654 | }, | 12644 | }, |
12655 | "hunspell-asm": { | 12645 | "hunspell-asm": { |
12656 | "version": "1.0.2", | 12646 | "version": "4.0.0", |
12657 | "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-1.0.2.tgz", | 12647 | "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-4.0.0.tgz", |
12658 | "integrity": "sha512-UTLBvc0yZiIcHl9qrgxnFTZbX3zF4CprzEY+u+N0iXlUKZnUJRIgvgppTdgiQTsucm5b0aN/rHsgXz2q/0kBRA==", | 12648 | "integrity": "sha512-EcNwMx0Byq1JHMZiuATmqpMk41bOo+NH4yD5xJ3H0X403MoDBory3zri2lJzYSGj+z/6Bqr3EZn24syCjZoY1w==", |
12659 | "requires": { | 12649 | "requires": { |
12660 | "emscripten-wasm-loader": "^1.0.0", | 12650 | "emscripten-wasm-loader": "^3.0.3", |
12661 | "nanoid": "^1.0.2", | 12651 | "nanoid": "^2.1.1" |
12662 | "tslib": "^1.9.0", | 12652 | }, |
12663 | "unixify": "^1.0.0" | 12653 | "dependencies": { |
12654 | "emscripten-wasm-loader": { | ||
12655 | "version": "3.0.3", | ||
12656 | "resolved": "https://registry.npmjs.org/emscripten-wasm-loader/-/emscripten-wasm-loader-3.0.3.tgz", | ||
12657 | "integrity": "sha512-fyq2maBt5LOou27LEBlL5H6G04BxgSamXkvmMsAuIT6rd8ioH4BxNQhuyl6jVPeODh6U8Wk1BoFZxzHpg3o8wA==", | ||
12658 | "requires": { | ||
12659 | "getroot": "^1.0.0", | ||
12660 | "nanoid": "^2.0.3", | ||
12661 | "unixify": "^1.0.0" | ||
12662 | } | ||
12663 | } | ||
12664 | } | 12664 | } |
12665 | }, | 12665 | }, |
12666 | "husky": { | 12666 | "husky": { |
@@ -15850,9 +15850,9 @@ | |||
15850 | "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" | 15850 | "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" |
15851 | }, | 15851 | }, |
15852 | "nanoid": { | 15852 | "nanoid": { |
15853 | "version": "1.3.4", | 15853 | "version": "2.1.2", |
15854 | "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz", | 15854 | "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.2.tgz", |
15855 | "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ==" | 15855 | "integrity": "sha512-q0iKJHcLc9rZg/qtJ/ioG5s6/5357bqvkYCpqXJxpcyfK7L5us8+uJllZosqPWou7l6E1lY2Qqoq5ce+AMbFuQ==" |
15856 | }, | 15856 | }, |
15857 | "nanomatch": { | 15857 | "nanomatch": { |
15858 | "version": "1.2.13", | 15858 | "version": "1.2.13", |
diff --git a/package.json b/package.json index 9f014a8e4..5b0a0bcdb 100644 --- a/package.json +++ b/package.json | |||
@@ -52,7 +52,7 @@ | |||
52 | "electron-dl": "1.14.0", | 52 | "electron-dl": "1.14.0", |
53 | "electron-fetch": "1.3.0", | 53 | "electron-fetch": "1.3.0", |
54 | "electron-hunspell": "1.0.0", | 54 | "electron-hunspell": "1.0.0", |
55 | "electron-is-dev": "1.0.1", | 55 | "electron-is-dev": "1.1.0", |
56 | "electron-react-titlebar": "0.8.1", | 56 | "electron-react-titlebar": "0.8.1", |
57 | "electron-updater": "4.1.2", | 57 | "electron-updater": "4.1.2", |
58 | "electron-window-state": "5.0.3", | 58 | "electron-window-state": "5.0.3", |