From b8c21ec6ee1e1d8b223be8ac6c7ade0cd32c5478 Mon Sep 17 00:00:00 2001 From: fenwick67 Date: Tue, 10 Jan 2023 22:33:26 -0500 Subject: [PATCH] move to axios and supply user-agent --- index.js | 1 - lib/apGet.js | 54 +++ lib/convertv2.js | 39 +-- package.json | 5 +- test/embedExample.html | 47 --- test/result.html | 534 ------------------------------ test/sample.atom | 721 ----------------------------------------- test/test.js | 15 - yarn.lock | 345 ++------------------ 9 files changed, 85 insertions(+), 1676 deletions(-) create mode 100644 lib/apGet.js delete mode 100644 test/embedExample.html delete mode 100644 test/result.html delete mode 100644 test/sample.atom delete mode 100644 test/test.js diff --git a/index.js b/index.js index b0a7571..34d1733 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,6 @@ var convert = require('./lib/convert'); // v2 api var convertv2 = require('./lib/convertv2'); var serveStatic = require('serve-static'); -var request = require('request'); var cors = require('cors'); var errorPage = require('./lib/errorPage'); var morgan = require('morgan'); diff --git a/lib/apGet.js b/lib/apGet.js new file mode 100644 index 0000000..6de823e --- /dev/null +++ b/lib/apGet.js @@ -0,0 +1,54 @@ +const axios = require('axios') +const NanoCache = require('nano-cache') +const hour = 3600000; + +const cache = new NanoCache({ + ttl: 24 * hour +}); + +cache.on('del',key=>console.log(key,'deleted')) + +// get JSON for an AP URL, by either fetching it or grabbing it from a cache. + +// Honestly request-promise-cache should be good enough. Redis would be a nice upgrade but for +// a single process install it will be fine. + +// note: rejects on HTTP 4xx or 5xx +module.exports = async function apGet(url,ttl) { + + return new Promise(function(resolve,reject){ + + // fail early + if (!url){ + return reject(new Error('URL is invalid')); + } + + var cachedResponse = cache.get(url); + if (cachedResponse){ + return resolve(cachedResponse); + } + + axios( { + method:'get', + url:url, + headers: { + "accept": "application/activity+json", + "User-Agent": "mastofeed.com" + }, + responseType: 'json', + + }) + .then((response)=>{ + // axios would have rejected if we got a 4xx or 5xx or not json + cache.set(url, response.data, { + ttl: ttl || 24 * hour + }); + return response.data + }) + .then(resolve) + .catch(reject) + + }) + + +} \ No newline at end of file diff --git a/lib/convertv2.js b/lib/convertv2.js index ff4ad70..1b125f7 100644 --- a/lib/convertv2.js +++ b/lib/convertv2.js @@ -2,42 +2,9 @@ var ejs = require('ejs'); var fs = require('fs'); var template = ejs.compile(fs.readFileSync('./lib/template.ejs', 'utf8')); var timeAgo = require('timeago.js'); - -var request = require('request-promise-cache') - +const apGet = require('./apGet.js') const hour = 3600000; -// get JSON for an AP URL, by either fetching it or grabbing it from a cache. - -// Honestly request-promise-cache should be good enough. Redis would be a nice upgrade but for -// a single process install it will be fine. - -// note: rejects on HTTP 4xx or 5xx -async function apGet(url,ttl) { - - return new Promise(function(resolve,reject){ - - // fail early - if (!url){ - reject(new Error('URL is invalid')); - } - - request( { - uri:url, - cacheKey:url, - cacheTTL:ttl || 24 * hour, - headers: { - "accept": "application/activity+json" - } - }) - .then(body=>JSON.parse(body)) - .then(resolve) - .catch(reject) - - }) - -} - // like Promise.all except returns null on error instead of failing all the promises async function promiseSome(proms){ @@ -122,10 +89,10 @@ async function itemsForFeed(opts,user,feed) { var boostData = []; var boostUrls = feed.orderedItems.filter(i=>i.type=="Announce").map(i=>i.object); // console.log(boostUrls); - boostData = await promiseSome(boostUrls.map(apGet)); + boostData = await promiseSome(boostUrls.map(url=>apGet(url))); // now get user data for each of those - let userData = await promiseSome(boostData.map(d=>d?d.attributedTo||'':null).map(apGet)); + let userData = await promiseSome(boostData.map(d=>d?d.attributedTo||'':null).map(url=>apGet(url))); // put a ._userdata key on the item object if this is a boost for (var i = 0; i < boostData.length; i ++){ diff --git a/package.json b/package.json index 5aeafd7..66a052a 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,13 @@ { "dependencies": { + "axios": "^1.2.2", "compression": "^1.7.4", "cors": "^2.8.5", "ejs": "^2.5.8", "express": "^4.16.4", "feedparser": "^2.2.9", "morgan": "^1.9.1", - "request": "^2.88.0", - "request-promise-cache": "^2.0.1", - "request-promise-native": "^1.0.7", + "nano-cache": "^1.1.2", "serve-static": "^1.13.2", "timeago.js": "^3.0.2" }, diff --git a/test/embedExample.html b/test/embedExample.html deleted file mode 100644 index 9f7ce9b..0000000 --- a/test/embedExample.html +++ /dev/null @@ -1,47 +0,0 @@ - -
-
-
-
- -
- - fenwick67 🦆 - boosted - -
- - -
- -
- - - - diff --git a/test/result.html b/test/result.html deleted file mode 100644 index 0e8f2ec..0000000 --- a/test/result.html +++ /dev/null @@ -1,534 +0,0 @@ - - - - - - - - - - - - - -
- -
- - - - - -
- - fenwick 🦆 - -
- Engineer, Developer, Person. http://fenwick.pizza -
-
-
- -
- - - - -
- -
fenwick67 shared a status by cypnk@mastodon.social
- -
- - - -
- r҉ustic cy͠be̸rpu̵nk🤠🤖 -
cypnk@mastodon.social
-
-
-
-

