diff --git a/package.json b/package.json index 258b370..016fe90 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@types/electron-store": "^1.2.0", "@types/mockery": "^1.4.29", "@types/mousetrap": "^1.5.34", - "@types/react": "^16.0.19", + "@types/react": "^16.0.20", "@types/react-dom": "^16.0.2", "@types/react-test-renderer": "^16.0.0", "@types/sinon": "^2.3.7", @@ -86,12 +86,12 @@ "ts-loader": "^3.1.1", "ts-node": "^3.3.0", "tslint": "^5.8.0", - "typescript": "^2.6.1" + "typescript": "~2.6.1" }, "license": "MIT", "lint-staged": { "*.{ts,tsx}": [ - "prettier --write --no-semi --print-width 100 --single-quote", + "prettier --write", "tslint --fix", "git add" ] diff --git a/tsconfig.json b/tsconfig.json index b43f879..9268183 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,15 +7,9 @@ "experimentalDecorators": true, "allowSyntheticDefaultImports": false, "strict": false, - "noUnusedLocals": true, - "typeRoots": [ - "node_modules/@types" - ] + "noUnusedLocals": true }, "include": [ "src" - ], - "exclude": [ - "node_modules/**/*" ] } diff --git a/tsconfig.test.json b/tsconfig.test.json index 7a77a62..cc07a25 100644 --- a/tsconfig.test.json +++ b/tsconfig.test.json @@ -9,16 +9,16 @@ "strict": false, "noUnusedLocals": true, "outDir": "out-test", - "sourceRoot": "src", "inlineSourceMap": true, "typeRoots": [ - "node_modules/@types" + "node_modules/@types", + "typings" ] }, "include": [ "src" ], "exclude": [ - "node_modules/**/*" + "node_modules" ] } diff --git a/yarn.lock b/yarn.lock index 924f74f..d4c429d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -223,10 +223,14 @@ version "1.5.34" resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.5.34.tgz#22b338d9c4bcdfd8f81c30684aefeb04a4727168" -"@types/node@*", "@types/node@^8.0.24": +"@types/node@*": version "8.0.47" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2" +"@types/node@^7.0.18": + version "7.0.46" + resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.46.tgz#c3dedd25558c676b3d6303e51799abb9c3f8f314" + "@types/react-dom@^16.0.2": version "16.0.2" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.2.tgz#2da9de21fd83f0140b64794ad9c47930230aedae" @@ -240,9 +244,9 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.0.18", "@types/react@^16.0.19": - version "16.0.19" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.19.tgz#f804a0fcd6d94c17df92cf2fd46671bbbc862329" +"@types/react@*", "@types/react@^16.0.18", "@types/react@^16.0.20": + version "16.0.20" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.20.tgz#dc16feb9c0bdf50e439482c6fd3c43d5a1d9f3b1" "@types/sinon@^2.3.7": version "2.3.7" @@ -403,16 +407,15 @@ anymatch@^1.3.0: micromatch "^2.1.5" normalize-path "^2.0.0" -app-package-builder@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/app-package-builder/-/app-package-builder-1.3.3.tgz#252489ebd9e99fded822d01c7d6042d37aa6d844" +app-package-builder@1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/app-package-builder/-/app-package-builder-1.5.0.tgz#3263598b07ac577b3df2205171a449f2dd5f30ca" dependencies: bluebird-lst "^1.0.5" - builder-util "^3.2.0" - builder-util-runtime "^2.5.0" + builder-util "^3.2.1" + builder-util-runtime "^3.1.0" fs-extra-p "^4.4.4" int64-buffer "^0.1.9" - js-yaml "^3.10.0" rabin-bindings "~1.7.3" app-root-path@^1.3.0: @@ -1835,10 +1838,10 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: electron-to-chromium "^1.2.7" browserslist@^2.1.2, browserslist@^2.5.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.6.1.tgz#cc65a05ad6131ebda26f076f2822ba1bc826376b" + version "2.7.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.7.0.tgz#dc375dc70048fec3d989042a35022342902eff00" dependencies: - caniuse-lite "^1.0.30000755" + caniuse-lite "^1.0.30000757" electron-to-chromium "^1.3.27" buf-compare@^1.0.0: @@ -1857,22 +1860,22 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -builder-util-runtime@2.5.0, builder-util-runtime@^2.5.0, builder-util-runtime@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-2.5.0.tgz#22373d4faab8d89e0b077630aef76538deb38476" +builder-util-runtime@3.1.0, builder-util-runtime@^3.0.0, builder-util-runtime@^3.1.0, builder-util-runtime@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-3.1.0.tgz#60ec66d3c49f028655230a09d7767e77ff6f15b8" dependencies: bluebird-lst "^1.0.5" debug "^3.1.0" fs-extra-p "^4.4.4" sax "^1.2.4" -builder-util@3.2.0, builder-util@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-3.2.0.tgz#08900f046c6b09c22a1f235f18644ae9eb963bc4" +builder-util@3.2.1, builder-util@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-3.2.1.tgz#3b4f4df06cc30307a89343caa0dd361eae363ba5" dependencies: "7zip-bin" "^2.2.7" bluebird-lst "^1.0.5" - builder-util-runtime "^2.5.0" + builder-util-runtime "^3.0.0" chalk "^2.3.0" debug "^3.1.0" fs-extra-p "^4.4.4" @@ -1949,12 +1952,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000756" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000756.tgz#e938a6b991630f30d2263dd3458beb65d362268b" + version "1.0.30000758" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000758.tgz#a235627b1922e878b63164942c991b84de92c810" -caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000755: - version "1.0.30000756" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz#3da701c1521b9fab87004c6de7c97fa47dbeaad2" +caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000757: + version "1.0.30000758" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000758.tgz#e261140076651049cf6891ed4bc649b5c8c26c69" capture-stack-trace@^1.0.0: version "1.0.0" @@ -2429,8 +2432,8 @@ cryptiles@3.x.x: boom "5.x.x" crypto-browserify@^3.11.0: - version "3.11.1" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f" + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" dependencies: browserify-cipher "^1.0.0" browserify-sign "^4.0.0" @@ -2442,6 +2445,7 @@ crypto-browserify@^3.11.0: pbkdf2 "^3.0.3" public-encrypt "^4.0.0" randombytes "^2.0.0" + randomfill "^1.0.3" crypto-random-string@^1.0.0: version "1.0.0" @@ -2650,6 +2654,10 @@ detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" +detect-libc@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.2.tgz#71ad5d204bf17a6a6ca8f450c61454066ef461e1" + diff@^3.1.0, diff@^3.2.0: version "3.4.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c" @@ -2662,12 +2670,12 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dmg-builder@2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-2.1.5.tgz#f1f7d68d75cfb834e793c0681c7f50ced0a3038d" +dmg-builder@2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-2.1.6.tgz#a37f0c8360794a7051a30a571582968cb1e3ce30" dependencies: bluebird-lst "^1.0.5" - builder-util "^3.2.0" + builder-util "^3.2.1" debug "^3.1.0" fs-extra-p "^4.4.4" iconv-lite "^0.4.19" @@ -2730,24 +2738,24 @@ ejs@^2.5.7: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" electron-builder@^19.43.0: - version "19.43.3" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.43.3.tgz#87b1d39a50456a989b273a7effc04498dd9c4b6a" + version "19.45.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.45.0.tgz#4a4d9eef6fa2b94d35f5a6e124e0305257a0c0f6" dependencies: "7zip-bin" "^2.2.7" - app-package-builder "1.3.3" + app-package-builder "1.5.0" asar-integrity "0.2.3" async-exit-hook "^2.0.1" bluebird-lst "^1.0.5" - builder-util "3.2.0" - builder-util-runtime "2.5.0" + builder-util "3.2.1" + builder-util-runtime "3.1.0" chalk "^2.3.0" chromium-pickle-js "^0.2.0" debug "^3.1.0" - dmg-builder "2.1.5" + dmg-builder "2.1.6" ejs "^2.5.7" electron-download-tf "4.3.4" electron-osx-sign "0.4.7" - electron-publish "19.43.0" + electron-publish "19.45.0" fs-extra-p "^4.4.4" hosted-git-info "^2.5.0" is-ci "^1.0.10" @@ -2811,13 +2819,13 @@ electron-osx-sign@0.4.7: minimist "^1.2.0" plist "^2.1.0" -electron-publish@19.43.0: - version "19.43.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.43.0.tgz#3a5b8f6317a2a83faa008c26594220ffb4006664" +electron-publish@19.45.0: + version "19.45.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.45.0.tgz#7cdcf4f54dd821bffaf4dcc59b21223cfbd8ac4c" dependencies: bluebird-lst "^1.0.5" - builder-util "^3.2.0" - builder-util-runtime "^2.5.0" + builder-util "^3.2.1" + builder-util-runtime "^3.1.0" chalk "^2.3.0" fs-extra-p "^4.4.4" mime "^2.0.3" @@ -2833,11 +2841,11 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.27: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d" electron-updater@^2.15.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.15.1.tgz#9cd218d5960b4e36b2528e92aff102d05911f9ae" + version "2.16.1" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.16.1.tgz#29e85589ec31ae817ca05bcaf10358bd66119188" dependencies: bluebird-lst "^1.0.5" - builder-util-runtime "~2.5.0" + builder-util-runtime "~3.1.0" electron-is-dev "^0.3.0" fs-extra-p "^4.4.4" js-yaml "^3.10.0" @@ -2854,10 +2862,10 @@ electron-window-state-manager@^0.3.2: fs-jetpack "^0.9.2" electron@^1.7.9: - version "1.8.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.1.tgz#19b6f39f2013e204a91a60bc3086dc7a4a07ed88" + version "1.7.9" + resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.9.tgz#add54e9f8f83ed02f6519ec10135f698b19336cf" dependencies: - "@types/node" "^8.0.24" + "@types/node" "^7.0.18" electron-download "^3.0.1" extract-zip "^1.0.3" @@ -5151,9 +5159,10 @@ node-libs-browser@^2.0.0: vm-browserify "0.0.4" node-pre-gyp@^0.6.36: - version "0.6.38" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d" + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: + detect-libc "^1.0.2" hawk "3.1.3" mkdirp "^0.5.1" nopt "^4.0.1" @@ -5888,8 +5897,8 @@ postcss-minify-selectors@^2.0.4: postcss-selector-parser "^2.0.0" postcss-modules-extract-imports@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" dependencies: postcss "^6.0.1" @@ -6004,10 +6013,10 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 supports-color "^3.2.3" postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13: - version "6.0.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f" + version "6.0.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.14.tgz#5534c72114739e75d0afcf017db853099f562885" dependencies: - chalk "^2.1.0" + chalk "^2.3.0" source-map "^0.6.1" supports-color "^4.4.0" @@ -6230,12 +6239,19 @@ randomatic@^1.1.3: is-number "^3.0.0" kind-of "^4.0.0" -randombytes@^2.0.0, randombytes@^2.0.1: +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" dependencies: safe-buffer "^5.1.0" +randomfill@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62" + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + range-parser@^1.0.3, range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" @@ -6934,8 +6950,8 @@ single-line-log@^1.1.2: string-width "^1.0.1" sinon@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.0.2.tgz#c81f62456d37986c84e9f522ddb9ce413bda49d2" + version "4.1.1" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.1.1.tgz#bd657be815df608887fe1f0b75f9590ec563748a" dependencies: diff "^3.1.0" formatio "1.2.0" @@ -7009,7 +7025,7 @@ source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6: +source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -7499,8 +7515,8 @@ tslint@^5.8.0: tsutils "^2.12.1" tsutils@^2.12.1: - version "2.12.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.1.tgz#f4d95ce3391c8971e46e54c4cf0edb0a21dd5b24" + version "2.12.2" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.2.tgz#ad58a4865d17ec3ddb6631b6ca53be14a5656ff3" dependencies: tslib "^1.7.1" @@ -7539,7 +7555,7 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^2.6.1: +typescript@~2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631" @@ -7778,11 +7794,11 @@ webpack-hot-middleware@^2.20.0: strip-ansi "^3.0.0" webpack-sources@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf" + version "1.0.2" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.2.tgz#d0148ec083b3b5ccef1035a6b3ec16442983b27a" dependencies: source-list-map "^2.0.0" - source-map "~0.5.3" + source-map "~0.6.1" webpack@^3.8.1: version "3.8.1"