diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-19 11:46:30 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-19 11:46:30 +0100 |
commit | ab9ae1829e51e463d644ff369ebc3434f2f42c81 (patch) | |
tree | 639b4dc0c0d519fbd2bf99c869b00bce1ccfb5cf /package-lock.json | |
parent | merge-in webview unmounting fix (diff) | |
parent | Merge pull request #1338 from meetfranz/chore/app-feature-helpers (diff) | |
download | ferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.tar.gz ferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.tar.zst ferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.zip |
fix conflicts with latest develop
Diffstat (limited to 'package-lock.json')
-rw-r--r-- | package-lock.json | 60 |
1 files changed, 49 insertions, 11 deletions
diff --git a/package-lock.json b/package-lock.json index 1f1ac3c00..c3b291acf 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -2340,7 +2340,8 @@ | |||
2340 | "abbrev": { | 2340 | "abbrev": { |
2341 | "version": "1.1.1", | 2341 | "version": "1.1.1", |
2342 | "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", | 2342 | "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", |
2343 | "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" | 2343 | "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", |
2344 | "dev": true | ||
2344 | }, | 2345 | }, |
2345 | "accepts": { | 2346 | "accepts": { |
2346 | "version": "1.0.7", | 2347 | "version": "1.0.7", |
@@ -2610,7 +2611,8 @@ | |||
2610 | "aproba": { | 2611 | "aproba": { |
2611 | "version": "1.2.0", | 2612 | "version": "1.2.0", |
2612 | "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", | 2613 | "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", |
2613 | "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" | 2614 | "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", |
2615 | "dev": true | ||
2614 | }, | 2616 | }, |
2615 | "archy": { | 2617 | "archy": { |
2616 | "version": "1.0.0", | 2618 | "version": "1.0.0", |
@@ -2622,6 +2624,7 @@ | |||
2622 | "version": "1.1.5", | 2624 | "version": "1.1.5", |
2623 | "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", | 2625 | "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", |
2624 | "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", | 2626 | "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", |
2627 | "dev": true, | ||
2625 | "requires": { | 2628 | "requires": { |
2626 | "delegates": "^1.0.0", | 2629 | "delegates": "^1.0.0", |
2627 | "readable-stream": "^2.0.6" | 2630 | "readable-stream": "^2.0.6" |
@@ -2631,6 +2634,7 @@ | |||
2631 | "version": "2.3.6", | 2634 | "version": "2.3.6", |
2632 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 2635 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
2633 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 2636 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
2637 | "dev": true, | ||
2634 | "requires": { | 2638 | "requires": { |
2635 | "core-util-is": "~1.0.0", | 2639 | "core-util-is": "~1.0.0", |
2636 | "inherits": "~2.0.3", | 2640 | "inherits": "~2.0.3", |
@@ -2645,6 +2649,7 @@ | |||
2645 | "version": "1.1.1", | 2649 | "version": "1.1.1", |
2646 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 2650 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
2647 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 2651 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
2652 | "dev": true, | ||
2648 | "requires": { | 2653 | "requires": { |
2649 | "safe-buffer": "~5.1.0" | 2654 | "safe-buffer": "~5.1.0" |
2650 | } | 2655 | } |
@@ -5410,7 +5415,8 @@ | |||
5410 | "delegates": { | 5415 | "delegates": { |
5411 | "version": "1.0.0", | 5416 | "version": "1.0.0", |
5412 | "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", | 5417 | "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", |
5413 | "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" | 5418 | "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", |
5419 | "dev": true | ||
5414 | }, | 5420 | }, |
5415 | "depd": { | 5421 | "depd": { |
5416 | "version": "0.4.4", | 5422 | "version": "0.4.4", |
@@ -5650,6 +5656,29 @@ | |||
5650 | "readable-stream": "~1.1.9" | 5656 | "readable-stream": "~1.1.9" |
5651 | }, | 5657 | }, |
5652 | "dependencies": { | 5658 | "dependencies": { |
5659 | "abbrev": { | ||
5660 | "version": "1.1.1", | ||
5661 | "resolved": false, | ||
5662 | "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" | ||
5663 | }, | ||
5664 | "ansi-regex": { | ||
5665 | "version": "2.1.1", | ||
5666 | "resolved": false, | ||
5667 | "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" | ||
5668 | }, | ||
5669 | "aproba": { | ||
5670 | "version": "1.2.0", | ||
5671 | "resolved": false, | ||
5672 | "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" | ||
5673 | }, | ||
5674 | "are-we-there-yet": { | ||
5675 | "version": "1.1.4", | ||
5676 | "resolved": false, | ||
5677 | "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", | ||
5678 | "requires": { | ||
5679 | "delegates": "^1.0.0" | ||
5680 | } | ||
5681 | }, | ||
5653 | "balanced-match": { | 5682 | "balanced-match": { |
5654 | "version": "1.0.0", | 5683 | "version": "1.0.0", |
5655 | "resolved": false, | 5684 | "resolved": false, |
@@ -5966,6 +5995,11 @@ | |||
5966 | "glob": "^7.0.5" | 5995 | "glob": "^7.0.5" |
5967 | } | 5996 | } |
5968 | }, | 5997 | }, |
5998 | "safe-buffer": { | ||
5999 | "version": "5.1.1", | ||
6000 | "resolved": false, | ||
6001 | "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" | ||
6002 | }, | ||
5969 | "safer-buffer": { | 6003 | "safer-buffer": { |
5970 | "version": "2.1.2", | 6004 | "version": "2.1.2", |
5971 | "resolved": false, | 6005 | "resolved": false, |
@@ -6010,7 +6044,10 @@ | |||
6010 | "strip-ansi": { | 6044 | "strip-ansi": { |
6011 | "version": "3.0.1", | 6045 | "version": "3.0.1", |
6012 | "resolved": false, | 6046 | "resolved": false, |
6013 | "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=" | 6047 | "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", |
6048 | "requires": { | ||
6049 | "ansi-regex": "^2.0.0" | ||
6050 | } | ||
6014 | }, | 6051 | }, |
6015 | "strip-json-comments": { | 6052 | "strip-json-comments": { |
6016 | "version": "2.0.1", | 6053 | "version": "2.0.1", |
@@ -6136,9 +6173,9 @@ | |||
6136 | "dev": true | 6173 | "dev": true |
6137 | }, | 6174 | }, |
6138 | "electron": { | 6175 | "electron": { |
6139 | "version": "4.0.7", | 6176 | "version": "4.0.8", |
6140 | "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.7.tgz", | 6177 | "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.8.tgz", |
6141 | "integrity": "sha512-KYQ9SJZFWNKqoq6XjKW1bLFHjmAGeSC3XNuhHK/Sd2MK5H5sO3iKjvZU/YhiBUtkB/cBSkOdQTVEaLcMwU8l3A==", | 6178 | "integrity": "sha512-FOBJIHkuv8wc15N+ZyqwDzPavYVu5CHMBEf14jHDWv7QW2vkEIpJjVK+PIT31kfZfvjsIP0j2wvA/FBsiqB7pw==", |
6142 | "dev": true, | 6179 | "dev": true, |
6143 | "requires": { | 6180 | "requires": { |
6144 | "@types/node": "^10.12.18", | 6181 | "@types/node": "^10.12.18", |
@@ -6147,9 +6184,9 @@ | |||
6147 | }, | 6184 | }, |
6148 | "dependencies": { | 6185 | "dependencies": { |
6149 | "@types/node": { | 6186 | "@types/node": { |
6150 | "version": "10.12.29", | 6187 | "version": "10.12.30", |
6151 | "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.29.tgz", | 6188 | "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", |
6152 | "integrity": "sha512-J/tnbnj8HcsBgCe2apZbdUpQ7hs4d7oZNTYA5bekWdP0sr2NGsOpI/HRdDroEi209tEvTcTtxhD0FfED3DhEcw==", | 6189 | "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==", |
6153 | "dev": true | 6190 | "dev": true |
6154 | } | 6191 | } |
6155 | } | 6192 | } |
@@ -14574,7 +14611,8 @@ | |||
14574 | "process-nextick-args": { | 14611 | "process-nextick-args": { |
14575 | "version": "2.0.0", | 14612 | "version": "2.0.0", |
14576 | "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", | 14613 | "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", |
14577 | "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" | 14614 | "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", |
14615 | "dev": true | ||
14578 | }, | 14616 | }, |
14579 | "progress": { | 14617 | "progress": { |
14580 | "version": "2.0.3", | 14618 | "version": "2.0.3", |