From 10cf5a24688c8f0dfaf2c2480fd2129721431094 Mon Sep 17 00:00:00 2001 From: zxx-457 <114141362+zxx-457@users.noreply.github.com> Date: Tue, 22 Nov 2022 01:53:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(route):=20add=20=E5=9B=BD=E5=8A=A1?= =?UTF-8?q?=E9=99=A2=E6=94=BF=E7=AD=96=E6=96=87=E4=BB=B6=E5=BA=93=20(#1130?= =?UTF-8?q?1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(route): add 国务院政策文件库 * fix wrong author * typo * refactor: migrate to v2 --- docs/government.md | 8 +++-- lib/router.js | 6 ++-- lib/routes/gov/zhengce/govall.js | 59 ------------------------------- lib/routes/gov/zhengce/wenjian.js | 53 --------------------------- lib/routes/gov/zhengce/zuixin.js | 42 ---------------------- lib/v2/gov/maintainer.js | 4 +++ lib/v2/gov/radar.js | 29 +++++++++++++++ lib/v2/gov/router.js | 4 +++ lib/v2/gov/zhengce/govall.js | 55 ++++++++++++++++++++++++++++ lib/v2/gov/zhengce/wenjian.js | 47 ++++++++++++++++++++++++ lib/v2/gov/zhengce/zhengceku.js | 22 ++++++++++++ lib/v2/gov/zhengce/zuixin.js | 39 ++++++++++++++++++++ 12 files changed, 209 insertions(+), 159 deletions(-) delete mode 100644 lib/routes/gov/zhengce/govall.js delete mode 100644 lib/routes/gov/zhengce/wenjian.js delete mode 100644 lib/routes/gov/zhengce/zuixin.js create mode 100644 lib/v2/gov/zhengce/govall.js create mode 100644 lib/v2/gov/zhengce/wenjian.js create mode 100644 lib/v2/gov/zhengce/zhengceku.js create mode 100644 lib/v2/gov/zhengce/zuixin.js diff --git a/docs/government.md b/docs/government.md index cd7c8c49581b15..021f9b2d13cb24 100644 --- a/docs/government.md +++ b/docs/government.md @@ -1002,7 +1002,7 @@ pageClass: routes -## 中国政府 +## 中国政府网 ### 数据 @@ -1040,7 +1040,7 @@ pageClass: routes ### 最新文件 - + ### 信息稿件 @@ -1059,6 +1059,10 @@ pageClass: routes +### 国务院政策文件库 + + + ### 政府新闻 diff --git a/lib/router.js b/lib/router.js index 2560788af471ab..175ff55c9d13d2 100644 --- a/lib/router.js +++ b/lib/router.js @@ -1174,9 +1174,9 @@ router.get('/cyzone/author/:id', lazyloadRouteHandler('./routes/cyzone/author')) router.get('/cyzone/label/:name', lazyloadRouteHandler('./routes/cyzone/label')); // 政府 -router.get('/gov/zhengce/zuixin', lazyloadRouteHandler('./routes/gov/zhengce/zuixin')); -router.get('/gov/zhengce/wenjian/:pcodeJiguan?', lazyloadRouteHandler('./routes/gov/zhengce/wenjian')); -router.get('/gov/zhengce/govall/:advance?', lazyloadRouteHandler('./routes/gov/zhengce/govall')); +// router.get('/gov/zhengce/zuixin', lazyloadRouteHandler('./routes/gov/zhengce/zuixin')); +// router.get('/gov/zhengce/wenjian/:pcodeJiguan?', lazyloadRouteHandler('./routes/gov/zhengce/wenjian')); +// router.get('/gov/zhengce/govall/:advance?', lazyloadRouteHandler('./routes/gov/zhengce/govall')); router.get('/gov/province/:name/:category', lazyloadRouteHandler('./routes/gov/province')); router.get('/gov/city/:name/:category', lazyloadRouteHandler('./routes/gov/city')); router.get('/gov/statecouncil/briefing', lazyloadRouteHandler('./routes/gov/statecouncil/briefing')); diff --git a/lib/routes/gov/zhengce/govall.js b/lib/routes/gov/zhengce/govall.js deleted file mode 100644 index 4c831e7366e358..00000000000000 --- a/lib/routes/gov/zhengce/govall.js +++ /dev/null @@ -1,59 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const { advance } = ctx.params; - const link = `http://sousuo.gov.cn/list.htm`; - const params = new URLSearchParams({ - n: 20, - t: 'govall', - sort: 'pubtime', - advance: 'true', - }); - const query = `${params.toString()}&${advance}`; - const res = await got.get(link, { - searchParams: query.replace(/([\u4e00-\u9fa5])/g, (str) => encodeURIComponent(str)), - }); - const $list = cheerio.load(res.data); - - ctx.state.data = { - title: `信息稿件 - 中国政府网`, - link: `${link}?${query}`, - item: await Promise.all( - $list('body > div.dataBox > table > tbody > tr') - .slice(1) - .map(async (_, el) => { - const item = $list(el); - - const number = item.find('td.info').next(); - const title = item.find('td.info > a'); - const href = title.attr('href'); - - const key = `gov_zhengce: ${href}`; - let description; - const value = await ctx.cache.get(key); - - if (value) { - description = value; - } else { - try { - const contentData = await got.get(href); - const $content = cheerio.load(contentData.data); - description = $content('#UCAP-CONTENT').html(); - } catch (error) { - description = '文章已被删除'; - } - - ctx.cache.set(key, description); - } - - return { - title: number.text() + ' | ' + title.text(), - description, - link: href, - }; - }) - .get() - ), - }; -}; diff --git a/lib/routes/gov/zhengce/wenjian.js b/lib/routes/gov/zhengce/wenjian.js deleted file mode 100644 index 44e4a9a25cab10..00000000000000 --- a/lib/routes/gov/zhengce/wenjian.js +++ /dev/null @@ -1,53 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const queryString = require('query-string'); - -module.exports = async (ctx) => { - const { pcodeJiguan } = ctx.params; - const link = `http://sousuo.gov.cn/list.htm`; - const res = await got.get(link, { - searchParams: queryString.stringify({ - n: 20, - sort: 'pubtime', - t: 'paper', - pcodeJiguan: pcodeJiguan ? pcodeJiguan : '', - }), - }); - const $list = cheerio.load(res.data); - - ctx.state.data = { - title: `最新文件 - 中国政府网`, - link, - item: await Promise.all( - $list('body > div.dataBox > table > tbody > tr') - .slice(1) - .map(async (_, el) => { - const item = $list(el); - - const number = item.find('td.info').next(); - const title = item.find('td.info > a'); - const href = title.attr('href'); - - const key = `gov_zhengce: ${href}`; - let description; - const value = await ctx.cache.get(key); - - if (value) { - description = value; - } else { - const contentData = await got.get(href); - const $content = cheerio.load(contentData.data); - description = $content('#UCAP-CONTENT').html(); - ctx.cache.set(key, description); - } - - return { - title: number.text() + ' | ' + title.text(), - description, - link: href, - }; - }) - .get() - ), - }; -}; diff --git a/lib/routes/gov/zhengce/zuixin.js b/lib/routes/gov/zhengce/zuixin.js deleted file mode 100644 index b027aef612b5d4..00000000000000 --- a/lib/routes/gov/zhengce/zuixin.js +++ /dev/null @@ -1,42 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const link = `http://www.gov.cn/zhengce/zuixin.htm`; - const listData = await got.get(link); - const $list = cheerio.load(listData.data); - ctx.state.data = { - title: `最新政策 - 中国政府网`, - link, - item: await Promise.all( - $list('.news_box .list li:not(.line)') - .map(async (_, el) => { - const $el = $list(el); - const $a = $el.find('h4 a'); - const href = $a.attr('href'); - const link = href.startsWith('/zhengce') ? `http://www.gov.cn${href}` : href; - const key = `gov_zhengce_zuixin: ${link}`; - let description; - const value = await ctx.cache.get(key); - - if (value) { - description = value; - } else { - const contentData = await got.get(link); - const $content = cheerio.load(contentData.data); - description = $content('#UCAP-CONTENT').html(); - ctx.cache.set(key, description); - } - - return { - title: $a.text(), - description, - guid: href, - link, - pubDate: new Date($el.find('.date').text()).toUTCString(), - }; - }) - .get() - ), - }; -}; diff --git a/lib/v2/gov/maintainer.js b/lib/v2/gov/maintainer.js index 0e5616cd2e305b..7d599f667646e9 100644 --- a/lib/v2/gov/maintainer.js +++ b/lib/v2/gov/maintainer.js @@ -35,6 +35,10 @@ module.exports = { '/pbc/tradeAnnouncement': ['nczitzk'], '/pbc/zcyj': ['Fatpandac'], '/stats/:path+': ['bigfei'], + '/zhengce/govall/:advance?': ['ciaranchen'], + '/zhengce/wenjian/:pcodeJiguan?': ['ciaranchen'], + '/zhengce/zhengceku/:department': ['zxx-457'], + '/zhengce/zuixin': ['SettingDust'], // province '/anhui/kjt/:path?': ['nczitzk'], '/beijing/bphc/:channel': ['bigfei'], diff --git a/lib/v2/gov/radar.js b/lib/v2/gov/radar.js index dba8dd5e6ce971..cd66c71adc98a2 100644 --- a/lib/v2/gov/radar.js +++ b/lib/v2/gov/radar.js @@ -776,6 +776,35 @@ module.exports = { }, ], }, + 'www.gov.cn': { + _name: '中国政府网', + '.': [ + { + title: '最新政策', + docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang', + source: ['/zhengce/zuixin.htm', '/'], + target: '/gov/zhengce/zuixin', + }, + { + title: '最新文件', + docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang', + source: ['/'], + target: '/gov/zhengce/wenjian', + }, + { + title: '信息稿件', + docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang', + source: ['/'], + target: '/gov/zhengce/govall', + }, + { + title: '国务院政策文件库', + docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang', + source: ['/zhengce/zhengceku/:lib'], + target: (params) => `/gov/zhengce/zhengceku/${params.libs}`, + }, + ], + }, 'xz.gov.cn': { _name: '徐州市人民政府', hrss: [ diff --git a/lib/v2/gov/router.js b/lib/v2/gov/router.js index fdf19f16c5cac4..e6bb34fda43d60 100644 --- a/lib/v2/gov/router.js +++ b/lib/v2/gov/router.js @@ -27,6 +27,10 @@ module.exports = function (router) { router.get('/pbc/tradeAnnouncement', require('./pbc/tradeAnnouncement')); router.get('/pbc/zcyj', require('./pbc/zcyj')); router.get(/stats(\/[\w/-]+)?/, require('./stats')); + router.get('/zhengce/govall/:advance?', require('./zhengce/govall')); + router.get('/zhengce/wenjian/:pcodeJiguan?', require('./zhengce/wenjian')); + router.get('/zhengce/zhengceku/:department', require('./zhengce/zhengceku')); + router.get('/zhengce/zuixin', require('./zhengce/zuixin')); // province router.get(/anhui\/kjt\/([\w\d/-]+)?/, require('./anhui/kjt')); router.get(/beijing\/bphc(\/[\w/-]+)?/, require('./beijing/bphc')); diff --git a/lib/v2/gov/zhengce/govall.js b/lib/v2/gov/zhengce/govall.js new file mode 100644 index 00000000000000..e3042cd379fdd7 --- /dev/null +++ b/lib/v2/gov/zhengce/govall.js @@ -0,0 +1,55 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); +const { parseDate } = require('@/utils/parse-date'); +const timezone = require('@/utils/timezone'); + +module.exports = async (ctx) => { + const { advance } = ctx.params; + const link = `http://sousuo.gov.cn/list.htm`; + const params = new URLSearchParams({ + n: 20, + t: 'govall', + sort: 'pubtime', + advance: 'true', + }); + const query = `${params.toString()}&${advance}`; + const res = await got.get(link, { + searchParams: query.replace(/([\u4e00-\u9fa5])/g, (str) => encodeURIComponent(str)), + }); + const $ = cheerio.load(res.data); + + const list = $('body > div.dataBox > table > tbody > tr') + .slice(1) + .toArray() + .map((elem) => { + elem = $(elem); + return { + title: elem.find('td:nth-child(2) > a').text(), + link: elem.find('td:nth-child(2) > a').attr('href'), + pubDate: timezone(parseDate(elem.find('td:nth-child(5)').text()), 8), + }; + }); + + const items = await Promise.all( + list.map((item) => + ctx.cache.tryGet(item.link, async () => { + let description = ''; + try { + const contentData = await got(item.link); + const $ = cheerio.load(contentData.data); + description = $('#UCAP-CONTENT').html(); + } catch (error) { + description = '文章已被删除'; + } + item.description = description; + return item; + }) + ) + ); + + ctx.state.data = { + title: '信息稿件 - 中国政府网', + link: `${link}?${query}`, + item: items, + }; +}; diff --git a/lib/v2/gov/zhengce/wenjian.js b/lib/v2/gov/zhengce/wenjian.js new file mode 100644 index 00000000000000..5134e53fa16c37 --- /dev/null +++ b/lib/v2/gov/zhengce/wenjian.js @@ -0,0 +1,47 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); +const { parseDate } = require('@/utils/parse-date'); +const timezone = require('@/utils/timezone'); + +module.exports = async (ctx) => { + const { pcodeJiguan } = ctx.params; + const link = 'http://sousuo.gov.cn/list.htm'; + const res = await got(link, { + searchParams: { + n: ctx.query.limit ? Number(ctx.query.limit) : 20, + sort: 'pubtime', + t: 'paper', + pcodeJiguan: pcodeJiguan ? pcodeJiguan : '', + }, + }); + const $ = cheerio.load(res.data); + + const list = $('body > div.dataBox > table > tbody > tr') + .slice(1) + .toArray() + .map((elem) => { + elem = $(elem); + return { + title: elem.find('td:nth-child(2) > a').text(), + link: elem.find('td:nth-child(2) > a').attr('href'), + pubDate: timezone(parseDate(elem.find('td:nth-child(5)').text()), 8), + }; + }); + + const items = await Promise.all( + list.map((item) => + ctx.cache.tryGet(item.link, async () => { + const contentData = await got(item.link); + const $ = cheerio.load(contentData.data); + item.description = $('#UCAP-CONTENT').html(); + return item; + }) + ) + ); + + ctx.state.data = { + title: '最新文件 - 中国政府网', + link: res.url, + item: items, + }; +}; diff --git a/lib/v2/gov/zhengce/zhengceku.js b/lib/v2/gov/zhengce/zhengceku.js new file mode 100644 index 00000000000000..f74c6c033e3360 --- /dev/null +++ b/lib/v2/gov/zhengce/zhengceku.js @@ -0,0 +1,22 @@ +const buildData = require('@/utils/common-config'); + +module.exports = async (ctx) => { + const department = ctx.params.department; + const link = `http://www.gov.cn/zhengce/zhengceku/${department}/`; + + ctx.state.data = await buildData({ + link, + url: link, + title: `%title%`, + description: '政府文件库, 当页的所有列表', + params: { + title: `$('.channel_tab > .noline > a').text().trim() + ' - 政府文件库'`, + }, + item: { + item: '.news_box > .list > ul > li:not(.line)', + title: `$('h4 > a').text()`, + link: `$('h4 > a').attr('href')`, + pubDate: `parseDate($('h4 > .date').text().trim())`, + }, + }); +}; diff --git a/lib/v2/gov/zhengce/zuixin.js b/lib/v2/gov/zhengce/zuixin.js new file mode 100644 index 00000000000000..6f0c9c79374a55 --- /dev/null +++ b/lib/v2/gov/zhengce/zuixin.js @@ -0,0 +1,39 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); +const { parseDate } = require('@/utils/parse-date'); +const timezone = require('@/utils/timezone'); +const baseUrl = 'http://www.gov.cn'; + +module.exports = async (ctx) => { + const link = `${baseUrl}/zhengce/zuixin.htm`; + const listData = await got(link); + const $ = cheerio.load(listData.data); + + const list = $('.news_box .list li:not(.line)') + .toArray() + .map((elem) => { + elem = $(elem); + return { + title: elem.find('h4 a').text(), + link: new URL(elem.find('h4 a').attr('href'), baseUrl).href, + pubDate: timezone(parseDate(elem.find('h4 .date').text()), 8), + }; + }); + + const items = await Promise.all( + list.map((item) => + ctx.cache.tryGet(item.link, async () => { + const contentData = await got(item.link); + const $ = cheerio.load(contentData.data); + item.description = $('#UCAP-CONTENT').html(); + return item; + }) + ) + ); + + ctx.state.data = { + title: '最新政策 - 中国政府网', + link, + item: items, + }; +}; From 52c887a2cb63db0be7f760836533c3632ecbdad2 Mon Sep 17 00:00:00 2001 From: zxx-457 <114141362+zxx-457@users.noreply.github.com> Date: Tue, 22 Nov 2022 02:47:16 +0800 Subject: [PATCH 2/4] feat(route): add AIEA seminars (#11302) * feat(route): add AIEA seminars * Fix lib/v2/aiea/radar.js * fix lib/v2/aiea/maintainer.js * add docs * add docs title * fix comma * docs: add en docs --- docs/en/study.md | 14 ++++++++++++++ docs/study.md | 22 ++++++++++++++++++---- lib/v2/aiea/index.js | 39 +++++++++++++++++++++++++++++++++++++++ lib/v2/aiea/maintainer.js | 3 +++ lib/v2/aiea/radar.js | 13 +++++++++++++ lib/v2/aiea/router.js | 3 +++ 6 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 lib/v2/aiea/index.js create mode 100644 lib/v2/aiea/maintainer.js create mode 100644 lib/v2/aiea/radar.js create mode 100644 lib/v2/aiea/router.js diff --git a/docs/en/study.md b/docs/en/study.md index 82b05fd628bafd..589148f79f6644 100644 --- a/docs/en/study.md +++ b/docs/en/study.md @@ -4,6 +4,20 @@ pageClass: routes # Study +## Asian Innovation and Entrepreneurship Association + +### Seminar Series + + + +| Time frame | +| ----- | +| upcoming | +| past | +| both| + + + ## gradCafe ### gradCafe result diff --git a/docs/study.md b/docs/study.md index 4c565f9c813481..ae233e10a0ec44 100644 --- a/docs/study.md +++ b/docs/study.md @@ -37,12 +37,26 @@ pageClass: routes | bilingual | 双语新闻 (Bilingual News) | | address | 总统演讲 (President Address) | +## Asian Innovation and Entrepreneurship Association + +### Seminar Series + + + +| 时间段 | +| -------- | +| upcoming | +| past | +| both | + + + ## CTFHub Calendar ### 查询国内外 CTF 赛事信息 - | `:class` | 类型 | @@ -65,8 +79,8 @@ path="/ctfhub/search/:limit?/:form?/:class?/:title?" ### 查询近期赛事 - diff --git a/lib/v2/aiea/index.js b/lib/v2/aiea/index.js new file mode 100644 index 00000000000000..a807a39ffd8314 --- /dev/null +++ b/lib/v2/aiea/index.js @@ -0,0 +1,39 @@ +const buildData = require('@/utils/common-config'); + +module.exports = async (ctx) => { + const link = 'http://www.aiea.org/0504'; + const period = ctx.params.period ?? ''; + + let nth_child = 'n'; + switch (period) { + case 'upcoming': + nth_child = '1'; + break; + + case 'past': + nth_child = '2'; + break; + + case 'both': + nth_child = 'n'; + break; + + default: + break; + } + + ctx.state.data = await buildData({ + link, + url: link, + title: `%title%`, + params: { + title: 'AIEA Seminars', + }, + item: { + item: `.seminar-contents .seminar-partWrap:nth-child(${nth_child}) > .seminar-list`, + title: `$('.seminar-list-title > span').text()`, + link: `$('a[href^="/0504"]').attr('href')`, + description: `$('.seminar-list .txt > .title').text()`, + }, + }); +}; diff --git a/lib/v2/aiea/maintainer.js b/lib/v2/aiea/maintainer.js new file mode 100644 index 00000000000000..75e1cf78ee126a --- /dev/null +++ b/lib/v2/aiea/maintainer.js @@ -0,0 +1,3 @@ +module.exports = { + '/seminars/:period': ['zxx-457'], +}; diff --git a/lib/v2/aiea/radar.js b/lib/v2/aiea/radar.js new file mode 100644 index 00000000000000..2dcbbd05dc41fb --- /dev/null +++ b/lib/v2/aiea/radar.js @@ -0,0 +1,13 @@ +module.exports = { + 'aiea.org': { + _name: 'Asian Innovation and Entrepreneurship Association', + www: [ + { + title: 'Seminar Series', + docs: 'https://docs.rsshub.app/study.html#AIEA-Seminar-Series', + source: ['/0504', '/'], + target: '/aiea/seminars/upcoming', + }, + ], + }, +}; diff --git a/lib/v2/aiea/router.js b/lib/v2/aiea/router.js new file mode 100644 index 00000000000000..129d36967383d6 --- /dev/null +++ b/lib/v2/aiea/router.js @@ -0,0 +1,3 @@ +module.exports = function (router) { + return router.get('/seminars/:period', require('.')); +}; From a51024bc9dceb6d5b5cda8682617aa2671d7e1c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 21:11:23 +0000 Subject: [PATCH 3/4] chore(deps): bump @sentry/node from 7.20.0 to 7.20.1 (#11309) Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 7.20.0 to 7.20.1. - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/7.20.0...7.20.1) --- updated-dependencies: - dependency-name: "@sentry/node" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index e5bdfe226863f5..30504940246e77 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "dependencies": { "@koa/router": "12.0.0", "@postlight/parser": "2.2.3", - "@sentry/node": "7.20.0", + "@sentry/node": "7.20.1", "aes-js": "3.1.2", "art-template": "4.13.2", "bbcodejs": "0.0.4", diff --git a/yarn.lock b/yarn.lock index bea7e88690d81e..af8ccfc113a0da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1538,39 +1538,39 @@ domhandler "^4.2.0" selderee "^0.6.0" -"@sentry/core@7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.20.0.tgz#7becd848c982d5422627f69c4061d5914946c54a" - integrity sha512-8dIHk8niyEyVayUQpgECHnV2p444nPBjIyuQrtkdTxL7sBLC5+Y0DhRjxg9cJyZe/bZnXVerGkgcA7niKW4W8A== +"@sentry/core@7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.20.1.tgz#b06f36dddba96e2cc7dfa2d24cb72ff39ecd7a59" + integrity sha512-Sc7vtNgO4QcE683qrR+b+KFQkkhvQv7gizN46QQPOWeqLDrai7x0+NspTFDLJyvdDuDh2rjoLfRwNsgbwe7Erw== dependencies: - "@sentry/types" "7.20.0" - "@sentry/utils" "7.20.0" + "@sentry/types" "7.20.1" + "@sentry/utils" "7.20.1" tslib "^1.9.3" -"@sentry/node@7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.20.0.tgz#a32e37b2c93607e8b8d7f3741f60418ec2d99ddb" - integrity sha512-aB0VSueCiWPg53DIevnKNYSu2OGsPweWO1eKhMhu1uJNbL+ZYAFRczdcLdkWCqa38X5jjqO82GKuIZYpXUGX+A== +"@sentry/node@7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.20.1.tgz#7558eba81f47c17674845cd151f34d5bf425ee67" + integrity sha512-vSzvS8b7dI8pKkE7nPFUxzjtpJAfSmUzc3epD6gCV+GnE+h5ROeAh+0tS55ak72FIZU0YHvlXGVSpPIcxS1dcg== dependencies: - "@sentry/core" "7.20.0" - "@sentry/types" "7.20.0" - "@sentry/utils" "7.20.0" + "@sentry/core" "7.20.1" + "@sentry/types" "7.20.1" + "@sentry/utils" "7.20.1" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/types@7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.20.0.tgz#ace232e00407355dccedf65e27471635b4331265" - integrity sha512-x17ddduGWqW95neBFVvxzmInb5WXVw+2PcNASHXpGFhi7v2gz2a7/w2CcIKxsqODNnc+z/k1t0Y+uy9B6aH6ag== +"@sentry/types@7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.20.1.tgz#26c6fc94dd25a66aeabbd795fa8985d768190970" + integrity sha512-bI4t5IXGLIQYH5MegKRl4x2LDSlPVbQJ5eE6NJCMrCm8PcFUo3WgkwP6toG9ThQwpTx/DhUo1sVNKrr0oW4cpA== -"@sentry/utils@7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.20.0.tgz#cca09e2256b64bfb41a78c89af3c88fcc7ca84c2" - integrity sha512-4lc122TFgkaCAvoPRy+uc5vgOCumTa/2nPkzCSxVsezQs+ebHxyMJQK7GWBLI6P+EzKfEjlgyMzRWaPJ3iJatA== +"@sentry/utils@7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.20.1.tgz#01b881b82598fca5c04af771ffe44663b66dee6f" + integrity sha512-wToW0710OijQLUZnbbOx1pxwJ4mXUZ5ZFl4/x7ubNftkOz5NwJ+F3ylRqHXpZJaR9pUfR5CNdInTFZn05h/KeQ== dependencies: - "@sentry/types" "7.20.0" + "@sentry/types" "7.20.1" tslib "^1.9.3" "@sinclair/typebox@^0.24.1": From 9892bbe40f71051db96a9f7471642bbe7b82beae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 21:14:38 +0000 Subject: [PATCH 4/4] chore(deps): bump rand-user-agent from 1.0.90 to 1.0.91 (#11311) Bumps [rand-user-agent](https://github.com/WebScrapingAPI/rand-user-agent) from 1.0.90 to 1.0.91. - [Release notes](https://github.com/WebScrapingAPI/rand-user-agent/releases) - [Commits](https://github.com/WebScrapingAPI/rand-user-agent/commits) --- updated-dependencies: - dependency-name: rand-user-agent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 30504940246e77..fdf23ec3042aed 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "puppeteer-extra": "3.3.4", "puppeteer-extra-plugin-stealth": "2.11.1", "query-string": "7.1.1", - "rand-user-agent": "1.0.90", + "rand-user-agent": "1.0.91", "re2": "1.17.7", "require-all": "3.0.0", "rss-parser": "3.12.0", diff --git a/yarn.lock b/yarn.lock index af8ccfc113a0da..65d1c037ace521 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11584,10 +11584,10 @@ ramda@^0.26.1: resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06" integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ== -rand-user-agent@1.0.90: - version "1.0.90" - resolved "https://registry.yarnpkg.com/rand-user-agent/-/rand-user-agent-1.0.90.tgz#f9dba5495526f2319b20460a2d303ed7ae8ef5ec" - integrity sha512-nFr2KF1/FkquNHVCSl8jDl7SNy/Hzij1mPZc4emBjt4RpXMkn+xYk0qxLyfuyA9je6FMH+1zZGp7gSZMj5mTRg== +rand-user-agent@1.0.91: + version "1.0.91" + resolved "https://registry.yarnpkg.com/rand-user-agent/-/rand-user-agent-1.0.91.tgz#57d0fe680de3182ddea47186e8121505312da9af" + integrity sha512-Xy4DrVnI5OQv4mWyAzk4kl/V3nb2Wh2GNwe0RQ1O5yNalfqeK2pqQZhhTYuZOaBDnqxTBRF4oC22PNa2+P4dbw== randexp@0.4.6: version "0.4.6"