mirror of
https://github.com/BoostIo/Boostnote
synced 2025-12-13 01:36:22 +00:00
Merge branch 'master' into smart_arrows
This commit is contained in:
25
yarn.lock
25
yarn.lock
@@ -1,7 +1,6 @@
|
||||
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||
# yarn lockfile v1
|
||||
|
||||
|
||||
"@ava/babel-plugin-throws-helper@^2.0.0":
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
|
||||
@@ -79,9 +78,9 @@
|
||||
fs-plus "2.x"
|
||||
optimist "~0.4.0"
|
||||
|
||||
"@types/node@^7.0.18":
|
||||
version "7.0.65"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.65.tgz#c160979ff66c4842adc76cc181a11b5e8722d13d"
|
||||
"@types/node@^8.0.24":
|
||||
version "8.10.17"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.17.tgz#d48cf10f0dc6dcf59f827f5a3fc7a4a6004318d3"
|
||||
|
||||
abab@^1.0.3, abab@^1.0.4:
|
||||
version "1.0.4"
|
||||
@@ -2382,6 +2381,12 @@ doctrine@^2.0.0, doctrine@^2.0.2:
|
||||
dependencies:
|
||||
esutils "^2.0.2"
|
||||
|
||||
doctrine@^2.0.2:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
|
||||
dependencies:
|
||||
esutils "^2.0.2"
|
||||
|
||||
dom-serializer@0:
|
||||
version "0.1.0"
|
||||
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
|
||||
@@ -2577,11 +2582,11 @@ electron-winstaller@^2.2.0:
|
||||
lodash.template "^4.2.2"
|
||||
temp "^0.8.3"
|
||||
|
||||
electron@1.7.11:
|
||||
version "1.7.11"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.11.tgz#993b6aa79e0e79a7cfcc369f4c813fbd9a0b08d9"
|
||||
electron@1.8.7:
|
||||
version "1.8.7"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.7.tgz#373c1dc4589d7ab4acd49aff8db4a1c0a6c3bcc1"
|
||||
dependencies:
|
||||
"@types/node" "^7.0.18"
|
||||
"@types/node" "^8.0.24"
|
||||
electron-download "^3.0.1"
|
||||
extract-zip "^1.0.3"
|
||||
|
||||
@@ -2771,7 +2776,11 @@ eslint-plugin-promise@~3.4.0:
|
||||
version "3.4.2"
|
||||
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
|
||||
|
||||
<<<<<<< HEAD
|
||||
eslint-plugin-react@^7.8.2:
|
||||
=======
|
||||
eslint-plugin-react@^7.2.0:
|
||||
>>>>>>> ca0b03e97ce59824c9730f08c15590c5f31ebfb0
|
||||
version "7.8.2"
|
||||
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d"
|
||||
dependencies:
|
||||
|
||||
Reference in New Issue
Block a user