So curl parrot.live is a thing

( Via twitter.com/darksim905/status/ )

-
- -
- - - - - -
- -
16 hours ago
-
- -
- -
fenwick67 shared a status by LinuxSocist@icosahedron.website
- -
- - - -
- Linux Socialist -
LinuxSocist@icosahedron.website
-
-
-
-

'Why we choose Godot Engine – Rock Milk'
medium.com/@rockmilkgames/why-

-
- -
16 hours ago
-
- -
- -
fenwick67 shared a status by meirlbot@mastodon.social
- -
- - - -
- me irl -
meirlbot@mastodon.social
-
-
- - -
- - - - - - - -
- -
16 hours ago
-
- -
- -
fenwick67 shared a status by natecull@mastodon.social
- -
- - - -
- Nate Cull -
natecull@mastodon.social
-
-
-
-

Medium needs to stop doing this, or people need to stop using Medium.

It's a website that hosts blogs.

That you read.

it doesn't need your Fooglebaceook account.

-
- -
- - - - - - - -
- -
16 hours ago
-
- -
- -
fenwick67 shared a status by tom@slime.global
- -
- - - -
- switched-on tom -
tom@slime.global
-
-
-
-

fuck you

-
- -
- - - - - -
- -
17 hours ago
-
- -
- -
fenwick67 shared a status by mcmoots@a.weirder.earth
- -
- - - -
- 👀🌲 -
mcmoots@a.weirder.earth
-
-
-
-

From yesterday. Even with a surprise snow it's still the most wonderful time of the year.

-
- -
- - - - - - - -
- -
18 hours ago
-
- -
- -
- - - -
- fenwick 🦆 -
fenwick67@octodon.social
-
-
-
-

@GinnyMcQueen these are so geometric I thought it was some plastic thing when I scrolled past

-
- -
18 hours ago
-
- -
- -
fenwick67 shared a status by fillertrack@slime.global
- -
- - - -
- 🐦birdtom🐦 -
fillertrack@slime.global
-
-
-
-

I am become death, destroyer of worlds.

-
- -
- - - - - -
- -
20 hours ago
-
- -
- -
- - - -
- fenwick 🦆 -
fenwick67@octodon.social
-
-
-
-

@zigg node's FS module on Windows is buggy enough that I recommend using the graceful-fs module in its place when you can

-
- -
1 day ago
-
- -
- -
- - - -
- fenwick 🦆 -
fenwick67@octodon.social
-
-
- - -
1 day ago
-
- -
- -
fenwick67 shared a status by kingu_platypus_gidora
- -
- - - -
- Anarkingu Gidora -
kingu_platypus_gidora@octodon.social
-
-
- - -
- - - - - - - -
- -
1 day ago
-
- -
- -
- - - -
- fenwick 🦆 -
fenwick67@octodon.social
-
-
-
-

@Mycroft the starter set is legit, it's easy to pick up and a surprising amount of content. Also, the SRD is free to download and there are free adventures on DM's guild.

-
- -
1 day ago
-
- -
- -
- - - -
- fenwick 🦆 -
fenwick67@octodon.social
-
-
-
-

@phenethylamine vlc?

-
- -
1 day ago
-
- -
- -
- - - -
- fenwick 🦆 -
fenwick67@octodon.social
-
-
-
-

@Shalazah welcome y'all

-
- -
1 day ago
-
- -
- -
fenwick67 shared a status by plsburydoughboy@kitty.town
- -
- - - -
- pls pet the kitty db -
plsburydoughboy@kitty.town
-
-
-
-

Marvel: “Infinity War is the most ambitious crossover event in history.”

Me, fighting off the bad vibes of the world:

-
- - - -
1 day ago
-
- -
- -
- - - -
- fenwick 🦆 -
fenwick67@octodon.social
-
-
-
-

