Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1345 from h3poteto/iss-1325 

closes #1325 Update megalodon version to 3.0.1
This commit is contained in:
AkiraFukushima 2020-04-02 22:29:51 +09:00 committed by GitHub
parent 577f8facaf b94f79603c
commit d958f5202c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
package-lock.json generated
View File

@ -4986,9 +4986,27 @@
"dev": true "dev": true
}, },
"agent-base": { "agent-base": {
"version": "5.1.1", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
"integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
"requires": {
"debug": "4"
},
"dependencies": {
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}
}
}, },
"aggregate-error": { "aggregate-error": {
"version": "3.0.1", "version": "3.0.1",
@ -7273,7 +7291,7 @@
"dependencies": { "dependencies": {
"resolve": { "resolve": {
"version": "1.1.7", "version": "1.1.7",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", "resolved": "http://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
"dev": true "dev": true
} }
@ -11074,15 +11092,8 @@
"es6-promise": { "es6-promise": {
"version": "4.2.6", "version": "4.2.6",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
"integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==" "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==",
}, "dev": true
"es6-promisify": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
"integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
"requires": {
"es6-promise": "^4.0.3"
}
}, },
"es6-templates": { "es6-templates": {
"version": "0.2.3", "version": "0.2.3",
@ -14307,11 +14318,11 @@
"dev": true "dev": true
}, },
"https-proxy-agent": { "https-proxy-agent": {
"version": "4.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
"integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
"requires": { "requires": {
"agent-base": "5", "agent-base": "6",
"debug": "4" "debug": "4"
}, },
"dependencies": { "dependencies": {
@ -17597,31 +17608,31 @@
"dev": true "dev": true
}, },
"megalodon": { "megalodon": {
"version": "3.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/megalodon/-/megalodon-3.0.0.tgz", "resolved": "https://registry.npmjs.org/megalodon/-/megalodon-3.0.1.tgz",
"integrity": "sha512-H0BwhizpOu0A0LOVJoy8jBKlFl1NiP+PNH2rZ8hMu5Z8qHt4Z9d3CrPX2cMX9j+c+rUhQzEdnWzu62SFcvzY3A==", "integrity": "sha512-UPFZ9PE7Am3AthdJ2wH3dzmvxc/SKbRez7NwgU14/o9F26NDklngXtoDCvXv4RY8+0aM3GLhh9Pnr7jodjE4AA==",
"requires": { "requires": {
"@types/oauth": "^0.9.0", "@types/oauth": "^0.9.0",
"@types/ws": "^7.2.0", "@types/ws": "^7.2.0",
"axios": "^0.19.0", "axios": "^0.19.0",
"https-proxy-agent": "^4.0.0", "https-proxy-agent": "^5.0.0",
"moment": "^2.24.0", "moment": "^2.24.0",
"oauth": "^0.9.15", "oauth": "^0.9.15",
"socks-proxy-agent": "github:h3poteto/node-socks-proxy-agent#master", "socks-proxy-agent": "^5.0.0",
"typescript": "3.8.2", "typescript": "3.8.3",
"uuid": "^7.0.2", "uuid": "^7.0.2",
"ws": "^7.2.1" "ws": "^7.2.1"
}, },
"dependencies": { "dependencies": {
"typescript": { "typescript": {
"version": "3.8.2", "version": "3.8.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
"integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==" "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w=="
}, },
"uuid": { "uuid": {
"version": "7.0.2", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw==" "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
}, },
"ws": { "ws": {
"version": "7.2.3", "version": "7.2.3",
@ -22775,20 +22786,27 @@
} }
}, },
"socks-proxy-agent": { "socks-proxy-agent": {
"version": "github:h3poteto/node-socks-proxy-agent#5be42d4a3f98c5a156d713ea88a54b825f26d1f3", "version": "5.0.0",
"from": "github:h3poteto/node-socks-proxy-agent#master", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
"integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
"requires": { "requires": {
"agent-base": "~4.2.1", "agent-base": "6",
"socks": "~2.3.2" "debug": "4",
"socks": "^2.3.3"
}, },
"dependencies": { "dependencies": {
"agent-base": { "debug": {
"version": "4.2.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": { "requires": {
"es6-promisify": "^5.0.0" "ms": "^2.1.1"
} }
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
} }
} }
}, },

2
package.json
View File

@ -184,7 +184,7 @@
"hoek": "^6.1.3", "hoek": "^6.1.3",
"i18next": "^19.0.3", "i18next": "^19.0.3",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"megalodon": "3.0.0", "megalodon": "3.0.1",
"moment": "^2.24.0", "moment": "^2.24.0",
"mousetrap": "^1.6.5", "mousetrap": "^1.6.5",
"nedb": "^1.8.0", "nedb": "^1.8.0",