@idesofmerch a radar chart would work great for this imo

-
- -
1 day ago
-
- -
- -
fenwick67 shared a status by weird_hell@cybre.space
- -
- - - -
- Display Neam -
weird_hell@cybre.space
-
-
-
-

if you can't be normal, stop trying to be normal.

Be weird. Go hard. Don't follow the advice.

-
- -
2 days ago
-
- -
- -
fenwick67 shared a status by irisjaycomics@mastodon.social
- -
- - - -
- ✨Iris Jay✨ -
irisjaycomics@mastodon.social
-
-
-
-

crossedwires.irisjay.net/?comic=02-106 NEW CROSSED WIRES UPDATE IS LIVE! It’s showdown time and nobody’s playing fair. #cyberpunk #webcomic #queercomics

Read from the beginning here: crossedwires.irisjay.net/?comi Buy the book here: oreillyjay.tictail.com/product … Send me a tip here: ko-fi.com/irisjay

-
- -
- - - - - - - -
- -
2 days ago
-
- -
- -
fenwick67 shared a status by omanreagan@scholar.social
- -
- - - -
- Michael 🚀 -
omanreagan@scholar.social
-
-
-
-

Most importantly, stop putting institutional events on Facebook, stop using it at universities, stop making participation in Facebook mandatory through your institutional, organization, and activist roles. You can be online, and social, and connected without supporting Facebook.

-
- -
2 days ago
-
- -
- -
fenwick67 shared a status by elomatreb@glitch.social
- -
- - - -
- elomatreb 🐟 -
elomatreb@glitch.social
-
-
-
-

Decades of programming language research destroyed in one sick own by a rotating coyote

-
- -
2 days ago
-
- -
- - - diff --git a/test/sample.atom b/test/sample.atom deleted file mode 100644 index 1a078d7..0000000 --- a/test/sample.atom +++ /dev/null @@ -1,721 +0,0 @@ - - - https://octodon.social/users/fenwick67.atom - fenwick 🦆 - Engineer, Developer, Person. http://fenwick.pizza - 2018-03-23T15:09:56Z - https://assets.octodon.social/accounts/avatars/000/008/871/original/d5281ad9c6c7401d.jpg - - https://octodon.social/users/fenwick67 - http://activitystrea.ms/schema/1.0/person - https://octodon.social/users/fenwick67 - fenwick67 - fenwick67@octodon.social - <p>Engineer, Developer, Person. <a href="http://fenwick.pizza" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="">fenwick.pizza</span><span class="invisible"></span></a></p> - - - fenwick67 - fenwick 🦆 - Engineer, Developer, Person. http://fenwick.pizza - public - - - - - - - - https://octodon.social/users/fenwick67/statuses/99736382143914398/activity - 2018-03-24T01:53:36Z - 2018-03-24T01:53:36Z - fenwick67 shared a status by cypnk@mastodon.social - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://mastodon.social/users/cypnk/statuses/99736359953171849 - 2018-03-24T01:48:12Z - 2018-03-24T01:48:12Z - New status by cypnk@mastodon.social - - https://mastodon.social/users/cypnk - http://activitystrea.ms/schema/1.0/person - https://mastodon.social/users/cypnk - cypnk - cypnk@mastodon.social - <p>Coffee, Code, Cabins<br>New York 🇺🇲</p><p>Tor: <a href="http://zgmlocci2uheaw6y.onion" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="">zgmlocci2uheaw6y.onion</span><span class="invisible"></span></a></p> - - - - cypnk - r҉ustic cy͠be̸rpu̵nk🤠🤖 - Coffee, Code, CabinsNew York 🇺🇲Tor: http://zgmlocci2uheaw6y.onion - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>So curl parrot.live is a thing</p><p>( Via <a href="https://twitter.com/darksim905/status/977256948918874112" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="ellipsis">twitter.com/darksim905/status/</span><span class="invisible">977256948918874112</span></a> )</p> - - - public - - - - - <p>So curl parrot.live is a thing</p><p>( Via <a href="https://twitter.com/darksim905/status/977256948918874112" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="ellipsis">twitter.com/darksim905/status/</span><span class="invisible">977256948918874112</span></a> )</p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99736372019184621/activity - 2018-03-24T01:51:02Z - 2018-03-24T01:51:02Z - fenwick67 shared a status by LinuxSocist@icosahedron.website - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://icosahedron.website/users/LinuxSocist/statuses/99736289786218826 - 2018-03-24T01:30:11Z - 2018-03-24T01:30:11Z - New status by LinuxSocist@icosahedron.website - - https://icosahedron.website/users/LinuxSocist - http://activitystrea.ms/schema/1.0/person - https://icosahedron.website/users/LinuxSocist - LinuxSocist - LinuxSocist@icosahedron.website - <p>If you can't hack it then you don't own it.</p> - - - - LinuxSocist - Linux Socialist - If you can't hack it then you don't own it. - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>'Why we choose Godot Engine – Rock Milk'<br><a href="https://medium.com/@rockmilkgames/why-godot-engine-e0d4736d6eb0" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="ellipsis">medium.com/@rockmilkgames/why-</span><span class="invisible">godot-engine-e0d4736d6eb0</span></a></p> - - public - - - - - <p>'Why we choose Godot Engine – Rock Milk'<br><a href="https://medium.com/@rockmilkgames/why-godot-engine-e0d4736d6eb0" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="ellipsis">medium.com/@rockmilkgames/why-</span><span class="invisible">godot-engine-e0d4736d6eb0</span></a></p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99736293961915027/activity - 2018-03-24T01:31:11Z - 2018-03-24T01:31:11Z - fenwick67 shared a status by meirlbot@mastodon.social - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://mastodon.social/users/meirlbot/statuses/99736260594446646 - 2018-03-24T01:22:45Z - 2018-03-24T01:22:45Z - New status by meirlbot@mastodon.social - - https://mastodon.social/users/meirlbot - http://activitystrea.ms/schema/1.0/person - https://mastodon.social/users/meirlbot - meirlbot - meirlbot@mastodon.social - <p>i'm a bot by <span class="h-card"><a href="https://ultrix.me/@corbin" class="u-url mention" rel="nofollow noopener" target="_blank">@<span>corbin</span></a></span> that mirrors the latest posts from /r/me_irl</p><p>twitter: <a href="https://twitter.com/itmeirl" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">twitter.com/itmeirl</span><span class="invisible"></span></a></p> - - - - meirlbot - me irl - i'm a bot by @corbin that mirrors the latest posts from /r/me_irltwitter: https://twitter.com/itmeirl - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>me irl <a href="https://redd.it/86nbzr" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">redd.it/86nbzr</span><span class="invisible"></span></a></p> - - - public - - - - - <p>me irl <a href="https://redd.it/86nbzr" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">redd.it/86nbzr</span><span class="invisible"></span></a></p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99736270823277858/activity - 2018-03-24T01:25:18Z - 2018-03-24T01:25:18Z - fenwick67 shared a status by natecull@mastodon.social - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://mastodon.social/users/natecull/statuses/99735315450345700 - 2018-03-23T21:22:24Z - 2018-03-23T21:22:24Z - New status by natecull@mastodon.social - - https://mastodon.social/users/natecull - http://activitystrea.ms/schema/1.0/person - https://mastodon.social/users/natecull - natecull - natecull@mastodon.social - <p>and we're all gonna shine a light together</p><p> <a href="http://natecull.org/wordpress/tomorrow/" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="ellipsis">natecull.org/wordpress/tomorro</span><span class="invisible">w/</span></a></p> - - - natecull - Nate Cull - and we're all gonna shine a light together http://natecull.org/wordpress/tomorrow/ - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>Medium needs to stop doing this, or people need to stop using Medium.</p><p>It's a website that hosts blogs.</p><p>That you read.</p><p>it doesn't need your Fooglebaceook account.</p> - - - public - - - - - <p>Medium needs to stop doing this, or people need to stop using Medium.</p><p>It's a website that hosts blogs.</p><p>That you read.</p><p>it doesn't need your Fooglebaceook account.</p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99736154791289301/activity - 2018-03-24T00:55:47Z - 2018-03-24T00:55:47Z - fenwick67 shared a status by tom@slime.global - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://slime.global/users/tom/statuses/99732325744900240 - 2018-03-23T08:42:08Z - 2018-03-23T08:42:08Z - New status by tom@slime.global - - https://slime.global/users/tom - http://activitystrea.ms/schema/1.0/person - https://slime.global/users/tom - tom - tom@slime.global - <p>systems engineer by day, instance admin by night! </p><p>also makes music &amp; takes photos. </p><p>nb, they/them ❤️ <a href="https://tom.ovh" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">tom.ovh</span><span class="invisible"></span></a> <a href="https://ko-fi.com/itstom" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">ko-fi.com/itstom</span><span class="invisible"></span></a> (EN/DE OK)</p> - - - - tom - switched-on tom - systems engineer by day, instance admin by night! also makes music &amp; takes photos. nb, they/them ❤️ https://tom.ovh https://ko-fi.com/itstom (EN/DE OK) - public - - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - <p>fuck you</p> - - - public - - - - - - <p>fuck you</p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99735931584316464/activity - 2018-03-23T23:59:02Z - 2018-03-23T23:59:02Z - fenwick67 shared a status by mcmoots@a.weirder.earth - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://a.weirder.earth/users/mcmoots/statuses/99735929849758025 - 2018-03-23T23:58:41Z - 2018-03-23T23:58:41Z - New status by mcmoots@a.weirder.earth - - https://a.weirder.earth/users/mcmoots - http://activitystrea.ms/schema/1.0/person - https://a.weirder.earth/users/mcmoots - mcmoots - mcmoots@a.weirder.earth - <p>your favorite non-masculine pronouns are fine</p><p>🌲🌿🍄<br>🌋🏔<br>🥗🥘<br>🍸🍷🍺 <br>🍩 🥧<br>😻</p> - - - mcmoots - 👀🌲 - your favorite non-masculine pronouns are fine🌲🌿🍄🌋🏔🥗🥘🍸🍷🍺 🍩 🥧😻 - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>From yesterday. Even with a surprise snow it's still the most wonderful time of the year.</p> - - - public - - - - - <p>From yesterday. Even with a surprise snow it's still the most wonderful time of the year.</p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99735917404431053 - 2018-03-23T23:55:25Z - 2018-03-23T23:55:25Z - New status by fenwick67 - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - - <p><span class="h-card"><a href="https://kitty.town/@GinnyMcQueen" class="u-url mention">@<span>GinnyMcQueen</span></a></span> these are so geometric I thought it was some plastic thing when I scrolled past</p> - - - public - - - - - - - https://octodon.social/users/fenwick67/statuses/99735390633117557/activity - 2018-03-23T21:41:27Z - 2018-03-23T21:41:27Z - fenwick67 shared a status by fillertrack@slime.global - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://slime.global/users/fillertrack/statuses/99732555261994849 - 2018-03-23T09:40:25Z - 2018-03-23T09:40:25Z - New status by fillertrack@slime.global - - https://slime.global/users/fillertrack - http://activitystrea.ms/schema/1.0/person - https://slime.global/users/fillertrack - fillertrack - fillertrack@slime.global - <p>Queer socialist grackle. Want to make video games and mixtapes. They/Them</p><p>Donations appreciated<br>ko-fi.com/fillertrack<br>paypal.me/imack666</p> - - - - fillertrack - 🐦birdtom🐦 - Queer socialist grackle. Want to make video games and mixtapes. They/ThemDonations appreciatedko-fi.com/fillertrackpaypal.me/imack666 - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>I am become death, destroyer of worlds.</p> - - - public - - - - - <p>I am become death, destroyer of worlds.</p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99734417810440700 - 2018-03-23T17:34:03Z - 2018-03-23T17:34:03Z - New status by fenwick67 - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - - <p><span class="h-card"><a href="https://cybre.space/@zigg" class="u-url mention">@<span>zigg</span></a></span> node&apos;s FS module on Windows is buggy enough that I recommend using the graceful-fs module in its place when you can</p> - - - public - - - - - - - https://octodon.social/users/fenwick67/statuses/99733847193567183 - 2018-03-23T15:08:56Z - 2018-03-23T15:08:56Z - New status by fenwick67 - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - - <p><span class="h-card"><a href="https://octodon.social/@kingu_platypus_gidora" class="u-url mention">@<span>kingu_platypus_gidora</span></a></span> me tbh</p> - - - public - - - - - - - https://octodon.social/users/fenwick67/statuses/99733846304708662/activity - 2018-03-23T15:08:43Z - 2018-03-23T15:08:43Z - fenwick67 shared a status by kingu_platypus_gidora - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://octodon.social/users/kingu_platypus_gidora/statuses/99733830894126614 - 2018-03-23T15:04:48Z - 2018-03-23T15:04:48Z - New status by kingu_platypus_gidora - - https://octodon.social/users/kingu_platypus_gidora - http://activitystrea.ms/schema/1.0/person - https://octodon.social/users/kingu_platypus_gidora - kingu_platypus_gidora - kingu_platypus_gidora@octodon.social - <p>Hello World! I am Kingu<br />D*: <a href="https://diasp.org/people/37b279f2a9f2348d" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="ellipsis">diasp.org/people/37b279f2a9f23</span><span class="invisible">48d</span></a><br />Music: <a href="https://kingu.reactoweb.com/" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">kingu.reactoweb.com/</span><span class="invisible"></span></a></p> - - - - kingu_platypus_gidora - Anarkingu Gidora - Hello World! I am Kingu -D*: https://diasp.org/people/37b279f2a9f2348d -Music: https://kingu.reactoweb.com/ - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - - <p>.</p> - - - public - - - - - <p>RT <span class="h-card"><a href="https://octodon.social/@kingu_platypus_gidora" class="u-url mention">@<span>kingu_platypus_gidora</span></a></span> .</p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99730862747105610 - 2018-03-23T02:29:57Z - 2018-03-23T02:29:57Z - New status by fenwick67 - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - - <p><span class="h-card"><a href="https://meow.social/@Mycroft" class="u-url mention">@<span>Mycroft</span></a></span> the starter set is legit, it&apos;s easy to pick up and a surprising amount of content. Also, the SRD is free to download and there are free adventures on DM&apos;s guild.</p> - - - public - - - - - - - https://octodon.social/users/fenwick67/statuses/99730686004948111 - 2018-03-23T01:45:00Z - 2018-03-23T01:45:00Z - New status by fenwick67 - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - - <p><span class="h-card"><a href="https://niu.moe/@phenethylamine" class="u-url mention">@<span>phenethylamine</span></a></span> vlc?</p> - - - public - - - - - - - https://octodon.social/users/fenwick67/statuses/99730669809908537 - 2018-03-23T01:40:53Z - 2018-03-23T01:40:53Z - New status by fenwick67 - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - - <p><span class="h-card"><a href="https://octodon.social/@Shalazah" class="u-url mention">@<span>Shalazah</span></a></span> welcome y&apos;all</p> - - - public - - - - - - - https://octodon.social/users/fenwick67/statuses/99730661494096566/activity - 2018-03-23T01:38:46Z - 2018-03-23T01:38:46Z - fenwick67 shared a status by plsburydoughboy@kitty.town - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://kitty.town/users/plsburydoughboy/statuses/99730600493978927 - 2018-03-23T01:23:25Z - 2018-03-23T01:23:25Z - New status by plsburydoughboy@kitty.town - - https://kitty.town/users/plsburydoughboy - http://activitystrea.ms/schema/1.0/person - https://kitty.town/users/plsburydoughboy - plsburydoughboy - plsburydoughboy@kitty.town - <p></p> - - - - plsburydoughboy - pls pet the kitty db - - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>Marvel: “Infinity War is the most ambitious crossover event in history.”</p><p>Me, fighting off the bad vibes of the world:</p> - - - - - - public - - - - - <p>Marvel: “Infinity War is the most ambitious crossover event in history.”</p><p>Me, fighting off the bad vibes of the world:</p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99729911231380605 - 2018-03-22T22:27:58Z - 2018-03-22T22:27:58Z - New status by fenwick67 - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - - <p><span class="h-card"><a href="https://mastodon.social/@idesofmerch" class="u-url mention">@<span>idesofmerch</span></a></span> a radar chart would work great for this imo</p> - - - public - - - - - - - https://octodon.social/users/fenwick67/statuses/99728007954983808/activity - 2018-03-22T14:23:57Z - 2018-03-22T14:23:57Z - fenwick67 shared a status by weird_hell@cybre.space - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://cybre.space/users/weird_hell/statuses/99725634875265024 - 2018-03-22T04:20:27Z - 2018-03-22T04:20:27Z - New status by weird_hell@cybre.space - - https://cybre.space/users/weird_hell - http://activitystrea.ms/schema/1.0/person - https://cybre.space/users/weird_hell - weird_hell - weird_hell@cybre.space - <p>A robot that builds and maintains other, less complex robots.</p><p>Enby / bi/pan as hell / Some days really appreciates your food CWs. &lt;3</p> - - - - weird_hell - Display Neam - A robot that builds and maintains other, less complex robots.Enby / bi/pan as hell / Some days really appreciates your food CWs. &lt;3 - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>if you can't be normal, stop trying to be normal.</p><p>Be weird. Go hard. Don't follow the advice.</p> - - public - - - - - <p>if you can't be normal, stop trying to be normal.</p><p>Be weird. Go hard. Don't follow the advice.</p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99727127483386833/activity - 2018-03-22T10:40:02Z - 2018-03-22T10:40:02Z - fenwick67 shared a status by irisjaycomics@mastodon.social - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://mastodon.social/users/irisjaycomics/statuses/99718925908910667 - 2018-03-20T23:54:19Z - 2018-03-20T23:54:19Z - New status by irisjaycomics@mastodon.social - - https://mastodon.social/users/irisjaycomics - http://activitystrea.ms/schema/1.0/person - https://mastodon.social/users/irisjaycomics - irisjaycomics - irisjaycomics@mastodon.social - <p>She/they. Comics: Crossed Wires, Epiphany, Golden Trick (writer). <a href="http://irisjay.net" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="">irisjay.net</span><span class="invisible"></span></a>. Icon by @skollirubedo.</p> - - - - irisjaycomics - ✨Iris Jay✨ - She/they. Comics: Crossed Wires, Epiphany, Golden Trick (writer). http://irisjay.net. Icon by @skollirubedo. - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>crossedwires.irisjay.net/?comic=02-106 NEW CROSSED WIRES UPDATE IS LIVE! It’s showdown time and nobody’s playing fair. <a href="https://mastodon.social/tags/cyberpunk" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>cyberpunk</span></a> <a href="https://mastodon.social/tags/webcomic" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>webcomic</span></a> <a href="https://mastodon.social/tags/queercomics" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>queercomics</span></a> </p><p>Read from the beginning here: <a href="http://crossedwires.irisjay.net/?comic=001" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="ellipsis">crossedwires.irisjay.net/?comi</span><span class="invisible">c=001</span></a> Buy the book here: <a href="http://oreillyjay.tictail.com/product/crossed-wires-volume-1" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="ellipsis">oreillyjay.tictail.com/product</span><span class="invisible">/crossed-wires-volume-1</span></a> … Send me a tip here: <a href="http://ko-fi.com/irisjay" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="">ko-fi.com/irisjay</span><span class="invisible"></span></a></p> - - - - - - public - - - - - <p>crossedwires.irisjay.net/?comic=02-106 NEW CROSSED WIRES UPDATE IS LIVE! It’s showdown time and nobody’s playing fair. <a href="https://mastodon.social/tags/cyberpunk" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>cyberpunk</span></a> <a href="https://mastodon.social/tags/webcomic" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>webcomic</span></a> <a href="https://mastodon.social/tags/queercomics" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>queercomics</span></a> </p><p>Read from the beginning here: <a href="http://crossedwires.irisjay.net/?comic=001" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="ellipsis">crossedwires.irisjay.net/?comi</span><span class="invisible">c=001</span></a> Buy the book here: <a href="http://oreillyjay.tictail.com/product/crossed-wires-volume-1" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="ellipsis">oreillyjay.tictail.com/product</span><span class="invisible">/crossed-wires-volume-1</span></a> … Send me a tip here: <a href="http://ko-fi.com/irisjay" rel="nofollow noopener" target="_blank"><span class="invisible">http://</span><span class="">ko-fi.com/irisjay</span><span class="invisible"></span></a></p> - - public - - - - - - https://octodon.social/users/fenwick67/statuses/99724279300280892/activity - 2018-03-21T22:35:42Z - 2018-03-21T22:35:42Z - fenwick67 shared a status by omanreagan@scholar.social - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://scholar.social/users/omanreagan/statuses/99723766503256517 - 2018-03-21T20:25:48Z - 2018-03-21T20:25:48Z - New status by omanreagan@scholar.social - - https://scholar.social/users/omanreagan - http://activitystrea.ms/schema/1.0/person - https://scholar.social/users/omanreagan - omanreagan - omanreagan@scholar.social - <p>Anthropologist. PhDing: exploration beyond Sol system, SETI, imagination, interstellar futures, sci-fi. [he/him, they/them] <a href="https://www.patreon.com/omanreagan" rel="nofollow noopener" target="_blank"><span class="invisible">https://www.</span><span class="">patreon.com/omanreagan</span><span class="invisible"></span></a></p> - - - - omanreagan - Michael 🚀 - Anthropologist. PhDing: exploration beyond Sol system, SETI, imagination, interstellar futures, sci-fi. [he/him, they/them] https://www.patreon.com/omanreagan - public - - http://activitystrea.ms/schema/1.0/comment - http://activitystrea.ms/schema/1.0/post - <p>Most importantly, stop putting institutional events on Facebook, stop using it at universities, stop making participation in Facebook mandatory through your institutional, organization, and activist roles. You can be online, and social, and connected without supporting Facebook.</p> - unlisted - - - - - - <p>Most importantly, stop putting institutional events on Facebook, stop using it at universities, stop making participation in Facebook mandatory through your institutional, organization, and activist roles. You can be online, and social, and connected without supporting Facebook.</p> - unlisted - - - - - - https://octodon.social/users/fenwick67/statuses/99723825992791716/activity - 2018-03-21T20:40:25Z - 2018-03-21T20:40:25Z - fenwick67 shared a status by elomatreb@glitch.social - http://activitystrea.ms/schema/1.0/activity - http://activitystrea.ms/schema/1.0/share - - https://glitch.social/users/elomatreb/statuses/99723784825017673 - 2018-03-21T20:29:58Z - 2018-03-21T20:29:58Z - New status by elomatreb@glitch.social - - https://glitch.social/users/elomatreb - http://activitystrea.ms/schema/1.0/person - https://glitch.social/users/elomatreb - elomatreb - elomatreb@glitch.social - <p>German, English</p><p>Ruby, High Voltage electronics, [Shockingly] bad at computers. Lives in northern Germany.</p><p><a href="https://ole.bertr.am/" rel="nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">ole.bertr.am/</span><span class="invisible"></span></a> - Previously <span class="h-card"><a href="https://anti.energy/@elomatreb" class="u-url mention" rel="nofollow noopener" target="_blank">@<span>elomatreb</span></a></span></p> - - - - elomatreb - elomatreb 🐟 - German, EnglishRuby, High Voltage electronics, [Shockingly] bad at computers. Lives in northern Germany.https://ole.bertr.am/ - Previously @elomatreb - public - - http://activitystrea.ms/schema/1.0/note - http://activitystrea.ms/schema/1.0/post - <p>Decades of programming language research destroyed in one sick own by a rotating coyote</p> - - public - - - - - <p>Decades of programming language research destroyed in one sick own by a rotating coyote</p> - - public - - - - - diff --git a/test/test.js b/test/test.js deleted file mode 100644 index d169116..0000000 --- a/test/test.js +++ /dev/null @@ -1,15 +0,0 @@ -// do a test - - -var fs = require('fs'), -request = require('request'), - convert = require('../lib/convert') - - -var r = fs.createReadStream('./test/sample.atom'); - -convert(r,function(er,data){ - if (er){return console.log('error: ',er)} - console.log('ok'); - fs.writeFileSync('./test/result.html',data,'utf8'); -}) diff --git a/yarn.lock b/yarn.lock index ca1c6a7..789baae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -135,16 +135,6 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv@^6.5.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -192,18 +182,6 @@ arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== -asn1@~0.2.3: - version "0.2.6" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" - integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== - async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" @@ -214,15 +192,14 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== - -aws4@^1.8.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" - integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== +axios@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1" + integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" balanced-match@^1.0.0: version "1.0.2" @@ -236,13 +213,6 @@ basic-auth@~2.0.0: dependencies: safe-buffer "5.1.2" -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== - dependencies: - tweetnacl "^0.14.3" - body-parser@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" @@ -346,11 +316,6 @@ camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== - chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -416,7 +381,7 @@ color-support@^1.1.3: resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -475,11 +440,6 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -core-util-is@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== - core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -502,13 +462,6 @@ cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== - dependencies: - assert-plus "^1.0.0" - debug@2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -556,14 +509,6 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw== - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -664,31 +609,11 @@ express@^4.16.4: utils-merge "1.0.1" vary "~1.1.2" -extend@~3.0.0, extend@~3.0.2: +extend@~3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== - -extsprintf@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" - integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - feedparser@^2.2.9: version "2.2.9" resolved "https://registry.yarnpkg.com/feedparser/-/feedparser-2.2.9.tgz#9138197dafdae05fcadde0036beeaf6066c2c5e9" @@ -725,18 +650,18 @@ find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== dependencies: asynckit "^0.4.0" - combined-stream "^1.0.6" + combined-stream "^1.0.8" mime-types "^2.1.12" forwarded@~0.1.2: @@ -797,13 +722,6 @@ get-stdin@^4.0.1: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" integrity sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw== -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== - dependencies: - assert-plus "^1.0.0" - glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -853,19 +771,6 @@ graceful-fs@^4.2.6: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q== - -har-validator@~5.1.0: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== - dependencies: - ajv "^6.5.5" - har-schema "^2.0.0" - hard-rejection@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" @@ -950,15 +855,6 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ== - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -1058,11 +954,6 @@ is-plain-obj@^1.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -1073,11 +964,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== - js-base64@^2.4.9: version "2.6.4" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" @@ -1088,41 +974,11 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== - json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" - integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== - -jsprim@^1.2.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb" - integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw== - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.4.0" - verror "1.10.0" - kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" @@ -1274,7 +1130,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.34: +mime-types@^2.1.12, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -1536,11 +1392,6 @@ npmlog@^6.0.0: gauge "^4.0.3" set-blocking "^2.0.0" -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - object-assign@^4: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -1631,11 +1482,6 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== - process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -1662,36 +1508,16 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.0" -psl@^1.1.24: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - -psl@^1.1.28: - version "1.9.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== - -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - -punycode@^2.1.0, punycode@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.2.0.tgz#2092cc57cd2582c38e4e7e8bb869dc8d3148bc74" - integrity sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw== +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@~6.5.2: - version "6.5.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" - integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== - quick-lru@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" @@ -1774,56 +1600,6 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -request-promise-cache@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/request-promise-cache/-/request-promise-cache-2.0.1.tgz#97879fc79c1abd82d1bf169987459d643d915c64" - integrity sha512-y+me4+M3wpQ1Sj4WPr3Ywg459UjkP+uyh0JlM0FQxjZtNNqixQxbqhmo5M3t+e2mjglMpfm6UPDhSo40kLWsmA== - dependencies: - nano-cache "^1.1.2" - request "^2.88.0" - -request-promise-core@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9" - integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ== - dependencies: - lodash "^4.17.15" - -request-promise-native@^1.0.7: - version "1.0.8" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" - integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== - dependencies: - request-promise-core "1.1.3" - stealthy-require "^1.1.1" - tough-cookie "^2.3.3" - -request@^2.88.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" - integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.0" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.4.3" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -1855,12 +1631,12 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -2018,21 +1794,6 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== -sshpk@^1.7.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" - integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - ssri@^8.0.0, ssri@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" @@ -2059,11 +1820,6 @@ stdout-stream@^1.4.0: dependencies: readable-stream "^2.0.1" -stealthy-require@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" - integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= - "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -2144,22 +1900,6 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -tough-cookie@^2.3.3: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== - dependencies: - psl "^1.1.24" - punycode "^1.4.1" - trim-newlines@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" @@ -2170,18 +1910,6 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf" integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q== -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== - type-fest@^0.18.0: version "0.18.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" @@ -2238,13 +1966,6 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -2255,11 +1976,6 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -2273,15 +1989,6 @@ vary@^1, vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"