hash,date,author,commit_message,is_merge,masked_commit_message,type,git_diff a9d2ea5b04879d281dc7fb3ac3d3955981f60906,2024-11-03 19:15:55,DIYgod,feat(twitter): recover cookie updating,False,recover cookie updating,feat,"diff --git a/lib/routes/twitter/api/web-api/utils.ts b/lib/routes/twitter/api/web-api/utils.ts index 235d2957b37deb..f75d2eee4ecb62 100644 --- a/lib/routes/twitter/api/web-api/utils.ts +++ b/lib/routes/twitter/api/web-api/utils.ts @@ -161,7 +161,7 @@ export const twitterGot = async ( const remainingInt = Number.parseInt(remaining || '0'); const reset = response.headers.get('x-rate-limit-reset'); logger.debug( - `twitter debug: twitter rate limit remaining for token ${auth?.token} is ${remaining} and reset at ${reset}, auth: ${JSON.stringify(auth)}, status: ${response.status}, data: ${JSON.stringify(response._data?.data)}` + `twitter debug: twitter rate limit remaining for token ${auth?.token} is ${remaining} and reset at ${reset}, auth: ${JSON.stringify(auth)}, status: ${response.status}, data: ${JSON.stringify(response._data?.data)}, cookie: ${JSON.stringify(dispatchers?.jar.serializeSync())}` ); if (auth) { if (remaining && remainingInt < 2 && reset) { @@ -211,10 +211,10 @@ export const twitterGot = async ( }, }); - // if (auth?.token) { - // logger.debug(`twitter debug: update twitter cookie for token ${auth.token}`); - // await cache.set(`twitter:cookie:${auth.token}`, JSON.stringify(dispatchers?.jar.serializeSync()), config.cache.contentExpire); - // } + if (auth?.token) { + logger.debug(`twitter debug: update twitter cookie for token ${auth.token}`); + await cache.set(`twitter:cookie:${auth.token}`, JSON.stringify(dispatchers?.jar.serializeSync()), config.cache.contentExpire); + } return response._data; };" 0d47d0199472e875e9ff29fd76f12626bdd72bb2,2024-02-21 20:49:04,abc1763613206,feat(route): Add qdu houqin (#14515),False,Add qdu houqin (#14515),feat,"diff --git a/lib/v2/qdu/houqin.js b/lib/v2/qdu/houqin.js new file mode 100644 index 00000000000000..12bf0f03b0e269 --- /dev/null +++ b/lib/v2/qdu/houqin.js @@ -0,0 +1,63 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); +const timezone = require('@/utils/timezone'); +const { parseDate } = require('@/utils/parse-date'); + +const base = 'https://houqin.qdu.edu.cn/'; + +module.exports = async (ctx) => { + const response = await got({ + method: 'get', + url: `${base}index/tzgg.htm`, + }); + + const $ = cheerio.load(response.data); + const list = $('.n_newslist').children(); + const items = await Promise.all( + list.map((i, item) => { + item = $(item); + const itemTitle = item.find('a').text(); + let itemDate = timezone(parseDate(item.find('span').text()), 8); + const path = item.find('a').attr('href'); + const itemUrl = base + path; + return ctx.cache.tryGet(itemUrl, async () => { + let description = ''; + const result = await got(itemUrl); + const $ = cheerio.load(result.data); + if ( + $('.article_body') + .find('div > h4') + .text() + .match(/发布时间:(.*)编辑:/) !== null + ) { + itemDate = timezone( + parseDate( + $('.article_body') + .find('div > h4') + .text() + .match(/发布时间:(.*)编辑:/)[1] + .trim(), + 'YYYY年MM月DD日 HH:mm' + ), + 8 + ); + } + description = $('.v_news_content').html().trim(); + + return { + title: itemTitle, + link: itemUrl, + pubDate: itemDate, + description, + }; + }); + }) + ); + + ctx.state.data = { + title: '青岛大学 - 后勤管理处通知', + link: `${base}index/tzgg.htm`, + description: '青岛大学 - 后勤管理处通知', + item: items, + }; +}; diff --git a/lib/v2/qdu/maintainer.js b/lib/v2/qdu/maintainer.js index f4270d26f29089..4350fcb6e757dc 100644 --- a/lib/v2/qdu/maintainer.js +++ b/lib/v2/qdu/maintainer.js @@ -1,3 +1,4 @@ module.exports = { + '/houqin': ['abc1763613206'], '/jwc': ['abc1763613206'], }; diff --git a/lib/v2/qdu/radar.js b/lib/v2/qdu/radar.js index e9f0a50c5e02c9..9db67e88e30071 100644 --- a/lib/v2/qdu/radar.js +++ b/lib/v2/qdu/radar.js @@ -9,5 +9,13 @@ module.exports = { target: '/qdu/jwc', }, ], + houqin: [ + { + title: '后勤管理处通知', + docs: 'https://docs.rsshub.app/routes/university#qing-dao-da-xue', + source: ['/tzgg.htm', '/'], + target: '/qdu/houqin', + }, + ], }, }; diff --git a/lib/v2/qdu/router.js b/lib/v2/qdu/router.js index 2df83518651c4e..70712ea2b6885a 100644 --- a/lib/v2/qdu/router.js +++ b/lib/v2/qdu/router.js @@ -1,3 +1,4 @@ module.exports = (router) => { + router.get('/houqin', require('./houqin')); router.get('/jwc', require('./jwc')); }; diff --git a/website/docs/routes/university.mdx b/website/docs/routes/university.mdx index 1dca95c32bbeac..6aae183136d3a7 100644 --- a/website/docs/routes/university.mdx +++ b/website/docs/routes/university.mdx @@ -2199,6 +2199,10 @@ jsjxy.hbut.edu.cn 证书链不全,自建 RSSHub 可设置环境变量 NODE\_TL +### 后勤管理处通知 {#qing-dao-da-xue-hou-qin-guan-li-chu-tong-zhi} + + + ## 清华大学 {#qing-hua-da-xue} ### 清华大学校内信息发布平台 {#qing-hua-da-xue-qing-hua-da-xue-xiao-nei-xin-xi-fa-bu-ping-tai}" 2522a9dff0f290016883210269d08e4a8ce501ca,2022-05-23 21:53:17,TonyRL,docs: fix missing H3 heading,False,fix missing H3 heading,docs,"diff --git a/docs/en/finance.md b/docs/en/finance.md index cdefe8ecc166a2..9e1694ff95982c 100644 --- a/docs/en/finance.md +++ b/docs/en/finance.md @@ -18,6 +18,8 @@ pageClass: routes ## FX Markets +### Channel + | Trading | Infrastructure | Tech and Data | Regulation | diff --git a/docs/finance.md b/docs/finance.md index e9cc31459c76d1..4b3aecf3f397c1 100644 --- a/docs/finance.md +++ b/docs/finance.md @@ -46,6 +46,8 @@ pageClass: routes ## FX Markets +### 分类 + | Trading | Infrastructure | Tech and Data | Regulation |" 8e9ca0f851719e1c7174acb08a57f0ec64e3f7fe,2018-05-06 20:36:36,DIYgod,docs: main color,False,main color,docs,"diff --git a/docs/.vuepress/override.styl b/docs/.vuepress/override.styl new file mode 100644 index 00000000000000..2b3b6ebc964f6f --- /dev/null +++ b/docs/.vuepress/override.styl @@ -0,0 +1,9 @@ +$accentColor = #F5712C + +.navbar .site-name { + color: $accentColor; +} + +.page .custom-block.tip { + border-color: $accentColor; +} \ No newline at end of file" a813c6bd4f3f556b67a9d93d56a679837a0169da,2020-03-01 11:06:15,DIYgod,docs: new sponsor NeverBehave,False,new sponsor NeverBehave,docs,"diff --git a/README.md b/README.md index bbb156ffc1a9a3..b57b2e4acd752f 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器,可以 ### Sponsors -| [Sayori Studio](https://t.me/SayoriStudio) | Anonymous | [Sion Kazama](https://blog.sion.moe) | [琚致远](https://www.shaoyaoju.org/) | [Rolly RSS Reader](https://www.coolapk.com/apk/239500) | [mokeyjay](https://www.mokeyjay.com/) | [tkaray](https://rayray.moe/) | -| :----------------------------------------: | :-------: | :----------------------------------: | :----------------------------------: | :----------------------------------------------------: | :-----------------------------------: | :---------------------------: | +| [Sayori Studio](https://t.me/SayoriStudio) | Anonymous | [Sion Kazama](https://blog.sion.moe) | [琚致远](https://www.shaoyaoju.org/) | [Rolly RSS Reader](https://www.coolapk.com/apk/239500) | [mokeyjay](https://www.mokeyjay.com/) | [tkaray](https://rayray.moe/) | [NeverBehave](https://never.pet/) | +| :----------------------------------------: | :-------: | :----------------------------------: | :----------------------------------: | :----------------------------------------------------: | :-----------------------------------: | :---------------------------: | :-------------------------------: | [![](https://opencollective.com/static/images/become_sponsor.svg)](https://docs.rsshub.app/en/support/) diff --git a/docs/README.md b/docs/README.md index b00cb935e801ec..4c664121f1edeb 100755 --- a/docs/README.md +++ b/docs/README.md @@ -32,8 +32,8 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器,可以 ### Sponsors -| [Sayori Studio](https://t.me/SayoriStudio) | 匿名 | [Sion Kazama](https://blog.sion.moe) | [琚致远](https://www.shaoyaoju.org/) | [Rolly RSS 阅读器](https://www.coolapk.com/apk/239500) | [mokeyjay](https://www.mokeyjay.com/) | [tkaray](https://rayray.moe/) | -| :----------------------------------------: | :--: | :----------------------------------: | :----------------------------------: | :----------------------------------------------------: | :-----------------------------------: | :---------------------------: | +| [Sayori Studio](https://t.me/SayoriStudio) | 匿名 | [Sion Kazama](https://blog.sion.moe) | [琚致远](https://www.shaoyaoju.org/) | [Rolly RSS 阅读器](https://www.coolapk.com/apk/239500) | [mokeyjay](https://www.mokeyjay.com/) | [tkaray](https://rayray.moe/) | [NeverBehave](https://never.pet/) | +| :----------------------------------------: | :--: | :----------------------------------: | :----------------------------------: | :----------------------------------------------------: | :-----------------------------------: | :---------------------------: | :-------------------------------: | [![](https://opencollective.com/static/images/become_sponsor.svg)](/support/) diff --git a/docs/en/README.md b/docs/en/README.md index 865dd064159e9f..d8e9667bbfb01a 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -30,8 +30,8 @@ RSSHub delivers millions of contents aggregated from all kinds of sources, our v ### Sponsors -| [Sayori Studio](https://t.me/SayoriStudio) | Anonymous | [Sion Kazama](https://blog.sion.moe) | [琚致远](https://www.shaoyaoju.org/) | [Rolly RSS Reader](https://www.coolapk.com/apk/239500) | [mokeyjay](https://www.mokeyjay.com/) | [tkaray](https://rayray.moe/) | -| :----------------------------------------: | :-------: | :----------------------------------: | :----------------------------------: | :----------------------------------------------------: | :-----------------------------------: | :---------------------------: | +| [Sayori Studio](https://t.me/SayoriStudio) | Anonymous | [Sion Kazama](https://blog.sion.moe) | [琚致远](https://www.shaoyaoju.org/) | [Rolly RSS Reader](https://www.coolapk.com/apk/239500) | [mokeyjay](https://www.mokeyjay.com/) | [tkaray](https://rayray.moe/) | [NeverBehave](https://never.pet/) | +| :----------------------------------------: | :-------: | :----------------------------------: | :----------------------------------: | :----------------------------------------------------: | :-----------------------------------: | :---------------------------: | :-------------------------------: | [![](https://opencollective.com/static/images/become_sponsor.svg)](/en/support/)" c16889aa29b69b5ae53d5033325650164f335ba7,2024-10-29 18:52:44,dependabot[bot],chore(deps-dev): bump @typescript-eslint/parser from 8.11.0 to 8.12.1 (#17351),False,bump @typescript-eslint/parser from 8.11.0 to 8.12.1 (#17351),chore,"diff --git a/package.json b/package.json index c2ab6fc8d3111b..be45119af1571d 100644 --- a/package.json +++ b/package.json @@ -164,7 +164,7 @@ ""@types/title"": ""3.4.3"", ""@types/uuid"": ""10.0.0"", ""@typescript-eslint/eslint-plugin"": ""8.11.0"", - ""@typescript-eslint/parser"": ""8.11.0"", + ""@typescript-eslint/parser"": ""8.12.1"", ""@vercel/nft"": ""0.27.5"", ""@vitest/coverage-v8"": ""2.0.5"", ""discord-api-types"": ""0.37.103"", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a0d42c9500468..622553b9465e1b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -344,10 +344,10 @@ importers: version: 10.0.0 '@typescript-eslint/eslint-plugin': specifier: 8.11.0 - version: 8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) + version: 8.11.0(@typescript-eslint/parser@8.12.1(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) '@typescript-eslint/parser': - specifier: 8.11.0 - version: 8.11.0(eslint@9.13.0)(typescript@5.6.3) + specifier: 8.12.1 + version: 8.12.1(eslint@9.13.0)(typescript@5.6.3) '@vercel/nft': specifier: 0.27.5 version: 0.27.5 @@ -1933,8 +1933,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.11.0': - resolution: {integrity: sha512-lmt73NeHdy1Q/2ul295Qy3uninSqi6wQI18XwSpm8w0ZbQXUpjCAWP1Vlv/obudoBiIjJVjlztjQ+d/Md98Yxg==} + '@typescript-eslint/parser@8.12.1': + resolution: {integrity: sha512-I/I9Bg7qFa8rOgBnUUHIWTgzbB5wVkSLX+04xGUzTcJUtdq/I2uHWR9mbW6qUYJG/UmkuDcTax5JHvoEWOAHOQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -7427,10 +7427,10 @@ snapshots: '@types/node': 22.8.1 optional: true - '@typescript-eslint/eslint-plugin@8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3)': + '@typescript-eslint/eslint-plugin@8.11.0(@typescript-eslint/parser@8.12.1(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.11.0(eslint@9.13.0)(typescript@5.6.3) + '@typescript-eslint/parser': 8.12.1(eslint@9.13.0)(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.11.0 '@typescript-eslint/type-utils': 8.11.0(eslint@9.13.0)(typescript@5.6.3) '@typescript-eslint/utils': 8.11.0(eslint@9.13.0)(typescript@5.6.3) @@ -7445,12 +7445,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.11.0(eslint@9.13.0)(typescript@5.6.3)': + '@typescript-eslint/parser@8.12.1(eslint@9.13.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/scope-manager': 8.11.0 - '@typescript-eslint/types': 8.11.0 - '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.11.0 + '@typescript-eslint/scope-manager': 8.12.1 + '@typescript-eslint/types': 8.12.1 + '@typescript-eslint/typescript-estree': 8.12.1(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.12.1 debug: 4.3.7 eslint: 9.13.0 optionalDependencies:" 930880170fccee0f1ee1eb286a10051c19d246a4,2019-09-26 20:57:46,hoilc,feat: 添加Lofter话题 (#3146),False,添加Lofter话题 (#3146),feat,"diff --git a/docs/social-media.md b/docs/social-media.md index 5e53827190b51d..aa2f05b20ad510 100644 --- a/docs/social-media.md +++ b/docs/social-media.md @@ -270,6 +270,22 @@ pageClass: routes +## Lofter + +::: tip 提示 + +官方提供了用户主页 RSS: http://**:username**.lofter.com/rss + +::: + +### 话题(标签) + + + +| new | date | week | month | total | +| ---- | ---- | ---- | ----- | ----- | +| 最新 | 日榜 | 周榜 | 月榜 | 总榜 | + ## pixiv ### 用户收藏 diff --git a/lib/router.js b/lib/router.js index 0bd4e13e3e5816..febf926a79b619 100644 --- a/lib/router.js +++ b/lib/router.js @@ -1754,4 +1754,7 @@ router.get('/taptap/topic/:id/:label?', require('./routes/taptap/topic')); router.get('/taptap/changelog/:id', require('./routes/taptap/changelog')); router.get('/taptap/review/:id/:order?', require('./routes/taptap/review')); +// lofter +router.get('/lofter/tag/:name/:type?', require('./routes/lofter/tag')); + module.exports = router; diff --git a/lib/routes/lofter/tag.js b/lib/routes/lofter/tag.js new file mode 100644 index 00000000000000..04866a1d5928eb --- /dev/null +++ b/lib/routes/lofter/tag.js @@ -0,0 +1,61 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +const titles = { + date: '日榜', + week: '周榜', + month: '月榜', + total: '总榜', + new: '最新', +}; + +module.exports = async (ctx) => { + const name = ctx.params.name; + const type = ctx.params.type ? ctx.params.type : 'new'; + + const url = `http://www.lofter.com/tag/${encodeURIComponent(name)}/${type}/`; + + const response = await got.get(url); + const $ = cheerio.load(response.data); + + const list = $('.m-mlist > .mlistcnt') + .slice(1) + .toArray(); + + ctx.state.data = { + title: `lofter话题 - ${name} - ${titles[type]}`, + link: url, + item: list.map((item) => { + item = $(item); + + const author = item + .find('.w-who > .ptag') + .first() + .text() + .trim(); + + const images = item.find('img[data-origin]'); + for (let k = 0; k < images.length; k++) { + $(images[k]).replaceWith(``); + } + + item.find('.imgc[style]').removeAttr('style'); + + item.find('.js-digest').remove(); + + item.find('a:not([href])').each(function() { + $(this).replaceWith($(this).html()); + }); + + const title = item.find('.tit'); + + return { + title: title.length === 0 ? `${author}的图片` : title.text().trim(), + author: author, + description: item.find('.m-icnt.ctag > .cnt').html(), + link: item.find('a.isayc').attr('href'), + pubDate: new Date(item.find('a.isayc').attr('data-time') * 1), + }; + }), + }; +};" 66972359a6abf8392a45975a4646e23d735667db,2020-01-20 12:21:14,vuhe,fix: 华北水利水电大学网站更改 (#3774),False,华北水利水电大学网站更改 (#3774),fix,"diff --git a/docs/university.md b/docs/university.md index bf744475addf66..0477d718767747 100644 --- a/docs/university.md +++ b/docs/university.md @@ -396,13 +396,7 @@ category 列表: ### 学校通知 - - -| 学校新闻 | 学校通知 | 学校文件 | 学术动态 | -| -------- | -------- | -------- | ----------- | -| news | notice | file | scholarship | - - + ## 华南理工大学 diff --git a/lib/router.js b/lib/router.js index 2bab8f578cd07d..be619c3fac0bbe 100644 --- a/lib/router.js +++ b/lib/router.js @@ -732,10 +732,7 @@ router.get('/upc/main/:type?', require('./routes/universities/upc/main')); router.get('/upc/jsj/:type?', require('./routes/universities/upc/jsj')); // 华北水利水电大学 -router.get('/ncwu/file', require('./routes/universities/ncwu/file')); -router.get('/ncwu/news', require('./routes/universities/ncwu/news')); router.get('/ncwu/notice', require('./routes/universities/ncwu/notice')); -router.get('/ncwu/scholarship', require('./routes/universities/ncwu/scholarship')); // ifanr router.get('/ifanr/:channel?', require('./routes/ifanr/index')); diff --git a/lib/routes/universities/ncwu/file.js b/lib/routes/universities/ncwu/file.js deleted file mode 100644 index 274850e9a424a8..00000000000000 --- a/lib/routes/universities/ncwu/file.js +++ /dev/null @@ -1,34 +0,0 @@ -const got = require('@/utils/got'); -const date = require('@/utils/date'); -const cheerio = require('cheerio'); - -const baseUrl = 'https://www5.ncwu.edu.cn/channels/58.html'; - -module.exports = async (ctx) => { - const response = await got.get(baseUrl); - const $ = cheerio.load(response.data); - const list = $('div.xinxilist>ul>li'); - - ctx.state.data = { - title: '华水-学校文件', - link: baseUrl, - item: - list && - list - .map((index, item) => ({ - title: $(item) - .find('span') - .text(), - description: `文件下载请转跳详情页`, - pubDate: date( - $(item) - .find('i') - .text() - ), - link: $(item) - .find('a') - .attr('href'), - })) - .get(), - }; -}; diff --git a/lib/routes/universities/ncwu/news.js b/lib/routes/universities/ncwu/news.js deleted file mode 100644 index e9581a754c2b3a..00000000000000 --- a/lib/routes/universities/ncwu/news.js +++ /dev/null @@ -1,34 +0,0 @@ -const got = require('@/utils/got'); -const date = require('@/utils/date'); -const cheerio = require('cheerio'); - -const baseUrl = 'https://www5.ncwu.edu.cn/channels/4.html'; - -module.exports = async (ctx) => { - const response = await got.get(baseUrl); - const $ = cheerio.load(response.data); - const list = $('div.xinxilist>ul>li'); - - ctx.state.data = { - title: '华水-学校新闻', - link: baseUrl, - item: - list && - list - .map((index, item) => ({ - title: $(item) - .find('span') - .text(), - description: `详情请点击查看`, - pubDate: date( - $(item) - .find('i') - .text() - ), - link: $(item) - .find('a') - .attr('href'), - })) - .get(), - }; -}; diff --git a/lib/routes/universities/ncwu/notice.js b/lib/routes/universities/ncwu/notice.js index d590bba74a6010..b46e728b392e55 100644 --- a/lib/routes/universities/ncwu/notice.js +++ b/lib/routes/universities/ncwu/notice.js @@ -1,37 +1,58 @@ -const got = require('@/utils/got'); const date = require('@/utils/date'); const cheerio = require('cheerio'); - const baseUrl = 'https://www5.ncwu.edu.cn/channels/5.html'; module.exports = async (ctx) => { - const response = await got.get(baseUrl); - const $ = cheerio.load(response.data); - const list = $('div.tongzhi>div.tzlist>ul>li'); + const htmlCache = await ctx.cache.tryGet( + baseUrl, + async () => { + // 由于学校系统升级,更换为使用 puppeteer 渲染页面获取 + const browser = await require('@/utils/puppeteer')(); + const page = await browser.newPage(); + await page.goto(baseUrl); + const html = await page.evaluate( + () => + // eslint-disable-next-line no-undef + document.querySelector('div.news-list').innerHTML + ); + browser.close(); + + return html; + }, + 60 * 60 * 12 + ); // 防止访问频率过高 + + const $ = cheerio.load(htmlCache); + const list = $('div.news-item'); ctx.state.data = { - title: '华水-学校通知', + title: '华水学校通知', link: baseUrl, item: list && list .map((index, item) => ({ - title: $(item) - .find('span') - .text(), - description: - `来自「` + + title: + `「` + $(item) .find('a.dw') .text() + - `」于 ` + + `」` + $(item) - .find('i') + .find('a.dw') + .next() .text(), + description: $(item) + .find('div.detail') + .text(), pubDate: date( $(item) - .find('i') - .text() + .find('div.month') + .text() + + '-' + + $(item) + .find('div.day') + .text() ), link: $(item) .find('a.dw') diff --git a/lib/routes/universities/ncwu/scholarship.js b/lib/routes/universities/ncwu/scholarship.js deleted file mode 100644 index fd3a5e172eb1e7..00000000000000 --- a/lib/routes/universities/ncwu/scholarship.js +++ /dev/null @@ -1,34 +0,0 @@ -const got = require('@/utils/got'); -const date = require('@/utils/date'); -const cheerio = require('cheerio'); - -const baseUrl = 'https://www5.ncwu.edu.cn/channels/2766.html'; - -module.exports = async (ctx) => { - const response = await got.get(baseUrl); - const $ = cheerio.load(response.data); - const list = $('div.xinxilist>ul>li'); - - ctx.state.data = { - title: '华水-学术动态', - link: baseUrl, - item: - list && - list - .map((index, item) => ({ - title: $(item) - .find('span') - .text(), - description: `详情请点击查看`, - pubDate: date( - $(item) - .find('i') - .text() - ), - link: $(item) - .find('a') - .attr('href'), - })) - .get(), - }; -};" c0d9f8aa0ba45d134034705492c064890133d7ec,2019-06-03 08:53:13,Xiang Li,feat: 增加 Dilbert Daily Strip 漫画全文抓取 (#2274),False,增加 Dilbert Daily Strip 漫画全文抓取 (#2274),feat,"diff --git a/docs/other.md b/docs/other.md index a039a24a807bfd..8340ea1652ff8a 100644 --- a/docs/other.md +++ b/docs/other.md @@ -74,6 +74,14 @@ pageClass: routes +## Dilbert Comic Strip + + + +通过提取漫画,提供比官方源更佳的阅读体验。 + + + ## DoNews ### 栏目 diff --git a/lib/router.js b/lib/router.js index addbad69e12268..7599b0cd61fe68 100644 --- a/lib/router.js +++ b/lib/router.js @@ -1371,4 +1371,7 @@ router.get('/maoyan/upcoming', require('./routes/maoyan/upcoming')); // cnBeta router.get('/cnbeta', require('./routes/cnbeta/home')); +// Dilbert Comic Strip +router.get('/dilbert/strip', require('./routes/dilbert/strip')); + module.exports = router; diff --git a/lib/routes/dilbert/strip.js b/lib/routes/dilbert/strip.js new file mode 100644 index 00000000000000..71d32d91c9eced --- /dev/null +++ b/lib/routes/dilbert/strip.js @@ -0,0 +1,51 @@ +const axios = require('@/utils/axios'); +const cheerio = require('cheerio'); +const Parser = require('rss-parser'); +const parser = new Parser(); + +async function load(link, id) { + const response = await axios.get(link); + const $ = cheerio.load(response.data); + + const context = $('.comic-item-container > .meta-info-container'); + const img = context.find('img.img-comic'); + const transcript = context.find('.js-toggle-container > p'); + + const title = img.attr('alt').replace('Dilbert by Scott Adams', id); + const src = 'https:' + img.attr('src'); + + const description = `

${transcript.html()}

`; + + return { + title, + description, + }; +} + +module.exports = async (ctx) => { + const title = 'Dilbert Daily Strip'; + const feed_url = 'http://feed.dilbert.com/dilbert/daily_strip'; + + const feed = await parser.parseURL(feed_url); + const items = await Promise.all( + feed.items.slice(0, 7).map(async (item) => { + const link = `https://dilbert.com/strip/${item.id}`; + + const single = { + pubDate: item.pubDate, + link, + }; + + const other = await ctx.cache.tryGet(link, async () => await load(link, item.id)); + + return Promise.resolve(Object.assign({}, single, other)); + }) + ); + + ctx.state.data = { + title, + link: 'https://dilbert.com', + description: title, + item: items, + }; +};" d9e2a62ae97c278d5cf7036511c56f486dd48384,2020-07-11 01:07:13,dependabot-preview[bot],chore(deps): bump chrono-node from 2.0.3 to 2.1.0,False,bump chrono-node from 2.0.3 to 2.1.0,chore,"diff --git a/package.json b/package.json index e5d6e7e39a21f2..c021fd74ac2f08 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ ""aes-js"": ""3.1.2"", ""art-template"": ""4.13.2"", ""cheerio"": ""1.0.0-rc.3"", - ""chrono-node"": ""2.0.3"", + ""chrono-node"": ""2.1.0"", ""co-redis"": ""2.1.1"", ""crypto-js"": ""4.0.0"", ""currency-symbol-map"": ""4.0.4"", diff --git a/yarn.lock b/yarn.lock index 7460b4b2360a26..385db5754a5d21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3343,10 +3343,10 @@ chrome-trace-event@^1.0.0: dependencies: tslib ""^1.9.0"" -chrono-node@2.0.3: - version ""2.0.3"" - resolved ""https://registry.yarnpkg.com/chrono-node/-/chrono-node-2.0.3.tgz#263679b904ae9921d2a447f083d4716c2160a980"" - integrity sha512-NS7BdOpmX5jYP9wBDGtZzOqb5/CaCHNFJ1E3PeS4cvvAFeSGwubVnwm2iFs1PDVgoncNHGp6S3xaUArn8e5E7Q== +chrono-node@2.1.0: + version ""2.1.0"" + resolved ""https://registry.yarnpkg.com/chrono-node/-/chrono-node-2.1.0.tgz#e1a7998e16ae90fee2f0f59595fc27e5e2642f7a"" + integrity sha512-BYqu6QKbUk86ymbrlYPMl3QVEO4JWPEDCzpbNFdwvRvr8BK3TXj+FSEfwlNlZo581fO2fetWCbfRpt2zaPC5wA== dependencies: dayjs ""^1.8.29""" 79ea987034cb051c888d17cae9427dd67401982f,2020-02-09 01:45:08,dependabot-preview[bot],chore(deps): bump got from 10.5.4 to 10.5.5,False,bump got from 10.5.4 to 10.5.5,chore,"diff --git a/package.json b/package.json index 3b4b48bca49afb..b80fad5a604964 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ ""fanfou-sdk"": ""4.1.0"", ""git-rev-sync"": ""2.0.0"", ""googleapis"": ""47.0.0"", - ""got"": ""10.5.4"", + ""got"": ""10.5.5"", ""he"": ""1.2.0"", ""iconv-lite"": ""0.5.1"", ""jsdom"": ""16.1.0"", diff --git a/yarn.lock b/yarn.lock index 4e8c64c5f37070..373f9b3708ed4a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5429,10 +5429,10 @@ googleapis@47.0.0: google-auth-library ""^5.6.1"" googleapis-common ""^3.2.0"" -got@10.5.4: - version ""10.5.4"" - resolved ""https://registry.yarnpkg.com/got/-/got-10.5.4.tgz#1cf7bee3436a80be48a314c197d22df3f7dee7e0"" - integrity sha512-DiyqjDt0yvN3HoGALtOHBGkl6cEZX24DgSm51eDgUk0JvVQF4oqhjDbFnLm81G/pOEl1sn7W0V5tDWkBfBYf+A== +got@10.5.5: + version ""10.5.5"" + resolved ""https://registry.yarnpkg.com/got/-/got-10.5.5.tgz#9ab2702c2a6b354ff95585144546d3e304a5022f"" + integrity sha512-B13HHkCkTA7KxyxTrFoZfrurBX1fZxjMTKpmIfoVzh0Xfs9aZV7xEfI6EKuERQOIPbomh5LE4xDkfK6o2VXksw== dependencies: ""@sindresorhus/is"" ""^1.0.0"" ""@szmarczak/http-timer"" ""^4.0.0""" df3edf3496be8a0e91f1d99c9abf8b7ccb0ba745,2024-12-03 16:35:52,dependabot[bot],chore(deps-dev): bump @typescript-eslint/parser from 8.16.0 to 8.17.0 (#17781),False,bump @typescript-eslint/parser from 8.16.0 to 8.17.0 (#17781),chore,"diff --git a/package.json b/package.json index 17a0f202b0eaa7..89e9722c69828e 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ ""@types/title"": ""3.4.3"", ""@types/uuid"": ""10.0.0"", ""@typescript-eslint/eslint-plugin"": ""8.16.0"", - ""@typescript-eslint/parser"": ""8.16.0"", + ""@typescript-eslint/parser"": ""8.17.0"", ""@vercel/nft"": ""0.27.7"", ""@vitest/coverage-v8"": ""2.0.5"", ""discord-api-types"": ""0.37.110"", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 643d34aab545f3..4fb86454c7b8b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -363,10 +363,10 @@ importers: version: 10.0.0 '@typescript-eslint/eslint-plugin': specifier: 8.16.0 - version: 8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0)(typescript@5.7.2))(eslint@9.16.0)(typescript@5.7.2) + version: 8.16.0(@typescript-eslint/parser@8.17.0(eslint@9.16.0)(typescript@5.7.2))(eslint@9.16.0)(typescript@5.7.2) '@typescript-eslint/parser': - specifier: 8.16.0 - version: 8.16.0(eslint@9.16.0)(typescript@5.7.2) + specifier: 8.17.0 + version: 8.17.0(eslint@9.16.0)(typescript@5.7.2) '@vercel/nft': specifier: 0.27.7 version: 0.27.7(rollup@4.24.4) @@ -2005,8 +2005,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.16.0': - resolution: {integrity: sha512-D7DbgGFtsqIPIFMPJwCad9Gfi/hC0PWErRRHFnaCWoEDYi5tQUDiJCTmGUbBiLzjqAck4KcXt9Ayj0CNlIrF+w==} + '@typescript-eslint/parser@8.17.0': + resolution: {integrity: sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -2023,6 +2023,10 @@ packages: resolution: {integrity: sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/scope-manager@8.17.0': + resolution: {integrity: sha512-/ewp4XjvnxaREtqsZjF4Mfn078RD/9GmiEAtTeLQ7yFdKnqwTOgRMSvFz4et9U5RiJQ15WTGXPLj89zGusvxBg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/type-utils@8.16.0': resolution: {integrity: sha512-IqZHGG+g1XCWX9NyqnI/0CX5LL8/18awQqmkZSl2ynn8F76j579dByc0jhfVSnSnhf7zv76mKBQv9HQFKvDCgg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2041,6 +2045,10 @@ packages: resolution: {integrity: sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/types@8.17.0': + resolution: {integrity: sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/typescript-estree@8.14.0': resolution: {integrity: sha512-OPXPLYKGZi9XS/49rdaCbR5j/S14HazviBlUQFvSKz3npr3NikF+mrgK7CFVur6XEt95DZp/cmke9d5i3vtVnQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2059,6 +2067,15 @@ packages: typescript: optional: true + '@typescript-eslint/typescript-estree@8.17.0': + resolution: {integrity: sha512-JqkOopc1nRKZpX+opvKqnM3XUlM7LpFMD0lYxTqOTKQfCWAmxw45e3qlOCsEqEB2yuacujivudOFpCnqkBDNMw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + '@typescript-eslint/utils@8.14.0': resolution: {integrity: sha512-OGqj6uB8THhrHj0Fk27DcHPojW7zKwKkPmHXHvQ58pLYp4hy8CSUdTKykKeh+5vFqTTVmjz0zCOOPKRovdsgHA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2083,6 +2100,10 @@ packages: resolution: {integrity: sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/visitor-keys@8.17.0': + resolution: {integrity: sha512-1Hm7THLpO6ww5QU6H/Qp+AusUUl+z/CAm3cNZZ0jQvon9yicgO7Rwd+/WWRpMKLYV6p2UvdbR27c86rzCPpreg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@ungap/structured-clone@1.2.0': resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -7458,10 +7479,10 @@ snapshots: '@types/node': 22.10.1 optional: true - '@typescript-eslint/eslint-plugin@8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0)(typescript@5.7.2))(eslint@9.16.0)(typescript@5.7.2)': + '@typescript-eslint/eslint-plugin@8.16.0(@typescript-eslint/parser@8.17.0(eslint@9.16.0)(typescript@5.7.2))(eslint@9.16.0)(typescript@5.7.2)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.16.0(eslint@9.16.0)(typescript@5.7.2) + '@typescript-eslint/parser': 8.17.0(eslint@9.16.0)(typescript@5.7.2) '@typescript-eslint/scope-manager': 8.16.0 '@typescript-eslint/type-utils': 8.16.0(eslint@9.16.0)(typescript@5.7.2) '@typescript-eslint/utils': 8.16.0(eslint@9.16.0)(typescript@5.7.2) @@ -7476,12 +7497,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.16.0(eslint@9.16.0)(typescript@5.7.2)': + '@typescript-eslint/parser@8.17.0(eslint@9.16.0)(typescript@5.7.2)': dependencies: - '@typescript-eslint/scope-manager': 8.16.0 - '@typescript-eslint/types': 8.16.0 - '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.7.2) - '@typescript-eslint/visitor-keys': 8.16.0 + '@typescript-eslint/scope-manager': 8.17.0 + '@typescript-eslint/types': 8.17.0 + '@typescript-eslint/typescript-estree': 8.17.0(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.17.0 debug: 4.3.7 eslint: 9.16.0 optionalDependencies: @@ -7499,6 +7520,11 @@ snapshots: '@typescript-eslint/types': 8.16.0 '@typescript-eslint/visitor-keys': 8.16.0 + '@typescript-eslint/scope-manager@8.17.0': + dependencies: + '@typescript-eslint/types': 8.17.0 + '@typescript-eslint/visitor-keys': 8.17.0 + '@typescript-eslint/type-utils@8.16.0(eslint@9.16.0)(typescript@5.7.2)': dependencies: '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.7.2) @@ -7515,6 +7541,8 @@ snapshots: '@typescript-eslint/types@8.16.0': {} + '@typescript-eslint/types@8.17.0': {} + '@typescript-eslint/typescript-estree@8.14.0(typescript@5.7.2)': dependencies: '@typescript-eslint/types': 8.14.0 @@ -7545,6 +7573,21 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/typescript-estree@8.17.0(typescript@5.7.2)': + dependencies: + '@typescript-eslint/types': 8.17.0 + '@typescript-eslint/visitor-keys': 8.17.0 + debug: 4.3.7 + fast-glob: 3.3.2 + is-glob: 4.0.3 + minimatch: 9.0.5 + semver: 7.6.3 + ts-api-utils: 1.4.0(typescript@5.7.2) + optionalDependencies: + typescript: 5.7.2 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/utils@8.14.0(eslint@9.16.0)(typescript@5.7.2)': dependencies: '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0) @@ -7578,6 +7621,11 @@ snapshots: '@typescript-eslint/types': 8.16.0 eslint-visitor-keys: 4.2.0 + '@typescript-eslint/visitor-keys@8.17.0': + dependencies: + '@typescript-eslint/types': 8.17.0 + eslint-visitor-keys: 4.2.0 + '@ungap/structured-clone@1.2.0': {} '@unhead/schema@1.11.11':" 8953a4d52fdeb168eb616fdb5675481c853b7b9c,2020-03-01 10:29:04,DIYgod,refactor: /rsshub/rss -> /rsshub/routes,False,/rsshub/rss -> /rsshub/routes,refactor,"diff --git a/assets/radar-rules-next.js b/assets/radar-rules-next.js index ed58e5ef4c7957..f7ebb8be134ae4 100644 --- a/assets/radar-rules-next.js +++ b/assets/radar-rules-next.js @@ -365,7 +365,7 @@ title: '有新路由啦', docs: 'https://docs.rsshub.app/program-update.html#rsshub', source: ['', '/*tpath'], - target: '/rsshub/rss', + target: '/rsshub/routes', }, ], }, diff --git a/assets/radar-rules.js b/assets/radar-rules.js index 4f2695f0b79982..bc5e3bd7abe90d 100644 --- a/assets/radar-rules.js +++ b/assets/radar-rules.js @@ -352,7 +352,7 @@ title: '有新路由啦', docs: 'https://docs.rsshub.app/program-update.html#rsshub', source: ['', '/*tpath'], - target: '/rsshub/rss', + target: '/rsshub/routes', }, ], }, diff --git a/docs/en/install/README.md b/docs/en/install/README.md index 68db2dd427c8f9..4a2da5599fb8dd 100644 --- a/docs/en/install/README.md +++ b/docs/en/install/README.md @@ -296,7 +296,7 @@ Partial routes have a strict anti-crawler policy, and can be configured to use p Routes in `protected_route.js` will be protected using HTTP Basic Authentication. -When adding feeds using RSS readers with HTTP Basic Authentication support, authentication information is required, eg:http://usernam3:passw0rd@localhost:1200/protected/rsshub/rss. +When adding feeds using RSS readers with HTTP Basic Authentication support, authentication information is required, eg:http://usernam3:passw0rd@localhost:1200/protected/rsshub/routes. `HTTP_BASIC_AUTH_NAME`: Http basic authentication username, default to `usernam3`, please change asap diff --git a/docs/en/program-update.md b/docs/en/program-update.md index 298165d9ca4138..54d17aecda0383 100644 --- a/docs/en/program-update.md +++ b/docs/en/program-update.md @@ -147,7 +147,7 @@ Refer to [#minecraft](/en/game.html#minecraft) ### New routes - + ## sketch.com diff --git a/docs/install/README.md b/docs/install/README.md index 26c33510671fc9..a0b7b279e7ed29 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -300,7 +300,7 @@ RSSHub 支持 `memory` 和 `redis` 两种缓存方式 `protected_route.js` 内的路由将启用 HTTP Basic Authentication 认证 -支持该认证协议的阅读器,在添加源地址时,需要在源地址前添加认证信息,例如:http://usernam3:passw0rd@127.0.0.1:1200/protected/rsshub/rss +支持该认证协议的阅读器,在添加源地址时,需要在源地址前添加认证信息,例如:http://usernam3:passw0rd@127.0.0.1:1200/protected/rsshub/routes `HTTP_BASIC_AUTH_NAME`: Http basic authentication 用户名,默认为 `usernam3`,请务必修改 diff --git a/docs/program-update.md b/docs/program-update.md index c8d9339b7b7a24..d8ecac1b910c8a 100644 --- a/docs/program-update.md +++ b/docs/program-update.md @@ -168,7 +168,7 @@ pageClass: routes ### 有新路由啦 - + ## sketch.com diff --git a/lib/protected_router.js b/lib/protected_router.js index e9662bef6e4d0f..8d112177f28c30 100644 --- a/lib/protected_router.js +++ b/lib/protected_router.js @@ -6,6 +6,6 @@ const config = require('./config').value; router.use('/(.*)', auth(config.authentication)); // RSSHub -router.get('/rsshub/rss', require('./routes/rsshub/rss')); +router.get('/rsshub/routes', require('./routes/rsshub/routes')); module.exports = router; diff --git a/lib/router.js b/lib/router.js index f64355269bc10c..2de65d10553b89 100644 --- a/lib/router.js +++ b/lib/router.js @@ -25,7 +25,8 @@ router.get('/', require('./routes/index')); router.get('/test/:id', require('./routes/test')); // RSSHub -router.get('/rsshub/rss', require('./routes/rsshub/rss')); +router.get('/rsshub/rss', require('./routes/rsshub/routes')); // 弃用 +router.get('/rsshub/routes', require('./routes/rsshub/routes')); // 1draw router.get('/1draw/', require('./routes/1draw/index')); diff --git a/lib/routes/rsshub/rss.js b/lib/routes/rsshub/routes.js similarity index 100% rename from lib/routes/rsshub/rss.js rename to lib/routes/rsshub/routes.js" 87b1f8320c7fdaad0c6be2308397e3e5bfb3d0f4,2020-03-24 08:13:58,s2marine,feat: add agefans.tv detail (#4291),False,add agefans.tv detail (#4291),feat,"diff --git a/docs/multimedia.md b/docs/multimedia.md index 179d16b3f9d6cf..99a4e3d79530d6 100644 --- a/docs/multimedia.md +++ b/docs/multimedia.md @@ -39,6 +39,12 @@ pageClass: routes +## AGE 动漫 + +### 番剧详情 + + + ## bilibili 见 [#bilibili](/social-media.html#bilibili) diff --git a/lib/router.js b/lib/router.js index dc1091d03575fe..2a8ae9ff2119c6 100644 --- a/lib/router.js +++ b/lib/router.js @@ -2409,6 +2409,9 @@ router.get('/hubu/news/:type', require('./routes/universities/hubu/news')); // 大连海事大学 router.get('/dlmu/news/:type', require('./routes/universities/dlmu/news')); +// AGE动漫 +router.get('/agefans/detail/:id', require('./routes/agefans/detail')); + // Checkra1n router.get('/checkra1n/releases', require('./routes/checkra1n/releases')); diff --git a/lib/routes/agefans/detail.js b/lib/routes/agefans/detail.js new file mode 100644 index 00000000000000..7a4f4469d13482 --- /dev/null +++ b/lib/routes/agefans/detail.js @@ -0,0 +1,29 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const response = await got({ + method: 'get', + url: `https://www.agefans.tv/detail/${ctx.params.id}`, + }); + const $ = cheerio.load(response.data); + + const defaultIdx = parseInt($('#DEF_PLAYINDEX').get(0).children[0].data); + const items = $('#main0 div') + .filter((idx) => defaultIdx === idx) + .find('a') + .map((idx, item) => ({ + title: $(item).text(), + description: $(item).text(), + link: `https://www.agefans.tv/${$(item).attr('href')}`, + })) + .get(); + items.reverse(); + + ctx.state.data = { + title: `ACG动漫 - ${$('.detail_imform_name').text()}`, + link: `https://www.agefans.tv/detail/${ctx.params.id}`, + description: $('.detail_imform_desc_pre').text(), + item: items, + }; +};" cae4bb2e55e819cc5e81ccbd8f6c0338723c484d,2020-02-09 17:15:51,hoilc,fix: konachan base url due to got v10 (#3939),False,konachan base url due to got v10 (#3939),fix,"diff --git a/lib/routes/konachan/post_popular_recent.js b/lib/routes/konachan/post_popular_recent.js index 84e71d1d08fffe..b78f68a872273e 100644 --- a/lib/routes/konachan/post_popular_recent.js +++ b/lib/routes/konachan/post_popular_recent.js @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const response = await got({ method: 'get', - baseUrl, + prefixUrl: baseUrl, url: '/post/popular_recent.json', searchParams: queryString.stringify({ period," db74a218d0055d2a13a5fd581d9417fc84bd80fd,2025-02-26 00:35:58,dependabot[bot],chore(deps): bump @sentry/node from 9.1.0 to 9.2.0 (#18451),False,bump @sentry/node from 9.1.0 to 9.2.0 (#18451),chore,"diff --git a/package.json b/package.json index 39511e8aba2c3d..a55c1fdd0be77e 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ ""@postlight/parser"": ""2.2.3"", ""@rss3/sdk"": ""0.0.25"", ""@scalar/hono-api-reference"": ""0.5.175"", - ""@sentry/node"": ""9.1.0"", + ""@sentry/node"": ""9.2.0"", ""@tonyrl/rand-user-agent"": ""2.0.83"", ""aes-js"": ""3.1.2"", ""art-template"": ""4.13.2"", @@ -197,7 +197,7 @@ ""vitest"": ""2.1.9"", ""yaml-eslint-parser"": ""1.2.3"" }, - ""packageManager"": ""pnpm@9.15.5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4"", + ""packageManager"": ""pnpm@9.15.6+sha512.139cab068fdf0b751268179ac5f909b5be72afb4a75c513d1905d151befc8977b593d3cf8671ed83d4d6637c5c94b98ffbce108125de4a5a27a31233601a99de"", ""engines"": { ""node"": "">=22"" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cac4adc277ee54..29385e9100ea3c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,8 +63,8 @@ importers: specifier: 0.5.175 version: 0.5.175(hono@4.7.2) '@sentry/node': - specifier: 9.1.0 - version: 9.1.0 + specifier: 9.2.0 + version: 9.2.0 '@tonyrl/rand-user-agent': specifier: 2.0.83 version: 2.0.83 @@ -2024,16 +2024,16 @@ packages: '@selderee/plugin-htmlparser2@0.11.0': resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==} - '@sentry/core@9.1.0': - resolution: {integrity: sha512-djWEzSBpMgqdF3GQuxO+kXCUX+Mgq42G4Uah/HSUBvPDHKipMmyWlutGRoFyVPPOnCDgpHu3wCt83wbpEyVmDw==} + '@sentry/core@9.2.0': + resolution: {integrity: sha512-REnEuneWyv3DkZfr0ZCQOZRCkBxUuWMY7aJ7BwWU9t3CFRUIPO0ePiXb2eZJEkDtalJK+m9pSTDUbChtrzQmLA==} engines: {node: '>=18'} - '@sentry/node@9.1.0': - resolution: {integrity: sha512-Xf9N0rpZ+lf3kA/MBa0yA7/wBd+dW8QhBav2YmM2GpqrrZ+3HtP6sT0N9+D3qADUYTn0RE2MNo8yaiaM6/FfPw==} + '@sentry/node@9.2.0': + resolution: {integrity: sha512-QDOCIs8hTnwPE34FwYL1oIQneqpqyl85MOEfHnv1K7WZ4XYaHMvlJi1vSDr155buFC9K6JkINTw5yJmU1Pi5mA==} engines: {node: '>=18'} - '@sentry/opentelemetry@9.1.0': - resolution: {integrity: sha512-sAsuzTYPS4iBxmzFmv6VmVfSphO4VPCpF6F+UbPJdp2ZGB9vxhDZmL1jcdbYZwNMK8RiOk/vNT8SMO+5ZghGOA==} + '@sentry/opentelemetry@9.2.0': + resolution: {integrity: sha512-ksd3M+KXuHt5vsPcqyy77YxVP0yb27J2LD19fasiybOPedb90XjynEk29zVBmW2iEPt8Ddw55FKDNVnHFEbUjw==} engines: {node: '>=18'} peerDependencies: '@opentelemetry/api': ^1.9.0 @@ -5121,8 +5121,8 @@ packages: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} - require-in-the-middle@7.5.1: - resolution: {integrity: sha512-fgZEz/t3FDrU9o7EhI+iNNq1pNNpJImOvX72HUd6RoFiw8MaKd8/gR5tLuc8A0G0e55LMbP6ImjnmXY6zrTmjw==} + require-in-the-middle@7.5.2: + resolution: {integrity: sha512-gAZ+kLqBdHarXB64XpAe2VCjB7rIRv+mU8tfRWziHRJ5umKsIHN2tLLv6EtMw7WCdP19S0ERVMldNvxYCHnhSQ==} engines: {node: '>=8.6.0'} requires-port@1.0.0: @@ -7484,7 +7484,7 @@ snapshots: '@opentelemetry/api-logs': 0.56.0 '@types/shimmer': 1.2.0 import-in-the-middle: 1.13.0 - require-in-the-middle: 7.5.1 + require-in-the-middle: 7.5.2 semver: 7.7.1 shimmer: 1.2.1 transitivePeerDependencies: @@ -7496,7 +7496,7 @@ snapshots: '@opentelemetry/api-logs': 0.57.1 '@types/shimmer': 1.2.0 import-in-the-middle: 1.13.0 - require-in-the-middle: 7.5.1 + require-in-the-middle: 7.5.2 semver: 7.7.1 shimmer: 1.2.1 transitivePeerDependencies: @@ -7508,7 +7508,7 @@ snapshots: '@opentelemetry/api-logs': 0.57.2 '@types/shimmer': 1.2.0 import-in-the-middle: 1.13.0 - require-in-the-middle: 7.5.1 + require-in-the-middle: 7.5.2 semver: 7.7.1 shimmer: 1.2.1 transitivePeerDependencies: @@ -7782,9 +7782,9 @@ snapshots: domhandler: 5.0.3 selderee: 0.11.0 - '@sentry/core@9.1.0': {} + '@sentry/core@9.2.0': {} - '@sentry/node@9.1.0': + '@sentry/node@9.2.0': dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0) @@ -7817,13 +7817,13 @@ snapshots: '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.30.0 '@prisma/instrumentation': 6.2.1(@opentelemetry/api@1.9.0) - '@sentry/core': 9.1.0 - '@sentry/opentelemetry': 9.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0) + '@sentry/core': 9.2.0 + '@sentry/opentelemetry': 9.2.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0) import-in-the-middle: 1.13.0 transitivePeerDependencies: - supports-color - '@sentry/opentelemetry@9.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0)': + '@sentry/opentelemetry@9.2.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0)': dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0) @@ -7831,7 +7831,7 @@ snapshots: '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0) '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.30.0 - '@sentry/core': 9.1.0 + '@sentry/core': 9.2.0 '@sindresorhus/is@5.6.0': {} @@ -11351,7 +11351,7 @@ snapshots: require-directory@2.1.1: {} - require-in-the-middle@7.5.1: + require-in-the-middle@7.5.2: dependencies: debug: 4.4.0 module-details-from-path: 1.0.3" 8ed999f1b59d776f7a79032e5eaa8f9f58643e33,2022-12-09 23:11:37,Tony,fix(route): researchgate (#11429),False,researchgate (#11429),fix,"diff --git a/docs/en/new-media.md b/docs/en/new-media.md index 73dcb4548d6a01..e2b4dea48d0843 100644 --- a/docs/en/new-media.md +++ b/docs/en/new-media.md @@ -581,12 +581,6 @@ Compared to the official one, this feed: -## Research Gate - -### Publications - - - ## RSS3 ### Blog diff --git a/docs/en/study.md b/docs/en/study.md index 589148f79f6644..2e5367d93d9296 100644 --- a/docs/en/study.md +++ b/docs/en/study.md @@ -108,6 +108,12 @@ pageClass: routes +## ResearchGate + +### Publications + + + ## X-MOL ### News diff --git a/docs/new-media.md b/docs/new-media.md index 9acdc7d1a899fd..4b85817d8cc4a7 100644 --- a/docs/new-media.md +++ b/docs/new-media.md @@ -1187,12 +1187,6 @@ IPFS 网关有可能失效,那时候换成其他网关。
-## Research Gate - -### Publications - - - ## RSS3 ### Blog diff --git a/docs/study.md b/docs/study.md index ae233e10a0ec44..db8106c84510cf 100644 --- a/docs/study.md +++ b/docs/study.md @@ -234,6 +234,12 @@ path=""/ctfhub/upcoming/:limit?"" +## ResearchGate + +### Publications + + + ## X-MOL 平台 ### 新闻 diff --git a/lib/router.js b/lib/router.js index 1a6dfbbdc05736..8e7bd61cd7e7c3 100644 --- a/lib/router.js +++ b/lib/router.js @@ -4028,7 +4028,7 @@ router.get('/sbs/chinese/:category?/:id?/:dialect?/:language?', lazyloadRouteHan // router.get('/asiantolick/:category?/:keyword?', lazyloadRouteHandler('./routes/asiantolick')); // Research Gate -router.get('/researchgate/publications/:id', lazyloadRouteHandler('./routes/researchgate/publications')); +// router.get('/researchgate/publications/:id', lazyloadRouteHandler('./routes/researchgate/publications')); // QuestMobile router.get('/questmobile/report/:category?/:label?', lazyloadRouteHandler('./routes/questmobile/report')); diff --git a/lib/routes/researchgate/publications.js b/lib/routes/researchgate/publications.js deleted file mode 100644 index 6d469ea92139b7..00000000000000 --- a/lib/routes/researchgate/publications.js +++ /dev/null @@ -1,60 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const id = ctx.params.id; - - const rootUrl = 'https://www.researchgate.net'; - const currentUrl = `${rootUrl}/profile/${id}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('div[itemprop=""headline""] a') - .slice(0, 15) - .map((_, item) => { - item = $(item); - return { - title: item.text(), - link: item.attr('href'), - }; - }) - .get(); - - const items = await Promise.all( - list.map( - async (item) => - await ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.doi = content('meta[property=""citation_doi""]').attr('content'); - item.pubDate = Date.parse(content('meta[property=""citation_publication_date""]').attr('content')); - - const authors = []; - - content('meta[property=""citation_author""]').each(function () { - authors.push(content(this).attr('content')); - }); - - item.author = authors.join(', '); - - item.description = content('div[itemprop=""description""]').html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `${$('meta[property=""profile:username""]').attr('content')}'s Publications - ResearchGate`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/v2/researchgate/maintainer.js b/lib/v2/researchgate/maintainer.js new file mode 100644 index 00000000000000..1422d9e67b56f7 --- /dev/null +++ b/lib/v2/researchgate/maintainer.js @@ -0,0 +1,3 @@ +module.exports = { + '/publications/:username': ['nczitzk'], +}; diff --git a/lib/v2/researchgate/publications.js b/lib/v2/researchgate/publications.js new file mode 100644 index 00000000000000..8451f6c6726a95 --- /dev/null +++ b/lib/v2/researchgate/publications.js @@ -0,0 +1,70 @@ +const cheerio = require('cheerio'); +const { parseDate } = require('@/utils/parse-date'); + +module.exports = async (ctx) => { + const id = ctx.params.id; + + const rootUrl = 'https://www.researchgate.net'; + const currentUrl = `${rootUrl}/profile/${id}`; + const browser = await require('@/utils/puppeteer')(); + const page = await browser.newPage(); + await page.setRequestInterception(true); + page.on('request', (request) => { + request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort(); + }); + await page.goto(currentUrl); + const response = await page.evaluate(() => document.documentElement.innerHTML); + await page.close(); + + const $ = cheerio.load(response); + + const list = $('div[itemprop=""headline""] a') + .toArray() + .slice(0, ctx.query.limit ? Number(ctx.query.limit) : 15) + .map((item) => { + item = $(item); + return { + title: item.text(), + link: item.attr('href'), + }; + }); + + const items = await Promise.all( + list.map((item) => + ctx.cache.tryGet(item.link, async () => { + const page = await browser.newPage(); + await page.setRequestInterception(true); + page.on('request', (request) => { + request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort(); + }); + await page.goto(item.link); + const detailResponse = await page.evaluate(() => document.documentElement.innerHTML); + await page.close(); + const content = cheerio.load(detailResponse); + + item.doi = content('meta[property=""citation_doi""]').attr('content'); + item.pubDate = parseDate(content('meta[property=""citation_publication_date""]').attr('content')); + + const authors = []; + + content('meta[property=""citation_author""]').each(function () { + authors.push(content(this).attr('content')); + }); + + item.author = authors.join(', '); + + item.description = content('div[itemprop=""description""]').html(); + + return item; + }) + ) + ); + + await browser.close(); + + ctx.state.data = { + title: `${$('meta[property=""profile:username""]').attr('content')}'s Publications - ResearchGate`, + link: currentUrl, + item: items, + }; +}; diff --git a/lib/v2/researchgate/radar.js b/lib/v2/researchgate/radar.js new file mode 100644 index 00000000000000..4df44cdec74618 --- /dev/null +++ b/lib/v2/researchgate/radar.js @@ -0,0 +1,13 @@ +module.exports = { + 'researchgate.net': { + _name: 'ResearchGate', + '.': [ + { + title: 'Publications', + docs: 'https://docs.rsshub.app/study.html#researchgate', + source: ['/profile/:username'], + target: '/researchgate/publications/:username', + }, + ], + }, +}; diff --git a/lib/v2/researchgate/router.js b/lib/v2/researchgate/router.js new file mode 100644 index 00000000000000..ae42543bfb4a14 --- /dev/null +++ b/lib/v2/researchgate/router.js @@ -0,0 +1,3 @@ +module.exports = (router) => { + router.get('/publications/:id', require('./publications')); +};" 915aed94f849ce234b1a02720c97b1189265d8c9,2023-04-23 02:20:41,Tony,fix: v1tx (#12374),False,v1tx (#12374),fix,"diff --git a/lib/v2/v1tx/index.js b/lib/v2/v1tx/index.js index dc15112f0c4a32..6c31e7046bc329 100644 --- a/lib/v2/v1tx/index.js +++ b/lib/v2/v1tx/index.js @@ -4,31 +4,50 @@ const { parseDate } = require('@/utils/parse-date'); module.exports = async (ctx) => { const baseUrl = 'https://www.v1tx.com'; - const response = await got(`${baseUrl}/wp-json/wp/v2/posts`, { - searchParams: { - per_page: ctx.query.limit ?? 100, - }, - }); - - const items = response.data.map((item) => { - const $ = cheerio.load(item.content.rendered, null, false); - $('figure > picture > source').remove(); - $('img').each((_, img) => { - img.attribs.src = img.attribs.src.replace(/-1024x\d+\.jpg/, '.webp').replace('.jpg', '.webp'); - delete img.attribs.srcset; + const { data: response } = await got(baseUrl); + + const $ = cheerio.load(response); + const list = $('h2.entry-title a') + .toArray() + .map((item) => { + item = $(item); + return { + title: item.text(), + link: item.attr('href'), + }; }); - return { - title: item.title.rendered, - link: item.link, - guid: item.guid.rendered, - description: $.html(), - pubDate: parseDate(item.date_gmt), - }; - }); + + const items = await Promise.all( + list.map((item) => + ctx.cache.tryGet(item.link, async () => { + const { data: response } = await got(item.link); + const $ = cheerio.load(response); + + const data = JSON.parse($('script[type=""application/ld+json""]').text()); + + $('.entry-content figure > picture > source, noscript').remove(); + $('.entry-content img').each((_, img) => { + if (img.attribs.src.startsWith('data:')) { + img.attribs.src = img.attribs['data-lazy-src']; + delete img.attribs['data-lazy-src']; + delete img.attribs['data-lazy-srcset']; + } + img.attribs.src = img.attribs.src.replace(/-1024x\d+\.jpg/, '.webp').replace('.jpg', '.webp'); + delete img.attribs.srcset; + }); + + item.pubDate = parseDate(data.datePublished); + item.updated = parseDate(data.dateModified); + item.description = $('.entry-content').html(); + + return item; + }) + ) + ); ctx.state.data = { - title: 'v1tx - 发现实用工具与软件', - description: 'v1tx.com 专注于发现新应用,推荐各种效率工具、软件、APP,包括Windows、Mac、Android、iOS、网页等多平台应用,让每个人找到适合的软件并掌握使用技巧', + title: $('head title').text(), + description: $('head meta[name=""description""]').attr('content'), link: baseUrl, image: `${baseUrl}/wp-content/uploads/2018/10/cropped-Favicon.webp`, item: items," 4405a2c1e79314a715a2b4d49309f9ef8378784f,2020-04-23 16:55:06,zhangpeng2k,fix: 修复scoresaber用户动态中时区错误的问题 (#4543),False,修复scoresaber用户动态中时区错误的问题 (#4543),fix,"diff --git a/lib/routes/scoresaber/user.js b/lib/routes/scoresaber/user.js index f39f2091c83bd5..e2d54a4a377bd0 100644 --- a/lib/routes/scoresaber/user.js +++ b/lib/routes/scoresaber/user.js @@ -21,7 +21,7 @@ module.exports = async (ctx) => { const song = item.find('.songTop.pp').text(); const mapper = item.find('.songTop.mapper').text(); const rank = item.find('.rank').text(); - const time = item.find('.time').attr('title'); + const time = new Date(item.find('.time').attr('title')).toLocaleString(); const ppValue = item.find('.ppValue').text(); const ppWeightedValue = item.find('.ppWeightedValue').text(); const scoreBottom = item.find('.scoreBottom').text();" ba06c26875e8fdaf3b557adcf3f46399f5d8d696,2020-04-16 17:17:34,mifang,feat: add bbs路由 eTOLAND (#4465),False,add bbs路由 eTOLAND (#4465),feat,"diff --git a/docs/bbs.md b/docs/bbs.md index cb7f129819fd9a..1ed898fbbccc09 100644 --- a/docs/bbs.md +++ b/docs/bbs.md @@ -82,6 +82,12 @@ pageClass: routes +## eTOLAND + +### 主题贴 + + + ## LearnKu ### 社区 diff --git a/lib/router.js b/lib/router.js index 0fb5966d5310e7..a86a28a3578e02 100644 --- a/lib/router.js +++ b/lib/router.js @@ -2536,4 +2536,7 @@ router.get('/iyouport/article', require('./routes/iyouport')); // girlimg router.get('/girlimg/album/:tag?/:mode?', require('./routes/girlimg/album')); +// etoland +router.get('/etoland/:bo_table', require('./routes/etoland/board')); + module.exports = router; diff --git a/lib/routes/etoland/board.js b/lib/routes/etoland/board.js new file mode 100644 index 00000000000000..e9d522427a8a21 --- /dev/null +++ b/lib/routes/etoland/board.js @@ -0,0 +1,46 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); +const iconv = require('iconv-lite'); +const date = require('@/utils/date'); + +module.exports = async (ctx) => { + const { bo_table } = ctx.params; + + const response = await got({ + method: 'get', + url: `http://www.etoland.co.kr/bbs/board.php?bo_table=${bo_table}`, + responseType: 'buffer', + }); + + const data = iconv.decode(response.data, 'euc-kr'); + + const $ = cheerio.load(data); + const list = $('form[name=""fboardlist""]>table tr[align=""center""]').filter((index, item) => { + item = $(item); + return item.find('td').first().find('span.mw_basic_list_num').length > 0; + }); + + ctx.state.data = { + title: 'eTOLAND', + link: 'http://www.etoland.co.kr', + language: 'ko-KR', + description: 'eTOLAND', + item: + list && + list + .map((index, item) => { + item = $(item); + const title = item.find('td.mw_basic_list_subject a:nth-child(3) span').text(); + const description = `点赞数:${item.find('td.mw_basic_list_good').text()}
浏览数:${item.find('td.mw_basic_list_hit').text()}`; + const link = item.find('td.mw_basic_list_subject a:nth-child(3)').attr('href'); + + return { + title: title, + description: description, + link: link, + pubDate: date(item.find('td.mw_basic_list_datetime').text()), + }; + }) + .get(), + }; +};" ab4d5039ad7d1210366714e8b8fede005b626275,2020-02-24 21:46:49,Henry Wang,feat: add finviz stock news (#4075),False,add finviz stock news (#4075),feat,"diff --git a/docs/en/finance.md b/docs/en/finance.md new file mode 100644 index 00000000000000..fcde5c8c82929d --- /dev/null +++ b/docs/en/finance.md @@ -0,0 +1,11 @@ +--- +pageClass: routes +--- + +# Finance + +## finviz + +### US stock news + + diff --git a/docs/finance.md b/docs/finance.md new file mode 100644 index 00000000000000..8b66061a735bee --- /dev/null +++ b/docs/finance.md @@ -0,0 +1,59 @@ +--- +pageClass: routes +--- + +# 金融 + +## 雪球 + +### 用户动态 + + + +| 原发布 | 长文 | 问答 | 热门 | 交易 | +| ------ | ---- | ---- | ---- | ---- | +| 0 | 2 | 4 | 9 | 11 | + + + +### 用户收藏动态 + + + +### 用户自选动态 + + + +### 基金净值更新 + + + +### 组合最新调仓信息 + + + +### 股票信息 + + + +| 公告 | 新闻 | 研报 | +| ------------ | ---- | -------- | +| announcement | news | research | + + + +## 淘股吧股票论坛 + +### 论坛总版 + + + +### 用户博客 + + + +## finviz + +### 美股股票新闻 + + diff --git a/docs/other.md b/docs/other.md index 58c9e6f00e0d69..cc4f4ca2755736 100644 --- a/docs/other.md +++ b/docs/other.md @@ -372,16 +372,6 @@ type 为 all 时,category 参数不支持 cost 和 free -## 淘股吧股票论坛 - -### 论坛总版 - - - -### 用户博客 - - - ## 腾讯吐个槽 ### 吐槽新帖 diff --git a/docs/social-media.md b/docs/social-media.md index c0c88365915342..debb7a081ef16f 100644 --- a/docs/social-media.md +++ b/docs/social-media.md @@ -780,44 +780,6 @@ rule -## 雪球 - -### 用户动态 - - - -| 原发布 | 长文 | 问答 | 热门 | 交易 | -| ------ | ---- | ---- | ---- | ---- | -| 0 | 2 | 4 | 9 | 11 | - - - -### 用户收藏动态 - - - -### 用户自选动态 - - - -### 基金净值更新 - - - -### 组合最新调仓信息 - - - -### 股票信息 - - - -| 公告 | 新闻 | 研报 | -| ------------ | ---- | -------- | -| announcement | news | research | - - - ### 热帖 diff --git a/lib/router.js b/lib/router.js index 27806e6225a906..82266bc3c5eac0 100644 --- a/lib/router.js +++ b/lib/router.js @@ -2259,6 +2259,10 @@ router.get('/google/news/:category/:locale', require('./routes/google/news')); router.get('/p-articles/section/:section', require('./routes/p-articles/section')); router.get('/p-articles/contributors/:author', require('./routes/p-articles/contributors')); +// finviz + +router.get('/finviz/news/:ticker', require('./routes/finviz/news')); + // 好好住 router.get('/haohaozhu/whole-house/:keyword?', require('./routes/haohaozhu/whole-house')); router.get('/haohaozhu/discover/:keyword?', require('./routes/haohaozhu/discover')); diff --git a/lib/routes/finviz/news.js b/lib/routes/finviz/news.js new file mode 100644 index 00000000000000..4c19b2f3dd5ae6 --- /dev/null +++ b/lib/routes/finviz/news.js @@ -0,0 +1,50 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); +const dateParser = require('@/utils/dateParser'); + +module.exports = async (ctx) => { + const link = `https://finviz.com/quote.ashx?t=${ctx.params.ticker}`; + const response = await got.get(link); + + const $ = cheerio.load(response.body); + const data = $('table.fullview-news-outer tr').slice(0, 10); + + let dateRow = ''; + const item = await Promise.all( + data + .map(async (i, e) => { + let date = $(e) + .find('td') + .first() + .text() + .trim(); + if (date.includes('-')) { + dateRow = date.split(' ')[0]; + } else { + date = `${dateRow} ${date}`; + } + return { + title: $(e) + .find('a') + .text(), + pubDate: dateParser(date, 'MMM-DD-YY HH:mmA'), + authors: $(e) + .find('span') + .text(), + link: $(e) + .find('a') + .attr('href'), + }; + }) + .get() + ); + + const name = $('.fullview-title b').text(); + + ctx.state.data = { + title: `${name} News by Finviz`, + link, + description: `A collection of ${name} news aggregated by Finviz.`, + item, + }; +};" ba8070b1b2bb39f9ddcb4196fc41613822a77ce1,2019-11-11 09:43:38,DIYgod,chore: format,False,format,chore,"diff --git a/lib/routes/cneb/guoneinews.js b/lib/routes/cneb/guoneinews.js index 8533183de2ced7..8c11c6a0d1c43d 100644 --- a/lib/routes/cneb/guoneinews.js +++ b/lib/routes/cneb/guoneinews.js @@ -1,10 +1,12 @@ const got = require('@/utils/got'); module.exports = async (ctx) => { - const list = (await got({ - method: 'get', - url: 'http://www.cneb.gov.cn/guoneinews/guoneidata/', - })).data.rollData; + const list = ( + await got({ + method: 'get', + url: 'http://www.cneb.gov.cn/guoneinews/guoneidata/', + }) + ).data.rollData; const items = list.map((item) => { const single = { diff --git a/lib/routes/cneb/yjxx.js b/lib/routes/cneb/yjxx.js index 177e37d16f6999..38d8ada1f3455b 100644 --- a/lib/routes/cneb/yjxx.js +++ b/lib/routes/cneb/yjxx.js @@ -1,10 +1,12 @@ const got = require('@/utils/got'); module.exports = async (ctx) => { - const warningMessagesJsonp = (await got({ - method: 'get', - url: 'http://uc.cneb.gov.cn:8080/getWarningMessages?callback=func&start=0&pagetype=PAGE1409368873582889&rows=100&_=' + +new Date(), - })).data.trim(); + const warningMessagesJsonp = ( + await got({ + method: 'get', + url: 'http://uc.cneb.gov.cn:8080/getWarningMessages?callback=func&start=0&pagetype=PAGE1409368873582889&rows=100&_=' + +new Date(), + }) + ).data.trim(); let warningMessages = []; diff --git a/lib/routes/eleme/open-be/announce.js b/lib/routes/eleme/open-be/announce.js index 7286c063a5e2bd..2df6e3b82e8a17 100644 --- a/lib/routes/eleme/open-be/announce.js +++ b/lib/routes/eleme/open-be/announce.js @@ -1,10 +1,12 @@ const got = require('@/utils/got'); module.exports = async (ctx) => { - const data = (await got({ - method: 'get', - url: 'https://open-be.ele.me/dev/notice/list?curpage=1&perpage=200', - })).data; + const data = ( + await got({ + method: 'get', + url: 'https://open-be.ele.me/dev/notice/list?curpage=1&perpage=200', + }) + ).data; ctx.state.data = { title: '饿百零售开放平台-公告', diff --git a/lib/routes/eleme/open/announce.js b/lib/routes/eleme/open/announce.js index dffdd94739b2e1..18c762fb02d086 100644 --- a/lib/routes/eleme/open/announce.js +++ b/lib/routes/eleme/open/announce.js @@ -1,25 +1,27 @@ const got = require('@/utils/got'); module.exports = async (ctx) => { - const data = (await got({ - method: 'post', - url: 'https://app-api.shop.ele.me/arena/invoke/?method=NoticeKeeperService.getBroadcastList', - json: true, - data: { - id: '5CC2B32FA6F24CF78CB300DDE2F370BE|1565511577423', - metas: { - appName: 'Odin', - appVersion: '4.4.0', + const data = ( + await got({ + method: 'post', + url: 'https://app-api.shop.ele.me/arena/invoke/?method=NoticeKeeperService.getBroadcastList', + json: true, + data: { + id: '5CC2B32FA6F24CF78CB300DDE2F370BE|1565511577423', + metas: { + appName: 'Odin', + appVersion: '4.4.0', + }, + service: 'NoticeKeeperService', + method: 'getBroadcastList', + params: { + offset: 0, + limit: 999, + }, + ncp: '2.0.0', }, - service: 'NoticeKeeperService', - method: 'getBroadcastList', - params: { - offset: 0, - limit: 999, - }, - ncp: '2.0.0', - }, - })).data; + }) + ).data; ctx.state.data = { title: '饿了么商家开放平台-公告', diff --git a/lib/routes/enclavebooks/category.js b/lib/routes/enclavebooks/category.js index 2df4c47d7444ec..e7c644f0f028bf 100644 --- a/lib/routes/enclavebooks/category.js +++ b/lib/routes/enclavebooks/category.js @@ -4,13 +4,15 @@ const host = 'https://www.enclavebooks.cn'; module.exports = async (ctx) => { const id = ctx.params.id; - const categorys = (await got({ - method: 'get', - url: 'https://app.enclavebooks.cn/v2/discovery', - headers: { - Referer: host, - }, - })).data.result.category; + const categorys = ( + await got({ + method: 'get', + url: 'https://app.enclavebooks.cn/v2/discovery', + headers: { + Referer: host, + }, + }) + ).data.result.category; let category_name, description; for (let i = 0; i < categorys.length; i++) { @@ -22,13 +24,15 @@ module.exports = async (ctx) => { } } - const list = (await got({ - method: 'get', - url: `https://app.enclavebooks.cn/v1_9/getCategoryList?cateId=${id}&page=1`, - headers: { - Referer: host, - }, - })).data.result.data; + const list = ( + await got({ + method: 'get', + url: `https://app.enclavebooks.cn/v1_9/getCategoryList?cateId=${id}&page=1`, + headers: { + Referer: host, + }, + }) + ).data.result.data; const out = await Promise.all( list.map(async (item) => { diff --git a/lib/routes/instagram/story.js b/lib/routes/instagram/story.js index 5095f3f17d8d9e..30ee95baa8e72d 100644 --- a/lib/routes/instagram/story.js +++ b/lib/routes/instagram/story.js @@ -3,13 +3,15 @@ const got = require('@/utils/got'); module.exports = async (ctx) => { const username = ctx.params.username; - const response = (await got({ - method: 'get', - url: `https://api.storiesig.com/stories/${username}`, - headers: { - Referer: `https://storiesig.com/?username=${username}`, - }, - })).data; + const response = ( + await got({ + method: 'get', + url: `https://api.storiesig.com/stories/${username}`, + headers: { + Referer: `https://storiesig.com/?username=${username}`, + }, + }) + ).data; const items = response.items.map((item) => { const image = item.image_versions2 && item.image_versions2.candidates[0].url; diff --git a/lib/routes/juejin/pins.js b/lib/routes/juejin/pins.js index 711633639e147f..6e4a55e645d3ae 100644 --- a/lib/routes/juejin/pins.js +++ b/lib/routes/juejin/pins.js @@ -11,36 +11,42 @@ module.exports = async (ctx) => { }, }); - const items = response.data.data.recommendedActivityFeed.items.edges.map(({ node: { targets: [item] } }) => { - const content = item.content; - const title = content; - const guid = item.id; - const link = `https://juejin.im/pin/${guid}`; - const pubDate = new Date(item.createdAt).toUTCString(); - const author = item.user.username; - const imgs = item.pictures.reduce((imgs, item) => { - imgs += ` + const items = response.data.data.recommendedActivityFeed.items.edges.map( + ({ + node: { + targets: [item], + }, + }) => { + const content = item.content; + const title = content; + const guid = item.id; + const link = `https://juejin.im/pin/${guid}`; + const pubDate = new Date(item.createdAt).toUTCString(); + const author = item.user.username; + const imgs = item.pictures.reduce((imgs, item) => { + imgs += `
`; - return imgs; - }, ''); - const url = item.url; - const urlTitle = item.urlTitle; - const description = ` + return imgs; + }, ''); + const url = item.url; + const urlTitle = item.urlTitle; + const description = ` ${content.replace(/\n/g, '
')}
${imgs}
${urlTitle}
`; - return { - title, - link, - description, - guid, - pubDate, - author, - }; - }); + return { + title, + link, + description, + guid, + pubDate, + author, + }; + } + ); ctx.state.data = { title: '沸点 - 动态', diff --git a/lib/routes/netease/dy.js b/lib/routes/netease/dy.js index f1840c9621f30b..064cd62135436f 100644 --- a/lib/routes/netease/dy.js +++ b/lib/routes/netease/dy.js @@ -19,9 +19,11 @@ module.exports = async (ctx) => { const response = await ctx.cache.tryGet( e.link, async () => - (await got.get(e.link, { - responseType: 'buffer', - })).data + ( + await got.get(e.link, { + responseType: 'buffer', + }) + ).data ); const html = iconv.decode(response, 'gbk'); const $ = cheerio.load(html, { decodeEntities: false }); diff --git a/lib/routes/sf/sffq-announce.js b/lib/routes/sf/sffq-announce.js index a605be5d067673..fcf1fb9c928be6 100644 --- a/lib/routes/sf/sffq-announce.js +++ b/lib/routes/sf/sffq-announce.js @@ -1,12 +1,14 @@ const got = require('@/utils/got'); module.exports = async (ctx) => { - const data = (await got({ - method: 'post', - url: 'https://qiao.sf-express.com/menu/getListNews.pub', - json: true, - data: {}, - })).data; + const data = ( + await got({ + method: 'post', + url: 'https://qiao.sf-express.com/menu/getListNews.pub', + json: true, + data: {}, + }) + ).data; ctx.state.data = { title: '顺丰丰桥开放平台-公告', diff --git a/lib/routes/tencent/news/author.js b/lib/routes/tencent/news/author.js index 03b870a3ff6143..78bde8d5e6ef57 100644 --- a/lib/routes/tencent/news/author.js +++ b/lib/routes/tencent/news/author.js @@ -29,9 +29,11 @@ module.exports = async (ctx) => { const response = await ctx.cache.tryGet( itemUrl, async () => - (await got.get(itemUrl, { - responseType: 'buffer', - })).data + ( + await got.get(itemUrl, { + responseType: 'buffer', + }) + ).data ); const html = iconv.decode(response, 'gbk'); const $ = cheerio.load(html, { decodeEntities: false }); diff --git a/lib/routes/universities/njust/cwc/index.js b/lib/routes/universities/njust/cwc/index.js index 39484615223198..3bcb887b4142cf 100644 --- a/lib/routes/universities/njust/cwc/index.js +++ b/lib/routes/universities/njust/cwc/index.js @@ -4,7 +4,10 @@ const url = require('url'); const host = 'http://cwc.njust.edu.cn/'; -const map = new Map([[1, { title: '南京理工大学财务处 -- 新闻及通知', id: 'wp_news_w2' }], [2, { title: '南京理工大学财务处 -- 办事指南', id: 'wp_news_w3' }]]); +const map = new Map([ + [1, { title: '南京理工大学财务处 -- 新闻及通知', id: 'wp_news_w2' }], + [2, { title: '南京理工大学财务处 -- 办事指南', id: 'wp_news_w3' }], +]); module.exports = async (ctx) => { const type = Number.parseInt(ctx.params.type); diff --git a/lib/routes/universities/njust/gs/index.js b/lib/routes/universities/njust/gs/index.js index ca87f6010048c1..03261bdc82b69b 100644 --- a/lib/routes/universities/njust/gs/index.js +++ b/lib/routes/universities/njust/gs/index.js @@ -1,7 +1,10 @@ const got = require('@/utils/got'); const cheerio = require('cheerio'); -const map = new Map([[1, { title: '南京理工大学研究生院 -- 通知公告', id: '/sytzgg_4568' }], [2, { title: '南京理工大学研究生院 -- 学术公告', id: '/xshdggl' }]]); +const map = new Map([ + [1, { title: '南京理工大学研究生院 -- 通知公告', id: '/sytzgg_4568' }], + [2, { title: '南京理工大学研究生院 -- 学术公告', id: '/xshdggl' }], +]); module.exports = async (ctx) => { const type = Number.parseInt(ctx.params.type); diff --git a/lib/routes/universities/swufe/seie/index.js b/lib/routes/universities/swufe/seie/index.js index 7950bf2db419d1..a9c93fd0134841 100644 --- a/lib/routes/universities/swufe/seie/index.js +++ b/lib/routes/universities/swufe/seie/index.js @@ -5,7 +5,10 @@ const url = require('url'); const listUrl = 'https://it.swufe.edu.cn/index/'; const baseUrl = 'https://it.swufe.edu.cn/'; -const map = new Map([['xyxw', { title: '西南财经大学经济信息工程学院 -- 学院新闻', suffix: 'xyxw.htm' }], ['tzgg', { title: '西南财经大学经济信息工程学院 -- 通知公告', suffix: 'tzgg.htm' }]]); +const map = new Map([ + ['xyxw', { title: '西南财经大学经济信息工程学院 -- 学院新闻', suffix: 'xyxw.htm' }], + ['tzgg', { title: '西南财经大学经济信息工程学院 -- 通知公告', suffix: 'tzgg.htm' }], +]); module.exports = async (ctx) => { const type = ctx.params.type || 'tzgg'; diff --git a/lib/routes/universities/szu/yz/index.js b/lib/routes/universities/szu/yz/index.js index 3f9242058b260f..0a1630308830a4 100644 --- a/lib/routes/universities/szu/yz/index.js +++ b/lib/routes/universities/szu/yz/index.js @@ -2,7 +2,10 @@ const got = require('@/utils/got'); const cheerio = require('cheerio'); const util = require('./utils'); -const map = new Map([[1, { title: '硕士招生 - 深圳大学研究生招生网' }], [2, { title: '博士招生 - 深圳大学研究生招生网' }]]); +const map = new Map([ + [1, { title: '硕士招生 - 深圳大学研究生招生网' }], + [2, { title: '博士招生 - 深圳大学研究生招生网' }], +]); module.exports = async (ctx) => { let type = Number.parseInt(ctx.params.type); diff --git a/lib/routes/vocus/user.js b/lib/routes/vocus/user.js index 4bd5a55bddc67a..b16c0385a7b840 100644 --- a/lib/routes/vocus/user.js +++ b/lib/routes/vocus/user.js @@ -5,21 +5,25 @@ module.exports = async (ctx) => { const id = ctx.params.id; const link = `https://vocus.cc/user/@${id}`; - const { _id, fullname, intro } = (await got({ - method: 'get', - url: `https://api.sosreader.com/api/users/${id}`, - headers: { - Referer: link, - }, - })).data; + const { _id, fullname, intro } = ( + await got({ + method: 'get', + url: `https://api.sosreader.com/api/users/${id}`, + headers: { + Referer: link, + }, + }) + ).data; - const { articles } = (await got({ - method: 'get', - url: `https://api.sosreader.com/api/articles?userId=${_id}&num=10&status=2&sort=lastPublishAt`, - headers: { - Referer: link, - }, - })).data; + const { articles } = ( + await got({ + method: 'get', + url: `https://api.sosreader.com/api/articles?userId=${_id}&num=10&status=2&sort=lastPublishAt`, + headers: { + Referer: link, + }, + }) + ).data; const items = await ProcessFeed(articles, link, ctx.cache); diff --git a/lib/routes/wechat-open/pay/announce.js b/lib/routes/wechat-open/pay/announce.js index 162bf59bf3c104..0d322965241ed5 100644 --- a/lib/routes/wechat-open/pay/announce.js +++ b/lib/routes/wechat-open/pay/announce.js @@ -1,17 +1,21 @@ const got = require('@/utils/got'); module.exports = async (ctx) => { - const data = (await got({ - method: 'get', - url: - 'https://pay.weixin.qq.com/index.php/public/cms/get_contents?id=6200&cmstype=1&url=https%253A%252F%252Fpay.weixin.qq.com%252Fpublic%252Fcms%252Fcontent_list%253Flang%253Dzh%2526id%253D6200&states=2&publishtimeend=1565537507&expiretimebeg=1565537507&propertyinclude=1&ordertype=4&field=contentId%2CcontentTitle%2CcontentPublishTime&g_ty=ajax', - })).data.data.contentlist; + const data = ( + await got({ + method: 'get', + url: + 'https://pay.weixin.qq.com/index.php/public/cms/get_contents?id=6200&cmstype=1&url=https%253A%252F%252Fpay.weixin.qq.com%252Fpublic%252Fcms%252Fcontent_list%253Flang%253Dzh%2526id%253D6200&states=2&publishtimeend=1565537507&expiretimebeg=1565537507&propertyinclude=1&ordertype=4&field=contentId%2CcontentTitle%2CcontentPublishTime&g_ty=ajax', + }) + ).data.data.contentlist; - const data2 = (await got({ - method: 'get', - url: - 'https://pay.weixin.qq.com/index.php/public/cms/get_contents?pagenum=1&id=6200&cmstype=1&url=https%253A%252F%252Fpay.weixin.qq.com%252Fpublic%252Fcms%252Fcontent_list%253Flang%253Dzh%2526id%253D6200&states=2&publishtimeend=1565537507&expiretimebeg=1565537507&propertyexclude=1&ordertype=4&field=contentId%2CcontentTitle%2CcontentPublishTime&g_ty=ajax', - })).data.data.contentlist; + const data2 = ( + await got({ + method: 'get', + url: + 'https://pay.weixin.qq.com/index.php/public/cms/get_contents?pagenum=1&id=6200&cmstype=1&url=https%253A%252F%252Fpay.weixin.qq.com%252Fpublic%252Fcms%252Fcontent_list%253Flang%253Dzh%2526id%253D6200&states=2&publishtimeend=1565537507&expiretimebeg=1565537507&propertyexclude=1&ordertype=4&field=contentId%2CcontentTitle%2CcontentPublishTime&g_ty=ajax', + }) + ).data.data.contentlist; data.push(...data2);" 8e4f814ea645585d7b5eae67f319218f0aa678ca,2023-08-23 18:06:08,JimenezLi,fix(route): add tophub cookie (#13104),False,add tophub cookie (#13104),fix,"diff --git a/lib/config.js b/lib/config.js index 317b316f17054e..2acce777a10ea5 100644 --- a/lib/config.js +++ b/lib/config.js @@ -275,6 +275,9 @@ const calculateValue = () => { telegram: { token: envs.TELEGRAM_TOKEN, }, + tophub: { + cookie: envs.TOPHUB_COOKIE, + }, twitter: { consumer_key: envs.TWITTER_CONSUMER_KEY, consumer_secret: envs.TWITTER_CONSUMER_SECRET, diff --git a/lib/routes/tophub/index.js b/lib/routes/tophub/index.js index 114703b9954b5b..68d61d8e701e82 100644 --- a/lib/routes/tophub/index.js +++ b/lib/routes/tophub/index.js @@ -1,11 +1,17 @@ const got = require('@/utils/got'); const cheerio = require('cheerio'); +const config = require('@/config').value; module.exports = async (ctx) => { const id = ctx.params.id; const link = `https://tophub.today/n/${id}`; - const response = await got.get(link); + const response = await got.get(link, { + headers: { + Referer: 'https://tophub.today', + Cookie: config.tophub.cookie, + }, + }); const $ = cheerio.load(response.data); const title = $('div.Xc-ec-L.b-L').text().trim(); diff --git a/website/docs/routes/new-media.md b/website/docs/routes/new-media.md index 9cb6d62bd3d5a8..6f7f021e816987 100644 --- a/website/docs/routes/new-media.md +++ b/website/docs/routes/new-media.md @@ -3053,6 +3053,12 @@ others = 热点新闻 + 滚动新闻 ## 今日热榜 {#jin-ri-re-bang} +:::caution + +由于需要登录后的 Cookie 值才能获取原始链接,所以需要自建,需要在环境变量中配置 `TOPHUB_COOKIE`,详情见部署页面的配置模块。 + +::: + ### 榜单 {#jin-ri-re-bang-bang-dan} diff --git a/website/i18n/zh/docusaurus-plugin-content-docs/current/install/README.md b/website/i18n/zh/docusaurus-plugin-content-docs/current/install/README.md index a883e9adb26eab..be71f2aa5a1e7d 100644 --- a/website/i18n/zh/docusaurus-plugin-content-docs/current/install/README.md +++ b/website/i18n/zh/docusaurus-plugin-content-docs/current/install/README.md @@ -977,6 +977,10 @@ RSSHub 支持使用访问密钥 / 码,白名单和黑名单三种方式进行 - `HEFENG_KEY`:API key +- 今日热榜 + + - `TOPHUB_COOKIE`: 今日热榜登录后的 cookie,目前只需要 `itc_center_user=...` 以获取原始链接 + - 南方周末付费全文 - `INFZM_COOKIE`: infzm 账户登陆后的 cookie,目前只需要 `passport_session=...` 即可获取全文" cc120802440db387754aef60499280514c658045,2021-04-23 01:12:54,dependabot-preview[bot],chore(deps): bump @sentry/node from 6.2.5 to 6.3.0,False,bump @sentry/node from 6.2.5 to 6.3.0,chore,"diff --git a/package.json b/package.json index 14c3e9073ac6fa..8c56da4b8ef89f 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ ""dependencies"": { ""@koa/router"": ""10.0.0"", ""@postlight/mercury-parser"": ""2.2.0"", - ""@sentry/node"": ""6.2.5"", + ""@sentry/node"": ""6.3.0"", ""aes-js"": ""3.1.2"", ""art-template"": ""4.13.2"", ""bbcodejs"": ""0.0.4"", diff --git a/yarn.lock b/yarn.lock index 60a755978a54e3..9b321559dc9da3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1354,72 +1354,72 @@ dependencies: safe-buffer ""^5.0.1"" -""@sentry/core@6.2.5"": - version ""6.2.5"" - resolved ""https://registry.yarnpkg.com/@sentry/core/-/core-6.2.5.tgz#e75093f8598becc0a4a0be927f32f7ac49e8588f"" - integrity sha512-I+AkgIFO6sDUoHQticP6I27TT3L+i6TUS03in3IEtpBcSeP2jyhlxI8l/wdA7gsBqUPdQ4GHOOaNgtFIcr8qag== - dependencies: - ""@sentry/hub"" ""6.2.5"" - ""@sentry/minimal"" ""6.2.5"" - ""@sentry/types"" ""6.2.5"" - ""@sentry/utils"" ""6.2.5"" +""@sentry/core@6.3.0"": + version ""6.3.0"" + resolved ""https://registry.yarnpkg.com/@sentry/core/-/core-6.3.0.tgz#3b8db24918a00c0b77f1663fc6d9be925f66bb3e"" + integrity sha512-voot/lJ9gRXB6bx6tVqbEbD6jOd4Sx6Rfmm6pzfpom9C0q+fjIZTatTLq8GdXj8DzxaH1MBDSwtaq/eC3NqYpA== + dependencies: + ""@sentry/hub"" ""6.3.0"" + ""@sentry/minimal"" ""6.3.0"" + ""@sentry/types"" ""6.3.0"" + ""@sentry/utils"" ""6.3.0"" tslib ""^1.9.3"" -""@sentry/hub@6.2.5"": - version ""6.2.5"" - resolved ""https://registry.yarnpkg.com/@sentry/hub/-/hub-6.2.5.tgz#324cae0c90d736cd1032e94104bf3f18becec4d6"" - integrity sha512-YlEFdEhcfqpl2HC+/dWXBsBJEljyMzFS7LRRjCk8QANcOdp9PhwQjwebUB4/ulOBjHPP2WZk7fBBd/IKDasTUg== +""@sentry/hub@6.3.0"": + version ""6.3.0"" + resolved ""https://registry.yarnpkg.com/@sentry/hub/-/hub-6.3.0.tgz#4225b3b0f31fe47f24d80753b257a4b57de5d651"" + integrity sha512-lAnW3Om66t9IR+t1wya1NpOF9lGbvYG6Ca8wxJJGJ1t2PxKwyxpZKzRx0q8M1QFhlZ5cETCzxmM7lBEZ4QVCBg== dependencies: - ""@sentry/types"" ""6.2.5"" - ""@sentry/utils"" ""6.2.5"" + ""@sentry/types"" ""6.3.0"" + ""@sentry/utils"" ""6.3.0"" tslib ""^1.9.3"" -""@sentry/minimal@6.2.5"": - version ""6.2.5"" - resolved ""https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.2.5.tgz#3e963e868bfa68e97581403521fd4e09a8965b02"" - integrity sha512-RKP4Qx3p7Cv0oX1cPKAkNVFYM7p2k1t32cNk1+rrVQS4hwlJ7Eg6m6fsqsO+85jd6Ne/FnyYsfo9cDD3ImTlWQ== +""@sentry/minimal@6.3.0"": + version ""6.3.0"" + resolved ""https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.3.0.tgz#e64d87c92a4676a11168672a96589f46985f2b22"" + integrity sha512-ZdPUwdPQkaKroy67NkwQRqmnfKyd/C1OyouM9IqYKyBjAInjOijwwc/Rd91PMHalvCOGfp1scNZYbZ+YFs/qQQ== dependencies: - ""@sentry/hub"" ""6.2.5"" - ""@sentry/types"" ""6.2.5"" + ""@sentry/hub"" ""6.3.0"" + ""@sentry/types"" ""6.3.0"" tslib ""^1.9.3"" -""@sentry/node@6.2.5"": - version ""6.2.5"" - resolved ""https://registry.yarnpkg.com/@sentry/node/-/node-6.2.5.tgz#6e6694c0c3ce6ca231710f40da0cac7fd5c645ef"" - integrity sha512-/iM3khzGnUH713VFhZBAEYJhb/saEQSVz7Udogml+O7mFQ4rutnwJhgoGcB9YYrwMv2m7qOSszkdZbemDV6k2g== - dependencies: - ""@sentry/core"" ""6.2.5"" - ""@sentry/hub"" ""6.2.5"" - ""@sentry/tracing"" ""6.2.5"" - ""@sentry/types"" ""6.2.5"" - ""@sentry/utils"" ""6.2.5"" +""@sentry/node@6.3.0"": + version ""6.3.0"" + resolved ""https://registry.yarnpkg.com/@sentry/node/-/node-6.3.0.tgz#8d55f32930d531b9a2a3b594754392925b1e3816"" + integrity sha512-n3RemuJsMpSbrIopJ2TxeECwQy/Dvho59SePAVQzK0s6dpG3Ak6YWQSh1XESbFbgLi4KzkbMdeBgznmmEbZPgg== + dependencies: + ""@sentry/core"" ""6.3.0"" + ""@sentry/hub"" ""6.3.0"" + ""@sentry/tracing"" ""6.3.0"" + ""@sentry/types"" ""6.3.0"" + ""@sentry/utils"" ""6.3.0"" cookie ""^0.4.1"" https-proxy-agent ""^5.0.0"" lru_map ""^0.3.3"" tslib ""^1.9.3"" -""@sentry/tracing@6.2.5"": - version ""6.2.5"" - resolved ""https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.2.5.tgz#3f5dadfdccdb5c1fb2eef68458c7c34329b0a34a"" - integrity sha512-j/hM0BoHxfrNLxPeEJ5Vq4R34hO/TOHMEpLR3FdnunBXbsmjoKMMygIkPxnpML5XWtvukAehbwpDXldwMYz83w== +""@sentry/tracing@6.3.0"": + version ""6.3.0"" + resolved ""https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.3.0.tgz#5da2ce67bb5f9cf4f3aa9b6dff06089478f0c501"" + integrity sha512-3UNGgQOrDKBoDqLc4vt+0n27Zv3lbNEoCbBydq4IvGfuYq7ozWMsaTcelsotMsd4ckDuOEh8V/nJTqrDjvL76g== dependencies: - ""@sentry/hub"" ""6.2.5"" - ""@sentry/minimal"" ""6.2.5"" - ""@sentry/types"" ""6.2.5"" - ""@sentry/utils"" ""6.2.5"" + ""@sentry/hub"" ""6.3.0"" + ""@sentry/minimal"" ""6.3.0"" + ""@sentry/types"" ""6.3.0"" + ""@sentry/utils"" ""6.3.0"" tslib ""^1.9.3"" -""@sentry/types@6.2.5"": - version ""6.2.5"" - resolved ""https://registry.yarnpkg.com/@sentry/types/-/types-6.2.5.tgz#34b75285b149e0b9bc5fd54fcc2c445d978c7f2e"" - integrity sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w== +""@sentry/types@6.3.0"": + version ""6.3.0"" + resolved ""https://registry.yarnpkg.com/@sentry/types/-/types-6.3.0.tgz#919cc1870f34b7126546c77e3c695052795d3add"" + integrity sha512-xWyCYDmFPjS5ex60kxOOHbHEs4vs00qHbm0iShQfjl4OSg9S2azkcWofDmX8Xbn0FSOUXgdPCjNJW1B0bPVhCA== -""@sentry/utils@6.2.5"": - version ""6.2.5"" - resolved ""https://registry.yarnpkg.com/@sentry/utils/-/utils-6.2.5.tgz#be90d056b09ed1216097d7a29e3e81ba39238e1b"" - integrity sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ== +""@sentry/utils@6.3.0"": + version ""6.3.0"" + resolved ""https://registry.yarnpkg.com/@sentry/utils/-/utils-6.3.0.tgz#e28645b6d4acd03a478e58bfe112ea02f81e94a0"" + integrity sha512-NZzw4oLelgvCsVBG2e+ZtFtaBvgA7rZYtcGFbZTphhAlYoJ6JMCQUzYk0iwJK79yR1quh510x4UE0jynvvToWg== dependencies: - ""@sentry/types"" ""6.2.5"" + ""@sentry/types"" ""6.3.0"" tslib ""^1.9.3"" ""@sindresorhus/is@^0.14.0"":" f4f37c17b1e6f18e6895e184bd4a8625b8a9d75f,2019-05-14 12:55:43,renovate[bot],chore(deps): update vuepress monorepo to v1.0.0-alpha.48 (#2129),False,update vuepress monorepo to v1.0.0-alpha.48 (#2129),chore,"diff --git a/package.json b/package.json index 3b2c5edfd2a534..824368ce9810dd 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ }, ""homepage"": ""https://github.com/DIYgod/RSSHub#readme"", ""devDependencies"": { - ""@vuepress/plugin-back-to-top"": ""1.0.0-alpha.47"", - ""@vuepress/plugin-google-analytics"": ""1.0.0-alpha.47"", - ""@vuepress/plugin-pwa"": ""1.0.0-alpha.47"", + ""@vuepress/plugin-back-to-top"": ""1.0.0-alpha.48"", + ""@vuepress/plugin-google-analytics"": ""1.0.0-alpha.48"", + ""@vuepress/plugin-pwa"": ""1.0.0-alpha.48"", ""axios-mock-adapter"": ""1.16.0"", ""eslint"": ""5.16.0"", ""eslint-config-prettier"": ""4.2.0"", @@ -46,7 +46,7 @@ ""prettier-check"": ""2.0.0"", ""pretty-quick"": ""1.10.0"", ""supertest"": ""4.0.2"", - ""vuepress"": ""1.0.0-alpha.47"", + ""vuepress"": ""1.0.0-alpha.48"", ""yorkie"": ""2.0.0"" }, ""dependencies"": { diff --git a/yarn.lock b/yarn.lock index 7a957af4355737..f595a199542f99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -867,6 +867,20 @@ dependencies: ""@babel/types"" ""^7.3.0"" +""@types/events@*"": + version ""3.0.0"" + resolved ""https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"" + integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== + +""@types/glob@^7.1.1"": + version ""7.1.1"" + resolved ""https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"" + integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== + dependencies: + ""@types/events"" ""*"" + ""@types/minimatch"" ""*"" + ""@types/node"" ""*"" + ""@types/istanbul-lib-coverage@*"": version ""2.0.1"" resolved ""https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"" @@ -892,6 +906,11 @@ ""@types/istanbul-lib-coverage"" ""*"" ""@types/istanbul-lib-report"" ""*"" +""@types/minimatch@*"": + version ""3.0.3"" + resolved ""https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + ""@types/node@*"": version ""11.13.7"" resolved ""https://registry.yarnpkg.com/@types/node/-/node-11.13.7.tgz#85dbb71c510442d00c0631f99dae957ce44fd104"" @@ -1009,35 +1028,35 @@ source-map ""~0.6.1"" vue-template-es2015-compiler ""^1.9.0"" -""@vuepress/core@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/core/-/core-1.0.0-alpha.47.tgz#b1965c0f0c0961aaf110d04525f08ac9a91545af"" - integrity sha512-4nD1fhQIK58W5hMzP2yT6rz8CNjwHWLI6ctRhNCFk4gnIDdwnRgfvkHSnN/fkNg4czZh9Gm7nOfL2sL7JurD6g== +""@vuepress/core@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/core/-/core-1.0.0-alpha.48.tgz#1015318396e29a7690a21f4dada43f7957fea6f0"" + integrity sha512-vGYudGsRNtA9ErKOQFSv9OzUGFG4R/ypemruT99bHqdVJ89bmJyil5hOF5tesT9kPrQV+lM9QPl4yH5Q7KOYmQ== dependencies: ""@babel/core"" ""^7.0.0"" ""@vue/babel-preset-app"" ""^3.1.1"" - ""@vuepress/markdown"" ""^1.0.0-alpha.47"" - ""@vuepress/markdown-loader"" ""^1.0.0-alpha.47"" - ""@vuepress/plugin-last-updated"" ""^1.0.0-alpha.47"" - ""@vuepress/plugin-register-components"" ""^1.0.0-alpha.47"" - ""@vuepress/shared-utils"" ""^1.0.0-alpha.47"" - autoprefixer ""^7.1.2"" + ""@vuepress/markdown"" ""^1.0.0-alpha.48"" + ""@vuepress/markdown-loader"" ""^1.0.0-alpha.48"" + ""@vuepress/plugin-last-updated"" ""^1.0.0-alpha.48"" + ""@vuepress/plugin-register-components"" ""^1.0.0-alpha.48"" + ""@vuepress/shared-utils"" ""^1.0.0-alpha.48"" + autoprefixer ""^9.5.1"" babel-loader ""^8.0.4"" - cache-loader ""^1.2.2"" + cache-loader ""^3.0.0"" chokidar ""^2.0.3"" connect-history-api-fallback ""^1.5.0"" - copy-webpack-plugin ""^4.5.1"" + copy-webpack-plugin ""^5.0.2"" cross-spawn ""^6.0.5"" - css-loader ""^0.28.11"" - file-loader ""^1.1.11"" + css-loader ""^2.1.1"" + file-loader ""^3.0.1"" js-yaml ""^3.11.0"" lru-cache ""^5.1.1"" - mini-css-extract-plugin ""0.4.4"" + mini-css-extract-plugin ""0.6.0"" optimize-css-assets-webpack-plugin ""^5.0.1"" portfinder ""^1.0.13"" - postcss-loader ""^2.1.5"" + postcss-loader ""^3.0.0"" postcss-safe-parser ""^4.0.1"" - toml ""^2.3.3"" + toml ""^3.0.0"" url-loader ""^1.0.1"" vue ""^2.5.16"" vue-loader ""^15.2.4"" @@ -1050,107 +1069,107 @@ webpack-chain ""^4.6.0"" webpack-dev-server ""^3.1.14"" webpack-merge ""^4.1.2"" - webpackbar ""^2.6.1"" + webpackbar ""3.2.0"" -""@vuepress/markdown-loader@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/markdown-loader/-/markdown-loader-1.0.0-alpha.47.tgz#243d8d400293085b32b6a050524eab679b49143f"" - integrity sha512-fPxpcWfn+wLHgOU1QMZ6J99e9u4+JlXXZMfTQC8IrtX5HYeiRCZfsrpTU4F3p41Ie4SLOVo4a9K34vBm3JnEmA== +""@vuepress/markdown-loader@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/markdown-loader/-/markdown-loader-1.0.0-alpha.48.tgz#21861f51586b20e7d6da6c8ca09417ddc92b5237"" + integrity sha512-wIwB6pAgwz1Z5b+YKLZqTTq24bT4SQ1Q5CLC1za8Tv710kciYKET+ltqZSExQ9+ZnTzaGFJX2hvCFbJA4dKMvw== dependencies: - ""@vuepress/markdown"" ""^1.0.0-alpha.47"" + ""@vuepress/markdown"" ""^1.0.0-alpha.48"" loader-utils ""^1.1.0"" lru-cache ""^5.1.1"" -""@vuepress/markdown@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/markdown/-/markdown-1.0.0-alpha.47.tgz#4dd3f8903f712f18c769f2873086f6ab5b6480a5"" - integrity sha512-tzSxZ/6zl4rIlzZZo2Nsaqyo+K2LYzulJrIUd0lnY67pUVPR5n8qSYvdxu2qSjquc1eQpy75/NIUqZfHQGpFaA== +""@vuepress/markdown@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/markdown/-/markdown-1.0.0-alpha.48.tgz#b049fcd52aaa18896dce95cea71c0d9ac4bd6b8d"" + integrity sha512-OT+mAjTp1BwlZhRd316VHN6dSoNPkBkWaCfuKDlVzOu5/HfoMpG1P8OJzhRpZO0w0I52HXe0nL0GFHybwOBxaA== dependencies: - ""@vuepress/shared-utils"" ""^1.0.0-alpha.47"" - lru-cache ""^5.1.1"" + ""@vuepress/shared-utils"" ""^1.0.0-alpha.48"" markdown-it ""^8.4.1"" markdown-it-anchor ""^5.0.2"" markdown-it-chain ""^1.3.0"" markdown-it-emoji ""^1.4.0"" + markdown-it-table-of-contents ""^0.4.0"" prismjs ""^1.13.0"" -""@vuepress/plugin-active-header-links@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.0.0-alpha.47.tgz#7e4e0e03c47d632e98e2d71a3e132722f40f34be"" - integrity sha512-Xfs1V52k54e0DDUb+/yrhd753SrQQoVA2hg3JTk9/tLG/qNzz5/tFrcdpV4rUPeDRVRiDdvHtYB0IXmp+Pwi3Q== +""@vuepress/plugin-active-header-links@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.0.0-alpha.48.tgz#f30772d4a83f12ade91019a62ac5ce3864f19d2c"" + integrity sha512-wgSxa45JhY/Lkt2YJPPmmqH4dDFBtw0A3mhpUL78mvBi77MM7lkB4dFxZ0PTOoc4zKuOqB0gLhtwclcjG3haVw== dependencies: lodash.throttle ""^4.1.1"" -""@vuepress/plugin-back-to-top@1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/plugin-back-to-top/-/plugin-back-to-top-1.0.0-alpha.47.tgz#138262700c22c80878a36e6837bfe03a4e514580"" - integrity sha512-02wOpaIzJqwDMMd5+22f48iOC7iz3NgAX42VOJjFvQmrFzcBMm/HMzXG0nLF0Q23Idcbs1b5Vf4UPPCgiHDZWQ== +""@vuepress/plugin-back-to-top@1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/plugin-back-to-top/-/plugin-back-to-top-1.0.0-alpha.48.tgz#27ce281cd2ad3eafb1fe820156ae483af731c509"" + integrity sha512-rJYBtl7QNjLmNMNZOa4BMTlU4m76koNSQEjLZlVyTLYrGDqP5yY7Stv5QcNeJrDfsHO9ZjJEIvwKHUjE6u/0zg== dependencies: lodash.debounce ""^4.0.8"" -""@vuepress/plugin-google-analytics@1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/plugin-google-analytics/-/plugin-google-analytics-1.0.0-alpha.47.tgz#48af1cda1bd9f1a9f5c3506c398a1c364db6647f"" - integrity sha512-QuJoudT8EGo14oQsNrFpV9sKYNAkHH31Jv5R8/7JSEBcG9NKgpIUAaCkb2+/Ytwot2Oh/cd7MQsZvHQeXWuTBQ== +""@vuepress/plugin-google-analytics@1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/plugin-google-analytics/-/plugin-google-analytics-1.0.0-alpha.48.tgz#1fbc06ebe88501ba443dd5e6196a0e32a1afa525"" + integrity sha512-4cv39L8iGGi1Txt8rQCJG9jaWI3gN/kivRgfVwRU7BbQ9Dr8pqVpZI9Znn8gJl1BKq0v2bdCMORhFh/pvhj4yw== -""@vuepress/plugin-last-updated@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/plugin-last-updated/-/plugin-last-updated-1.0.0-alpha.47.tgz#ff764b8397e8184e03a8f6b13b1482ea4f3b11eb"" - integrity sha512-fJNAY+duJXC6PzXplEQCh34VIpQ9ygeJip1G72B+6HxV4fCrrsz/eXKFdW0HXUamgLkm9b1S/KuXdd5nhTnRpA== +""@vuepress/plugin-last-updated@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/plugin-last-updated/-/plugin-last-updated-1.0.0-alpha.48.tgz#dd9f5fdb2f4994f71bd47ae4dd4ca4885d346347"" + integrity sha512-qJFEov3ff789Z+ZQeJ7mX++QYDykhfktq8jCum6ilrJhV5ni1TMvhYYCGlcDu3Z86VGmt0O4TmAUf9JYzV9wXQ== dependencies: cross-spawn ""^6.0.5"" -""@vuepress/plugin-nprogress@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/plugin-nprogress/-/plugin-nprogress-1.0.0-alpha.47.tgz#e0ad9cfac1d86b168a720045e3e96a01fe9f5190"" - integrity sha512-EzdZ9GqT2H3PzCI4Ddp8EJh0bfe9EcbgIhKnl2fK7mH5RUt7RthDstn5pOhKpAjEC+e1NvH9NGd0pPzLsa0xcQ== +""@vuepress/plugin-nprogress@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/plugin-nprogress/-/plugin-nprogress-1.0.0-alpha.48.tgz#b0f8459d518b8f8b1fdd58b9e8e3aa195bb94604"" + integrity sha512-18F1TToseOpukH8auniVI5rW1i8pUw6hCFj7RurUM2whgt9y4rF8qDVuZeBAhs3/cTmdvxZwpP+W1GyL+EXMiw== dependencies: nprogress ""^0.2.0"" -""@vuepress/plugin-pwa@1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/plugin-pwa/-/plugin-pwa-1.0.0-alpha.47.tgz#6365e5cfda6f527ccc66f723d55ef3c2c3e34321"" - integrity sha512-BI0xVWEAEWt4CsYndqh38m5biROb6TTUVS0ubuO5a5cfPdltLI/X/h8jOpAZO5RJKsUGHGJvDCWrlkT5Bamnww== +""@vuepress/plugin-pwa@1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/plugin-pwa/-/plugin-pwa-1.0.0-alpha.48.tgz#358724a54acb296d580298c33d5f59c186e7490c"" + integrity sha512-a8Fva1nvI2ViOoNZOClSIdCY5wEkhxn+iGS1vFtKcUcpX6o5mDFPg4is0+7cBmBZ47tfbaFXSaR/NfAQEUac5Q== dependencies: - ""@vuepress/shared-utils"" ""^1.0.0-alpha.47"" + ""@vuepress/shared-utils"" ""^1.0.0-alpha.48"" register-service-worker ""^1.5.2"" workbox-build ""^3.1.0"" -""@vuepress/plugin-register-components@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/plugin-register-components/-/plugin-register-components-1.0.0-alpha.47.tgz#c2f6f03f20071e3f0e9047051689395eb47b8a1e"" - integrity sha512-IQXEEM08B4W7owbawNSp3htlNIrn5wEplSAGqEIjjRUrHWhZ6kcFskTgAj2czRndwKGHLaleY5CJsU7dS/B9kA== +""@vuepress/plugin-register-components@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/plugin-register-components/-/plugin-register-components-1.0.0-alpha.48.tgz#790a9d3dff8dce6691cac82d5778efa7ac8ca8bb"" + integrity sha512-4FwiIdKQ4ZQtWnawxI597ezJr6iIRW8NRbHLZUV0dAIac4W6ktABV/wlBp9bhCL9jZBtnnn2OsMIrVePmamrUg== dependencies: - ""@vuepress/shared-utils"" ""^1.0.0-alpha.47"" + ""@vuepress/shared-utils"" ""^1.0.0-alpha.48"" -""@vuepress/plugin-search@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.0.0-alpha.47.tgz#4463927edd915ee38fbe08510f4398ff9da43ab0"" - integrity sha512-Cc0Pckzv4bspfOFecvubazirnZMPbaT4B4KT3KPknrqCfW0Uiv4sSxXEAtzMCB+UF6P7Dlt50SfI/2MO7k58xg== +""@vuepress/plugin-search@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.0.0-alpha.48.tgz#d373de4cb0f86a28cc83a026e19189de0b9e6461"" + integrity sha512-pgaY4RPTbF/1vxLg2iZoHtzQZmybMvhDfmQcca1fOZp52cm23ZB+1uQaHYMVUAwbQJoaoGssUh4aQDaAT/GI5g== -""@vuepress/shared-utils@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.0.0-alpha.47.tgz#a971d026fbb1c9d05255eec7986ef9a243ce4f74"" - integrity sha512-4E/p0Owp4KUBpICeWctwZTCBPGuqzLwDBREjigVyPC02+A0oTL5XT8KVYj6uWn4VjSIt+XtMY2TYDpYni5f5Ew== +""@vuepress/shared-utils@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.0.0-alpha.48.tgz#c00edb82c58c2079be65149d917b8a4048041f60"" + integrity sha512-nu30m2u9tNa5Owk24KOL/rf3kOgRxRYhksEWiAjtDsBynYB/6AkEt2ZGCu27kMgNxPCNc8XVm/6XNSRfGvbt7g== dependencies: chalk ""^2.3.2"" diacritics ""^1.3.0"" escape-html ""^1.0.3"" - fs-extra ""^5.0.0"" - globby ""^8.0.1"" + fs-extra ""^7.0.1"" + globby ""^9.2.0"" gray-matter ""^4.0.1"" hash-sum ""^1.0.2"" - semver ""^5.5.0"" + semver ""^6.0.0"" upath ""^1.1.0"" -""@vuepress/theme-default@^1.0.0-alpha.47"": - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/@vuepress/theme-default/-/theme-default-1.0.0-alpha.47.tgz#9eb8708c7319eb5b9a982fa17f0244c6da574a20"" - integrity sha512-/9Pw3vD0JEwXznmUwq5aYk1Npi14AloxkNcr6CyM1MXAmtZOG0Bbq2h9Sr5lpQLCPgrfOVuobqol4X0QeHokSw== +""@vuepress/theme-default@^1.0.0-alpha.48"": + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/@vuepress/theme-default/-/theme-default-1.0.0-alpha.48.tgz#6b140293422e97a2a53d69e610017c4f6cd3ab9a"" + integrity sha512-FdC/2pOI46qT28EJ4zIlLD2EvltBX/Y6HZDoZvF+NxGi0kJX7s17/+z2yb+sVh5pQukp5avxCSwnAPoN4ZFRfw== dependencies: - ""@vuepress/plugin-active-header-links"" ""^1.0.0-alpha.47"" - ""@vuepress/plugin-nprogress"" ""^1.0.0-alpha.47"" - ""@vuepress/plugin-search"" ""^1.0.0-alpha.47"" + ""@vuepress/plugin-active-header-links"" ""^1.0.0-alpha.48"" + ""@vuepress/plugin-nprogress"" ""^1.0.0-alpha.48"" + ""@vuepress/plugin-search"" ""^1.0.0-alpha.48"" docsearch.js ""^2.5.2"" stylus ""^0.54.5"" stylus-loader ""^3.0.2"" @@ -1387,12 +1406,12 @@ ajv-errors@^1.0.0: resolved ""https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"" integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== -ajv-keywords@^3.0.0, ajv-keywords@^3.1.0: +ajv-keywords@^3.1.0: version ""3.4.0"" resolved ""https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"" integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw== -ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1: +ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1: version ""6.10.0"" resolved ""https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"" integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg== @@ -1423,7 +1442,7 @@ algoliasearch@^3.24.5: semver ""^5.1.0"" tunnel-agent ""^0.6.0"" -alphanum-sort@^1.0.0, alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: +alphanum-sort@^1.0.0: version ""1.0.2"" resolved ""https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= @@ -1450,6 +1469,13 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: resolved ""https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== +ansi-escapes@^4.1.0: + version ""4.1.0"" + resolved ""https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.1.0.tgz#62a9e5fa78e99c5bb588b1796855f5d729231b53"" + integrity sha512-2VY/iCUZTDLD/qxptS3Zn3c6k2MeIbYqjRXqM8T5oC7N2mMjh3xIU3oYru6cHGbldFa9h5i8N0fP65UaUqrMWA== + dependencies: + type-fest ""^0.3.0"" + ansi-html@0.0.7: version ""0.0.7"" resolved ""https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"" @@ -1663,29 +1689,17 @@ autocomplete.js@0.33.0: dependencies: immediate ""^3.2.3"" -autoprefixer@^6.3.1: - version ""6.7.7"" - resolved ""https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"" - integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ= - dependencies: - browserslist ""^1.7.6"" - caniuse-db ""^1.0.30000634"" - normalize-range ""^0.1.2"" - num2fraction ""^1.2.2"" - postcss ""^5.2.16"" - postcss-value-parser ""^3.2.3"" - -autoprefixer@^7.1.2: - version ""7.2.6"" - resolved ""https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"" - integrity sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ== +autoprefixer@^9.5.1: + version ""9.5.1"" + resolved ""https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"" + integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ== dependencies: - browserslist ""^2.11.3"" - caniuse-lite ""^1.0.30000805"" + browserslist ""^4.5.4"" + caniuse-lite ""^1.0.30000957"" normalize-range ""^0.1.2"" num2fraction ""^1.2.2"" - postcss ""^6.0.17"" - postcss-value-parser ""^3.2.3"" + postcss ""^7.0.14"" + postcss-value-parser ""^3.3.1"" aws-sign2@~0.7.0: version ""0.7.0"" @@ -1719,15 +1733,6 @@ axios@0.18.0: follow-redirects ""^1.3.0"" is-buffer ""^1.1.5"" -babel-code-frame@^6.26.0: - version ""6.26.0"" - resolved ""https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= - dependencies: - chalk ""^1.1.3"" - esutils ""^2.0.2"" - js-tokens ""^3.0.2"" - babel-extract-comments@^1.0.0: version ""1.0.0"" resolved ""https://registry.yarnpkg.com/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz#0a2aedf81417ed391b85e18b4614e693a0351a21"" @@ -1815,11 +1820,6 @@ babylon@^6.18.0: resolved ""https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"" integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== -balanced-match@^0.4.2: - version ""0.4.2"" - resolved ""https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"" - integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg= - balanced-match@^1.0.0: version ""1.0.0"" resolved ""https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"" @@ -1890,7 +1890,7 @@ bl@^1.0.0: readable-stream ""^2.3.5"" safe-buffer ""^5.1.1"" -bluebird@^3.1.1, bluebird@^3.1.5, bluebird@^3.5.1, bluebird@^3.5.3: +bluebird@^3.1.1, bluebird@^3.1.5, bluebird@^3.5.3: version ""3.5.4"" resolved ""https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"" integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw== @@ -2046,22 +2046,6 @@ browserify-zlib@^0.2.0: dependencies: pako ""~1.0.5"" -browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: - version ""1.7.7"" - resolved ""https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"" - integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk= - dependencies: - caniuse-db ""^1.0.30000639"" - electron-to-chromium ""^1.2.7"" - -browserslist@^2.11.3: - version ""2.11.3"" - resolved ""https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"" - integrity sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA== - dependencies: - caniuse-lite ""^1.0.30000792"" - electron-to-chromium ""^1.3.30"" - browserslist@^4.0.0, browserslist@^4.3.4: version ""4.5.5"" resolved ""https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"" @@ -2071,6 +2055,15 @@ browserslist@^4.0.0, browserslist@^4.3.4: electron-to-chromium ""^1.3.124"" node-releases ""^1.1.14"" +browserslist@^4.5.4: + version ""4.5.6"" + resolved ""https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.6.tgz#ea42e8581ca2513fa7f371d4dd66da763938163d"" + integrity sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg== + dependencies: + caniuse-lite ""^1.0.30000963"" + electron-to-chromium ""^1.3.127"" + node-releases ""^1.1.17"" + bser@^2.0.0: version ""2.0.0"" resolved ""https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"" @@ -2111,6 +2104,11 @@ buffer-indexof@^1.0.0: resolved ""https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"" integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== +buffer-json@^2.0.0: + version ""2.0.0"" + resolved ""https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23"" + integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== + buffer-xor@^1.0.3: version ""1.0.3"" resolved ""https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"" @@ -2140,26 +2138,7 @@ cac@^6.3.9: resolved ""https://registry.yarnpkg.com/cac/-/cac-6.5.1.tgz#c5685ebc20a8448558191d70a2a76636640308a0"" integrity sha512-mqKv0Ub/nXSoqlACRvrso3k7+nCdzUNimdh+3l0ywDNt27d/x5s/zEg2Ubf1MrsV5Q/DncxtXhNJLrJN6zq1jQ== -cacache@^10.0.4: - version ""10.0.4"" - resolved ""https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"" - integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA== - dependencies: - bluebird ""^3.5.1"" - chownr ""^1.0.1"" - glob ""^7.1.2"" - graceful-fs ""^4.1.11"" - lru-cache ""^4.1.1"" - mississippi ""^2.0.0"" - mkdirp ""^0.5.1"" - move-concurrently ""^1.0.1"" - promise-inflight ""^1.0.1"" - rimraf ""^2.6.2"" - ssri ""^5.2.4"" - unique-filename ""^1.1.0"" - y18n ""^4.0.0"" - -cacache@^11.0.2: +cacache@^11.0.2, cacache@^11.3.2: version ""11.3.2"" resolved ""https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"" integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg== @@ -2202,15 +2181,17 @@ cache-content-type@^1.0.0: mime-types ""^2.1.18"" ylru ""^1.2.0"" -cache-loader@^1.2.2: - version ""1.2.5"" - resolved ""https://registry.yarnpkg.com/cache-loader/-/cache-loader-1.2.5.tgz#9ab15b0ae5f546f376083a695fc1a75f546cb266"" - integrity sha512-enWKEQ4kO3YreDFd7AtVRjtJBmNiqh/X9hVDReu0C4qm8gsGmySkwuWtdc+N5O+vq5FzxL1mIZc30NyXCB7o/Q== +cache-loader@^3.0.0: + version ""3.0.1"" + resolved ""https://registry.yarnpkg.com/cache-loader/-/cache-loader-3.0.1.tgz#cee6cf4b3cdc7c610905b26bad6c2fc439c821af"" + integrity sha512-HzJIvGiGqYsFUrMjAJNDbVZoG7qQA+vy9AIoKs7s9DscNfki0I589mf2w6/tW+kkFH3zyiknoWV5Jdynu6b/zw== dependencies: - loader-utils ""^1.1.0"" + buffer-json ""^2.0.0"" + find-cache-dir ""^2.1.0"" + loader-utils ""^1.2.3"" mkdirp ""^0.5.1"" - neo-async ""^2.5.0"" - schema-utils ""^0.4.2"" + neo-async ""^2.6.1"" + schema-utils ""^1.0.0"" call-me-maybe@^1.0.1: version ""1.0.1"" @@ -2254,21 +2235,11 @@ camelcase@^4.0.0: resolved ""https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= -camelcase@^5.0.0: +camelcase@^5.0.0, camelcase@^5.2.0: version ""5.3.1"" resolved ""https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-api@^1.5.2: - version ""1.6.1"" - resolved ""https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"" - integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw= - dependencies: - browserslist ""^1.3.6"" - caniuse-db ""^1.0.30000529"" - lodash.memoize ""^4.1.2"" - lodash.uniq ""^4.5.0"" - caniuse-api@^3.0.0: version ""3.0.0"" resolved ""https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"" @@ -2279,16 +2250,16 @@ caniuse-api@^3.0.0: lodash.memoize ""^4.1.2"" lodash.uniq ""^4.5.0"" -caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version ""1.0.30000962"" - resolved ""https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000962.tgz#a8643c55d4e566a0636e20472e3125f2cb114191"" - integrity sha512-zkAkM+FSotCJZxdBDHoMhUWGUJzJjyWTTt4h33w3VFM1pirqxRHGgGIjireWkdYZQVRSYScNANixGtGycIFhmg== - -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000960: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000960: version ""1.0.30000962"" resolved ""https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000962.tgz#6c10c3ab304b89bea905e66adf98c0905088ee44"" integrity sha512-WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA== +caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000963: + version ""1.0.30000967"" + resolved ""https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73"" + integrity sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ== + capture-exit@^2.0.0: version ""2.0.0"" resolved ""https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"" @@ -2374,7 +2345,7 @@ chrome-trace-event@^1.0.0: dependencies: tslib ""^1.9.0"" -ci-info@^1.5.0: +ci-info@^1.5.0, ci-info@^1.6.0: version ""1.6.0"" resolved ""https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"" integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== @@ -2392,13 +2363,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits ""^2.0.1"" safe-buffer ""^5.0.1"" -clap@^1.0.9: - version ""1.2.3"" - resolved ""https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"" - integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA== - dependencies: - chalk ""^1.1.3"" - class-utils@^0.3.5: version ""0.3.6"" resolved ""https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"" @@ -2421,7 +2385,7 @@ cli-boxes@^1.0.0: resolved ""https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"" integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM= -cli-cursor@^2.0.0, cli-cursor@^2.1.0: +cli-cursor@^2.1.0: version ""2.1.0"" resolved ""https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"" integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= @@ -2451,11 +2415,6 @@ cliui@^4.0.0: strip-ansi ""^4.0.0"" wrap-ansi ""^2.0.0"" -clone@^1.0.2: - version ""1.0.4"" - resolved ""https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"" - integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= - co-redis@2.1.1: version ""2.1.1"" resolved ""https://registry.yarnpkg.com/co-redis/-/co-redis-2.1.1.tgz#8bc3717977c9ee5bfb6b28f39ae01bcf724d2dde"" @@ -2477,13 +2436,6 @@ coa@^2.0.2: chalk ""^2.4.1"" q ""^1.1.2"" -coa@~1.0.1: - version ""1.0.4"" - resolved ""https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"" - integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0= - dependencies: - q ""^1.1.2"" - code-point-at@^1.0.0: version ""1.1.0"" resolved ""https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"" @@ -2497,7 +2449,7 @@ collection-visit@^1.0.0: map-visit ""^1.0.0"" object-visit ""^1.0.0"" -color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1: +color-convert@^1.9.0, color-convert@^1.9.1: version ""1.9.3"" resolved ""https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -2514,13 +2466,6 @@ color-name@^1.0.0: resolved ""https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^0.3.0: - version ""0.3.0"" - resolved ""https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"" - integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE= - dependencies: - color-name ""^1.0.0"" - color-string@^1.5.2: version ""1.5.3"" resolved ""https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"" @@ -2537,15 +2482,6 @@ color@3.0.x: color-convert ""^1.9.1"" color-string ""^1.5.2"" -color@^0.11.0: - version ""0.11.4"" - resolved ""https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"" - integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q= - dependencies: - clone ""^1.0.2"" - color-convert ""^1.3.0"" - color-string ""^0.3.0"" - color@^3.0.0: version ""3.1.0"" resolved ""https://registry.yarnpkg.com/color/-/color-3.1.0.tgz#d8e9fb096732875774c84bf922815df0308d0ffc"" @@ -2562,15 +2498,6 @@ color@^3.1.1: color-convert ""^1.9.1"" color-string ""^1.5.2"" -colormin@^1.0.5: - version ""1.1.2"" - resolved ""https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"" - integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM= - dependencies: - color ""^0.11.0"" - css-color-names ""0.0.4"" - has ""^1.0.1"" - colornames@^1.1.1: version ""1.1.1"" resolved ""https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"" @@ -2581,11 +2508,6 @@ colors@^1.2.1: resolved ""https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"" integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg== -colors@~1.1.2: - version ""1.1.2"" - resolved ""https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"" - integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= - colorspace@1.1.x: version ""1.1.1"" resolved ""https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.1.tgz#9ac2491e1bc6f8fb690e2176814f8d091636d972"" @@ -2690,15 +2612,10 @@ connect-history-api-fallback@^1.5.0, connect-history-api-fallback@^1.6.0: resolved ""https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== -consola@^1.4.3: - version ""1.4.5"" - resolved ""https://registry.yarnpkg.com/consola/-/consola-1.4.5.tgz#09732d07cb50af07332e54e0f42fafb92b962c4a"" - integrity sha512-movqq3MbyXbSf7cG/x+EbO3VjKQVZPB/zeB5+lN1TuBYh9BWDemLQca9P+a4xpO4lXva9rz+Bd8XyqlH136Lww== - dependencies: - chalk ""^2.3.2"" - figures ""^2.0.0"" - lodash ""^4.17.5"" - std-env ""^1.1.0"" +consola@^2.6.0: + version ""2.6.1"" + resolved ""https://registry.yarnpkg.com/consola/-/consola-2.6.1.tgz#d2f2bee385b5dba11907e4e0d17fc563d5fb9fa6"" + integrity sha512-vt35owQG6OxYDJVaViQ4aFgOK+b98hIvs+R5CWkKgpO8rTPyaYwlMadZ7oZcjnWz1/+u4czDnrcogFr5AtrRug== console-browserify@^1.1.0: version ""1.1.0"" @@ -2788,19 +2705,23 @@ copy-descriptor@^0.1.0: resolved ""https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@^4.5.1: - version ""4.6.0"" - resolved ""https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"" - integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA== +copy-webpack-plugin@^5.0.2: + version ""5.0.3"" + resolved ""https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.3.tgz#2179e3c8fd69f13afe74da338896f1f01a875b5c"" + integrity sha512-PlZRs9CUMnAVylZq+vg2Juew662jWtwOXOqH4lbQD9ZFhRG9R7tVStOgHt21CBGVq7k5yIJaz8TXDLSjV+Lj8Q== dependencies: - cacache ""^10.0.4"" - find-cache-dir ""^1.0.0"" + cacache ""^11.3.2"" + find-cache-dir ""^2.1.0"" + glob-parent ""^3.1.0"" globby ""^7.1.1"" - is-glob ""^4.0.0"" - loader-utils ""^1.1.0"" + is-glob ""^4.0.1"" + loader-utils ""^1.2.3"" minimatch ""^3.0.4"" - p-limit ""^1.0.0"" - serialize-javascript ""^1.4.0"" + normalize-path ""^3.0.0"" + p-limit ""^2.2.0"" + schema-utils ""^1.0.0"" + serialize-javascript ""^1.7.0"" + webpack-log ""^2.0.0"" core-js@^2.4.0, core-js@^2.6.5: version ""2.6.5"" @@ -2925,25 +2846,22 @@ css-declaration-sorter@^4.0.1: postcss ""^7.0.1"" timsort ""^0.3.0"" -css-loader@^0.28.11: - version ""0.28.11"" - resolved ""https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"" - integrity sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg== +css-loader@^2.1.1: + version ""2.1.1"" + resolved ""https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea"" + integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w== dependencies: - babel-code-frame ""^6.26.0"" - css-selector-tokenizer ""^0.7.0"" - cssnano ""^3.10.0"" - icss-utils ""^2.1.0"" - loader-utils ""^1.0.2"" - lodash.camelcase ""^4.3.0"" - object-assign ""^4.1.1"" - postcss ""^5.0.6"" - postcss-modules-extract-imports ""^1.2.0"" - postcss-modules-local-by-default ""^1.2.0"" - postcss-modules-scope ""^1.1.0"" - postcss-modules-values ""^1.3.0"" + camelcase ""^5.2.0"" + icss-utils ""^4.1.0"" + loader-utils ""^1.2.3"" + normalize-path ""^3.0.0"" + postcss ""^7.0.14"" + postcss-modules-extract-imports ""^2.0.0"" + postcss-modules-local-by-default ""^2.0.6"" + postcss-modules-scope ""^2.1.0"" + postcss-modules-values ""^2.0.0"" postcss-value-parser ""^3.3.0"" - source-list-map ""^2.0.0"" + schema-utils ""^1.0.0"" css-parse@1.7.x: version ""1.7.0"" @@ -2975,15 +2893,6 @@ css-select@^2.0.0: domutils ""^1.7.0"" nth-check ""^1.0.2"" -css-selector-tokenizer@^0.7.0: - version ""0.7.1"" - resolved ""https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"" - integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA== - dependencies: - cssesc ""^0.1.0"" - fastparse ""^1.1.1"" - regexpu-core ""^1.0.0"" - css-tree@1.0.0-alpha.28: version ""1.0.0-alpha.28"" resolved ""https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f"" @@ -3015,16 +2924,16 @@ css-what@2.1, css-what@^2.1.2: resolved ""https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"" integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== -cssesc@^0.1.0: - version ""0.1.0"" - resolved ""https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"" - integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q= - cssesc@^2.0.0: version ""2.0.0"" resolved ""https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"" integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== +cssesc@^3.0.0: + version ""3.0.0"" + resolved ""https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + cssnano-preset-default@^4.0.7: version ""4.0.7"" resolved ""https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"" @@ -3083,44 +2992,6 @@ cssnano-util-same-parent@^4.0.0: resolved ""https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"" integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== -cssnano@^3.10.0: - version ""3.10.0"" - resolved ""https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"" - integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg= - dependencies: - autoprefixer ""^6.3.1"" - decamelize ""^1.1.2"" - defined ""^1.0.0"" - has ""^1.0.1"" - object-assign ""^4.0.1"" - postcss ""^5.0.14"" - postcss-calc ""^5.2.0"" - postcss-colormin ""^2.1.8"" - postcss-convert-values ""^2.3.4"" - postcss-discard-comments ""^2.0.4"" - postcss-discard-duplicates ""^2.0.1"" - postcss-discard-empty ""^2.0.1"" - postcss-discard-overridden ""^0.1.1"" - postcss-discard-unused ""^2.2.1"" - postcss-filter-plugins ""^2.0.0"" - postcss-merge-idents ""^2.1.5"" - postcss-merge-longhand ""^2.0.1"" - postcss-merge-rules ""^2.0.3"" - postcss-minify-font-values ""^1.0.2"" - postcss-minify-gradients ""^1.0.1"" - postcss-minify-params ""^1.0.4"" - postcss-minify-selectors ""^2.0.4"" - postcss-normalize-charset ""^1.1.0"" - postcss-normalize-url ""^3.0.7"" - postcss-ordered-values ""^2.1.0"" - postcss-reduce-idents ""^2.2.2"" - postcss-reduce-initial ""^1.0.0"" - postcss-reduce-transforms ""^1.0.3"" - postcss-svgo ""^2.1.1"" - postcss-unique-selectors ""^2.0.2"" - postcss-value-parser ""^3.2.3"" - postcss-zindex ""^2.0.1"" - cssnano@^4.1.0: version ""4.1.10"" resolved ""https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"" @@ -3138,14 +3009,6 @@ csso@^3.5.1: dependencies: css-tree ""1.0.0-alpha.29"" -csso@~2.3.1: - version ""2.3.2"" - resolved ""https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"" - integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U= - dependencies: - clap ""^1.0.9"" - source-map ""^0.5.3"" - cssom@0.3.x, ""cssom@>= 0.3.2 < 0.4.0"": version ""0.3.6"" resolved ""https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad"" @@ -3227,7 +3090,7 @@ debug@~3.1.0: dependencies: ms ""2.0.0"" -decamelize@^1.1.2, decamelize@^1.2.0: +decamelize@^1.2.0: version ""1.2.0"" resolved ""https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -3301,11 +3164,6 @@ define-property@^2.0.2: is-descriptor ""^1.0.2"" isobject ""^3.0.1"" -defined@^1.0.0: - version ""1.0.0"" - resolved ""https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"" - integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= - del@^4.1.0: version ""4.1.0"" resolved ""https://registry.yarnpkg.com/del/-/del-4.1.0.tgz#049543b8290e1a9293e2bd150ab3a06f637322b8"" @@ -3394,15 +3252,7 @@ diffie-hellman@^5.0.0: miller-rabin ""^4.0.0"" randombytes ""^2.0.0"" -dir-glob@2.0.0: - version ""2.0.0"" - resolved ""https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"" - integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag== - dependencies: - arrify ""^1.0.1"" - path-type ""^3.0.0"" - -dir-glob@^2.0.0: +dir-glob@^2.0.0, dir-glob@^2.2.2: version ""2.2.2"" resolved ""https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"" integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== @@ -3561,11 +3411,16 @@ ee-first@1.1.1: resolved ""https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.124, electron-to-chromium@^1.3.30: +electron-to-chromium@^1.3.124: version ""1.3.125"" resolved ""https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.125.tgz#dbde0e95e64ebe322db0eca764d951f885a5aff2"" integrity sha512-XxowpqQxJ4nDwUXHtVtmEhRqBpm2OnjBomZmZtHD0d2Eo0244+Ojezhk3sD/MBSSe2nxCdGQFRXHIsf/LUTL9A== +electron-to-chromium@^1.3.127: + version ""1.3.133"" + resolved ""https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz#c47639c19b91feee3e22fad69f5556142007008c"" + integrity sha512-lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg== + elliptic@^6.0.0: version ""6.4.1"" resolved ""https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"" @@ -3635,6 +3490,11 @@ envify@^4.0.0: esprima ""^4.0.0"" through ""~2.3.4"" +envinfo@^7.2.0: + version ""7.3.1"" + resolved ""https://registry.yarnpkg.com/envinfo/-/envinfo-7.3.1.tgz#892e42f7bf858b3446d9414ad240dbaf8da52f09"" + integrity sha512-GvXiDTqLYrORVSCuJCsWHPXF5BFvoWMQA9xX4YVjPT1jyS3aZEHUBwjzxU/6LTPF9ReHgVEbX7IEN5UvSXHw/A== + errno@^0.1.3, errno@~0.1.7: version ""0.1.7"" resolved ""https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"" @@ -3804,11 +3664,6 @@ espree@^5.0.1: acorn-jsx ""^5.0.0"" eslint-visitor-keys ""^1.0.0"" -esprima@^2.6.0: - version ""2.7.3"" - resolved ""https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"" - integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= - esprima@^3.1.3: version ""3.1.3"" resolved ""https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"" @@ -4084,7 +3939,7 @@ fast-diff@^1.1.2: resolved ""https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^2.0.2: +fast-glob@^2.2.6: version ""2.2.6"" resolved ""https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"" integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w== @@ -4116,11 +3971,6 @@ fast-text-encoding@^1.0.0: resolved ""https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz#3e5ce8293409cfaa7177a71b9ca84e1b1e6f25ef"" integrity sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ== -fastparse@^1.1.1: - version ""1.1.2"" - resolved ""https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"" - integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== - faye-websocket@^0.10.0: version ""0.10.0"" resolved ""https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"" @@ -4166,6 +4016,13 @@ figures@^2.0.0: dependencies: escape-string-regexp ""^1.0.5"" +figures@^3.0.0: + version ""3.0.0"" + resolved ""https://registry.yarnpkg.com/figures/-/figures-3.0.0.tgz#756275c964646163cc6f9197c7a0295dbfd04de9"" + integrity sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g== + dependencies: + escape-string-regexp ""^1.0.5"" + file-entry-cache@^5.0.1: version ""5.0.1"" resolved ""https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"" @@ -4173,13 +4030,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache ""^2.0.1"" -file-loader@^1.1.11: - version ""1.1.11"" - resolved ""https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"" - integrity sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg== +file-loader@^3.0.1: + version ""3.0.1"" + resolved ""https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"" + integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw== dependencies: loader-utils ""^1.0.2"" - schema-utils ""^0.4.5"" + schema-utils ""^1.0.0"" fill-range@^4.0.0: version ""4.0.0"" @@ -4204,16 +4061,7 @@ finalhandler@1.1.1: statuses ""~1.4.0"" unpipe ""~1.0.0"" -find-cache-dir@^1.0.0: - version ""1.0.0"" - resolved ""https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"" - integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8= - dependencies: - commondir ""^1.0.1"" - make-dir ""^1.0.0"" - pkg-dir ""^2.0.0"" - -find-cache-dir@^2.0.0: +find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: version ""2.1.0"" resolved ""https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"" integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== @@ -4250,11 +4098,6 @@ flatted@^2.0.0: resolved ""https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"" integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg== -flatten@^1.0.2: - version ""1.0.2"" - resolved ""https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"" - integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I= - flush-write-stream@^1.0.0: version ""1.1.1"" resolved ""https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"" @@ -4343,10 +4186,10 @@ fs-extra@^4.0.2: jsonfile ""^4.0.0"" universalify ""^0.1.0"" -fs-extra@^5.0.0: - version ""5.0.0"" - resolved ""https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"" - integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== +fs-extra@^7.0.1: + version ""7.0.1"" + resolved ""https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== dependencies: graceful-fs ""^4.1.2"" jsonfile ""^4.0.0"" @@ -4557,18 +4400,19 @@ globby@^7.1.1: pify ""^3.0.0"" slash ""^1.0.0"" -globby@^8.0.1: - version ""8.0.2"" - resolved ""https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"" - integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w== +globby@^9.2.0: + version ""9.2.0"" + resolved ""https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"" + integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg== dependencies: - array-union ""^1.0.1"" - dir-glob ""2.0.0"" - fast-glob ""^2.0.2"" - glob ""^7.1.2"" - ignore ""^3.3.5"" - pify ""^3.0.0"" - slash ""^1.0.0"" + ""@types/glob"" ""^7.1.1"" + array-union ""^1.0.2"" + dir-glob ""^2.2.2"" + fast-glob ""^2.2.6"" + glob ""^7.1.3"" + ignore ""^4.0.3"" + pify ""^4.0.1"" + slash ""^2.0.0"" good-listener@^1.2.2: version ""1.2.2"" @@ -4709,11 +4553,6 @@ has-ansi@^2.0.0: dependencies: ansi-regex ""^2.0.0"" -has-flag@^1.0.0: - version ""1.0.0"" - resolved ""https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"" - integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= - has-flag@^3.0.0: version ""3.0.0"" resolved ""https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"" @@ -4991,12 +4830,12 @@ icss-replace-symbols@^1.1.0: resolved ""https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"" integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0= -icss-utils@^2.1.0: - version ""2.1.0"" - resolved ""https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"" - integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI= +icss-utils@^4.1.0: + version ""4.1.0"" + resolved ""https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.0.tgz#339dbbffb9f8729a243b701e1c29d4cc58c52f0e"" + integrity sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ== dependencies: - postcss ""^6.0.1"" + postcss ""^7.0.14"" ieee754@^1.1.4: version ""1.1.13"" @@ -5025,7 +4864,7 @@ ignore@^3.3.5, ignore@^3.3.7: resolved ""https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"" integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== -ignore@^4.0.6: +ignore@^4.0.3, ignore@^4.0.6: version ""4.0.6"" resolved ""https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== @@ -5231,7 +5070,7 @@ is-callable@^1.1.4: resolved ""https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== -is-ci@^1.0.10, is-ci@^1.1.0: +is-ci@^1.0.10: version ""1.2.1"" resolved ""https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"" integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== @@ -5345,7 +5184,7 @@ is-glob@^3.1.0: dependencies: is-extglob ""^2.1.0"" -is-glob@^4.0.0: +is-glob@^4.0.0, is-glob@^4.0.1: version ""4.0.1"" resolved ""https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== @@ -5457,13 +5296,6 @@ is-stream@^1.0.0, is-stream@^1.1.0: resolved ""https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= -is-svg@^2.0.0: - version ""2.1.0"" - resolved ""https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"" - integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk= - dependencies: - html-comment-regex ""^1.1.0"" - is-svg@^3.0.0: version ""3.0.0"" resolved ""https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"" @@ -5953,11 +5785,6 @@ joi@^11.1.1: isemail ""3.x.x"" topo ""2.x.x"" -js-base64@^2.1.9: - version ""2.5.1"" - resolved ""https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"" - integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== - js-levenshtein@^1.1.3: version ""1.1.6"" resolved ""https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"" @@ -5968,7 +5795,7 @@ js-levenshtein@^1.1.3: resolved ""https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-tokens@^3.0.1, js-tokens@^3.0.2: +js-tokens@^3.0.1: version ""3.0.2"" resolved ""https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= @@ -5981,14 +5808,6 @@ js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0: argparse ""^1.0.7"" esprima ""^4.0.0"" -js-yaml@~3.7.0: - version ""3.7.0"" - resolved ""https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"" - integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A= - dependencies: - argparse ""^1.0.7"" - esprima ""^2.6.0"" - jsbn@~0.1.0: version ""0.1.1"" resolved ""https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"" @@ -6344,7 +6163,7 @@ loader-utils@^0.2.16: json5 ""^0.5.0"" object-assign ""^4.0.1"" -loader-utils@^1.0.2, loader-utils@^1.1.0: +loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: version ""1.2.3"" resolved ""https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"" integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== @@ -6374,11 +6193,6 @@ lodash._reinterpolate@~3.0.0: resolved ""https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= -lodash.camelcase@^4.3.0: - version ""4.3.0"" - resolved ""https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - lodash.clonedeep@^4.5.0: version ""4.5.0"" resolved ""https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"" @@ -6449,20 +6263,11 @@ lodash.uniq@^4.5.0: resolved ""https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5: +lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.5: version ""4.17.11"" resolved ""https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== -log-update@^2.3.0: - version ""2.3.0"" - resolved ""https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"" - integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= - dependencies: - ansi-escapes ""^3.0.0"" - cli-cursor ""^2.0.0"" - wrap-ansi ""^3.0.1"" - logform@^2.1.1: version ""2.1.2"" resolved ""https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360"" @@ -6503,7 +6308,7 @@ lru-cache@5.1.1, lru-cache@^5.0.0, lru-cache@^5.1.1: dependencies: yallist ""^3.0.2"" -lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2: +lru-cache@^4.0.1, lru-cache@^4.1.2: version ""4.1.5"" resolved ""https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -6589,6 +6394,11 @@ markdown-it-emoji@^1.4.0: resolved ""https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz#9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"" integrity sha1-m+4OmpkKljupbfaYDE/dsF37Tcw= +markdown-it-table-of-contents@^0.4.0: + version ""0.4.4"" + resolved ""https://registry.yarnpkg.com/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.4.tgz#3dc7ce8b8fc17e5981c77cc398d1782319f37fbc"" + integrity sha512-TAIHTHPwa9+ltKvKPWulm/beozQU41Ab+FIefRaQV1NRnpzwcV9QOe6wXQS5WLivm5Q/nlo0rl6laGkMDZE7Gw== + markdown-it@8.4.2, markdown-it@^8.4.1: version ""8.4.2"" resolved ""https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"" @@ -6600,11 +6410,6 @@ markdown-it@8.4.2, markdown-it@^8.4.1: mdurl ""^1.0.1"" uc.micro ""^1.0.5"" -math-expression-evaluator@^1.2.14: - version ""1.2.17"" - resolved ""https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"" - integrity sha1-3oGf282E3M2PrlnGrreWFbnSZqw= - md5.js@^1.3.4: version ""1.3.5"" resolved ""https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"" @@ -6751,12 +6556,13 @@ min-document@^2.19.0: dependencies: dom-walk ""^0.1.0"" -mini-css-extract-plugin@0.4.4: - version ""0.4.4"" - resolved ""https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"" - integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ== +mini-css-extract-plugin@0.6.0: + version ""0.6.0"" + resolved ""https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"" + integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw== dependencies: loader-utils ""^1.1.0"" + normalize-url ""^2.0.1"" schema-utils ""^1.0.0"" webpack-sources ""^1.1.0"" @@ -6807,22 +6613,6 @@ minizlib@^1.1.1: dependencies: minipass ""^2.2.1"" -mississippi@^2.0.0: - version ""2.0.0"" - resolved ""https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"" - integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw== - dependencies: - concat-stream ""^1.5.0"" - duplexify ""^3.4.2"" - end-of-stream ""^1.1.0"" - flush-write-stream ""^1.0.0"" - from2 ""^2.1.0"" - parallel-transform ""^1.1.0"" - pump ""^2.0.1"" - pumpify ""^1.3.3"" - stream-each ""^1.1.0"" - through2 ""^2.0.0"" - mississippi@^3.0.0: version ""3.0.0"" resolved ""https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"" @@ -6984,6 +6774,11 @@ neo-async@^2.5.0, neo-async@^2.6.0: resolved ""https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"" integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA== +neo-async@^2.6.1: + version ""2.6.1"" + resolved ""https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"" + integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + nice-try@^1.0.4: version ""1.0.5"" resolved ""https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"" @@ -7096,6 +6891,13 @@ node-releases@^1.1.14: dependencies: semver ""^5.3.0"" +node-releases@^1.1.17: + version ""1.1.19"" + resolved ""https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.19.tgz#c492d1e381fea0350b338b646c27867e88e91b3d"" + integrity sha512-SH/B4WwovHbulIALsQllAVwqZZD1kPmKCqrhGfR29dXjLAVZMHvBjD3S6nL9D/J9QkmZ1R92/0wCMDKXUUvyyA== + dependencies: + semver ""^5.3.0"" + nodejieba@^2.2.1: version ""2.3.0"" resolved ""https://registry.yarnpkg.com/nodejieba/-/nodejieba-2.3.0.tgz#ba6934b949ce486c6a57e4cb7df9f4a5fb3336c4"" @@ -7171,15 +6973,14 @@ normalize-range@^0.1.2: resolved ""https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= -normalize-url@^1.4.0: - version ""1.9.1"" - resolved ""https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"" - integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= +normalize-url@^2.0.1: + version ""2.0.1"" + resolved ""https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"" + integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw== dependencies: - object-assign ""^4.0.1"" - prepend-http ""^1.0.0"" - query-string ""^4.1.0"" - sort-keys ""^1.0.0"" + prepend-http ""^2.0.0"" + query-string ""^5.0.1"" + sort-keys ""^2.0.0"" normalize-url@^3.0.0: version ""3.3.0"" @@ -7248,7 +7049,7 @@ oauth-sign@~0.9.0: resolved ""https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0: version ""4.1.1"" resolved ""https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -7446,14 +7247,14 @@ p-is-promise@^2.0.0: resolved ""https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"" integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== -p-limit@^1.0.0, p-limit@^1.1.0: +p-limit@^1.1.0: version ""1.3.0"" resolved ""https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"" integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== dependencies: p-try ""^1.0.0"" -p-limit@^2.0.0: +p-limit@^2.0.0, p-limit@^2.2.0: version ""2.2.0"" resolved ""https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"" integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ== @@ -7705,13 +7506,6 @@ pirates@^4.0.1: dependencies: node-modules-regexp ""^1.0.0"" -pkg-dir@^2.0.0: - version ""2.0.0"" - resolved ""https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up ""^2.1.0"" - pkg-dir@^3.0.0: version ""3.0.0"" resolved ""https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"" @@ -7747,15 +7541,6 @@ posix-character-classes@^0.1.0: resolved ""https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss-calc@^5.2.0: - version ""5.3.1"" - resolved ""https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"" - integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14= - dependencies: - postcss ""^5.0.2"" - postcss-message-helpers ""^2.0.0"" - reduce-css-calc ""^1.2.6"" - postcss-calc@^7.0.1: version ""7.0.1"" resolved ""https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"" @@ -7766,15 +7551,6 @@ postcss-calc@^7.0.1: postcss-selector-parser ""^5.0.0-rc.4"" postcss-value-parser ""^3.3.1"" -postcss-colormin@^2.1.8: - version ""2.2.2"" - resolved ""https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"" - integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks= - dependencies: - colormin ""^1.0.5"" - postcss ""^5.0.13"" - postcss-value-parser ""^3.2.3"" - postcss-colormin@^4.0.3: version ""4.0.3"" resolved ""https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"" @@ -7786,14 +7562,6 @@ postcss-colormin@^4.0.3: postcss ""^7.0.0"" postcss-value-parser ""^3.0.0"" -postcss-convert-values@^2.3.4: - version ""2.6.1"" - resolved ""https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"" - integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0= - dependencies: - postcss ""^5.0.11"" - postcss-value-parser ""^3.1.2"" - postcss-convert-values@^4.0.1: version ""4.0.1"" resolved ""https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"" @@ -7802,13 +7570,6 @@ postcss-convert-values@^4.0.1: postcss ""^7.0.0"" postcss-value-parser ""^3.0.0"" -postcss-discard-comments@^2.0.4: - version ""2.0.4"" - resolved ""https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"" - integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0= - dependencies: - postcss ""^5.0.14"" - postcss-discard-comments@^4.0.2: version ""4.0.2"" resolved ""https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"" @@ -7816,13 +7577,6 @@ postcss-discard-comments@^4.0.2: dependencies: postcss ""^7.0.0"" -postcss-discard-duplicates@^2.0.1: - version ""2.1.0"" - resolved ""https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"" - integrity sha1-uavye4isGIFYpesSq8riAmO5GTI= - dependencies: - postcss ""^5.0.4"" - postcss-discard-duplicates@^4.0.2: version ""4.0.2"" resolved ""https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"" @@ -7830,13 +7584,6 @@ postcss-discard-duplicates@^4.0.2: dependencies: postcss ""^7.0.0"" -postcss-discard-empty@^2.0.1: - version ""2.1.0"" - resolved ""https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"" - integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU= - dependencies: - postcss ""^5.0.14"" - postcss-discard-empty@^4.0.1: version ""4.0.1"" resolved ""https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"" @@ -7844,13 +7591,6 @@ postcss-discard-empty@^4.0.1: dependencies: postcss ""^7.0.0"" -postcss-discard-overridden@^0.1.1: - version ""0.1.1"" - resolved ""https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"" - integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg= - dependencies: - postcss ""^5.0.16"" - postcss-discard-overridden@^4.0.1: version ""4.0.1"" resolved ""https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"" @@ -7858,21 +7598,6 @@ postcss-discard-overridden@^4.0.1: dependencies: postcss ""^7.0.0"" -postcss-discard-unused@^2.2.1: - version ""2.2.3"" - resolved ""https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"" - integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM= - dependencies: - postcss ""^5.0.14"" - uniqs ""^2.0.0"" - -postcss-filter-plugins@^2.0.0: - version ""2.0.3"" - resolved ""https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz#82245fdf82337041645e477114d8e593aa18b8ec"" - integrity sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ== - dependencies: - postcss ""^5.0.4"" - postcss-load-config@^2.0.0: version ""2.0.0"" resolved ""https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"" @@ -7881,31 +7606,15 @@ postcss-load-config@^2.0.0: cosmiconfig ""^4.0.0"" import-cwd ""^2.0.0"" -postcss-loader@^2.1.5: - version ""2.1.6"" - resolved ""https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.6.tgz#1d7dd7b17c6ba234b9bed5af13e0bea40a42d740"" - integrity sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg== +postcss-loader@^3.0.0: + version ""3.0.0"" + resolved ""https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"" + integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA== dependencies: loader-utils ""^1.1.0"" - postcss ""^6.0.0"" + postcss ""^7.0.0"" postcss-load-config ""^2.0.0"" - schema-utils ""^0.4.0"" - -postcss-merge-idents@^2.1.5: - version ""2.1.7"" - resolved ""https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"" - integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA= - dependencies: - has ""^1.0.1"" - postcss ""^5.0.10"" - postcss-value-parser ""^3.1.1"" - -postcss-merge-longhand@^2.0.1: - version ""2.0.2"" - resolved ""https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"" - integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg= - dependencies: - postcss ""^5.0.4"" + schema-utils ""^1.0.0"" postcss-merge-longhand@^4.0.11: version ""4.0.11"" @@ -7917,17 +7626,6 @@ postcss-merge-longhand@^4.0.11: postcss-value-parser ""^3.0.0"" stylehacks ""^4.0.0"" -postcss-merge-rules@^2.0.3: - version ""2.1.2"" - resolved ""https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"" - integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE= - dependencies: - browserslist ""^1.5.2"" - caniuse-api ""^1.5.2"" - postcss ""^5.0.4"" - postcss-selector-parser ""^2.2.2"" - vendors ""^1.0.0"" - postcss-merge-rules@^4.0.3: version ""4.0.3"" resolved ""https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650"" @@ -7940,20 +7638,6 @@ postcss-merge-rules@^4.0.3: postcss-selector-parser ""^3.0.0"" vendors ""^1.0.0"" -postcss-message-helpers@^2.0.0: - version ""2.0.0"" - resolved ""https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"" - integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4= - -postcss-minify-font-values@^1.0.2: - version ""1.0.5"" - resolved ""https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"" - integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k= - dependencies: - object-assign ""^4.0.1"" - postcss ""^5.0.4"" - postcss-value-parser ""^3.0.2"" - postcss-minify-font-values@^4.0.2: version ""4.0.2"" resolved ""https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"" @@ -7962,14 +7646,6 @@ postcss-minify-font-values@^4.0.2: postcss ""^7.0.0"" postcss-value-parser ""^3.0.0"" -postcss-minify-gradients@^1.0.1: - version ""1.0.5"" - resolved ""https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"" - integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE= - dependencies: - postcss ""^5.0.12"" - postcss-value-parser ""^3.3.0"" - postcss-minify-gradients@^4.0.2: version ""4.0.2"" resolved ""https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471"" @@ -7980,16 +7656,6 @@ postcss-minify-gradients@^4.0.2: postcss ""^7.0.0"" postcss-value-parser ""^3.0.0"" -postcss-minify-params@^1.0.4: - version ""1.2.2"" - resolved ""https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"" - integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM= - dependencies: - alphanum-sort ""^1.0.1"" - postcss ""^5.0.2"" - postcss-value-parser ""^3.0.2"" - uniqs ""^2.0.0"" - postcss-minify-params@^4.0.2: version ""4.0.2"" resolved ""https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874"" @@ -8002,16 +7668,6 @@ postcss-minify-params@^4.0.2: postcss-value-parser ""^3.0.0"" uniqs ""^2.0.0"" -postcss-minify-selectors@^2.0.4: - version ""2.1.1"" - resolved ""https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"" - integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8= - dependencies: - alphanum-sort ""^1.0.2"" - has ""^1.0.1"" - postcss ""^5.0.14"" - postcss-selector-parser ""^2.0.0"" - postcss-minify-selectors@^4.0.2: version ""4.0.2"" resolved ""https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"" @@ -8022,43 +7678,37 @@ postcss-minify-selectors@^4.0.2: postcss ""^7.0.0"" postcss-selector-parser ""^3.0.0"" -postcss-modules-extract-imports@^1.2.0: - version ""1.2.1"" - resolved ""https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"" - integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw== +postcss-modules-extract-imports@^2.0.0: + version ""2.0.0"" + resolved ""https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"" + integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== dependencies: - postcss ""^6.0.1"" + postcss ""^7.0.5"" -postcss-modules-local-by-default@^1.2.0: - version ""1.2.0"" - resolved ""https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"" - integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk= +postcss-modules-local-by-default@^2.0.6: + version ""2.0.6"" + resolved ""https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63"" + integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA== dependencies: - css-selector-tokenizer ""^0.7.0"" - postcss ""^6.0.1"" + postcss ""^7.0.6"" + postcss-selector-parser ""^6.0.0"" + postcss-value-parser ""^3.3.1"" -postcss-modules-scope@^1.1.0: - version ""1.1.0"" - resolved ""https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"" - integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A= +postcss-modules-scope@^2.1.0: + version ""2.1.0"" + resolved ""https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"" + integrity sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A== dependencies: - css-selector-tokenizer ""^0.7.0"" - postcss ""^6.0.1"" + postcss ""^7.0.6"" + postcss-selector-parser ""^6.0.0"" -postcss-modules-values@^1.3.0: - version ""1.3.0"" - resolved ""https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"" - integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA= +postcss-modules-values@^2.0.0: + version ""2.0.0"" + resolved ""https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"" + integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w== dependencies: icss-replace-symbols ""^1.1.0"" - postcss ""^6.0.1"" - -postcss-normalize-charset@^1.1.0: - version ""1.1.1"" - resolved ""https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"" - integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E= - dependencies: - postcss ""^5.0.5"" + postcss ""^7.0.6"" postcss-normalize-charset@^4.0.1: version ""4.0.1"" @@ -8123,16 +7773,6 @@ postcss-normalize-unicode@^4.0.1: postcss ""^7.0.0"" postcss-value-parser ""^3.0.0"" -postcss-normalize-url@^3.0.7: - version ""3.0.8"" - resolved ""https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"" - integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI= - dependencies: - is-absolute-url ""^2.0.0"" - normalize-url ""^1.4.0"" - postcss ""^5.0.14"" - postcss-value-parser ""^3.2.3"" - postcss-normalize-url@^4.0.1: version ""4.0.1"" resolved ""https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"" @@ -8151,14 +7791,6 @@ postcss-normalize-whitespace@^4.0.2: postcss ""^7.0.0"" postcss-value-parser ""^3.0.0"" -postcss-ordered-values@^2.1.0: - version ""2.2.3"" - resolved ""https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"" - integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0= - dependencies: - postcss ""^5.0.4"" - postcss-value-parser ""^3.0.1"" - postcss-ordered-values@^4.1.2: version ""4.1.2"" resolved ""https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee"" @@ -8168,21 +7800,6 @@ postcss-ordered-values@^4.1.2: postcss ""^7.0.0"" postcss-value-parser ""^3.0.0"" -postcss-reduce-idents@^2.2.2: - version ""2.4.0"" - resolved ""https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"" - integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM= - dependencies: - postcss ""^5.0.4"" - postcss-value-parser ""^3.0.2"" - -postcss-reduce-initial@^1.0.0: - version ""1.0.1"" - resolved ""https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"" - integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo= - dependencies: - postcss ""^5.0.4"" - postcss-reduce-initial@^4.0.3: version ""4.0.3"" resolved ""https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"" @@ -8193,15 +7810,6 @@ postcss-reduce-initial@^4.0.3: has ""^1.0.0"" postcss ""^7.0.0"" -postcss-reduce-transforms@^1.0.3: - version ""1.0.4"" - resolved ""https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"" - integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE= - dependencies: - has ""^1.0.1"" - postcss ""^5.0.8"" - postcss-value-parser ""^3.0.1"" - postcss-reduce-transforms@^4.0.2: version ""4.0.2"" resolved ""https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29"" @@ -8219,15 +7827,6 @@ postcss-safe-parser@^4.0.1: dependencies: postcss ""^7.0.0"" -postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: - version ""2.2.3"" - resolved ""https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"" - integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A= - dependencies: - flatten ""^1.0.2"" - indexes-of ""^1.0.1"" - uniq ""^1.0.1"" - postcss-selector-parser@^3.0.0: version ""3.1.1"" resolved ""https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"" @@ -8246,15 +7845,14 @@ postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4: indexes-of ""^1.0.1"" uniq ""^1.0.1"" -postcss-svgo@^2.1.1: - version ""2.1.6"" - resolved ""https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"" - integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0= +postcss-selector-parser@^6.0.0: + version ""6.0.2"" + resolved ""https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"" + integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== dependencies: - is-svg ""^2.0.0"" - postcss ""^5.0.14"" - postcss-value-parser ""^3.2.3"" - svgo ""^0.7.0"" + cssesc ""^3.0.0"" + indexes-of ""^1.0.1"" + uniq ""^1.0.1"" postcss-svgo@^4.0.2: version ""4.0.2"" @@ -8266,15 +7864,6 @@ postcss-svgo@^4.0.2: postcss-value-parser ""^3.0.0"" svgo ""^1.0.0"" -postcss-unique-selectors@^2.0.2: - version ""2.0.2"" - resolved ""https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"" - integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0= - dependencies: - alphanum-sort ""^1.0.1"" - postcss ""^5.0.4"" - uniqs ""^2.0.0"" - postcss-unique-selectors@^4.0.1: version ""4.0.1"" resolved ""https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"" @@ -8284,39 +7873,11 @@ postcss-unique-selectors@^4.0.1: postcss ""^7.0.0"" uniqs ""^2.0.0"" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: +postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: version ""3.3.1"" resolved ""https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-zindex@^2.0.1: - version ""2.2.0"" - resolved ""https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"" - integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI= - dependencies: - has ""^1.0.1"" - postcss ""^5.0.4"" - uniqs ""^2.0.0"" - -postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16: - version ""5.2.18"" - resolved ""https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"" - integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== - dependencies: - chalk ""^1.1.3"" - js-base64 ""^2.1.9"" - source-map ""^0.5.6"" - supports-color ""^3.2.3"" - -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.17: - version ""6.0.23"" - resolved ""https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"" - integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== - dependencies: - chalk ""^2.4.1"" - source-map ""^0.6.1"" - supports-color ""^5.4.0"" - postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.5: version ""7.0.14"" resolved ""https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"" @@ -8326,6 +7887,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.5: source-map ""^0.6.1"" supports-color ""^6.1.0"" +postcss@^7.0.6: + version ""7.0.16"" + resolved ""https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"" + integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA== + dependencies: + chalk ""^2.4.2"" + source-map ""^0.6.1"" + supports-color ""^6.1.0"" + prebuild-install@^5.3.0: version ""5.3.0"" resolved ""https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.0.tgz#58b4d8344e03590990931ee088dd5401b03004c8"" @@ -8353,11 +7923,16 @@ prelude-ls@~1.1.2: resolved ""https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prepend-http@^1.0.0, prepend-http@^1.0.1: +prepend-http@^1.0.1: version ""1.0.4"" resolved ""https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= +prepend-http@^2.0.0: + version ""2.0.0"" + resolved ""https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + prettier-check@2.0.0: version ""2.0.0"" resolved ""https://registry.yarnpkg.com/prettier-check/-/prettier-check-2.0.0.tgz#edd086ee12d270579233ccb136a16e6afcfba1ae"" @@ -8589,11 +8164,12 @@ qs@^6.5.1, qs@^6.5.2: resolved ""https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -query-string@^4.1.0: - version ""4.3.4"" - resolved ""https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"" - integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= +query-string@^5.0.1: + version ""5.1.1"" + resolved ""https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"" + integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw== dependencies: + decode-uri-component ""^0.2.0"" object-assign ""^4.1.0"" strict-uri-encode ""^1.0.0"" @@ -8738,22 +8314,6 @@ redis@2.8.0: redis-commands ""^1.2.0"" redis-parser ""^2.6.0"" -reduce-css-calc@^1.2.6: - version ""1.3.0"" - resolved ""https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"" - integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY= - dependencies: - balanced-match ""^0.4.2"" - math-expression-evaluator ""^1.2.14"" - reduce-function-call ""^1.0.1"" - -reduce-function-call@^1.0.1: - version ""1.0.2"" - resolved ""https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"" - integrity sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk= - dependencies: - balanced-match ""^0.4.2"" - reduce@^1.0.1: version ""1.0.2"" resolved ""https://registry.yarnpkg.com/reduce/-/reduce-1.0.2.tgz#0cd680ad3ffe0b060e57a5c68bdfce37168d361b"" @@ -8768,7 +8328,7 @@ regenerate-unicode-properties@^8.0.2: dependencies: regenerate ""^1.4.0"" -regenerate@^1.2.1, regenerate@^1.4.0: +regenerate@^1.4.0: version ""1.4.0"" resolved ""https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== @@ -8808,15 +8368,6 @@ regexpp@^2.0.1: resolved ""https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpu-core@^1.0.0: - version ""1.0.0"" - resolved ""https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"" - integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs= - dependencies: - regenerate ""^1.2.1"" - regjsgen ""^0.2.0"" - regjsparser ""^0.1.4"" - regexpu-core@^4.5.4: version ""4.5.4"" resolved ""https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"" @@ -8849,23 +8400,11 @@ registry-url@^3.0.3: dependencies: rc ""^1.0.1"" -regjsgen@^0.2.0: - version ""0.2.0"" - resolved ""https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"" - integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= - regjsgen@^0.5.0: version ""0.5.0"" resolved ""https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"" integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA== -regjsparser@^0.1.4: - version ""0.1.5"" - resolved ""https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"" - integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= - dependencies: - jsesc ""~0.5.0"" - regjsparser@^0.6.0: version ""0.6.0"" resolved ""https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"" @@ -9130,19 +8669,11 @@ sax@0.5.x: resolved ""https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"" integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE= -sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4: +sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: version ""1.2.4"" resolved ""https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.5: - version ""0.4.7"" - resolved ""https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"" - integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ== - dependencies: - ajv ""^6.1.0"" - ajv-keywords ""^3.1.0"" - schema-utils@^1.0.0: version ""1.0.0"" resolved ""https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"" @@ -9213,7 +8744,7 @@ send@0.16.2: range-parser ""~1.2.0"" statuses ""~1.4.0"" -serialize-javascript@^1.3.0, serialize-javascript@^1.4.0: +serialize-javascript@^1.3.0, serialize-javascript@^1.4.0, serialize-javascript@^1.7.0: version ""1.7.0"" resolved ""https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"" integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA== @@ -9381,13 +8912,6 @@ slash@^2.0.0: resolved ""https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"" integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== -slice-ansi@1.0.0: - version ""1.0.0"" - resolved ""https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"" - integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== - dependencies: - is-fullwidth-code-point ""^2.0.0"" - slice-ansi@^2.1.0: version ""2.1.0"" resolved ""https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"" @@ -9468,10 +8992,10 @@ socks@~2.3.2: ip ""^1.1.5"" smart-buffer ""4.0.2"" -sort-keys@^1.0.0: - version ""1.1.2"" - resolved ""https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"" - integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= +sort-keys@^2.0.0: + version ""2.0.0"" + resolved ""https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"" + integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= dependencies: is-plain-obj ""^1.0.0"" @@ -9610,13 +9134,6 @@ sshpk@^1.7.0: safer-buffer ""^2.0.2"" tweetnacl ""~0.14.0"" -ssri@^5.2.4: - version ""5.3.0"" - resolved ""https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"" - integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ== - dependencies: - safe-buffer ""^5.1.1"" - ssri@^6.0.1: version ""6.0.1"" resolved ""https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"" @@ -9657,12 +9174,12 @@ statuses@~1.4.0: resolved ""https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"" integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew== -std-env@^1.1.0, std-env@^1.3.1: - version ""1.3.1"" - resolved ""https://registry.yarnpkg.com/std-env/-/std-env-1.3.1.tgz#4e1758412439e9ece1d437b1b098551911aa44ee"" - integrity sha512-KI2F2pPJpd3lHjng+QLezu0eq+QDtXcv1um016mhOPAJFHKL+09ykK5PUBWta2pZDC8BVV0VPya08A15bUXSLQ== +std-env@^2.2.1: + version ""2.2.1"" + resolved ""https://registry.yarnpkg.com/std-env/-/std-env-2.2.1.tgz#2ffa0fdc9e2263e0004c1211966e960948a40f6b"" + integrity sha512-IjYQUinA3lg5re/YMlwlfhqNRTzMZMqE+pezevdcTaHceqx8ngEi1alX9nNCk9Sc81fy1fLDeQoaCzeiW1yBOQ== dependencies: - is-ci ""^1.1.0"" + ci-info ""^1.6.0"" stealthy-require@^1.1.1: version ""1.1.1"" @@ -9876,14 +9393,7 @@ supports-color@^2.0.0: resolved ""https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^3.2.3: - version ""3.2.3"" - resolved ""https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"" - integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= - dependencies: - has-flag ""^1.0.0"" - -supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0: +supports-color@^5.2.0, supports-color@^5.3.0: version ""5.5.0"" resolved ""https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -9902,19 +9412,6 @@ svg-tags@^1.0.0: resolved ""https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"" integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= -svgo@^0.7.0: - version ""0.7.2"" - resolved ""https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"" - integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U= - dependencies: - coa ""~1.0.1"" - colors ""~1.1.2"" - csso ""~2.3.1"" - js-yaml ""~3.7.0"" - mkdirp ""~0.5.1"" - sax ""~1.2.1"" - whet.extend ""~0.9.9"" - svgo@^1.0.0: version ""1.2.2"" resolved ""https://registry.yarnpkg.com/svgo/-/svgo-1.2.2.tgz#0253d34eccf2aed4ad4f283e11ee75198f9d7316"" @@ -9940,18 +9437,6 @@ symbol-tree@^3.2.2: resolved ""https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"" integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY= -table@^4.0.3: - version ""4.0.3"" - resolved ""https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"" - integrity sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg== - dependencies: - ajv ""^6.0.1"" - ajv-keywords ""^3.0.0"" - chalk ""^2.1.0"" - lodash ""^4.17.4"" - slice-ansi ""1.0.0"" - string-width ""^2.1.1"" - table@^5.2.3: version ""5.2.3"" resolved ""https://registry.yarnpkg.com/table/-/table-5.2.3.tgz#cde0cc6eb06751c009efab27e8c820ca5b67b7f2"" @@ -10174,10 +9659,10 @@ toidentifier@1.0.0: resolved ""https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -toml@^2.3.3: - version ""2.3.6"" - resolved ""https://registry.yarnpkg.com/toml/-/toml-2.3.6.tgz#25b0866483a9722474895559088b436fd11f861b"" - integrity sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ== +toml@^3.0.0: + version ""3.0.0"" + resolved ""https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"" + integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== topo@2.x.x: version ""2.0.2"" @@ -10279,6 +9764,11 @@ type-check@~0.3.2: dependencies: prelude-ls ""~1.1.2"" +type-fest@^0.3.0: + version ""0.3.1"" + resolved ""https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"" + integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== + type-is@^1.6.16, type-is@~1.6.16: version ""1.6.16"" resolved ""https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"" @@ -10363,7 +9853,7 @@ uniqs@^2.0.0: resolved ""https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"" integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= -unique-filename@^1.1.0, unique-filename@^1.1.1: +unique-filename@^1.1.1: version ""1.1.1"" resolved ""https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"" integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== @@ -10654,14 +10144,15 @@ vuepress-plugin-container@^2.0.0: dependencies: markdown-it-container ""^2.0.0"" -vuepress@1.0.0-alpha.47: - version ""1.0.0-alpha.47"" - resolved ""https://registry.yarnpkg.com/vuepress/-/vuepress-1.0.0-alpha.47.tgz#b6f06a5569aaf0b4016f9eb1da5fd4e01f295d45"" - integrity sha512-AxvDNsT1Cj7ZrVSR4pKtCDD4DYQOTMWtUkBcRDAuSzBIJfjOjdrW6FY/G27SrKHA7cKhVXzxBiHYmXysIpfPjw== +vuepress@1.0.0-alpha.48: + version ""1.0.0-alpha.48"" + resolved ""https://registry.yarnpkg.com/vuepress/-/vuepress-1.0.0-alpha.48.tgz#485b908c246297d4210999d7a010105447a6c3f0"" + integrity sha512-rvEh4xS1Jp7/dC1YsT0VRmn+cP2BLn4KXSKKt9LFnUPgDwi80zARaSIN0NrpaADPQqKb2OxUY1fNV9ectzZ+QA== dependencies: - ""@vuepress/core"" ""^1.0.0-alpha.47"" - ""@vuepress/theme-default"" ""^1.0.0-alpha.47"" + ""@vuepress/core"" ""^1.0.0-alpha.48"" + ""@vuepress/theme-default"" ""^1.0.0-alpha.48"" cac ""^6.3.9"" + envinfo ""^7.2.0"" w3c-hr-time@^1.0.1: version ""1.0.1"" @@ -10805,21 +10296,19 @@ webpack@^4.8.1: watchpack ""^1.5.0"" webpack-sources ""^1.3.0"" -webpackbar@^2.6.1: - version ""2.6.4"" - resolved ""https://registry.yarnpkg.com/webpackbar/-/webpackbar-2.6.4.tgz#9118dde6b8f513a2d50ce630952157bca9218c6f"" - integrity sha512-uQzJwuX172E+Vnk2NRFSM1hZBMCXd2CIpRUl1hr5tbAndTGVnDmYXQKHsbgbCKQXFJKKAl8EHYsdeauJZu2Qvg== +webpackbar@3.2.0: + version ""3.2.0"" + resolved ""https://registry.yarnpkg.com/webpackbar/-/webpackbar-3.2.0.tgz#bdaad103fad11a4e612500e72aaae98b08ba493f"" + integrity sha512-PC4o+1c8gWWileUfwabe0gqptlXUDJd5E0zbpr2xHP1VSOVlZVPBZ8j6NCR8zM5zbKdxPhctHXahgpNK1qFDPw== dependencies: + ansi-escapes ""^4.1.0"" chalk ""^2.4.1"" - consola ""^1.4.3"" - figures ""^2.0.0"" - loader-utils ""^1.1.0"" - lodash ""^4.17.10"" - log-update ""^2.3.0"" + consola ""^2.6.0"" + figures ""^3.0.0"" pretty-time ""^1.1.0"" - schema-utils ""^1.0.0"" - std-env ""^1.3.1"" - table ""^4.0.3"" + std-env ""^2.2.1"" + text-table ""^0.2.0"" + wrap-ansi ""^5.1.0"" websocket-driver@>=0.5.1: version ""0.7.0"" @@ -10869,11 +10358,6 @@ when@~3.6.x: resolved ""https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"" integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404= -whet.extend@~0.9.9: - version ""0.9.9"" - resolved ""https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"" - integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE= - which-module@^2.0.0: version ""2.0.0"" resolved ""https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"" @@ -11071,13 +10555,14 @@ wrap-ansi@^2.0.0: string-width ""^1.0.1"" strip-ansi ""^3.0.1"" -wrap-ansi@^3.0.1: - version ""3.0.1"" - resolved ""https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"" - integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= +wrap-ansi@^5.1.0: + version ""5.1.0"" + resolved ""https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== dependencies: - string-width ""^2.1.1"" - strip-ansi ""^4.0.0"" + ansi-styles ""^3.2.0"" + string-width ""^3.0.0"" + strip-ansi ""^5.0.0"" wrappy@1: version ""1.0.2""" f8816dcd0753c01d15092e332df4437c068efb1b,2019-09-20 09:27:00,DIYgod,fix(pkg): module alias error,False,module alias error,fix,"diff --git a/lib/app.js b/lib/app.js index 28500ad1a091b6..a0021206e1653b 100644 --- a/lib/app.js +++ b/lib/app.js @@ -1,4 +1,6 @@ -require('module-alias/register'); +const moduleAlias = require('module-alias'); +moduleAlias.addAlias('@', () => __dirname); + require('./utils/request-wrapper'); const Koa = require('koa'); diff --git a/package.json b/package.json index 12cd94bfacf18a..c9fe32741c9490 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { ""name"": ""rsshub"", - ""version"": ""0.1.0"", + ""version"": ""0.1.1"", ""description"": ""Make RSS Great Again!"", ""main"": ""lib/pkg.js"", ""files"": [ @@ -123,8 +123,5 @@ ""moduleNameMapper"": { ""@/(.*)"": ""/lib/$1"" } - }, - ""_moduleAliases"": { - ""@"": ""./lib"" } }" f4c9ad41c42b8879a2470f975956dc89e6080206,2020-12-03 14:17:37,dependabot-preview[bot],chore(deps-dev): bump eslint-plugin-prettier from 3.1.4 to 3.2.0,False,bump eslint-plugin-prettier from 3.1.4 to 3.2.0,chore,"diff --git a/package.json b/package.json index 83c64d2c718fc2..ee8464e6542880 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ ""entities"": ""2.1.0"", ""eslint"": ""7.14.0"", ""eslint-config-prettier"": ""6.15.0"", - ""eslint-plugin-prettier"": ""3.1.4"", + ""eslint-plugin-prettier"": ""3.2.0"", ""jest"": ""26.6.3"", ""mockdate"": ""3.0.2"", ""nock"": ""13.0.5"", diff --git a/yarn.lock b/yarn.lock index a6cebf53c013de..fe31e8070d9c7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4990,10 +4990,10 @@ eslint-config-prettier@6.15.0: dependencies: get-stdin ""^6.0.0"" -eslint-plugin-prettier@3.1.4: - version ""3.1.4"" - resolved ""https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"" - integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg== +eslint-plugin-prettier@3.2.0: + version ""3.2.0"" + resolved ""https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.2.0.tgz#af391b2226fa0e15c96f36c733f6e9035dbd952c"" + integrity sha512-kOUSJnFjAUFKwVxuzy6sA5yyMx6+o9ino4gCdShzBNx4eyFRudWRYKCFolKjoM40PEiuU6Cn7wBLfq3WsGg7qg== dependencies: prettier-linter-helpers ""^1.0.0""" 4b84b0dbd7204f125633f60a7805f952e0067d09,2023-03-11 20:07:17,cxfksword,feat(route): add VCB-Studio (#12074),False,add VCB-Studio (#12074),feat,"diff --git a/docs/anime.md b/docs/anime.md index cfac9ad97f0811..19fb30caacc489 100644 --- a/docs/anime.md +++ b/docs/anime.md @@ -436,6 +436,22 @@ Sources +## VCB-Studio + +### 最新文章 + + + +### 分类文章 + + + +| 作品项目 | 科普系列 | 计划与日志 | +| ----- | ---- | ------- | +| works | kb | planlog | + + + ## Vol.moe ### vol diff --git a/lib/v2/vcb-s/category.js b/lib/v2/vcb-s/category.js new file mode 100644 index 00000000000000..68a7d3b4bbaec4 --- /dev/null +++ b/lib/v2/vcb-s/category.js @@ -0,0 +1,51 @@ +const got = require('@/utils/got'); +const { parseDate } = require('@/utils/parse-date'); +const { art } = require('@/utils/render'); +const path = require('path'); + +const rootUrl = 'https://vcb-s.com'; +const cateAPIUrl = `${rootUrl}/wp-json/wp/v2/categories`; +const postsAPIUrl = `${rootUrl}/wp-json/wp/v2/posts`; + +module.exports = async (ctx) => { + const cate = ctx.params.cate; + const limit = ctx.query.limit ?? 7; + + const cateUrl = `${cateAPIUrl}?slug=${cate}`; + const category = await ctx.cache.tryGet(cateUrl, async () => { + const res = await got.get(cateUrl); + + if (typeof res.data === 'string') { + res.data = JSON.parse(res.body.trim()); + } + return res.data[0]; + }); + + const url = `${postsAPIUrl}?categories=${category.id}&page=1&per_page=${limit}&_embed`; + const response = await got.get(url); + if (typeof response.data === 'string') { + response.data = JSON.parse(response.body.trim()); + } + const data = response.data; + + const items = data.map((item) => { + const description = art(path.join(__dirname, 'templates/post.art'), { + post: item.content.rendered.replace(/
(.*?)<\/pre>/gs, '
$1
').replace(/(.*?)<\/div>/gs, '
$1
'), + medias: item._embedded['wp:featuredmedia'], + }); + + return { + title: item.title.rendered, + link: item.link, + description, + pubDate: parseDate(item.date_gmt), + author: item._embedded.author[0].name, + }; + }); + + ctx.state.data = { + title: `${category.name} | VCB-Studio`, + link: `${rootUrl}/archives/category/${category.slug}`, + item: items, + }; +}; diff --git a/lib/v2/vcb-s/index.js b/lib/v2/vcb-s/index.js new file mode 100644 index 00000000000000..4801e13069d250 --- /dev/null +++ b/lib/v2/vcb-s/index.js @@ -0,0 +1,39 @@ +const got = require('@/utils/got'); +const { parseDate } = require('@/utils/parse-date'); +const { art } = require('@/utils/render'); +const path = require('path'); + +const rootUrl = 'https://vcb-s.com'; +const postsAPIUrl = `${rootUrl}/wp-json/wp/v2/posts`; + +module.exports = async (ctx) => { + const limit = ctx.query.limit ?? 7; + const url = `${postsAPIUrl}?per_page=${limit}&_embed`; + + const response = await got.get(url); + if (typeof response.data === 'string') { + response.data = JSON.parse(response.body.trim()); + } + const data = response.data; + + const items = data.map((item) => { + const description = art(path.join(__dirname, 'templates/post.art'), { + post: item.content.rendered.replace(/
(.*?)<\/pre>/gs, '
$1
').replace(/(.*?)<\/div>/gs, '
$1
'), + medias: item._embedded['wp:featuredmedia'], + }); + + return { + title: item.title.rendered, + link: item.link, + description, + pubDate: parseDate(item.date_gmt), + author: item._embedded.author[0].name, + }; + }); + + ctx.state.data = { + title: 'VCB-Studio - 大家一起实现的故事!', + link: rootUrl, + item: items, + }; +}; diff --git a/lib/v2/vcb-s/maintainer.js b/lib/v2/vcb-s/maintainer.js new file mode 100644 index 00000000000000..f23ed63842cb75 --- /dev/null +++ b/lib/v2/vcb-s/maintainer.js @@ -0,0 +1,4 @@ +module.exports = { + '/': ['cxfksword'], + '/category/:cate': ['cxfksword'], +}; diff --git a/lib/v2/vcb-s/radar.js b/lib/v2/vcb-s/radar.js new file mode 100644 index 00000000000000..3f4f8083651f45 --- /dev/null +++ b/lib/v2/vcb-s/radar.js @@ -0,0 +1,19 @@ +module.exports = { + 'vcb-s.com': { + _name: 'VCB-Studio', + '.': [ + { + title: '最新文章', + docs: 'https://docs.rsshub.app/anime.html#vcb-studio', + source: ['/'], + target: '/vcb-s', + }, + { + title: '分类文章', + docs: 'https://docs.rsshub.app/anime.html#vcb-studio', + source: ['/archives/category/:cate'], + target: '/vcb-s/category/:cate', + }, + ], + }, +}; diff --git a/lib/v2/vcb-s/router.js b/lib/v2/vcb-s/router.js new file mode 100644 index 00000000000000..18fb0db3d1d5f4 --- /dev/null +++ b/lib/v2/vcb-s/router.js @@ -0,0 +1,4 @@ +module.exports = (router) => { + router.get('/', require('./index')); + router.get('/category/:cate', require('./category')); +}; diff --git a/lib/v2/vcb-s/templates/post.art b/lib/v2/vcb-s/templates/post.art new file mode 100644 index 00000000000000..2f026e84c5b6c6 --- /dev/null +++ b/lib/v2/vcb-s/templates/post.art @@ -0,0 +1,9 @@ + +{{ if medias }} +{{ each medias media }} +
+{{ /each }} +{{ /if }} +{{ if post }} +{{@ post }} +{{ /if }}" e6d01108cc4f548e9d884139335c505771cae9fa,2024-11-08 19:01:08,dependabot[bot],chore(deps): bump @scalar/hono-api-reference from 0.5.158 to 0.5.159 (#17507),False,bump @scalar/hono-api-reference from 0.5.158 to 0.5.159 (#17507),chore,"diff --git a/package.json b/package.json index 87a7ac155723cf..cc61c5c07d3945 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ ""@opentelemetry/semantic-conventions"": ""1.27.0"", ""@postlight/parser"": ""2.2.3"", ""@rss3/sdk"": ""0.0.23"", - ""@scalar/hono-api-reference"": ""0.5.158"", + ""@scalar/hono-api-reference"": ""0.5.159"", ""@sentry/node"": ""7.119.1"", ""@tonyrl/rand-user-agent"": ""2.0.81"", ""aes-js"": ""3.1.2"", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ad040fd32436c..bbb2f8fc3c9b6d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,8 +54,8 @@ importers: specifier: 0.0.23 version: 0.0.23 '@scalar/hono-api-reference': - specifier: 0.5.158 - version: 0.5.158(hono@4.6.9) + specifier: 0.5.159 + version: 0.5.159(hono@4.6.9) '@sentry/node': specifier: 7.119.1 version: 7.119.1 @@ -1746,18 +1746,18 @@ packages: '@rss3/sdk@0.0.23': resolution: {integrity: sha512-1cF1AqLU0k6dMwqQ5Fch3rOAbh4UXJ4UZLtOwzp/RWyGoCvu3lUOUIdJF41omunuH/JJSP2z6rJTPj4S6a60eg==} - '@scalar/hono-api-reference@0.5.158': - resolution: {integrity: sha512-2P7l/ivuC/RWpAKddLtkqIZ89TA5/QlpfEBrdpH9/yjn4NpR5XkbtT+/8uZVELCyjfUMpGcaNXrxuJERFJ3sxA==} + '@scalar/hono-api-reference@0.5.159': + resolution: {integrity: sha512-nUKaN0CKvytbXPj9b6taF/efKKRqEUwhVxlfLVjrJXN0eHNHDWxG9e/5Tyw1o2MXJo1cQpGZ4qTh48k/8u6ZjA==} engines: {node: '>=18'} peerDependencies: hono: ^4.0.0 - '@scalar/openapi-types@0.1.4': - resolution: {integrity: sha512-+wRXgmqzgDnj8Dxqf4OOPMPo4or/LRd1Bsy4pnrIW0yBt8rKSdtBb+jH/aRnhgDDmKVjWxJ+KFk7WlSKvZwNTw==} + '@scalar/openapi-types@0.1.5': + resolution: {integrity: sha512-6geH9ehvQ/sG/xUyy3e0lyOw3BaY5s6nn22wHjEJhcobdmWyFER0O6m7AU0ZN4QTjle/gYvFJOjj552l/rsNSw==} engines: {node: '>=18'} - '@scalar/types@0.0.18': - resolution: {integrity: sha512-gfJB/e9Rq/vjsiWlNwBkaIAZVb9v5guHQB5uVoVFcU0gdAuXni0KVxFxl3gGTu2zhBdB+DkixjyPcNzpqwksmA==} + '@scalar/types@0.0.19': + resolution: {integrity: sha512-wOxtXd35BS0DaVhBopQUB8c8hfLQ+/PKEr99GbOZW+4DWCrEB8JfWJgvpJyxHU6by7LHNVY4fvpFQR7Ezh1IIw==} engines: {node: '>=18'} '@sec-ant/readable-stream@0.4.1': @@ -7295,16 +7295,16 @@ snapshots: '@rss3/api-core': 0.0.23 '@rss3/api-utils': 0.0.23 - '@scalar/hono-api-reference@0.5.158(hono@4.6.9)': + '@scalar/hono-api-reference@0.5.159(hono@4.6.9)': dependencies: - '@scalar/types': 0.0.18 + '@scalar/types': 0.0.19 hono: 4.6.9 - '@scalar/openapi-types@0.1.4': {} + '@scalar/openapi-types@0.1.5': {} - '@scalar/types@0.0.18': + '@scalar/types@0.0.19': dependencies: - '@scalar/openapi-types': 0.1.4 + '@scalar/openapi-types': 0.1.5 '@unhead/schema': 1.11.11 '@sec-ant/readable-stream@0.4.1': {}" 7565a7d2d872fe89ece5cd682468ac3e44fe8545,2020-10-03 04:47:52,233yeee,feat: add 中国人大网 (#5772),False,add 中国人大网 (#5772),feat,"diff --git a/docs/government.md b/docs/government.md index fdf5ca977bc522..39315111bdf319 100644 --- a/docs/government.md +++ b/docs/government.md @@ -133,6 +133,16 @@ pageClass: routes +## 中国人大网 + + + +| 立法 | 监督 | 代表 | 理论 | 权威发布 | 滚动新闻 | +| ---- | ---- | ---- | ---- | -------- | -------- | +| c183 | c184 | c185 | c189 | c12435 | c10134 | + + + ## 中国信息通信研究院 ### 白皮书 diff --git a/lib/router.js b/lib/router.js index 89f567a781a1b6..8be0af7959e7dd 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3269,4 +3269,7 @@ router.get('/nobelprize/:caty?', require('./routes/nobelprize/index')); // 中華民國國防部 router.get('/gov/taiwan/mnd', require('./routes/gov/taiwan/mnd')); +// 中国人大网 +router.get('/npc/:caty', require('./routes/npc/index')); + module.exports = router; diff --git a/lib/routes/npc/index.js b/lib/routes/npc/index.js new file mode 100644 index 00000000000000..4fcb8365519a77 --- /dev/null +++ b/lib/routes/npc/index.js @@ -0,0 +1,42 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const { caty } = ctx.params; + // 主页 + const response = await got(`http://www.npc.gov.cn/npc/${caty}/list.shtml`); + const data = response.body; + const $ = cheerio.load(data, { decodeEntities: false }); + const title = $('title').text(); + // 获取每条的链接 + const links = $('.clist a') + .map((index, item) => [$(item).attr('href')]) + .get(); + // 获取标题、日期 + const list = await Promise.all( + links.map(async (link) => { + const response = await got(`http://www.npc.gov.cn${link}`); + const data = response.body; + const $ = cheerio.load(data, { decodeEntities: false }); + const title = $('title').text().replace('_中国人大网', ''); + const time = $('span.fr').text(); + const description = $('#Zoom p') + .map((index, item) => $.html(item)) + .get() + .join(''); + return Promise.resolve([title, link, time, description]); + }) + ); + // 整合 + ctx.state.data = { + title: title, + link: `http://www.npc.gov.cn/npc/${caty}/list.shtml`, + description: title, + item: list.map((item) => ({ + title: item[0], + link: `http://www.npc.gov.cn${item[1]}`, + pubDate: new Date(item[2].substr(0, 4), parseInt(item[2].substr(5, 2)) - 1, item[2].substr(8, 2), item[2].substr(12, 2), item[2].substr(15, 2), item[2].substr(18, 2)).toUTCString(), + description: item[3], + })), + }; +};" 56e998d0a9b81ac2a40379605231073a9eb6f954,2022-07-05 18:13:47,Ethan Shen,fix(route): 櫻坂46博客 (#10131),False,櫻坂46博客 (#10131),fix,"diff --git a/docs/new-media.md b/docs/new-media.md index 61a4f8908a9005..50dfe6795a355f 100644 --- a/docs/new-media.md +++ b/docs/new-media.md @@ -1432,7 +1432,34 @@ Supported sub-sites: ### 櫻坂 46 博客 - + + +| 编号 | 姓名 | +| -- | ------ | +| 03 | 上村 莉菜 | +| 04 | 尾関 梨香 | +| 06 | 小池 美波 | +| 07 | 小林 由依 | +| 08 | 齋藤 冬優花 | +| 11 | 菅井 友香 | +| 14 | 土生 瑞穂 | +| 15 | 原田 葵 | +| 43 | 井上 梨名 | +| 53 | 遠藤 光莉 | +| 54 | 大園 玲 | +| 55 | 大沼 晶保 | +| 56 | 幸阪 茉里乃 | +| 44 | 関 有美子 | +| 45 | 武元 唯衣 | +| 46 | 田村 保乃 | +| 47 | 藤吉 夏鈴 | +| 57 | 増本 綺良 | +| 48 | 松田 里奈 | +| 50 | 森田 ひかる | +| 58 | 守屋 麗奈 | +| 51 | 山﨑 天 | + + ### 日向坂 46 新闻 diff --git a/lib/router.js b/lib/router.js index bff9ff3e7e0bf2..2439a78ae2c2de 100644 --- a/lib/router.js +++ b/lib/router.js @@ -1894,7 +1894,7 @@ router.get('/keyakizaka46/news', lazyloadRouteHandler('./routes/keyakizaka46/new router.get('/hinatazaka46/news', lazyloadRouteHandler('./routes/hinatazaka46/news')); router.get('/keyakizaka46/blog', lazyloadRouteHandler('./routes/keyakizaka46/blog')); router.get('/hinatazaka46/blog', lazyloadRouteHandler('./routes/hinatazaka46/blog')); -router.get('/sakurazaka46/blog', lazyloadRouteHandler('./routes/sakurazaka46/blog')); +// router.get('/sakurazaka46/blog', lazyloadRouteHandler('./routes/sakurazaka46/blog')); // 酷安 router.get('/coolapk/tuwen/:type?', lazyloadRouteHandler('./routes/coolapk/tuwen')); diff --git a/lib/routes/sakurazaka46/blog.js b/lib/routes/sakurazaka46/blog.js deleted file mode 100644 index f2d743bde9a0f8..00000000000000 --- a/lib/routes/sakurazaka46/blog.js +++ /dev/null @@ -1,38 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const response = await got({ - method: 'get', - url: 'https://sakurazaka46.com/s/s46/diary/blog', - headers: { - Referer: 'https://sakurazaka46.com/', - }, - }); - - const data = response.data; - const $ = cheerio.load(data); - const list = $('ul.com-blog-part li'); - let itemPicUrl; - - ctx.state.data = { - allowEmpty: true, - title: '櫻坂46 公式ブログ', - link: 'https://sakurazaka46.com/s/s46/diary/blog', - item: - list && - list - .map((index, item) => { - item = $(item); - itemPicUrl = item.find('div.wrap-bg span.img').attr('style').replace('background-image: url(', '').replace(');', ''); - return { - title: item.find('div.date-title h3.title').text().trim(), - link: item.find('a').first().attr('href'), - pubDate: item.find('div.date-title p.date').text(), - author: item.find('div.prof-in p.name').text().trim(), - description: ``, - }; - }) - .get(), - }; -}; diff --git a/lib/v2/sakurazaka46/blog.js b/lib/v2/sakurazaka46/blog.js new file mode 100644 index 00000000000000..bb03565a839cf0 --- /dev/null +++ b/lib/v2/sakurazaka46/blog.js @@ -0,0 +1,54 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); +const timezone = require('@/utils/timezone'); +const { parseDate } = require('@/utils/parse-date'); + +module.exports = async (ctx) => { + const id = ctx.params.id ?? ''; + + const rootUrl = 'https://sakurazaka46.com'; + const currentUrl = `${rootUrl}/s/s46/diary/blog/list${id ? `?ct=${id}` : ''}`; + + const response = await got({ + method: 'get', + url: currentUrl, + }); + + const $ = cheerio.load(response.data); + + let items = $('.com-blog-part .box a') + .toArray() + .map((item) => { + item = $(item); + + return { + title: item.text(), + author: item.find('.name').text(), + link: `${rootUrl}${item.attr('href')}`, + }; + }); + + items = await Promise.all( + items.map((item) => + ctx.cache.tryGet(item.link, async () => { + const detailResponse = await got({ + method: 'get', + url: item.link, + }); + + const content = cheerio.load(detailResponse.data); + + item.description = content('.box-article').html(); + item.pubDate = timezone(parseDate(content('.blog-foot .date').text()), +9); + + return item; + }) + ) + ); + + ctx.state.data = { + title: `${$('title').text()}${id ? ` - ${$('.name').first().text()}` : ''}`, + link: currentUrl, + item: items, + }; +}; diff --git a/lib/v2/sakurazaka46/maintainer.js b/lib/v2/sakurazaka46/maintainer.js new file mode 100644 index 00000000000000..92b2a643d6671a --- /dev/null +++ b/lib/v2/sakurazaka46/maintainer.js @@ -0,0 +1,3 @@ +module.exports = { + '/blog/:id?': ['victor21813', 'nczitzk'], +}; diff --git a/lib/v2/sakurazaka46/radar.js b/lib/v2/sakurazaka46/radar.js new file mode 100644 index 00000000000000..23bb42c4d80c91 --- /dev/null +++ b/lib/v2/sakurazaka46/radar.js @@ -0,0 +1,13 @@ +module.exports = { + 'sakurazaka46.com': { + _name: '櫻坂46', + '.': [ + { + title: '公式ブログ', + docs: 'https://docs.rsshub.app/new-media.html#ban-dao-xi-lie-guan-wang-zi-xun-ying-ban-46-bo-ke', + source: ['/s/s46/diary/blog/list', '/'], + target: (params, url) => `/sakurazaka46/blog/${new URL(url).searchParams.get('ct')}`, + }, + ], + }, +}; diff --git a/lib/v2/sakurazaka46/router.js b/lib/v2/sakurazaka46/router.js new file mode 100644 index 00000000000000..22505a9f862300 --- /dev/null +++ b/lib/v2/sakurazaka46/router.js @@ -0,0 +1,3 @@ +module.exports = function (router) { + router.get('/blog/:id?', require('./blog')); +};" a60a81de65fa9eaa51440b486d71f35051054fe3,2024-01-16 06:45:08,dependabot[bot],chore(deps-dev): bump nock from 13.4.0 to 13.5.0 (#14254),False,bump nock from 13.4.0 to 13.5.0 (#14254),chore,"diff --git a/package.json b/package.json index 41db0a8d5ec8bb..2afa1e5a876ed0 100644 --- a/package.json +++ b/package.json @@ -195,7 +195,7 @@ ""jest-junit"": ""16.0.0"", ""lint-staged"": ""15.2.0"", ""mockdate"": ""3.0.5"", - ""nock"": ""13.4.0"", + ""nock"": ""13.5.0"", ""nodemon"": ""3.0.2"", ""prettier"": ""3.2.2"", ""remark"": ""14.0.3"", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e077ff013d6ba..74715f7ae4262e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -338,8 +338,8 @@ devDependencies: specifier: 3.0.5 version: 3.0.5 nock: - specifier: 13.4.0 - version: 13.4.0 + specifier: 13.5.0 + version: 13.5.0 nodemon: specifier: 3.0.2 version: 3.0.2 @@ -6839,8 +6839,8 @@ packages: lower-case: 1.1.4 dev: false - /nock@13.4.0: - resolution: {integrity: sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==} + /nock@13.5.0: + resolution: {integrity: sha512-9hc1eCS2HtOz+sE9W7JQw/tXJktg0zoPSu48s/pYe73e25JW9ywiowbqnUSd7iZPeVawLcVpPZeZS312fwSY+g==} engines: {node: '>= 10.13'} dependencies: debug: 4.3.4(supports-color@5.5.0)" 3b89ca084e96e6fd71f9ff02e61acefc45d7c72f,2022-06-07 03:42:42,dependabot[bot],chore(deps): bump rand-user-agent from 1.0.65 to 1.0.66 (#9909),False,bump rand-user-agent from 1.0.65 to 1.0.66 (#9909),chore,"diff --git a/package.json b/package.json index a63648a21c09d8..20aa90c2fffe32 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ ""puppeteer-extra"": ""3.2.3"", ""puppeteer-extra-plugin-stealth"": ""2.9.0"", ""query-string"": ""7.1.1"", - ""rand-user-agent"": ""1.0.65"", + ""rand-user-agent"": ""1.0.66"", ""require-all"": ""3.0.0"", ""rss-parser"": ""3.12.0"", ""showdown"": ""2.1.0"", diff --git a/yarn.lock b/yarn.lock index fa8efb10d4fad2..aeb2584c3c75ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11468,10 +11468,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.65: - version ""1.0.65"" - resolved ""https://registry.yarnpkg.com/rand-user-agent/-/rand-user-agent-1.0.65.tgz#c33eb859245c725f6b3d55820ba7fb87e6ece23b"" - integrity sha512-QLUI7l+0GQt/IpMEyamViPmknirXFGGpTIhxfizhBggrfUciwBh4h9iSgetRDzVHksogUdjMezNEdnoiOV/PuA== +rand-user-agent@1.0.66: + version ""1.0.66"" + resolved ""https://registry.yarnpkg.com/rand-user-agent/-/rand-user-agent-1.0.66.tgz#15830bb6c28e398a9d0bb08973e4c5113aaa9942"" + integrity sha512-qi/JhTAhE4BODL5pDp3DjdMRVTDoWrbeEH1myjdaa7ioI4AnWP1KZrisrcc1AnBs6KypH5bLnV2QJsImEXEKcA== randexp@0.4.6: version ""0.4.6""" 17626929149b79251acf30a3eb03fa7e610af0c4,2024-03-08 21:05:33,Enoch Ma,fix(route): show correct author name (AEON) (#14721),False,show correct author name (AEON) (#14721),fix,"diff --git a/lib/routes/aeon/utils.ts b/lib/routes/aeon/utils.ts index 52d558503d980e..c24e7f0183d251 100644 --- a/lib/routes/aeon/utils.ts +++ b/lib/routes/aeon/utils.ts @@ -29,14 +29,14 @@ const getData = async (ctx, list) => { // e.g. https://aeon.co/essays/how-to-mourn-a-forest-a-lesson-from-west-papua . // But that's very rare. - item.author = data.props.pageProps.article.authors.map((author) => author.displayName).join(', '); + item.author = data.props.pageProps.article.authors.map((author) => author.name).join(', '); const article = data.props.pageProps.article; const capture = load(article.body); const banner = article.thumbnail?.urls?.header; capture('p.pullquote').remove(); - const authorsBio = article.authors.map((author) => '

' + author.displayName + author.authorBio.replaceAll(/^

/g, ' ')).join(''); + const authorsBio = article.authors.map((author) => '

' + author.name + author.authorBio.replaceAll(/^

/g, ' ')).join(''); item.description = art(path.join(__dirname, 'templates/essay.art'), { banner, authorsBio, content: capture.html() }); }" ac018809138d4c3078b94441255310b43ec33555,2022-02-10 00:11:32,dependabot[bot],chore(deps-dev): bump @types/cheerio from 0.22.30 to 0.22.31 (#9050),False,bump @types/cheerio from 0.22.30 to 0.22.31 (#9050),chore,"diff --git a/package.json b/package.json index b55ed207a1512c..e81a41af022245 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ ""homepage"": ""https://github.com/DIYgod/RSSHub#readme"", ""devDependencies"": { ""@napi-rs/pinyin"": ""1.7.0"", - ""@types/cheerio"": ""0.22.30"", + ""@types/cheerio"": ""0.22.31"", ""@types/got"": ""9.6.12"", ""@types/koa"": ""2.13.4"", ""@vercel/nft"": ""0.17.4"", diff --git a/yarn.lock b/yarn.lock index 6475eadb155fd1..97e6b934640e7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1598,10 +1598,10 @@ resolved ""https://registry.yarnpkg.com/@types/chance/-/chance-1.1.3.tgz#d19fe9391288d60fdccd87632bfc9ab2b4523fea"" integrity sha512-X6c6ghhe4/sQh4XzcZWSFaTAUOda38GQHmq9BUanYkOE/EO7ZrkazwKmtsj3xzTjkLWmwULE++23g3d3CCWaWw== -""@types/cheerio@0.22.30"": - version ""0.22.30"" - resolved ""https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.30.tgz#6c1ded70d20d890337f0f5144be2c5e9ce0936e6"" - integrity sha512-t7ZVArWZlq3dFa9Yt33qFBQIK4CQd1Q3UJp0V+UhP6vgLWLM6Qug7vZuRSGXg45zXeB1Fm5X2vmBkEX58LV2Tw== +""@types/cheerio@0.22.31"": + version ""0.22.31"" + resolved ""https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.31.tgz#b8538100653d6bb1b08a1e46dec75b4f2a5d5eb6"" + integrity sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw== dependencies: ""@types/node"" ""*""" 096e57d429f0072314cd0dacf7268a04c895a5c2,2024-08-19 22:22:21,Andvari,fix(route/gisreportsonlline): Restore linefeed (#16487),False,Restore linefeed (#16487),fix,"diff --git a/lib/routes/gisreportsonline/index.ts b/lib/routes/gisreportsonline/index.ts index fb90dd51d490d1..fcf9b2ff49cce4 100644 --- a/lib/routes/gisreportsonline/index.ts +++ b/lib/routes/gisreportsonline/index.ts @@ -45,7 +45,7 @@ async function handler(ctx) { item.description = content('header.entry-header ~ :not(#pos-conclusion ~ *)') .toArray() - .map((e) => content(e).html()) + .map((e) => content(e).prop('outerHTML')) .join(''); return item;" dafa855b81b2caa7ed6324b66424f032cd8bb248,2022-02-09 18:25:58,dependabot[bot],chore(deps): bump googleapis from 91.0.0 to 95.0.0 (#8992),False,bump googleapis from 91.0.0 to 95.0.0 (#8992),chore,"diff --git a/package.json b/package.json index c56b3b4cc71400..6d15464ada3efb 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ ""etag"": ""1.8.1"", ""fanfou-sdk"": ""4.2.0"", ""git-rev-sync"": ""3.0.1"", - ""googleapis"": ""91.0.0"", + ""googleapis"": ""95.0.0"", ""got"": ""11.8.3"", ""https-proxy-agent"": ""5.0.0"", ""iconv-lite"": ""0.6.3"", diff --git a/yarn.lock b/yarn.lock index 94489a234dd958..ddcaa934b909b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6333,10 +6333,10 @@ googleapis-common@^5.0.2: url-template ""^2.0.8"" uuid ""^8.0.0"" -googleapis@91.0.0: - version ""91.0.0"" - resolved ""https://registry.yarnpkg.com/googleapis/-/googleapis-91.0.0.tgz#c5e51ca568ed687f0694a082237c7b7b96a19b3b"" - integrity sha512-iHqXZwgYam0g8n0Yyi+YHx8kgwT+H5O4k3fe0LB1JhWRp1dSKYu+ShY4PQbW584zLOE4kK3LHf2B+x1THx+ZPQ== +googleapis@95.0.0: + version ""95.0.0"" + resolved ""https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz#63f6e28e78874044585f1e86c100a308a44fb385"" + integrity sha512-ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA== dependencies: google-auth-library ""^7.0.2"" googleapis-common ""^5.0.2""" 0615d26ab1d6ef691bd274473fec0fd3e3c41413,2024-05-03 21:53:02,Tony,chore: fix depedabot upgrade,False,fix depedabot upgrade,chore,"diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3d9d120ec810f..c67d7e01c29471 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,30 @@ permissions: contents: read jobs: + fix-pnpmp-lock: + # workaround for https://github.com/dependabot/dependabot-core/issues/7258 + # until https://github.com/pnpm/pnpm/issues/6530 is fixed + if: github.triggering_actor == 'dependabot[bot]' && github.event_name == 'pull_request' + runs-on: ubuntu-latest + permissions: + pull-requests: write + contents: write + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: lts/* + cache: 'pnpm' + - run: | + rm pnpm-lock.yaml + pnpm i + - uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: 'chore: fix pnpm install' + vitest: runs-on: ubuntu-latest timeout-minutes: 10" 8e27ffcc3d08aaf5a533db7c2468f9e315849fb4,2025-02-24 14:06:17,dependabot[bot],chore(deps): bump @tonyrl/rand-user-agent from 2.0.81 to 2.0.83 (#18443),False,bump @tonyrl/rand-user-agent from 2.0.81 to 2.0.83 (#18443),chore,"diff --git a/package.json b/package.json index 4388bff6874630..a26991879faf95 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ ""@rss3/sdk"": ""0.0.25"", ""@scalar/hono-api-reference"": ""0.5.175"", ""@sentry/node"": ""9.1.0"", - ""@tonyrl/rand-user-agent"": ""2.0.81"", + ""@tonyrl/rand-user-agent"": ""2.0.83"", ""aes-js"": ""3.1.2"", ""art-template"": ""4.13.2"", ""cheerio"": ""1.0.0"", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e178c3d46a8b65..f81f037bd09b5f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -66,8 +66,8 @@ importers: specifier: 9.1.0 version: 9.1.0 '@tonyrl/rand-user-agent': - specifier: 2.0.81 - version: 2.0.81 + specifier: 2.0.83 + version: 2.0.83 aes-js: specifier: 3.1.2 version: 3.1.2 @@ -2065,8 +2065,8 @@ packages: resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==} engines: {node: '>=14.16'} - '@tonyrl/rand-user-agent@2.0.81': - resolution: {integrity: sha512-pL8is8iSle1gVPeNGSIKNpnyDaxSChWAtG7Kbbx1wq91Y8NJ+O+S/AsNvrQ7GVzKZF7rPTiRGl2eHNDVjdR2/A==} + '@tonyrl/rand-user-agent@2.0.83': + resolution: {integrity: sha512-FqifQhfeJ1WojY8j6s7D3qcs20KhZwVggirT7btqi7g5bSTbbD4v0cuhxHaASyHlv3R757Jum2ro03dRVUXgVw==} engines: {node: '>=14.16'} '@tootallnate/quickjs-emscripten@0.23.0': @@ -7836,7 +7836,7 @@ snapshots: dependencies: defer-to-connect: 2.0.1 - '@tonyrl/rand-user-agent@2.0.81': {} + '@tonyrl/rand-user-agent@2.0.83': {} '@tootallnate/quickjs-emscripten@0.23.0': {}" bd759b49d6f959072ce285af1f4c11456413ef00,2023-06-07 20:44:57,Youssif Shaaban Alsager,feat(route): Add Rattibha Twitter user threads (#12630),False,Add Rattibha Twitter user threads (#12630),feat,"diff --git a/docs/en/social-media.md b/docs/en/social-media.md index d4c1dc9e8855a5..f06f6bd4983a7e 100644 --- a/docs/en/social-media.md +++ b/docs/en/social-media.md @@ -376,6 +376,12 @@ Only for self-hosted +## Rattibha + +### User Threads + + + ## Telegram ### Channel diff --git a/lib/v2/rattibha/maintainer.js b/lib/v2/rattibha/maintainer.js new file mode 100644 index 00000000000000..6a82a2f6393743 --- /dev/null +++ b/lib/v2/rattibha/maintainer.js @@ -0,0 +1,3 @@ +module.exports = { + '/user/:user': ['yshalsager'], +}; diff --git a/lib/v2/rattibha/radar.js b/lib/v2/rattibha/radar.js new file mode 100644 index 00000000000000..6678dc36967c8c --- /dev/null +++ b/lib/v2/rattibha/radar.js @@ -0,0 +1,13 @@ +module.exports = { + 'rattibha.com': { + _name: 'رتبها - Rattibha', + '.': [ + { + title: 'User Threads', + docs: 'https://docs.rsshub.app/en/social-media.html#rattibha', + source: ['/:user'], + target: '/rattibha/user/:user', + }, + ], + }, +}; diff --git a/lib/v2/rattibha/router.js b/lib/v2/rattibha/router.js new file mode 100644 index 00000000000000..c0a2646ba9ce91 --- /dev/null +++ b/lib/v2/rattibha/router.js @@ -0,0 +1,3 @@ +module.exports = function (router) { + router.get('/user/:user', require('./user')); +}; diff --git a/lib/v2/rattibha/user.js b/lib/v2/rattibha/user.js new file mode 100644 index 00000000000000..8aa1dbc6406021 --- /dev/null +++ b/lib/v2/rattibha/user.js @@ -0,0 +1,43 @@ +const got = require('@/utils/got'); +const { parseDate } = require('@/utils/parse-date'); + +module.exports = async (ctx) => { + const baseUrl = 'https://rattibha.com'; + const { user: twitterUser } = ctx.params; + + const { + data: { user: userData }, + } = await got(`${baseUrl}/user?id=${twitterUser}`, { + headers: { + accept: 'application/json', + }, + }); + const { data: userThreads } = await got(`${baseUrl}/u_threads?id=${userData.account_user_id}`, { headers: { accept: 'application/json' } }); + + // extract the relevant data from the API response + const list = userThreads.map((item) => ({ + title: item.thread.t.info.text, + link: `${baseUrl}/thread/${item.thread_id}`, + pubDate: parseDate(item.thread.created_at), + updated: parseDate(item.thread.updated_at), + author: userData.name, + api_link: `${baseUrl}/threads?id=${item.thread_id}`, + })); + + // Get tweet full text + const items = await Promise.all( + list.map((item) => + ctx.cache.tryGet(item.api_link, async () => { + const { data: threads } = await got(item.api_link, { headers: { accept: 'application/json' } }); + item.description = threads.reduce((accumulator, tweet) => `${accumulator}${tweet.tweet_detail.info.text}
`, ''); + return item; + }) + ) + ); + + ctx.state.data = { + title: `سلاسل تغريدات ${twitterUser}`, + link: `${baseUrl}/${twitterUser}`, + item: items, + }; +};" bbeefb0962ce028483fe793b5b837153dec5b3c2,2024-02-05 17:39:51,github-actions[bot],style: auto format,False,auto format,style,"diff --git a/website/docs/routes/government.mdx b/website/docs/routes/government.mdx index da920cce827c40..71ca7b15e8564f 100644 --- a/website/docs/routes/government.mdx +++ b/website/docs/routes/government.mdx @@ -12,9 +12,9 @@ -## Constitutional Court of Baden-Württemberg (Germany) {#constitutional-court-of-baden-wvrttemberg-germany} +## Constitutional Court of Baden-Württemberg (Germany) {#constitutional-court-of-baden-w%C3%BCrttemberg-germany} -### Press releases {#constitutional-court-of-baden-wvrttemberg-germany-press-releases} +### Press releases {#constitutional-court-of-baden-w%C3%BCrttemberg-germany-press-releases} diff --git a/website/docs/routes/other.mdx b/website/docs/routes/other.mdx index c697910947312f..abca26609334ef 100644 --- a/website/docs/routes/other.mdx +++ b/website/docs/routes/other.mdx @@ -121,7 +121,7 @@ See [#app-store-mac-app-store](/routes/program-update#app-store-mac-app-store) -### Macao Pagina Electrónica Especial Contra Epidemias: What’s New {#corona-virus-disease-2019-macao-pagina-electronica-especial-contra-epidemias-what-s-new} +### Macao Pagina Electrónica Especial Contra Epidemias: What’s New {#corona-virus-disease-2019-macao-pagina-electr%C3%B3nica-especial-contra-epidemias-what-s-new} Official Website: [https://www.ssm.gov.mo/apps1/PreventWuhanInfection/en.aspx](https://www.ssm.gov.mo/apps1/PreventWuhanInfection/en.aspx)" bb99de6957b10b823b11ce6294015f431428cab1,2020-07-21 22:18:39,dependabot-preview[bot],chore(deps): bump @sentry/node from 5.19.2 to 5.20.0,False,bump @sentry/node from 5.19.2 to 5.20.0,chore,"diff --git a/package.json b/package.json index c0b6ec9e36e21d..6f7c91c7014d2f 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ ""dependencies"": { ""@koa/router"": ""9.3.1"", ""@postlight/mercury-parser"": ""2.2.0"", - ""@sentry/node"": ""5.19.2"", + ""@sentry/node"": ""5.20.0"", ""aes-js"": ""3.1.2"", ""art-template"": ""4.13.2"", ""cheerio"": ""1.0.0-rc.3"", diff --git a/yarn.lock b/yarn.lock index e13bdfc01cc554..fef1a3a57bc6cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1312,83 +1312,83 @@ dependencies: safe-buffer ""^5.0.1"" -""@sentry/apm@5.19.2"": - version ""5.19.2"" - resolved ""https://registry.yarnpkg.com/@sentry/apm/-/apm-5.19.2.tgz#369fdcbc9fa5db992f707b24f3165e106a277cf7"" - integrity sha512-V7p5niqG/Nn1OSMAyreChiIrQFYzFHKADKNaDEvIXqC4hxFnMG8lPRqEFJH49fNjsFBFfIG9iY1rO1ZFg3S42Q== - dependencies: - ""@sentry/browser"" ""5.19.2"" - ""@sentry/hub"" ""5.19.2"" - ""@sentry/minimal"" ""5.19.2"" - ""@sentry/types"" ""5.19.2"" - ""@sentry/utils"" ""5.19.2"" +""@sentry/apm@5.20.0"": + version ""5.20.0"" + resolved ""https://registry.yarnpkg.com/@sentry/apm/-/apm-5.20.0.tgz#14c1900ce83582c988c7620ab41d0d2d95956059"" + integrity sha512-6zfMRYXG/9VzsmgQqYqFFvg/5XJYOimY/KIrJAijemMLb0Xhwu3xw/2eelWxkWilTBXUWO+dQel5P7JBA8QsKw== + dependencies: + ""@sentry/browser"" ""5.20.0"" + ""@sentry/hub"" ""5.20.0"" + ""@sentry/minimal"" ""5.20.0"" + ""@sentry/types"" ""5.20.0"" + ""@sentry/utils"" ""5.20.0"" tslib ""^1.9.3"" -""@sentry/browser@5.19.2"": - version ""5.19.2"" - resolved ""https://registry.yarnpkg.com/@sentry/browser/-/browser-5.19.2.tgz#8bad445b8d1efd50e6510bb43b3018b941f6e5cb"" - integrity sha512-o6Z532n+0N5ANDzgR9GN+Q6CU7zVlIJvBEW234rBiB+ZZj6XwTLS1dD+JexGr8lCo8PeXI2rypKcj1jUGLVW8w== +""@sentry/browser@5.20.0"": + version ""5.20.0"" + resolved ""https://registry.yarnpkg.com/@sentry/browser/-/browser-5.20.0.tgz#010ae9a09060ca1859dcc1dbfa186798db82ef7e"" + integrity sha512-xVPL7/RuAPcemfSzXiyPHAt4M+0BfzkdTlN+PZb6frCEo4k6E0UiN6WLsGj/iwa2gXhyfTQXtbTuP+tDuNPEJw== dependencies: - ""@sentry/core"" ""5.19.2"" - ""@sentry/types"" ""5.19.2"" - ""@sentry/utils"" ""5.19.2"" + ""@sentry/core"" ""5.20.0"" + ""@sentry/types"" ""5.20.0"" + ""@sentry/utils"" ""5.20.0"" tslib ""^1.9.3"" -""@sentry/core@5.19.2"": - version ""5.19.2"" - resolved ""https://registry.yarnpkg.com/@sentry/core/-/core-5.19.2.tgz#99a64ef0e55230fc02a083c48fa07ada85de4929"" - integrity sha512-sfbBsVXpA0WYJUichz5IhvqKD8xJUfQvsszrTsUKa7PQAMAboOmuh6bo8KquaVQnAZyZWZU08UduvlSV3tA7tw== +""@sentry/core@5.20.0"": + version ""5.20.0"" + resolved ""https://registry.yarnpkg.com/@sentry/core/-/core-5.20.0.tgz#4c6daad108af94cd0ec5a13fd20b2bfe61ccd586"" + integrity sha512-fzzWKEolc0O6H/phdDenzKs7JXDSb0sooxVn0QCUkwWSzACALQh+NR/UciOXyhyuoUiqu4zthYQx02qtGqizeQ== dependencies: - ""@sentry/hub"" ""5.19.2"" - ""@sentry/minimal"" ""5.19.2"" - ""@sentry/types"" ""5.19.2"" - ""@sentry/utils"" ""5.19.2"" + ""@sentry/hub"" ""5.20.0"" + ""@sentry/minimal"" ""5.20.0"" + ""@sentry/types"" ""5.20.0"" + ""@sentry/utils"" ""5.20.0"" tslib ""^1.9.3"" -""@sentry/hub@5.19.2"": - version ""5.19.2"" - resolved ""https://registry.yarnpkg.com/@sentry/hub/-/hub-5.19.2.tgz#ab7f3d2d253c3441b2833a530b17c6de2418b2c7"" - integrity sha512-2KkEYX4q9TDCOiaVEo2kQ1W0IXyZxJxZtIjDdFQyes9T4ubYlKHAbvCjTxHSQv37lDO4t7sOIApWG9rlkHzlEA== +""@sentry/hub@5.20.0"": + version ""5.20.0"" + resolved ""https://registry.yarnpkg.com/@sentry/hub/-/hub-5.20.0.tgz#3c8ceb29debaea4184bca210cfa7fdd4aad639cb"" + integrity sha512-DiU8fpjAAMOgSx5tsTekMtHPCAtSNWSNS91FFkDCqPn6fYG+/aK/hB5kTlJwr+GTM1815+WWrtXP6y2ecSmZuA== dependencies: - ""@sentry/types"" ""5.19.2"" - ""@sentry/utils"" ""5.19.2"" + ""@sentry/types"" ""5.20.0"" + ""@sentry/utils"" ""5.20.0"" tslib ""^1.9.3"" -""@sentry/minimal@5.19.2"": - version ""5.19.2"" - resolved ""https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.19.2.tgz#0fc2fdf9911a0cb31b52f7ccad061b74785724a3"" - integrity sha512-rApEOkjy+ZmkeqEItgFvUFxe5l+dht9AumuUzq74pWp+HJqxxv9IVTusKppBsE1adjtmyhwK4O3Wr8qyc75xlw== +""@sentry/minimal@5.20.0"": + version ""5.20.0"" + resolved ""https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.20.0.tgz#309ab4159b44ce3350698294e47da97903593dad"" + integrity sha512-oA+0g7p3bapzjgGKQIkSjcjA85VG1HPmjxBD9wpRvNjmYuVmm80Cl1H/P+xg/hupw/kNmASAX4IOd5Z9pEeboA== dependencies: - ""@sentry/hub"" ""5.19.2"" - ""@sentry/types"" ""5.19.2"" + ""@sentry/hub"" ""5.20.0"" + ""@sentry/types"" ""5.20.0"" tslib ""^1.9.3"" -""@sentry/node@5.19.2"": - version ""5.19.2"" - resolved ""https://registry.yarnpkg.com/@sentry/node/-/node-5.19.2.tgz#8c1c2f6c983c3d8b25143e5b99c4b6cc745125ec"" - integrity sha512-gbww3iTWkdvYIAhOmULbv8znKwkIpklGJ0SPtAh0orUMuaa0lVht+6HQIhRgeXp50lMzNaYC3fuzkbFfYgpS7A== - dependencies: - ""@sentry/apm"" ""5.19.2"" - ""@sentry/core"" ""5.19.2"" - ""@sentry/hub"" ""5.19.2"" - ""@sentry/types"" ""5.19.2"" - ""@sentry/utils"" ""5.19.2"" - cookie ""^0.3.1"" +""@sentry/node@5.20.0"": + version ""5.20.0"" + resolved ""https://registry.yarnpkg.com/@sentry/node/-/node-5.20.0.tgz#8efd42aa86289c0ba98eca7601b4d5032bcae3a5"" + integrity sha512-xOSP+sWptQff1dQR8G9DCpATT99odsnEpg+X/uqW6bUvjfgsabiPN4nc/orwkTNtm4MhffZiXVq48IAgl/x8Uw== + dependencies: + ""@sentry/apm"" ""5.20.0"" + ""@sentry/core"" ""5.20.0"" + ""@sentry/hub"" ""5.20.0"" + ""@sentry/types"" ""5.20.0"" + ""@sentry/utils"" ""5.20.0"" + cookie ""^0.4.1"" https-proxy-agent ""^5.0.0"" lru_map ""^0.3.3"" tslib ""^1.9.3"" -""@sentry/types@5.19.2"": - version ""5.19.2"" - resolved ""https://registry.yarnpkg.com/@sentry/types/-/types-5.19.2.tgz#ead586f0b64b91c396d3521b938ca25f7b59d655"" - integrity sha512-O6zkW8oM1qK5Uma9+B/UMlmlm9/gkw9MooqycWuEhIaKfDBj/yVbwb/UTiJmNkGc5VJQo0v1uXUZZQt6/Xq1GA== +""@sentry/types@5.20.0"": + version ""5.20.0"" + resolved ""https://registry.yarnpkg.com/@sentry/types/-/types-5.20.0.tgz#0bccbc96ce6fabd115545ec4e70c78ba6c506644"" + integrity sha512-/9tiGiXBRsOKM66HeCpt0iSF0vnAIqHzXgC97icNQIstx/ZA8tcLs9540cHDeaN0cyZUyZF1o8ECqcLXGNODWQ== -""@sentry/utils@5.19.2"": - version ""5.19.2"" - resolved ""https://registry.yarnpkg.com/@sentry/utils/-/utils-5.19.2.tgz#f2819d9de5abc33173019e81955904247e4a8246"" - integrity sha512-gEPkC0CJwvIWqcTcPSdIzqJkJa9N5vZzUZyBvdu1oiyJu7MfazpJEvj3whfJMysSfXJQxoJ+a1IPrA73VY23VA== +""@sentry/utils@5.20.0"": + version ""5.20.0"" + resolved ""https://registry.yarnpkg.com/@sentry/utils/-/utils-5.20.0.tgz#d67636d83a3001008ad442e3a13f6cc88d48aaf6"" + integrity sha512-w0AeAzWEf35h9U9QL/4lgS9MqaTPjeSmQYNU/n4ef3FKr+u8HP68Ra7NZ0adiKgi67Yxr652kWopOLPl7CxvZg== dependencies: - ""@sentry/types"" ""5.19.2"" + ""@sentry/types"" ""5.20.0"" tslib ""^1.9.3"" ""@sindresorhus/is@^0.14.0"": @@ -3695,10 +3695,10 @@ cookie@0.4.0: resolved ""https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -cookie@^0.3.1: - version ""0.3.1"" - resolved ""https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= +cookie@^0.4.1: + version ""0.4.1"" + resolved ""https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== cookiejar@^2.1.0: version ""2.1.2""" 4356fad91a268c81b8dacd2e3d9d07dbdce231a0,2023-10-28 18:37:14,eternasuno,feat(route): add yomujp route (#13595),False,add yomujp route (#13595),feat,"diff --git a/lib/v2/yomujp/level.js b/lib/v2/yomujp/level.js new file mode 100644 index 00000000000000..3aea6201035fa2 --- /dev/null +++ b/lib/v2/yomujp/level.js @@ -0,0 +1,101 @@ +const { parseDate } = require('@/utils/parse-date'); +const cheerio = require('cheerio'); +const got = require('@/utils/got'); +const md5 = require('@/utils/md5'); + +module.exports = async (ctx) => { + const level = formatLevel(ctx.params.level); + const url = new URL('https://yomujp.com/wp-json/wp/v2/posts'); + url.searchParams.append('categories', getLevel(level)); + url.searchParams.append('per_page', parseInt(ctx.query.limit) || 10); + const posts = await get(url); + + const item = posts.map((post) => { + const $ = cheerio.load(post.content.rendered.replace(/[\n\t\r]/g, '')); + const audio = $('audio.vapfem_audio>source'); + const description = $('section') + .slice(2, -2) + .find('.elementor-widget-text-editor>div,.elementor-widget-image>div>img') + .map((_, el) => { + if (el.tagName === 'img') { + return ``; + } else if (el.firstChild.tagName === 'p') { + return `

${$(el.firstChild).html()}

`; + } else { + return `

${$(el).html()}

`; + } + }) + .get() + .join(''); + + return { + title: post.title.rendered, + author: $('section:last-of-type p:first-of-type').text().replace(/^.+:/, ''), + description, + pubDate: parseDate(post.date_gmt), + updated: parseDate(post.modified_gmt), + guid: md5(post.guid.rendered), + link: post.link, + itunes_item_image: $('section:nth-of-type(2) img').attr('src'), + enclosure_url: audio.attr('src'), + enclosure_type: audio.attr('type'), + }; + }); + + ctx.state.data = { + title: level ? `${level.toUpperCase()} | 日本語多読道場` : '日本語多読道場', + link: `https://yomujp.com/${level}`, + description: 'みなさん、こんにちは。 「 日本語多読道場(にほんごたどくどうじょう) Yomujp」は日本語を勉強する人のための読みものサイト(website)です。 日本の地理、食べもの、動物、植物、文化や歴史などを紹介します。', + language: 'ja-jp', + itunes_author: 'Yomujp', + image: 'https://yomujp.com/wp-content/uploads/2023/08/top1-2-300x99-1.png', + item, + }; +}; + +const formatLevel = (level) => { + const lowerCaseLevel = level?.toLowerCase(); + + switch (lowerCaseLevel) { + case 'n6': + return 'n5l'; + + case 'n5l': + case 'n5': + case 'n4': + case 'n3': + case 'n2': + case 'n1': + return lowerCaseLevel; + + default: + return ''; + } +}; + +const getLevel = (level) => { + switch (level) { + case 'n6': + case 'n5l': + return '27'; + case 'n5': + return '26'; + case 'n4': + return '21'; + case 'n3': + return '20'; + case 'n2': + return '19'; + case 'n1': + return '17'; + + default: + return '17,19,20,21,26,27'; + } +}; + +const get = async (url) => { + const response = await got({ method: 'get', url }); + + return response.data; +}; diff --git a/lib/v2/yomujp/maintainer.js b/lib/v2/yomujp/maintainer.js new file mode 100644 index 00000000000000..5eb6ed44cbdfe8 --- /dev/null +++ b/lib/v2/yomujp/maintainer.js @@ -0,0 +1,3 @@ +module.exports = { + '/:level?': ['eternasuno'], +}; diff --git a/lib/v2/yomujp/radar.js b/lib/v2/yomujp/radar.js new file mode 100644 index 00000000000000..8e11ddbd170acd --- /dev/null +++ b/lib/v2/yomujp/radar.js @@ -0,0 +1,13 @@ +module.exports = { + 'yomujp.com': { + _name: '日本語多読道場', + '.': [ + { + title: '等级', + docs: 'https://docs.rsshub.app/zh/routes/reading#ri-ben-yu-duo-du-dao-chang-deng-ji', + source: ['/', '/:level'], + target: '/yomujp/:level', + }, + ], + }, +}; diff --git a/lib/v2/yomujp/router.js b/lib/v2/yomujp/router.js new file mode 100644 index 00000000000000..d5dbd51f17a451 --- /dev/null +++ b/lib/v2/yomujp/router.js @@ -0,0 +1,3 @@ +module.exports = (router) => { + router.get('/:level?', require('./level')); +}; diff --git a/website/docs/routes/reading.md b/website/docs/routes/reading.md index 6deedf5699f8db..6a7316ce459097 100644 --- a/website/docs/routes/reading.md +++ b/website/docs/routes/reading.md @@ -511,6 +511,12 @@ count 的取值范围为 1-12,为防止请求次数过多,推荐设置为 5
+## 日本語多読道場 {#ri-ben-yu-duo-du-dao-chang} + +### 等级 {#ri-ben-yu-duo-du-dao-chang-deng-ji} + + + ## 生物帮 {#sheng-wu-bang} ### 所有栏目 {#sheng-wu-bang-suo-you-lan-mu}" 442d68e1895e02f1b1580d9d7831a35a8a06e293,2023-12-18 22:19:24,DIYgod,feat: remove notOperational routes - new media,False,remove notOperational routes - new media,feat,"diff --git a/assets/radar-rules.js b/assets/radar-rules.js index 3efaa733017636..b25731c043a9ae 100644 --- a/assets/radar-rules.js +++ b/assets/radar-rules.js @@ -346,27 +346,7 @@ }, ], }, - 'buaq.net': { _name: '不安全资讯', '.': [{ title: '不安全资讯', docs: 'http://docs.rsshub.app/routes/new-media#bu-an-quan', source: '/', target: '/buaq' }] }, 'jian-ning.com': { _name: '建宁闲谈', '.': [{ title: '文章', docs: 'https://docs.rsshub.app/routes/blog#jian-ning-xian-tan', source: '/*', target: '/blogs/jianning' }] }, - 'matataki.io': { - _name: 'matataki', - www: [ - { title: '最热作品', docs: 'https://docs.rsshub.app/routes/new-media#matataki', source: '/article/', target: '/matataki/posts/hot' }, - { title: '最新作品', docs: 'https://docs.rsshub.app/routes/new-media#matataki', source: '/article/latest', target: '/matataki/posts/latest' }, - { title: '作者创作', docs: 'https://docs.rsshub.app/routes/new-media#matataki', source: '/user/:uid', target: (params) => `/matataki/users/${params.uid}/posts` }, - { title: 'Fan票关联作品', docs: 'https://docs.rsshub.app/routes/new-media#matataki', source: ['/token/:tokenId', '/token/:tokenId/circle'], target: (params) => `/matataki/tokens/${params.tokenId}/posts` }, - { - title: '标签关联作品', - docs: 'https://docs.rsshub.app/routes/new-media#matataki', - source: ['/tag/:tagId'], - target: (params, url) => { - const tagName = new URL(url).searchParams.get('name'); - return `/matataki/tags/${params.tagId}/${tagName}/posts`; - }, - }, - { title: '收藏夹', docs: 'https://docs.rsshub.app/routes/new-media#matataki', source: '/user/:uid/favlist/:fid', target: (params) => `/matataki/users/${params.uid}/favorites/${params.fid}/posts` }, - ], - }, 'eventernote.com': { _name: 'Eventernote', www: [{ title: '声优活动及演唱会', docs: 'https://docs.rsshub.app/routes/anime#eventernote', source: '/actors/:name/:id/events', target: '/eventernote/actors/:name/:id' }] }, 'huya.com': { _name: '虎牙直播', '.': [{ title: '直播间开播', docs: 'https://docs.rsshub.app/routes/live#hu-ya-zhi-bo-zhi-bo-jian-kai-bo', source: '/:id', target: '/huya/live/:id' }] }, 'craigslist.org': { _name: 'Craigslist', '.': [{ title: '商品搜索列表', docs: 'https://docs.rsshub.app/routes/shopping#craigslist' }] }, diff --git a/lib/radar-rules.js b/lib/radar-rules.js index 4a54c681eae28a..bb6356062e3d26 100644 --- a/lib/radar-rules.js +++ b/lib/radar-rules.js @@ -925,17 +925,6 @@ module.exports = { }, ], }, - 'buaq.net': { - _name: '不安全资讯', - '.': [ - { - title: '不安全资讯', - docs: 'http://docs.rsshub.app/routes/new-media#bu-an-quan', - source: '/', - target: '/buaq', - }, - ], - }, 'jian-ning.com': { _name: '建宁闲谈', '.': [ @@ -947,50 +936,6 @@ module.exports = { }, ], }, - 'matataki.io': { - _name: 'matataki', - www: [ - { - title: '最热作品', - docs: 'https://docs.rsshub.app/routes/new-media#matataki', - source: '/article/', - target: '/matataki/posts/hot', - }, - { - title: '最新作品', - docs: 'https://docs.rsshub.app/routes/new-media#matataki', - source: '/article/latest', - target: '/matataki/posts/latest', - }, - { - title: '作者创作', - docs: 'https://docs.rsshub.app/routes/new-media#matataki', - source: '/user/:uid', - target: (params) => `/matataki/users/${params.uid}/posts`, - }, - { - title: 'Fan票关联作品', - docs: 'https://docs.rsshub.app/routes/new-media#matataki', - source: ['/token/:tokenId', '/token/:tokenId/circle'], - target: (params) => `/matataki/tokens/${params.tokenId}/posts`, - }, - { - title: '标签关联作品', - docs: 'https://docs.rsshub.app/routes/new-media#matataki', - source: ['/tag/:tagId'], - target: (params, url) => { - const tagName = new URL(url).searchParams.get('name'); - return `/matataki/tags/${params.tagId}/${tagName}/posts`; - }, - }, - { - title: '收藏夹', - docs: 'https://docs.rsshub.app/routes/new-media#matataki', - source: '/user/:uid/favlist/:fid', - target: (params) => `/matataki/users/${params.uid}/favorites/${params.fid}/posts`, - }, - ], - }, 'huya.com': { _name: '虎牙直播', '.': [ diff --git a/lib/router.js b/lib/router.js index 0443025b3b253a..fcb036837fc866 100644 --- a/lib/router.js +++ b/lib/router.js @@ -40,9 +40,6 @@ router.get('/mzitu/tag/:tag', lazyloadRouteHandler('./routes/mzitu/tag')); // pixiv-fanbox router.get('/fanbox/:user?', lazyloadRouteHandler('./routes/fanbox/main')); -// 法律白話文運動 -router.get('/plainlaw/archives', lazyloadRouteHandler('./routes/plainlaw/archives.js')); - // Dockone router.get('/dockone/weekly', lazyloadRouteHandler('./routes/dockone/weekly')); @@ -51,9 +48,6 @@ router.get('/zcfy', lazyloadRouteHandler('./routes/zcfy/index')); router.get('/zcfy/index', lazyloadRouteHandler('./routes/zcfy/index')); // 废弃 router.get('/zcfy/hot', lazyloadRouteHandler('./routes/zcfy/hot')); -// 今日头条 -router.get('/jinritoutiao/keyword/:keyword', lazyloadRouteHandler('./routes/jinritoutiao/keyword')); - // Disqus router.get('/disqus/posts/:forum', lazyloadRouteHandler('./routes/disqus/posts')); @@ -131,9 +125,6 @@ router.get('/one', lazyloadRouteHandler('./routes/one/index')); // Thunderbird router.get('/thunderbird/release', lazyloadRouteHandler('./routes/thunderbird/release')); -// tuicool -router.get('/tuicool/mags/:type', lazyloadRouteHandler('./routes/tuicool/mags')); - // Hexo router.get('/hexo/next/:url', lazyloadRouteHandler('./routes/hexo/next')); router.get('/hexo/yilia/:url', lazyloadRouteHandler('./routes/hexo/yilia')); @@ -169,9 +160,6 @@ router.get('/wikipedia/mainland', lazyloadRouteHandler('./routes/wikipedia/mainl // 联合国 United Nations router.get('/un/scveto', lazyloadRouteHandler('./routes/un/scveto')); -// e 公司 -// router.get('/egsea/flash', lazyloadRouteHandler('./routes/egsea/flash')); - // 选股宝 router.get('/xuangubao/subject/:subject_id', lazyloadRouteHandler('./routes/xuangubao/subject')); @@ -493,7 +481,6 @@ router.get('/geekpark/breakingnews', lazyloadRouteHandler('./routes/geekpark/bre // 百度 router.get('/baidu/doodles', lazyloadRouteHandler('./routes/baidu/doodles')); // router.get('/baidu/topwords/:boardId?', lazyloadRouteHandler('./routes/baidu/topwords')); -router.get('/baidu/daily', lazyloadRouteHandler('./routes/baidu/daily')); // 搜狗 router.get('/sogou/doodles', lazyloadRouteHandler('./routes/sogou/doodles')); @@ -513,13 +500,6 @@ router.get('/gnn/gnn', lazyloadRouteHandler('./routes/gnn/gnn')); // a9vg游戏新闻 router.get('/a9vg/a9vg', lazyloadRouteHandler('./routes/a9vg/a9vg')); -// IT桔子 -router.get('/itjuzi/invest', lazyloadRouteHandler('./routes/itjuzi/invest')); -router.get('/itjuzi/merge', lazyloadRouteHandler('./routes/itjuzi/merge')); - -// 探物 -router.get('/tanwu/products', lazyloadRouteHandler('./routes/tanwu/products')); - // GitChat router.get('/gitchat/newest/:category?/:selected?', lazyloadRouteHandler('./routes/gitchat/newest')); @@ -607,7 +587,6 @@ router.get('/tingdiantz/95598/:province/:city/:district?', lazyloadRouteHandler( // PMCAFF router.get('/pmcaff/list/:typeid', lazyloadRouteHandler('./routes/pmcaff/list')); router.get('/pmcaff/feed/:typeid', lazyloadRouteHandler('./routes/pmcaff/feed')); -router.get('/pmcaff/user/:userid', lazyloadRouteHandler('./routes/pmcaff/user')); // icourse163 router.get('/icourse163/newest', lazyloadRouteHandler('./routes/icourse163/newest')); @@ -706,10 +685,6 @@ router.get('/duozhi', lazyloadRouteHandler('./routes/duozhi')); // 高清电台 router.get('/gaoqing/latest', lazyloadRouteHandler('./routes/gaoqing/latest')); -// 鲸跃汽车 -router.get('/whalegogo/home', lazyloadRouteHandler('./routes/whalegogo/home')); -router.get('/whalegogo/portal/:type_id/:tagid?', lazyloadRouteHandler('./routes/whalegogo/portal')); - // LeetCode // router.get('/leetcode/articles', lazyloadRouteHandler('./routes/leetcode/articles')); router.get('/leetcode/submission/us/:user', lazyloadRouteHandler('./routes/leetcode/check-us')); @@ -725,9 +700,6 @@ router.get('/sketch/updates', lazyloadRouteHandler('./routes/sketch/updates')); // 每日安全 router.get('/security/pulses', lazyloadRouteHandler('./routes/security/pulses')); -// DoNews -router.get('/donews/:column?', lazyloadRouteHandler('./routes/donews/index')); - // WeGene router.get('/wegene/column/:type/:category', lazyloadRouteHandler('./routes/wegene/column')); router.get('/wegene/newest', lazyloadRouteHandler('./routes/wegene/newest')); @@ -739,9 +711,6 @@ router.get('/instapaper/person/:name', lazyloadRouteHandler('./routes/instapaper router.get('/ui-cn/article', lazyloadRouteHandler('./routes/ui-cn/article')); router.get('/ui-cn/user/:id', lazyloadRouteHandler('./routes/ui-cn/user')); -// 决胜网 -router.get('/juesheng', lazyloadRouteHandler('./routes/juesheng')); - // 一些博客 // 敬维-以认真的态度做完美的事情: https://jingwei.link/ router.get('/blogs/jingwei.link', lazyloadRouteHandler('./routes/blogs/jingwei_link')); @@ -755,9 +724,6 @@ router.get('/blogs/wang54/:id?', lazyloadRouteHandler('./routes/blogs/wang54')); // WordPress router.get('/blogs/wordpress/:domain/:https?', lazyloadRouteHandler('./routes/blogs/wordpress')); -// 西祠胡同 -router.get('/xici/:id?', lazyloadRouteHandler('./routes/xici')); - // 今日热榜 migrated to v2 // router.get('/tophub/:id', lazyloadRouteHandler('./routes/tophub')); @@ -819,15 +785,9 @@ router.get('/matters/author/:uid', lazyloadRouteHandler('./routes/matters/author // MobData router.get('/mobdata/report', lazyloadRouteHandler('./routes/mobdata/report')); -// 谷雨 -router.get('/tencent/guyu/channel/:name', lazyloadRouteHandler('./routes/tencent/guyu/channel')); - // 古诗文网 router.get('/gushiwen/recommend/:annotation?', lazyloadRouteHandler('./routes/gushiwen/recommend')); -// 电商在线 -router.get('/imaijia/category/:category', lazyloadRouteHandler('./routes/imaijia/category')); - // 21财经 router.get('/21caijing/channel/:name', lazyloadRouteHandler('./routes/21caijing/channel')); @@ -898,10 +858,6 @@ router.get('/paidai/news', lazyloadRouteHandler('./routes/paidai/news')); // 漫画db router.get('/manhuadb/comics/:id', lazyloadRouteHandler('./routes/manhuadb/comics')); -// 装备前线 -router.get('/zfrontier/postlist/:type', lazyloadRouteHandler('./routes/zfrontier/postlist')); -router.get('/zfrontier/board/:boardId', lazyloadRouteHandler('./routes/zfrontier/board_postlist')); - // Hpoi 手办维基 router.get('/hpoi/info/:type?', lazyloadRouteHandler('./routes/hpoi/info')); router.get('/hpoi/:category/:words', lazyloadRouteHandler('./routes/hpoi')); @@ -925,7 +881,7 @@ router.get('/enclavebooks/collection/:uid', lazyloadRouteHandler('./routes/encla router.get('/digitaling/index', lazyloadRouteHandler('./routes/digitaling/index')); // 数英网文章专题 -router.get('/digitaling/articles/:category/:subcate', lazyloadRouteHandler('./routes/digitaling/article')); +router.get('/digitaling/articles/:category/:subcate?', lazyloadRouteHandler('./routes/digitaling/article')); // 数英网项目专题 router.get('/digitaling/projects/:category', lazyloadRouteHandler('./routes/digitaling/project')); @@ -939,9 +895,6 @@ router.get('/maxnews/dota2', lazyloadRouteHandler('./routes/maxnews/dota2')); // 柠檬 - 私房歌 router.get('/ningmeng/song', lazyloadRouteHandler('./routes/ningmeng/song')); -// 紫竹张先生 -router.get('/zzz/:category?/:language?', lazyloadRouteHandler('./routes/zzz')); - // AlgoCasts router.get('/algocasts', lazyloadRouteHandler('./routes/algocasts/all')); @@ -982,19 +935,12 @@ router.get('/dekudeals/:type', lazyloadRouteHandler('./routes/dekudeals')); // 快科技(原驱动之家) // router.get('/kkj/news', lazyloadRouteHandler('./routes/kkj/news')); -// sixthtone -router.get('/sixthtone/news', lazyloadRouteHandler('./routes/sixthtone/news')); - // AI研习社 router.get('/aiyanxishe/:id/:sort?', lazyloadRouteHandler('./routes/aiyanxishe/home')); // 活动行 router.get('/huodongxing/explore', lazyloadRouteHandler('./routes/hdx/explore')); -// 巴比特作者专栏 -router.get('/8btc/:authorid', lazyloadRouteHandler('./routes/8btc/author')); -router.get('/8btc/news/flash', lazyloadRouteHandler('./routes/8btc/news/flash')); - // LWN.net Alerts router.get('/lwn/alerts/:distributor', lazyloadRouteHandler('./routes/lwn/alerts')); @@ -1008,9 +954,6 @@ router.get('/lolapp/article/:uuid', lazyloadRouteHandler('./routes/lolapp/articl // 左岸读书 router.get('/zreading', lazyloadRouteHandler('./routes/zreading/home')); -// NBA -router.get('/nba/app_news', lazyloadRouteHandler('./routes/nba/app_news')); - // 天津产权交易中心 router.get('/tprtc/cqzr', lazyloadRouteHandler('./routes/tprtc/cqzr')); router.get('/tprtc/qyzc', lazyloadRouteHandler('./routes/tprtc/qyzc')); @@ -1049,9 +992,6 @@ router.get('/meituan/tech/home', lazyloadRouteHandler('./routes//meituan/tech/ho router.get('/codeceo/home', lazyloadRouteHandler('./routes/codeceo/home')); router.get('/codeceo/:type/:category?', lazyloadRouteHandler('./routes/codeceo/category')); -// BOF -router.get('/bof/home', lazyloadRouteHandler('./routes/bof/home')); - // 爱发电 router.get('/afdian/explore/:type?/:category?', lazyloadRouteHandler('./routes/afdian/explore')); router.get('/afdian/dynamic/:uid', lazyloadRouteHandler('./routes/afdian/dynamic')); @@ -1079,7 +1019,6 @@ router.get('/wikihow/category/:category/:type', lazyloadRouteHandler('./routes/w router.get('/10000link/news/:category?', lazyloadRouteHandler('./routes/10000link/news')); // 一兜糖 -router.get('/yidoutang/index', lazyloadRouteHandler('./routes/yidoutang/index.js')); router.get('/yidoutang/guide', lazyloadRouteHandler('./routes/yidoutang/guide.js')); router.get('/yidoutang/mtest', lazyloadRouteHandler('./routes/yidoutang/mtest.js')); router.get('/yidoutang/case/:type', lazyloadRouteHandler('./routes/yidoutang/case.js')); @@ -1158,9 +1097,6 @@ router.get('/weidian/goods/:id', lazyloadRouteHandler('./routes/weidian/goods')) // 有赞 router.get('/youzan/goods/:id', lazyloadRouteHandler('./routes/youzan/goods')); -// 币世界快讯 -router.get('/bishijie/kuaixun', lazyloadRouteHandler('./routes/bishijie/kuaixun')); - // 顺丰丰桥 router.get('/sf/sffq-announce', lazyloadRouteHandler('./routes/sf/sffq-announce')); @@ -1205,12 +1141,6 @@ router.get('/nfmovies/:id?', lazyloadRouteHandler('./routes/nfmovies/index')); // 书友社区 router.get('/andyt/:view?', lazyloadRouteHandler('./routes/andyt/index')); -// 品途商业评论 -router.get('/pintu360/:type?', lazyloadRouteHandler('./routes/pintu360/index')); - -// engadget中国版 -router.get('/engadget-cn', lazyloadRouteHandler('./routes/engadget/home')); - // engadget router.get('/engadget/:lang?', lazyloadRouteHandler('./routes/engadget/home')); @@ -1247,9 +1177,6 @@ router.get('/zhanqi/room/:id', lazyloadRouteHandler('./routes/zhanqi/room')); // 酒云网 router.get('/wineyun/:category', lazyloadRouteHandler('./routes/wineyun')); -// 快知 -router.get('/kzfeed/topic/:id', lazyloadRouteHandler('./routes/kzfeed/topic')); - // X-MOL化学资讯平台 // router.get('/x-mol/news/:tag?', lazyloadRouteHandler('./routes/x-mol/news.js')); // router.get('/x-mol/paper/:type/:magazine', lazyloadRouteHandler('./routes/x-mol/paper')); @@ -1535,9 +1462,6 @@ router.get('/lagou/jobs/:position/:city', lazyloadRouteHandler('./routes/lagou/j router.get('/yzu/home/:type', lazyloadRouteHandler('./routes/universities/yzu/home')); router.get('/yzu/yjszs/:type', lazyloadRouteHandler('./routes/universities/yzu/yjszs')); -// 德国新闻社卫健新闻 -router.get('/krankenkassen', lazyloadRouteHandler('./routes/krankenkassen')); - // 桂林航天工业学院 router.get('/guat/news/:type?', lazyloadRouteHandler('./routes/guat/news')); @@ -1821,9 +1745,6 @@ router.get('/missevan/drama/:id', lazyloadRouteHandler('./routes/missevan/drama' // AMD router.get('/amd/graphicsdrivers/:id/:rid?', lazyloadRouteHandler('./routes/amd/graphicsdrivers')); -// 电商报 -router.get('/dsb/area/:area', lazyloadRouteHandler('./routes/dsb/area')); - // 靠谱新闻 router.get('/kaopunews/:language?', lazyloadRouteHandler('./routes/kaopunews')); @@ -1857,7 +1778,6 @@ router.get('/kuaibao', lazyloadRouteHandler('./routes/kuaibao/index')); // SocialBeta router.get('/socialbeta/home', lazyloadRouteHandler('./routes/socialbeta/home')); -router.get('/socialbeta/hunt', lazyloadRouteHandler('./routes/socialbeta/hunt')); // 东方我乐多丛志 router.get('/touhougarakuta/:language/:type', lazyloadRouteHandler('./routes/touhougarakuta')); @@ -1896,12 +1816,6 @@ router.get('/tencent/bigdata', lazyloadRouteHandler('./routes/tencent/bigdata/in // 搜韵网 router.get('/souyun/today', lazyloadRouteHandler('./routes/souyun/today')); -// 生物谷 -router.get('/bioon/latest', lazyloadRouteHandler('./routes/bioon/latest')); - -// soomal -router.get('/soomal/topics/:category/:language?', lazyloadRouteHandler('./routes/soomal/topics')); - // JustRun router.get('/justrun', lazyloadRouteHandler('./routes/justrun/index')); @@ -1943,9 +1857,6 @@ router.get('/wenxuecity/bbs/:cat/:elite?', lazyloadRouteHandler('./routes/wenxue router.get('/wenxuecity/hot/:cid', lazyloadRouteHandler('./routes/wenxuecity/hot')); router.get('/wenxuecity/news', lazyloadRouteHandler('./routes/wenxuecity/news')); -// 不安全 -router.get('/buaq', lazyloadRouteHandler('./routes/buaq/index')); - // 快出海 router.get('/kchuhai', lazyloadRouteHandler('./routes/kchuhai/index')); @@ -1970,9 +1881,6 @@ router.get('/blogs/jianning', lazyloadRouteHandler('./routes/blogs/jianning')); // 互动吧 router.get('/hudongba/:city/:id', lazyloadRouteHandler('./routes/hudongba/index')); -// 飞雪娱乐网 -router.get('/feixuew/:id?', lazyloadRouteHandler('./routes/feixuew/index')); - // 1X router.get('/1x/:category?', lazyloadRouteHandler('./routes/1x/index')); @@ -1982,15 +1890,8 @@ router.get('/jx3/:caty?', lazyloadRouteHandler('./routes/jx3/news')); // 泉州市跨境电子商务协会 router.get('/qzcea/:caty?', lazyloadRouteHandler('./routes/qzcea/index')); -// 福利年 -router.get('/fulinian/:caty?', lazyloadRouteHandler('./routes/fulinian/index')); - // CGTN -router.get('/cgtn/top', lazyloadRouteHandler('./routes/cgtn/top')); router.get('/cgtn/most/:type?/:time?', lazyloadRouteHandler('./routes/cgtn/most')); - -router.get('/cgtn/pick', lazyloadRouteHandler('./routes/cgtn/pick')); - router.get('/cgtn/opinions', lazyloadRouteHandler('./routes/cgtn/opinions')); // AppSales @@ -2042,9 +1943,6 @@ router.get('/gov/taiwan/mnd', lazyloadRouteHandler('./routes/gov/taiwan/mnd')); // 高科技行业门户 router.get('/ofweek/news', lazyloadRouteHandler('./routes/ofweek/news')); -// 八阕 -router.get('/popyard/:caty?', lazyloadRouteHandler('./routes/popyard/index')); - // World Trade Organization router.get('/wto/dispute-settlement/:year?', lazyloadRouteHandler('./routes/wto/dispute-settlement')); @@ -2054,12 +1952,6 @@ router.get('/forum4399/:mtag', lazyloadRouteHandler('./routes/game4399/forum')); // 国防科技大学 router.get('/nudt/yjszs/:id?', lazyloadRouteHandler('./routes/universities/nudt/yjszs')); -// 全现在 -router.get('/allnow/column/:id', lazyloadRouteHandler('./routes/allnow/column')); -router.get('/allnow/tag/:id', lazyloadRouteHandler('./routes/allnow/tag')); -router.get('/allnow/user/:id', lazyloadRouteHandler('./routes/allnow/user')); -router.get('/allnow', lazyloadRouteHandler('./routes/allnow/index')); - // dev.to router.get('/dev.to/top/:period', lazyloadRouteHandler('./routes/dev.to/top')); @@ -2110,12 +2002,6 @@ router.get('/nwpu/:column', lazyloadRouteHandler('./routes/nwpu/index')); // 美国联邦最高法院 router.get('/us/supremecourt/argument_audio/:year?', lazyloadRouteHandler('./routes/us/supremecourt/argument_audio')); -// 未名新闻 -router.get('/mitbbs/:caty?', lazyloadRouteHandler('./routes/mitbbs/index')); - -// 贾真的电商108将 -router.get('/jiazhen108', lazyloadRouteHandler('./routes/jiazhen108/index')); - // 优设网 router.get('/uisdc/talk/:sort?', lazyloadRouteHandler('./routes/uisdc/talk')); router.get('/uisdc/hangye/:caty?', lazyloadRouteHandler('./routes/uisdc/hangye')); @@ -2123,9 +2009,6 @@ router.get('/uisdc/news', lazyloadRouteHandler('./routes/uisdc/news')); router.get('/uisdc/zt/:title?', lazyloadRouteHandler('./routes/uisdc/zt')); router.get('/uisdc/topic/:title?/:sort?', lazyloadRouteHandler('./routes/uisdc/topic')); -// 中国劳工观察 -router.get('/chinalaborwatch/reports/:lang?/:industry?', lazyloadRouteHandler('./routes/chinalaborwatch/reports')); - // 美国中央情报局 router.get('/cia/foia-annual-report', lazyloadRouteHandler('./routes/us/cia/foia-annual-report')); @@ -2135,15 +2018,9 @@ router.get('/everything/changes', lazyloadRouteHandler('./routes/everything/chan // 中国劳工通讯 router.get('/clb/commentary/:lang?', lazyloadRouteHandler('./routes/clb/commentary')); -// 国际教育研究所 -router.get('/iie/blog', lazyloadRouteHandler('./routes/iie/blog')); - // 超理论坛 router.get('/chaoli/:channel?', lazyloadRouteHandler('./routes/chaoli/index')); -// Polar -router.get('/polar/blog', lazyloadRouteHandler('./routes/polar/blog')); - // XYplorer router.get('/xyplorer/whatsnew', lazyloadRouteHandler('./routes/xyplorer/whatsnew')); @@ -2166,23 +2043,6 @@ router.get('/qstheory/:category?', lazyloadRouteHandler('./routes/qstheory/index // 生命时报 router.get('/lifetimes/:category?', lazyloadRouteHandler('./routes/lifetimes/index')); -// MakeUseOf -router.get('/makeuseof/:category?', lazyloadRouteHandler('./routes/makeuseof/index')); - -// 瞬Matataki -// 热门作品 -router.get('/matataki/posts/hot/:ipfsFlag?', lazyloadRouteHandler('./routes/matataki/site/posts/scoreranking')); -// 最新作品 -router.get('/matataki/posts/latest/:ipfsFlag?', lazyloadRouteHandler('./routes/matataki/site/posts/timeranking')); -// 作者创作 -router.get('/matataki/users/:authorId/posts/:ipfsFlag?', lazyloadRouteHandler('./routes/matataki/site/posts/author')); -// Fan票关联作品 -router.get('/matataki/tokens/:id/posts/:filterCode/:ipfsFlag?', lazyloadRouteHandler('./routes/matataki/site/posts/token')); -// 标签关联作品 -router.get('/matataki/tags/:tagId/:tagName/posts/:ipfsFlag?', lazyloadRouteHandler('./routes/matataki/site/posts/tag')); -// 收藏夹 -router.get('/matataki/users/:userId/favorites/:favoriteListId/posts/:ipfsFlag?', lazyloadRouteHandler('./routes/matataki/site/posts/favorite')); - // Zhimap 知识导图社区 router.get('/zhimap/:categoryUuid?/:recommend?', lazyloadRouteHandler('./routes/zhimap/index')); @@ -2203,9 +2063,6 @@ router.get('/mind42/:caty?', lazyloadRouteHandler('./routes/mind42/index')); // 幕布网 router.get('/mubu/explore/:category?/:title?', lazyloadRouteHandler('./routes/mubu/explore')); -// Esquirehk -router.get('/esquirehk/tag/:id', lazyloadRouteHandler('./routes/esquirehk/tag')); - // 国家普通话测试 杭州市 router.get('/putonghua', lazyloadRouteHandler('./routes/putonghua/hangzhou')); @@ -2220,9 +2077,6 @@ router.get('/yinxiang/card/:id', lazyloadRouteHandler('./routes/yinxiang/card')) router.get('/yinxiang/personal/:id', lazyloadRouteHandler('./routes/yinxiang/personal')); router.get('/yinxiang/category/:id', lazyloadRouteHandler('./routes/yinxiang/category')); -// 遠見 gvm.com.tw -router.get('/gvm/index/:category?', lazyloadRouteHandler('./routes/gvm/index')); - // 触乐 router.get('/chuapp/index/:category?', lazyloadRouteHandler('./routes/chuapp/index')); @@ -2247,9 +2101,6 @@ router.get('/ustr/press-releases/:year?/:month?', lazyloadRouteHandler('./routes // 游戏动力 router.get('/vgn/:platform?', lazyloadRouteHandler('./routes/vgn/index')); -// 国际能源署 -router.get('/iea/:category?', lazyloadRouteHandler('./routes/iea/index')); - // The Brain router.get('/thebrain/:category?', lazyloadRouteHandler('./routes/thebrain/blog')); @@ -2265,9 +2116,6 @@ router.get('/marginnote/tag/:id?', lazyloadRouteHandler('./routes/marginnote/tag // ASML router.get('/asml/press-releases', lazyloadRouteHandler('./routes/asml/press-releases')); -// 中国机械工程学会 -router.get('/cmes/news/:category?', lazyloadRouteHandler('./routes/cmes/news')); - // Craigslist router.get('/craigslist/:location/:type', lazyloadRouteHandler('./routes/craigslist/search')); @@ -2282,12 +2130,6 @@ router.get('/mathunion/fields-medal', lazyloadRouteHandler('./routes/mathunion/f // ACM router.get('/acm/amturingaward', lazyloadRouteHandler('./routes/acm/amturingaward')); -// 網路天文館 -router.get('/tam/forecast', lazyloadRouteHandler('./routes/tam/forecast')); - -// Day One -router.get('/dayone/blog', lazyloadRouteHandler('./routes/dayone/blog')); - // 滴答清单 router.get('/dida365/habit/checkins', lazyloadRouteHandler('./routes/dida365/habit-checkins')); @@ -2297,24 +2139,12 @@ router.get('/ditto/changes/:type?', lazyloadRouteHandler('./routes/ditto/changes // iDaily 每日环球视野 router.get('/idaily/today', lazyloadRouteHandler('./routes/idaily/index')); -// 北屋 -router.get('/northhouse/:category?', lazyloadRouteHandler('./routes/northhouse/index')); - // Oak Ridge National Laboratory router.get('/ornl/news', lazyloadRouteHandler('./routes/ornl/news')); // 信阳师范学院 自考办 router.get('/xynu/zkb/:category', lazyloadRouteHandler('./routes/universities/xynu/zkb')); -// Bell Labs -router.get('/bell-labs/events-news/:category?', lazyloadRouteHandler('./routes/bell-labs/events-news.js')); - -// 中国科学院青年创新促进会 -router.get('/yicas/blog', lazyloadRouteHandler('./routes/yicas/blog')); - -// 九三学社 -router.get('/93/:category?', lazyloadRouteHandler('./routes/93/index')); - // DailyArt router.get('/dailyart/:language?', lazyloadRouteHandler('./routes/dailyart/index')); @@ -2333,21 +2163,12 @@ router.get('/nace/blog/:sort?', lazyloadRouteHandler('./routes/nace/blog')); // Semiconductor Industry Association router.get('/semiconductors/latest-news', lazyloadRouteHandler('./routes/semiconductors/latest-news')); -// VOA News -router.get('/voa/day-photos', lazyloadRouteHandler('./routes/voa/day-photos')); - // Voice of America router.get('/voa/:language/:channel?', lazyloadRouteHandler('./routes/voa/index')); -// 游戏葡萄 -router.get('/gamegrape/:id?', lazyloadRouteHandler('./routes/gamegrape/index')); - // 阳光高考 router.get('/chsi/zszcgd/:category?', lazyloadRouteHandler('./routes/chsi/zszcgd')); -// 眾新聞 -router.get('/hkcnews/news/:category?', lazyloadRouteHandler('./routes/hkcnews/news')); - // AnyTXT router.get('/anytxt/release-notes', lazyloadRouteHandler('./routes/anytxt/release-notes')); @@ -2390,12 +2211,6 @@ router.get('/cqut/libnews', lazyloadRouteHandler('./routes/universities/cqut/cqu // 城农 Growin' City router.get('/growincity/news/:id?', lazyloadRouteHandler('./routes/growincity/news')); -// Thrillist -router.get('/thrillist/:tag?', lazyloadRouteHandler('./routes/thrillist/index')); - -// 丁香园 -router.get('/dxy/vaccine/:province?/:city?/:location?', lazyloadRouteHandler('./routes/dxy/vaccine')); - // 中国庭审公开网 router.get('/tingshen', lazyloadRouteHandler('./routes/tingshen/tingshen')); @@ -2463,9 +2278,6 @@ router.get('/furaffinity/favorites/:username/:nsfw?', lazyloadRouteHandler('./ro router.get('/furaffinity/submission_comments/:id', lazyloadRouteHandler('./routes/furaffinity/submission_comments')); router.get('/furaffinity/journal_comments/:id', lazyloadRouteHandler('./routes/furaffinity/journal_comments')); -// 亿欧网 -router.get('/iyiou', lazyloadRouteHandler('./routes/iyiou')); - // 香港商报 router.get('/hkcd/pdf', lazyloadRouteHandler('./routes/hkcd/pdf')); @@ -2483,9 +2295,6 @@ router.get('/trakt/collection/:username/:type?', lazyloadRouteHandler('./routes/ // 全球化智库 router.get('/ccg/:category?', lazyloadRouteHandler('./routes/ccg/index')); -// 中国橡胶网 -router.get('/cria/news/:id?', lazyloadRouteHandler('./routes/cria/news')); - // 灵异网 router.get('/lingyi/:category', lazyloadRouteHandler('./routes/lingyi/index')); @@ -2526,9 +2335,6 @@ router.get('/hugo/releases', lazyloadRouteHandler('./routes/hugo/releases')); // 东立出版 router.get('/tongli/news/:type', lazyloadRouteHandler('./routes/tongli/news')); -// OR -router.get('/or/:id?', lazyloadRouteHandler('./routes/or')); - // 字型故事 router.get('/fontstory', lazyloadRouteHandler('./routes/fontstory/tw')); @@ -2571,12 +2377,6 @@ router.get('/tanchinese/:category?', lazyloadRouteHandler('./routes/tanchinese') // yuzu emulator router.get('/yuzu-emu/entry', lazyloadRouteHandler('./routes/yuzu-emu/entry')); -// Resources - The Partnership on AI -router.get('/partnershiponai/resources', lazyloadRouteHandler('./routes/partnershiponai/resources')); - -// Common App -router.get('/commonapp/blog', lazyloadRouteHandler('./routes/commonapp/blog')); - // Europa Press router.get('/europapress/:category?', lazyloadRouteHandler('./routes/europapress')); @@ -2609,9 +2409,6 @@ router.get('/x410/news', lazyloadRouteHandler('./routes/x410/news')); router.get('/micmicidol', lazyloadRouteHandler('./routes/micmicidol/latest')); router.get('/micmicidol/search/:label', lazyloadRouteHandler('./routes/micmicidol/search')); -// 香港高登 -router.get('/hkgolden/:id?/:limit?/:sort?', lazyloadRouteHandler('./routes/hkgolden')); - // 香港討論區 router.get('/discuss/:fid', lazyloadRouteHandler('./routes/discuss')); diff --git a/lib/routes/199it/category.js b/lib/routes/199it/category.js index 489505265a2ffb..ae8455c96b8183 100644 --- a/lib/routes/199it/category.js +++ b/lib/routes/199it/category.js @@ -1,6 +1,6 @@ const utils = require('./utils'); -const rootUrl = 'http://www.199it.com/archives/category/'; +const rootUrl = 'https://www.199it.com/archives/category'; module.exports = async (ctx) => { const keyword = ctx.params.caty.split('|').join('/'); diff --git a/lib/routes/199it/tag.js b/lib/routes/199it/tag.js index 7bee423df5fc16..d158e8118836bd 100644 --- a/lib/routes/199it/tag.js +++ b/lib/routes/199it/tag.js @@ -1,6 +1,6 @@ const utils = require('./utils'); -const rootUrl = 'http://www.199it.com/archives/tag/'; +const rootUrl = 'https://www.199it.com/archives/tag'; module.exports = async (ctx) => { const keyword = ctx.params.tag.split('|').join('/'); diff --git a/lib/routes/199it/utils.js b/lib/routes/199it/utils.js index bbbf926541dcfc..2cc478daf7f99d 100644 --- a/lib/routes/199it/utils.js +++ b/lib/routes/199it/utils.js @@ -25,7 +25,7 @@ module.exports = async (ctx, keyword, currentUrl) => { ctx.cache.tryGet(item.link, async () => { const detailResponse = await got({ method: 'get', - url: item.link, + url: `https:${item.link}`, }); const content = cheerio.load(detailResponse.data); diff --git a/lib/routes/8btc/author.js b/lib/routes/8btc/author.js deleted file mode 100644 index 2f04fb41e0d8b8..00000000000000 --- a/lib/routes/8btc/author.js +++ /dev/null @@ -1,49 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const authorid = ctx.params.authorid; - const response = await got.get(`https://webapi.8btc.com/bbt_api/comments/list?author_id=${authorid}&fetch_num=20`); - - const ProcessFeed = (data) => { - const $ = cheerio.load(data); - - // 提取内容 - return $('.bbt-html').html(); - }; - - const items = await Promise.all( - response.data.data.list.map(async (item) => { - const link = `https://www.8btc.com/article/${item.post_id}`; - - const cache = await ctx.cache.get(link); - if (cache) { - return Promise.resolve(JSON.parse(cache)); - } - - const response = await got({ - method: 'get', - url: link, - }); - - const description = ProcessFeed(response.data); - - const single = { - title: item.post.title, - description, - pubDate: item.date_gmt, - link, - author: item.reviewer.name, - }; - ctx.cache.set(link, JSON.stringify(single)); - return Promise.resolve(single); - }) - ); - - ctx.state.data = { - title: '巴比特作者专栏', - link: `https://www.8btc.com/author/${authorid}`, - description: '巴比特作者专栏', - item: items, - }; -}; diff --git a/lib/routes/8btc/news/flash.js b/lib/routes/8btc/news/flash.js deleted file mode 100644 index b3403fa5de378f..00000000000000 --- a/lib/routes/8btc/news/flash.js +++ /dev/null @@ -1,41 +0,0 @@ -const got = require('@/utils/got'); - -module.exports = async (ctx) => { - const response = await got({ - method: 'get', - url: `https://app.blockmeta.com/w1/news/list?num=30&cat_id=4481&page=1`, - headers: { - from: 'web', - Referer: `https://www.8btc.com/flash`, - }, - }); - - const newsflashes = response.data.list; - - let newsflashesList = []; - for (let i = 0; i < newsflashes.length; i++) { - newsflashesList = newsflashesList.concat(newsflashes[i]); - } - - const out = newsflashesList.map((item) => { - const pubDate = item.post_date_format; - const link = item.source.link; - const title = item.title; - const description = item.content; - - const single = { - title, - link, - pubDate, - description, - }; - - return single; - }); - - ctx.state.data = { - title: `快讯 - 巴比特`, - link: `https://www.8btc.com/flash`, - item: out, - }; -}; diff --git a/lib/routes/93/index.js b/lib/routes/93/index.js deleted file mode 100644 index f5468f1ded4b78..00000000000000 --- a/lib/routes/93/index.js +++ /dev/null @@ -1,50 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const category = ctx.params.category || 'lxzn-yzjy'; - - const rootUrl = 'http://www.93.gov.cn'; - const currentUrl = `${rootUrl}/${category}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('li.clearfix a') - .slice(0, 15) - .map((_, item) => { - item = $(item); - return { - title: item.text(), - link: `${rootUrl}${item.attr('href')}`, - pubDate: new Date(item.next().text()).toUTCString(), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('.pageContent').html(); - item.author = content('.pageTitle ul li').eq(1).text().replace('来源:', ''); - - return item; - }) - ) - ); - - ctx.state.data = { - title: $('title').text(), - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/allnow/column.js b/lib/routes/allnow/column.js deleted file mode 100644 index afb29d127860f1..00000000000000 --- a/lib/routes/allnow/column.js +++ /dev/null @@ -1,7 +0,0 @@ -const utils = require('./utils'); - -module.exports = async (ctx) => { - const id = ctx.params.id; - - ctx.state.data = await utils.processItems(ctx, `${utils.rootUrl}/column/${id}`); -}; diff --git a/lib/routes/allnow/index.js b/lib/routes/allnow/index.js deleted file mode 100644 index 16d1f8f0e927c3..00000000000000 --- a/lib/routes/allnow/index.js +++ /dev/null @@ -1,5 +0,0 @@ -const utils = require('./utils'); - -module.exports = async (ctx) => { - ctx.state.data = await utils.processItems(ctx, utils.rootUrl); -}; diff --git a/lib/routes/allnow/tag.js b/lib/routes/allnow/tag.js deleted file mode 100644 index f27a72c28b0d68..00000000000000 --- a/lib/routes/allnow/tag.js +++ /dev/null @@ -1,7 +0,0 @@ -const utils = require('./utils'); - -module.exports = async (ctx) => { - const id = ctx.params.id; - - ctx.state.data = await utils.processItems(ctx, `${utils.rootUrl}/tag/${id}`); -}; diff --git a/lib/routes/allnow/user.js b/lib/routes/allnow/user.js deleted file mode 100644 index 8b4b80eb8f47d5..00000000000000 --- a/lib/routes/allnow/user.js +++ /dev/null @@ -1,7 +0,0 @@ -const utils = require('./utils'); - -module.exports = async (ctx) => { - const id = ctx.params.id; - - ctx.state.data = await utils.processItems(ctx, `${utils.rootUrl}/user/${id}`); -}; diff --git a/lib/routes/allnow/utils.js b/lib/routes/allnow/utils.js deleted file mode 100644 index 5311c4a104422a..00000000000000 --- a/lib/routes/allnow/utils.js +++ /dev/null @@ -1,67 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); - -const rootUrl = 'https://www.allnow.com'; - -module.exports = { - rootUrl, - - processItems: async (ctx, currentUrl) => { - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('.post-list .post') - .slice(0, ctx.params.limit ? parseInt(ctx.params.limit) : 15) - .map((_, item) => { - item = $(item); - - return { - link: `${rootUrl}${item.attr('href')}`, - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - - const content = cheerio.load(detailResponse.data); - - item.author = detailResponse.data.match(/authorName:""(.*?)"",avatar/)[1]; - item.title = content('title') - .text() - .replace(/-全现在官方网站/, ''); - item.pubDate = timezone(parseDate(detailResponse.data.match(/time:""(.*)"",type/)[1]), +8); - item.category = detailResponse.data - .match(/tags:\[(.*)\],columns/)[1] - .split('},') - .map((category) => category.match(/title:""(.*)""/)[1]); - item.description = content('#article-content').html() ?? content('.summary').html() ?? ''; - - content('video').each(function () { - item.description += ``; - }); - - return item; - }) - ) - ); - - return { - title: $('title').text(), - link: currentUrl, - item: items, - description: $('.desc').eq(0).text(), - }; - }, -}; diff --git a/lib/routes/baidu/daily.js b/lib/routes/baidu/daily.js deleted file mode 100644 index 5d4ec6d8f6df90..00000000000000 --- a/lib/routes/baidu/daily.js +++ /dev/null @@ -1,55 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const iconv = require('iconv-lite'); - -module.exports = async (ctx) => { - const host = `https://zhidao.baidu.com/daily?fr=daohang`; - - const response = await got.get(host, { - responseType: 'buffer', - }); - - response.data = iconv.decode(response.data, 'gbk'); - const $ = cheerio.load(response.data); - - const list = $(""li[class=' clearfix']"").get(); - - const items = list.map((item) => { - item = $(item); - - return { - title: item.find('div.daily-cont-top > h2 > a').text(), - description: item.find('div.daily-cont-top > div > a').text(), - link: `https://zhidao.baidu.com/${item.find('div.daily-cont-top > h2 > a').attr('href')}`, - }; - }); - - const result = await Promise.all( - items.map(async (item) => { - const link = item.link; - - const cache = await ctx.cache.get(link); - if (cache) { - return Promise.resolve(JSON.parse(cache)); - } - - const itemReponse = await got.get(link, { - responseType: 'buffer', - }); - const data = iconv.decode(itemReponse.data, 'gbk'); - const itemElement = cheerio.load(data); - - item.description = itemElement('.detail-wp').html(); - - ctx.cache.set(link, JSON.stringify(item)); - return item; - }) - ); - - ctx.state.data = { - title: `知道日报`, - link: host, - description: `每天都知道一点`, - item: result, - }; -}; diff --git a/lib/routes/bell-labs/events-news.js b/lib/routes/bell-labs/events-news.js deleted file mode 100644 index 1130619d20a245..00000000000000 --- a/lib/routes/bell-labs/events-news.js +++ /dev/null @@ -1,70 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -const config = { - events: '.tout-text a', - 'industry-recognition': '.n-block-section .n-block .rich-text p b', - 'press-releases': 'h5 a', -}; - -module.exports = async (ctx) => { - const category = ctx.params.category || 'press-releases'; - - const rootUrl = 'http://www.bell-labs.com'; - const currentUrl = `${rootUrl}/events-news/${category}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - let items = (category === 'industry-recognition' ? $(config[category]).closest('.rich-text') : $(config[category])) - .slice(0, 15) - .map((_, i) => { - let item = $(i); - - if (category === 'industry-recognition') { - item = item.children('.n-link-list').length > 0 ? item.children('.n-link-list') : item.children('p').eq(1); - } - if (item.children('a').attr('href')) { - item = item.children('a'); - } - - return { - title: item.text(), - link: item.attr('href') || currentUrl, - pubDate: new Date(category === 'events' ? item.text().split(':')[0].split(' - ')[0] : category === 'industry-recognition' ? $(i).children('p').eq(0).text() : '').toUTCString(), - - description: category === 'events' ? item.closest('.n-block').next().find('.rich-text').html() : category === 'industry-recognition' ? `

${$(i).find('p').last().text()}

` : '', - }; - }) - .get(); - - if (category === 'press-releases') { - items = await Promise.all( - items.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - content('.social-media-sharing').remove(); - - item.description = content('.layout-content').html(); - item.pubDate = new Date(content('meta[name=""search-updated""]').attr('content')).toUTCString(); - - return item; - }) - ) - ); - } - - ctx.state.data = { - title: $('title').eq(0).text(), - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/bioon/latest.js b/lib/routes/bioon/latest.js deleted file mode 100644 index f2d47df92aca0c..00000000000000 --- a/lib/routes/bioon/latest.js +++ /dev/null @@ -1,51 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const currentUrl = 'http://www.bioon.com'; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - const list = $('#cms_list li[data-i]') - .slice(0, 10) - .map((_, item) => { - item = $(item); - const a = item.find('a'); - - return { - title: a.text(), - link: a.attr('href'), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - - const content = cheerio.load(detailResponse.data); - - const subtitle = content('div.title5 p').text().split(' '); - const pubDate = `${subtitle.slice(-2)[0]} ${subtitle.slice(-1)}`; - - item.pubDate = new Date(pubDate + ' GMT+8').toUTCString(); - item.description = content('div.text3').html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: '生物谷 - 最新资讯', - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/bishijie/kuaixun.js b/lib/routes/bishijie/kuaixun.js deleted file mode 100644 index 4a582dcb3b8bb0..00000000000000 --- a/lib/routes/bishijie/kuaixun.js +++ /dev/null @@ -1,21 +0,0 @@ -const buildData = require('@/utils/common-config'); - -module.exports = async (ctx) => { - const link = `https://www.bishijie.com/kuaixun/`; - const host = `https://www.bishijie.com`; - ctx.state.data = await buildData({ - link, - url: link, - title: `%title%`, - params: { - title: '币世界快讯列表', - host, - }, - item: { - item: 'ul.newscontainer > li', - title: `$('div.content a h3').text()`, - link: `$('div.content a').attr('href')`, - description: `$('div.content div.news-content div').html()`, - }, - }); -}; diff --git a/lib/routes/bof/home.js b/lib/routes/bof/home.js deleted file mode 100644 index b5d29df319e6a8..00000000000000 --- a/lib/routes/bof/home.js +++ /dev/null @@ -1,42 +0,0 @@ -const got = require('@/utils/got'); - -module.exports = async (ctx) => { - const response = await got({ - method: 'POST', - url: 'https://www.businessoffashion.com/graphql/v1', - headers: { - 'Content-Type': 'application/json', - }, - data: JSON.stringify({ - operationName: 'GetArticlesGQL', - variables: { - first: 5, - lastCursor: null, - height: 440, - width: 670, - }, - query: 'query GetArticlesGQL($articleSlug: String, $category: String, $authorSlug: String, $height: Int, $lastCursor: ID, $width: Int!, $first: Int) {\n articles(first: $first, after: $lastCursor, filter: {language__eq: chinese, articleSlug__eq: $articleSlug, categorySlug__eq: $category, authorSlug__eq: $authorSlug}) {\n edges {\n cursor\n node {\n __typename\n ... on ArticleInterface {\n title\n summary\n content\n url\n featuredAsset {\n ... on AssetInterface {\n caption\n __typename\n }\n ... on ManagedImage {\n transform(transform: {width: $width, height: $height, crop: FOCALPOINT, fit: CROP})\n __typename\n }\n ... on ManagedVideo {\n url\n __typename\n }\n __typename\n }\n isExclusive\n isSponsored\n published {\n value\n __typename\n }\n __typename\n }\n ... on InternalArticleInterface {\n authors {\n displayName\n slug\n __typename\n }\n __typename\n }\n ... on ExternalArticleInterface {\n source\n __typename\n }\n ... on CuratedArticleLink {\n _id\n title\n published {\n value\n __typename\n }\n url\n __typename\n }\n ... on SyndicatedArticle {\n _id\n topics {\n _id\n label\n __typename\n }\n categories {\n _id\n label\n __typename\n }\n __typename\n }\n ... on OriginalArticle {\n _id\n topics {\n _id\n label\n __typename\n }\n categories {\n _id\n label\n slug\n __typename\n }\n __typename\n }\n ... on FashionWeekReview {\n _id\n topics {\n _id\n label\n __typename\n }\n categories {\n _id\n label\n __typename\n }\n __typename\n }\n }\n __typename\n }\n __typename\n }\n}\n', - }), - }); - - const items = response.data.data.articles.edges.map((item) => { - const url = new URL(item.node.url); - url.host = 'cn.businessoffashion.com'; - const single = { - title: item.node.title, - description: `${item.node.summary}
${item.node.content}`, - pubDate: new Date(item.node.published.value).toUTCString(), - link: url.href, - author: item.node.authors[0].displayName, - }; - - return single; - }); - - ctx.state.data = { - title: `BoF时装商业评论 | 时刻为全球时尚产业提供最新的新闻、分析与情报 | BoF`, - link: `https://cn.businessoffashion.com/`, - description: 'BoF时装商业评论 | 时刻为全球时尚产业提供最新的新闻、分析与情报 | BoF', - item: items, - }; -}; diff --git a/lib/routes/buaq/index.js b/lib/routes/buaq/index.js deleted file mode 100644 index b8371352c3cea5..00000000000000 --- a/lib/routes/buaq/index.js +++ /dev/null @@ -1,31 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const baseUrl = 'https://buaq.net'; - - const response = await got({ - method: 'get', - url: baseUrl, - }); - const $ = cheerio.load(response.data); // 使用 cheerio 加载返回的 HTML - const list = $('tr[class]'); - - ctx.state.data = { - title: `不安全文章 ~ 资讯`, - link: `https://buaq.net/`, - description: '不安全文章 ~ 资讯', - item: - list && - list - .map((index, item) => { - item = $(item); - return { - title: $('font[size=""4""]', item).children('a').text(), - pubDate: new Date($('font[size=""1""]', item).children().first().text()).toUTCString(), - link: baseUrl + $('font[size=""4""]', item).children('a').attr('href'), - }; - }) - .get(), - }; -}; diff --git a/lib/routes/cgtn/pick.js b/lib/routes/cgtn/pick.js deleted file mode 100644 index f70192cf66d4d2..00000000000000 --- a/lib/routes/cgtn/pick.js +++ /dev/null @@ -1,45 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const rootUrl = 'https://www.cgtn.com/'; - const response = await got({ - method: 'get', - url: rootUrl, - }); - - const $ = cheerio.load(response.data); - const list = $('.titleArea') - .map((_, item) => { - item = $(item); - const a = item.find('a'); - return { - title: a.text(), - link: a.attr('href'), - pubDate: new Date(parseInt(a.attr('data-time'))).toUTCString(), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('#cmsMainContent').html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: ""CGTN - Editors' Pick"", - link: rootUrl, - item: items, - }; -}; diff --git a/lib/routes/cgtn/top.js b/lib/routes/cgtn/top.js deleted file mode 100644 index 4c5c93a4791404..00000000000000 --- a/lib/routes/cgtn/top.js +++ /dev/null @@ -1,45 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const rootUrl = 'https://www.cgtn.com/'; - const response = await got({ - method: 'get', - url: rootUrl, - }); - - const $ = cheerio.load(response.data); - const list = $('div.topNews-item') - .map((_, item) => { - item = $(item); - const a = item.find('div.topNews-item-content-title a'); - return { - title: a.text(), - link: a.attr('href'), - pubDate: new Date(parseInt(a.attr('data-time'))).toUTCString(), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('#cmsMainContent').html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: 'CGTN - Top News', - link: rootUrl, - item: items, - }; -}; diff --git a/lib/routes/chinalaborwatch/reports.js b/lib/routes/chinalaborwatch/reports.js deleted file mode 100644 index d2a44980393124..00000000000000 --- a/lib/routes/chinalaborwatch/reports.js +++ /dev/null @@ -1,53 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const lang = ctx.params.lang || ''; - const industry = ctx.params.industry || ''; - - const rootUrl = 'http://www.chinalaborwatch.org'; - const currentUrl = `${rootUrl}/${lang === '' ? '' : 'cn/'}reports${industry === '' ? '' : `/industry/${industry}`}`; - - const response = await got({ - method: 'get', - url: currentUrl, - }); - const $ = cheerio.load(response.data); - - const list = $('.Alt1 a, .Alt2 a') - .slice(0, 10) - .map((_, item) => { - item = $(item); - return { - title: item.text(), - link: `${rootUrl}${item.attr('href')}`, - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.pubDate = new Date(content('#ContentPlaceHolder1_LabelDate').text().replace(/年|月/g, '-').replace('日', '')).toUTCString(); - - content('h1, #ContentPlaceHolder1_LabelDate').remove(); - - item.description = content('.mainContent').html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `${$('title').text()} - ${lang === '' ? 'China Labour Watch' : '中国劳工观察'}`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/cmes/news.js b/lib/routes/cmes/news.js deleted file mode 100644 index c2015474d8cf6b..00000000000000 --- a/lib/routes/cmes/news.js +++ /dev/null @@ -1,64 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const category = ctx.params.category || 'Information'; - - const rootUrl = 'https://www.cmes.org'; - const currentUrl = `${rootUrl}/News/${category}/index.html`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('.r_ct') - .find('a') - .slice(0, 10) - .map((_, item) => { - item = $(item); - - const link = item.attr('href'); - - let date = '00000000'; - if (link.split('/')[2] !== 'mkc.ckcest.cn') { - date = link.split('/')[5]; - } - - return { - link, - title: item.text(), - pubDate: new Date(`${date.substr(0, 4)}-${date.substr(5, 2)}-${date.substr(7, 2)}`).toDateString(), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - content('h3, script, .bshare-custom').remove(); - - item.description = content('.xhjj').html() || content('.detail-page').html(); - - if (content('#articleTime').html()) { - item.pubDate = new Date(content('#articleTime').text()).toUTCString(); - } - - return item; - }) - ) - ); - - ctx.state.data = { - title: $('title').text(), - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/commonapp/blog.js b/lib/routes/commonapp/blog.js deleted file mode 100644 index a3ee56c9cc960e..00000000000000 --- a/lib/routes/commonapp/blog.js +++ /dev/null @@ -1,42 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); - -module.exports = async (ctx) => { - const rootUrl = 'https://www.commonapp.org'; - const jsonUrl = `${rootUrl}/page-data/sq/d/4283793559.json`; - const response = await got({ - method: 'get', - url: jsonUrl, - }); - - const list = response.data.data.allNodeBlogPost.edges.map((item) => ({ - title: item.node.title, - author: item.node.field_blog_author, - pubDate: parseDate(item.node.created), - link: `${rootUrl}${item.node.path.alias}`, - })); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - - const content = cheerio.load(detailResponse.data); - - item.description = content('.inner-page').html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: 'Blog - Common App', - link: `${rootUrl}/blog`, - item: items, - }; -}; diff --git a/lib/routes/cria/news.js b/lib/routes/cria/news.js deleted file mode 100644 index 51c2277678b4cf..00000000000000 --- a/lib/routes/cria/news.js +++ /dev/null @@ -1,57 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const id = ctx.params.id || ''; - - const rootUrl = 'http://www.cria.org.cn'; - const currentUrl = `${rootUrl}/${id ? `newslist/${id}.html` : 'news'}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('.ch_news,.enterprise_news_c') - .find('ul li') - .map((_, item) => { - item = $(item); - const a = item.find('a'); - - return { - link: `${rootUrl}${a.attr('href')}`, - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - try { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.title = content('title').text(); - item.description = content('.news_details_c').html(); - item.pubDate = new Date(detailResponse.data.match(/发布时间:(.*)<\/span>来源:/)[1]).toUTCString(); - - return item; - } catch (e) { - return Promise.resolve(''); - } - }) - ) - ); - - const title = id ? response.data.match(/

当前位置:中国橡胶网 > (.*)<\/span><\/h3>/)[1] : '新闻资讯'; - - ctx.state.data = { - title: `${title} - 中国橡胶网`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/dayone/blog.js b/lib/routes/dayone/blog.js deleted file mode 100644 index 7e27b27a87f7b6..00000000000000 --- a/lib/routes/dayone/blog.js +++ /dev/null @@ -1,56 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const rootUrl = 'https://dayoneapp.com'; - const currentUrl = `${rootUrl}/blog`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('h3 a') - .slice(0, 20) - .map((_, item) => { - item = $(item); - const info = item.parent().next().text().split(' by '); - - return { - author: info[1], - title: item.text(), - link: `${rootUrl}${item.attr('href')}`, - pubDate: new Date(info[0]).toUTCString(), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - const description = content('.blog-layout'); - - description.children().last().remove(); - content('h1').next().remove(); - content('h1').remove(); - - item.description = description.html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: $('title').text(), - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/donews/index.js b/lib/routes/donews/index.js deleted file mode 100644 index d1c97e9b72f83b..00000000000000 --- a/lib/routes/donews/index.js +++ /dev/null @@ -1,59 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -const util = require('./utils'); - -module.exports = async (ctx) => { - const { column = '' } = ctx.params; - - let host = `http://www.donews.com/${column}`; - - if (column !== '' && column !== 'idonews') { - host += '/index'; - } - - const response = await got.get(host); - - const $ = cheerio.load(response.data); - - let list, - title = 'DoNews - '; - - if (column === '') { - title += '首页'; - } else { - title += $('.breadCrumb > a:nth-child(2)').text(); - } - - switch (column) { - case '': - // 首页轮播 - list = $('a.news-item').get(); - - break; - case 'ent': - case 'idonews': - // 首页轮播 - list = $('ul.zl-top > li > a').get(); - list = list.concat($('.fl.w840 > .block > dl > dd > h3 > a').slice(0, 5).get()); - - break; - default: - list = $('.fl.w840 > .block > dl > dd > h3 > a').slice(0, 10).get(); - break; - } - - const items = await Promise.all( - list.map((e) => { - const link = $(e).attr('href'); - return ctx.cache.tryGet(link, () => util.ProcessFeed(link)); - }) - ); - - ctx.state.data = { - title, - link: host, - description: '中国最早的web2.0网站,专业科技媒体、互联网行业门户网站。提供互联网新闻IT资讯,关注科技创新,覆盖移动互联网创业、游戏、风险投资等热点,是中国互联网行业的风向标。', - item: items, - }; -}; diff --git a/lib/routes/donews/utils.js b/lib/routes/donews/utils.js deleted file mode 100644 index 73769b83754060..00000000000000 --- a/lib/routes/donews/utils.js +++ /dev/null @@ -1,19 +0,0 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); - -const ProcessFeed = async (link) => { - const response = await got.get(link); - const $ = cheerio.load(response.data); - - return { - title: $('.detail-con h1').text() || $('.detail-con h2').text().replace('{{news.title}}', ''), - author: $('.tag > .fl > span:nth-child(2)').text().replace('{{news.author}}', ''), - description: $('.article-con').html(), - pubDate: new Date($('.tag > .fl > span:nth-child(1)').text().replace('{{news.timeFormat}}', '')), - link, - }; -}; - -module.exports = { - ProcessFeed, -}; diff --git a/lib/routes/dsb/area.js b/lib/routes/dsb/area.js deleted file mode 100644 index ccdead6eed23b4..00000000000000 --- a/lib/routes/dsb/area.js +++ /dev/null @@ -1,33 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const area = ctx.params.area; - const host = 'www.dsb.cn'; - const areaUrl = `http://${host}/${area}`; - const areaResp = await got(areaUrl); - const $ = cheerio.load(areaResp.data); - const areaName = $('.new-list-title').text(); - const newsUrls = $('ul.new-list-cons > li > a') - .map((i, e) => $(e).attr('href')) - .get(); - - ctx.state.data = { - title: `电商报 - ${areaName}`, - link: areaUrl, - item: await Promise.all( - newsUrls.map((url) => - ctx.cache.tryGet(url, async () => { - const newsResp = await got(url); - const $ = cheerio.load(newsResp.data); - return { - title: $('.new-content > h2').text(), - link: url, - pubDate: $('.new-content-info > span:nth-child(3)').text(), - description: $('div.new-content-con').html(), - }; - }) - ) - ), - }; -}; diff --git a/lib/routes/dxy/vaccine.js b/lib/routes/dxy/vaccine.js deleted file mode 100644 index 74c90cbbcbae63..00000000000000 --- a/lib/routes/dxy/vaccine.js +++ /dev/null @@ -1,109 +0,0 @@ -const got = require('@/utils/got'); - -module.exports = async (ctx) => { - const province = ctx.params.province || ''; - const city = ctx.params.city || ''; - const location = ctx.params.location || ''; - let fullLocation = ''; - if (province) { - fullLocation += `/${province}`; - if (city) { - fullLocation += `/${city}`; - if (location) { - fullLocation += `/${location}`; - } - } - } - - const rootUrl = 'https://mama.dxy.com'; - const currentUrl = `${rootUrl}/client/vaccine/new-crown-vaccine`; - const apiUrl = `${rootUrl}/api/vaccine/client/vaccination-point/all`; - - const apiResponse = await got({ - method: 'get', - url: apiUrl, - }); - - const response = await got({ - method: 'get', - url: apiResponse.data.results.fileUrl, - }); - - const allPoints = [], - allLocations = {}, - allLocationIds = {}, - pointDataArray = response.data.results.pointData; - - for (const data of pointDataArray) { - allLocations[data.locationName] = data.locationId; - allLocationIds[data.locationId] = data.locationName; - if (data.points) { - allPoints.push(...data.points); - } else { - pointDataArray.push(...data.pointData); - } - } - - const list = allPoints.map((item) => { - const locationId = item.locationId; - const province = locationId - (locationId % 10000); - const city = locationId - (locationId % 100); - - return { - title: `${allLocationIds[province]}/${allLocationIds.hasOwnProperty(city) ? `${allLocationIds[city]}/` : `${allLocationIds[province]}/`}${allLocationIds[locationId]}`, - link: item.contentUrl, - pubDate: new Date(item.modifyDate).toUTCString(), - }; - }); - - const items = await Promise.all( - list - .filter((item) => { - if (fullLocation !== '') { - const locationSplit = item.title.split('/'); - const fullLocationSplit = fullLocation.split('/'); - - for (let index = 0; index < fullLocationSplit.length; index++) { - if (locationSplit[index] !== fullLocationSplit[index]) { - return false; - } - } - } - return true; - }) - .map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const result = detailResponse.data.results; - - const description = - `

${result.point.pointName}

` + - '
    ' + - `
  • 户籍限制:${result.point.registerLimit}
  • ` + - `
  • 服务限制:${result.point.serviceTag}
  • ` + - `
  • 服务时间:${result.detail.serviceTime}
  • ` + - `
  • 地址:${result.point.address}
  • ` + - `
  • 电话:${result.point.phoneNo}
  • ` + - `
  • 接种人群:${result.detail.targetPeople}
  • ` + - `
  • 接种所需材料:${result.detail.materials}
  • ` + - `
  • 预约步骤:${result.detail.reserveSteps}
  • ` + - '
'; - - item.description = description; - item.title = `${result.point.pointName}(${item.title})`; - item.link = `${rootUrl}/client/vaccine/vaccination-point?pointId=${result.point.id}`; - - return item; - }) - ) - ); - - ctx.state.data = { - title: `新冠疫苗接种点查询${fullLocation ? `(${fullLocation})` : ''} - 丁香园`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/esquirehk/tag.js b/lib/routes/esquirehk/tag.js deleted file mode 100644 index e53db81757aefc..00000000000000 --- a/lib/routes/esquirehk/tag.js +++ /dev/null @@ -1,71 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - let id = ctx.params.id || 'Fashion'; - - id = id.toLowerCase(); - - const rootUrl = 'https://www.esquirehk.com'; - const topics = ['style', 'watch', 'money-investment', 'lifestyle', 'culture', 'mens-talk', 'gear', 'people']; - - let currentUrl = `${rootUrl}/tag/${id}`; - if (topics.indexOf(id) > -1) { - currentUrl = `${rootUrl}/${id}`; - } - - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - const list = $('.FeedStory') - .slice(0, 10) - .map((_, item) => { - item = $(item); - return { - author: item.find('.author').text(), - link: `${rootUrl}${item.find('a.Anchor').eq(0).attr('href')}`, - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - content('.RelatedBlock').remove(); - content('.TagContainer').remove(); - content('.YouMayLikeContainer').remove(); - content('.SubscriptionContainer').remove(); - - content('img').each(function () { - const srcset = content(this).attr('srcset'); - if (srcset) { - content(this).removeAttr('srcset'); - content(this).removeAttr('data-src'); - content(this).attr('src', `${rootUrl}${srcset.split(',')[1].replace('1032w', '')}`); - } - }); - - item.title = content('.CommonTitle').text(); - item.description = content('.ArticlePage').html(); - item.pubDate = new Date(content('.ArticleFeeds-info time').eq(0).attr('data-timestamp') * 1000).toUTCString(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `${$('title').text()} - Esquirehk`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/feixuew/index.js b/lib/routes/feixuew/index.js deleted file mode 100644 index 6c6e1162f8a8c6..00000000000000 --- a/lib/routes/feixuew/index.js +++ /dev/null @@ -1,63 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - let currentUrl; - let query; - - const rootUrl = 'https://www.feixuew.com'; - - ctx.params.id = ctx.params.id || 'latest'; - - if (ctx.params.id === 'latest') { - currentUrl = rootUrl; - } else { - currentUrl = `${rootUrl}/sort/${ctx.params.id}`; - } - - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - if (ctx.params.id === 'latest') { - query = $('ul.ul-new li a').slice(4, 10); - } else { - query = $('a.sjwu').slice(0, 10); - } - - const list = query - .map((_, item) => { - item = $(item); - return { - title: item.attr('title'), - link: item.attr('href'), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('div.info-con').html(); - item.pubDate = new Date(content('p.f-sgray span').eq(1).text().replace('发布时间:', '') + ' GMT+8').toUTCString(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `飞雪娱乐网 - ${$('title').text().split('-')[0]}`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/fulinian/index.js b/lib/routes/fulinian/index.js deleted file mode 100644 index e4548660d9fb56..00000000000000 --- a/lib/routes/fulinian/index.js +++ /dev/null @@ -1,50 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -const rootUrl = 'https://www.fulinian.com/'; - -module.exports = async (ctx) => { - ctx.params.caty = ctx.params.caty || ''; - - const currentUrl = `${rootUrl}/${ctx.params.caty}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - const list = $('article.excerpt') - .slice(0, 10) - .map((_, item) => { - item = $(item); - const a = item.find('header h2 a'); - return { - title: a.text(), - link: a.attr('href'), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('article.article-content').html(); - item.pubDate = new Date(content('div.article-meta span.item').eq(0).text() + ' GMT+8').toUTCString(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `福利年 - ${$('h1').text()}`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/gamegrape/index.js b/lib/routes/gamegrape/index.js deleted file mode 100644 index 280a75e099ce6b..00000000000000 --- a/lib/routes/gamegrape/index.js +++ /dev/null @@ -1,73 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -function getNum(str) { - const result = str.match(/(\d{1,2}).*/); - if (result) { - return parseInt(result[1]); - } -} -function resolveRelativeTime(relativeTime) { - const result = /\S* · (\d{1,2}天)?(\d{1,2}小时)?(\d{1,2}分钟)?/.exec(relativeTime); - let day, hour, min; - if (result[1]) { - day = getNum(result[1]); - } - if (result[2]) { - hour = getNum(result[2]); - } - if (result[3]) { - min = getNum(result[3]); - } - return (((day || 0) * 24 + (hour || 0)) * 60 + (min || 0)) * 60 * 1000; -} - -module.exports = async (ctx) => { - const id = ctx.params.id || ''; - - const rootUrl = 'http://youxiputao.com'; - const currentUrl = `${rootUrl}/article${id ? `/index/id/${id}` : ''}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('.news-info-box') - .slice(0, 15) - .map((_, item) => { - item = $(item); - const a = item.find('a[title]'); - - return { - title: a.text(), - link: `${rootUrl}${a.attr('href')}`, - pubDate: Date.now() - resolveRelativeTime(item.find('.pull-right').text()), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('.info').html(); - item.author = content('.users-info h4').text(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: $('title').text(), - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/gvm/index.js b/lib/routes/gvm/index.js deleted file mode 100644 index 68896d42900c08..00000000000000 --- a/lib/routes/gvm/index.js +++ /dev/null @@ -1,94 +0,0 @@ -const got = require('got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const category = ctx.params.category || 'newest'; - let suffix = '/newest'; - - const options = { - newest: '最新文章', - recommend: '你可能會喜歡', - opinion: '名家專欄', - topic: '專題', - news: '時事熱點', - politics: '政治', - society: '社會', - figure: '人物報導', - world: '國際', - world_focus: '全球焦點', - cross_strait_politics: '兩岸', - money: '金融理財', - investment: '投資理財', - insurance: '保險規劃', - retire: '退休理財', - fintech: '金融Fintech', - real_estate: '房地產', - economy: '總體經濟', - tech: '科技', - tech_trend: '科技趨勢', - energy: '能源', - business: '產經', - industry: '傳產', - service: '消費服務', - medical: '生技醫藥', - family_business_succession: '傳承轉型', - startup: '創業新創', - management: '管理', - agriculture: '農業', - education: '教育', - higher_education: '高教', - technological: '技職', - parent: '親子教育', - world_education: '國際文教', - sports: '體育', - life: '好享生活', - art: '時尚設計', - self_growth: '心靈成長', - film: '藝文影視', - travel: '旅遊', - environment: '環境生態', - health: '健康', - food: '美食', - career: '職場生涯', - survey: '調查', - county: '縣市', - csr: 'CSR', - }; - - if (category !== 'newest' && category !== 'recommend') { - suffix = `/category/${category}`; - } - - const response = await got({ - method: 'get', - url: 'https://www.gvm.com.tw' + suffix, - }); - - const $ = cheerio.load(response.body); - - const articles = $('#article_list .article-list-item .article-list-item__intro') - .map((index, ele) => ({ - title: $('a', ele).text(), - link: $('a', ele).attr('href'), - pubDate: new Date($('.time', ele).text()), - author: $('.author', ele).text(), - })) - .get(); - - const item = await Promise.all( - articles.map((item) => - ctx.cache.tryGet(item.link, async () => { - const res = await got.get(item.link); - const content = cheerio.load(res.body); - item.description = content('.article-content').html(); - return item; - }) - ) - ); - - ctx.state.data = { - title: `遠見 - ${options[category]}`, - link: 'https://www.gvm.com.tw' + suffix, - item, - }; -}; diff --git a/lib/routes/hkcnews/news.js b/lib/routes/hkcnews/news.js deleted file mode 100644 index 476f4c52847443..00000000000000 --- a/lib/routes/hkcnews/news.js +++ /dev/null @@ -1,63 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -const titles = { - '': '眾聞', - 13: '經濟', - 15: '社會', - 14: '生活', - 12: '政治', - 16: '國際', - 20: '台灣', - 21: '人物', - 19: '中國', -}; - -module.exports = async (ctx) => { - const category = ctx.params.category || ''; - - const rootUrl = 'https://www.hkcnews.com'; - const apiUrl = `${rootUrl}/data/newsposts${category === '' ? '' : `/${category}`}?page=1`; - const response = await got({ - method: 'get', - url: apiUrl, - }); - - const list = response.data.items.map((item) => { - const $ = cheerio.load(item); - const news = $('.article-block-body a'); - const date = $('.line').eq(1).text().split('.').reverse().join('-'); - - return { - title: news.text(), - link: `${rootUrl}${news.attr('href')}`, - pubDate: new Date(date.length === 8 ? `${new Date().getFullYear().toString().slice(0, 2)}${date}` : date).toUTCString(), - }; - }); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('.article-content').html(); - // substring 2 times - // from https://hkcnews.com/article/47878/loreal歐萊雅-薇婭-李佳琦-47884/薇婭、李佳琦幫loreal帶貨引價格爭議-loreal道歉 - // to https://hkcnews.com/article/47878 - item.guid = item.link.substring(0, item.link.lastIndexOf('/')).substring(0, item.link.substring(0, item.link.lastIndexOf('/')).lastIndexOf('/')); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `眾新聞 - ${titles[category]}`, - link: `${rootUrl}/news${category === '' ? '' : `/${category}/${titles[category]}`}`, - item: items, - }; -}; diff --git a/lib/routes/hkgolden/index.js b/lib/routes/hkgolden/index.js deleted file mode 100644 index a56b2d4bac61fb..00000000000000 --- a/lib/routes/hkgolden/index.js +++ /dev/null @@ -1,110 +0,0 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const dayjs = require('dayjs'); - -const channels = { - BW: '吹水台', - HT: '高登熱', - NW: '最 新', - CA: '時事台', - ET: '娛樂台', - SP: '體育台', - FN: '財經台', - ST: '學術台', - SY: '講故台', - EP: '創意台', - HW: '硬件台', - IN: '電訊台', - SW: '軟件台', - MP: '手機台', - AP: 'Apps台', - GM: '遊戲台', - ED: '飲食台', - TR: '旅遊台', - CO: '潮流台', - AN: '動漫台', - TO: '玩具台', - MU: '音樂台', - VI: '影視台', - DC: '攝影台', - TS: '汽車台', - WK: '上班台', - LV: '感情台', - SC: '校園台', - BB: '親子台', - PT: '寵物台', - MB: '站務台', - RA: '電 台', - AC: '活動台', - BS: '買賣台', - JT: '直播台', - AU: '成人台', - OP: '考古台', -}; - -const limits = { - '-1': '全部', - 1: '正式', - 0: '公海', -}; - -const sorts = { - 0: '最後回應時間', - 1: '發表時間', - 2: '熱門', -}; - -module.exports = async (ctx) => { - const id = ctx.params.id || 'BW'; - const sort = ctx.params.sort || '0'; - const limit = ctx.params.limit || '-1'; - - const rootUrl = 'https://forum.hkgolden.com'; - const apiRootUrl = 'https://api.hkgolden.com'; - const apiUrl = `${apiRootUrl}/v1/topics/HT/1?sort=${sort}&limit=${limit}`; - - const response = await got({ - method: 'get', - url: apiUrl, - }); - - const list = response.data.data.list.slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 30).map((item) => ({ - link: item.id, - title: item.title, - author: item.authorName, - pubDate: parseDate(item.orderDate), - })); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: `${apiRootUrl}/v1/view/${item.link}`, - }); - - const data = detailResponse.data.data; - - item.link = `${rootUrl}/thread/${item.id}`; - item.description = - `` + - ``; - - for (const reply of data.replies) { - item.description += - `` + ``; - } - - item.description += '
${data.authorName} (${dayjs(data.messageDate).format('YYYY-MM-DD hh:mm:ss')})
${data.content.replace(/src=""\/faces/g, 'src=""https://assets.hkgolden.com/faces')}
${reply.authorName} (${dayjs(reply.replyDate).format('YYYY-MM-DD hh:mm:ss')})
${reply.content.replace(/src=""\/faces/g, 'src=""https://assets.hkgolden.com/faces')}
'; - - return item; - }) - ) - ); - - ctx.state.data = { - title: `${channels[id]} (${sorts[sort]}|${limits[limit]}) - 香港高登`, - link: `${rootUrl}/channel/${id}`, - item: items, - }; -}; diff --git a/lib/routes/iea/index.js b/lib/routes/iea/index.js deleted file mode 100644 index 9206146ddf3c11..00000000000000 --- a/lib/routes/iea/index.js +++ /dev/null @@ -1,53 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const category = ctx.params.category || 'news-and-events'; - - const rootUrl = 'https://www.iea.org'; - const currentUrl = `${rootUrl}/${category}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('.m-news-listing__hover') - .slice(0, 15) - .map((_, item) => { - item = $(item); - - const title = $(item).text(); - item = item.parent().get(0).tagName === 'a' ? $(item).parent() : $(item).parent().parent(); - - return { - title, - link: `${rootUrl}${item.attr('href')}`, - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('.m-block__content').html(); - item.pubDate = new Date(content('.o-hero-freepage__meta').text()).toUTCString(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: $('title').eq(0).text(), - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/iie/blog.js b/lib/routes/iie/blog.js deleted file mode 100644 index 7f653054720604..00000000000000 --- a/lib/routes/iie/blog.js +++ /dev/null @@ -1,47 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const rootUrl = 'https://www.iie.org'; - const currentUrl = `${rootUrl}/Learn/Blog`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('.events__title a') - .slice(0, 10) - .map((_, item) => { - item = $(item); - return { - title: item.text(), - link: `${rootUrl}${item.attr('href')}`, - pubDate: new Date(item.parent().parent().find('time').attr('datetime')).toUTCString(), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('.wysiwyg').html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: $('title').text(), - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/imaijia/category.js b/lib/routes/imaijia/category.js deleted file mode 100644 index 79ba232c551ba5..00000000000000 --- a/lib/routes/imaijia/category.js +++ /dev/null @@ -1,63 +0,0 @@ -const got = require('@/utils/got'); - -module.exports = async (ctx) => { - const category = ctx.params.category; - - const api_url = `http://www.imaijia.com/xstb/front/authorArticleController.do?indexArticles&pageSize=20`; - const url = `http://www.imaijia.com/#/information.htm?catid=${category}`; - - const response = await got({ - method: 'post', - headers: { - Referer: url, - }, - url: api_url, - form: { - pageNo: 1, - catid: category, - }, - }); - - const data = response.data; - const description = data.description; - const name = data.catName; - const list = data.resList; - - const out = await Promise.all( - list.map(async (info) => { - const title = info.title; - const cat_path = info.catPath; - const id = info.id; - const itemUrl = `http://www.imaijia.com/#/atricleDetails.htm?atricleId=${id}&catPath=${cat_path}`; - const api_url = `http://www.imaijia.com/data/details/${cat_path}${id}.json`; - const pubDate = info.created; - const author = info.author; - - const cache = await ctx.cache.get(itemUrl); - if (cache) { - return Promise.resolve(JSON.parse(cache)); - } - - const response = await got.get(api_url); - - const description = response.data.resList.articleDataF.content.replace(/src=""/g, 'src=""http://www.imaijia.com'); - - const single = { - title, - link: itemUrl, - author, - description, - pubDate: new Date(pubDate).toUTCString(), - }; - ctx.cache.set(itemUrl, JSON.stringify(single)); - return Promise.resolve(single); - }) - ); - - ctx.state.data = { - title: `电商在线-${name}`, - description, - link: url, - item: out, - }; -}; diff --git a/lib/routes/itjuzi/invest.js b/lib/routes/itjuzi/invest.js deleted file mode 100644 index 55a02c5344104d..00000000000000 --- a/lib/routes/itjuzi/invest.js +++ /dev/null @@ -1,32 +0,0 @@ -const got = require('@/utils/got'); - -module.exports = async (ctx) => { - const response = await got({ - method: 'get', - url: 'https://www.itjuzi.com/api/index/invse', - }); - - const data = response.data; - - ctx.state.data = { - title: 'IT桔子-投融资事件', - link: 'https://www.itjuzi.com/', - item: data.map((item) => { - const invest = item.invst.map((item) => item.name).join('、'); - - return { - title: `${item.name} / ${item.round} / ${item.money}`, - link: `https://www.itjuzi.com/company/${item.invse_com_id}`, - description: ` -

- ${item.name}
- ${item.slogan}
- ${item.round} / ${item.money} / ${item.time}
- 投资方: ${invest} - `, - pubDate: new Date(item.time).toUTCString(), - guid: item.id, - }; - }), - }; -}; diff --git a/lib/routes/itjuzi/merge.js b/lib/routes/itjuzi/merge.js deleted file mode 100644 index 13cb3498c14ccf..00000000000000 --- a/lib/routes/itjuzi/merge.js +++ /dev/null @@ -1,32 +0,0 @@ -const got = require('@/utils/got'); - -module.exports = async (ctx) => { - const response = await got({ - method: 'get', - url: 'https://www.itjuzi.com/api/index/merge', - }); - - const data = response.data.data; - - ctx.state.data = { - title: 'IT桔子-并购事件', - link: 'https://www.itjuzi.com/', - item: data.map((item) => { - const party = item.party.map((item) => item.name || item.invst_name).join('、'); - - return { - title: `${item.name}-${item.slogan}`, - link: `https://www.itjuzi.com/merger/${item.id}`, - description: ` -

- ${item.name}
- ${item.slogan}
- 股权占比: ${item.ratio} / 金额: ${item.money} / ${item.time}
- 并购方: ${party} - `, - pubDate: new Date(item.time).toUTCString(), - guid: item.id, - }; - }), - }; -}; diff --git a/lib/routes/iyiou/index.js b/lib/routes/iyiou/index.js deleted file mode 100644 index 1cc04996fdb8a9..00000000000000 --- a/lib/routes/iyiou/index.js +++ /dev/null @@ -1,41 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const formatPubDate = require('@/utils/date.js'); - -module.exports = async (ctx) => { - const response = await got({ - method: 'get', - url: `https://www.iyiou.com/news`, - }); - const $ = cheerio.load(response.data); - const postList = $('.list-container').find('.eo-article-column').get(); - const result = await Promise.all( - postList.map(async (item) => { - const title = $(item).find('.eo-hover-child').find('.content').find('a').find('.title').text(); - const link = 'https://www.iyiou.com' + $(item).find('.eo-hover-child').find('a').attr('href'); - const guid = link; - const pubDate = formatPubDate($(item).find('.eo-hover-child').find('.content').find('.eo-post-date').text().replace(' ', '')); - - const single = { - title, - link, - guid, - pubDate, - description: '', - }; - - const description_key = 'iyiou' + guid; - const description_value = await ctx.cache.get(description_key); - - if (description_value) { - single.description = description_value; - } else { - const temp = await got(link); - single.description = $(temp.data).find('.post-body').html(); - ctx.cache.set(description_key, single.description); - } - return Promise.resolve(single); - }) - ); - ctx.state.data = { title: '亿欧网', link: 'https://www.iyiou.com/', item: result }; -}; diff --git a/lib/routes/jiazhen108/index.js b/lib/routes/jiazhen108/index.js deleted file mode 100644 index 1eabfcd4bd3eb1..00000000000000 --- a/lib/routes/jiazhen108/index.js +++ /dev/null @@ -1,47 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const rootUrl = 'http://www.jiazhen108.com/news/'; - const response = await got({ - method: 'get', - url: rootUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('div.met-news-list ul li') - .slice(0, 10) - .map((_, item) => { - item = $(item); - const a = item.find('a'); - return { - title: a.text(), - link: a.attr('href'), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - item.description = content('section.met-editor').html(); - item.pubDate = new Date(content('div.info span').eq(0).text() + ' GMT+8').toUTCString(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `「108将」实战分享`, - link: rootUrl, - item: items, - }; -}; diff --git a/lib/routes/jinritoutiao/keyword.js b/lib/routes/jinritoutiao/keyword.js deleted file mode 100644 index e757e88baba29c..00000000000000 --- a/lib/routes/jinritoutiao/keyword.js +++ /dev/null @@ -1,27 +0,0 @@ -const got = require('../../utils/got'); - -module.exports = async (ctx) => { - const keyword = ctx.params.keyword; - - const response = await got({ - method: 'get', - url: `https://www.toutiao.com/api/search/content/?offset=0&format=json&keyword=${encodeURIComponent(keyword)}&autoload=true&count=20&cur_tab=1&from=search_tab`, - headers: { - Referer: `https://www.toutiao.com/search/?keyword=${encodeURIComponent(keyword)}`, - }, - }); - let data = response.data.data; - data = data.filter((item) => !item.cell_type); - - ctx.state.data = { - title: `今日头条: ${keyword}`, - link: `https://www.toutiao.com/search/?keyword=${keyword}`, - description: keyword, - item: data.map((item) => ({ - title: `${item.media_name}: ${item.title}`, - description: item.abstract, - pubDate: new Date(parseInt(item.create_time) * 1000), - link: item.article_url, - })), - }; -}; diff --git a/lib/routes/juesheng/index.js b/lib/routes/juesheng/index.js deleted file mode 100644 index ee33d9ea1a3328..00000000000000 --- a/lib/routes/juesheng/index.js +++ /dev/null @@ -1,49 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const response = await got('http://www.juesheng.com/'); - const $ = cheerio.load(response.data); - const postList = $('.sec-box #informationBox li').get(); - const result = await Promise.all( - postList.map(async (item) => { - const title = $(item).find('.news-item-title').find('a').text(); - const link = $(item).find('.news-item-title').find('a').attr('href'); - const guid = link; - - const single = { - title, - link, - guid, - pubDate: '', - description: '', - }; - - const description_key = 'juesheng_description_' + guid; - const description_value = await ctx.cache.get(description_key); - - const pubDate_key = 'juesheng_pubDate_' + guid; - const pubDate_value = await ctx.cache.get(pubDate_key); - - if (description_value && pubDate_value) { - single.description = description_value; - single.pubDate = pubDate_value; - } else { - const temp = await got(link); - single.description = $(temp.data).find('.content-box').html(); - single.pubDate = new Date($(temp.data).find('.part-time').text()).toUTCString(); - - ctx.cache.set(description_key, single.description); - ctx.cache.set(pubDate_key, single.pubDate); - } - - return Promise.resolve(single); - }) - ); - ctx.state.data = { - title: '决胜网', - link: 'http://www.juesheng.com/', - description: '决胜网是教育产业门户网站提供:教育门户新闻资讯、互联网+教育、在线教育、兴趣教育、在线职业教育、教育创业、教育信息化、教育创业报道等,找教育就上决胜网教育门户网站。', - item: result, - }; -}; diff --git a/lib/routes/krankenkassen/index.js b/lib/routes/krankenkassen/index.js deleted file mode 100644 index 827073796624df..00000000000000 --- a/lib/routes/krankenkassen/index.js +++ /dev/null @@ -1,54 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const response = await got({ - method: 'get', - url: 'https://www.krankenkassen.de/dpa/', - }); - - const data = response.data; - - const $ = cheerio.load(data); - const list = $('.news td a'); - - const getContent = async (subLink) => { - const cacheKey = `krankenkassen_${subLink}`; - const cache = await ctx.cache.get(cacheKey); - if (cache) { - return JSON.parse(cache); - } - - const articlePageRes = await got(subLink); - const articleHtml = articlePageRes.data; - const $ = cheerio.load(articleHtml); - const pubDate = $('.untertitel').text(); - const description = $('#content p').text(); - const result = { - pubDate, - description, - title: $('.titel').text(), - link: subLink, - }; - ctx.cache.set(cacheKey, JSON.stringify(result)); - return result; - }; - - const item = await Promise.all( - list - .slice(0, 30) - .map((index, dom) => { - dom = $(dom); - const link = `https://www.krankenkassen.de/dpa/${dom.attr('href')}`; - return getContent(link); - }) - .get() - ); - - ctx.state.data = { - title: $('title').text(), - link: 'https://www.krankenkassen.de/dpa/', - description: '德国新闻社卫健新闻', - item, - }; -}; diff --git a/lib/routes/kzfeed/topic.js b/lib/routes/kzfeed/topic.js deleted file mode 100644 index 833cfabfc4058e..00000000000000 --- a/lib/routes/kzfeed/topic.js +++ /dev/null @@ -1,122 +0,0 @@ -/** - * 这里列出部分已知用途且在 Feed 中有用的属性 - * - * @typedef {Object} Card - * @property {String} id 卡片 id - * @property {String} title 卡片标题 - * @property {String} text 正文内容,会有换行符,里面的链接会是 的形式 - * @property {String} video 可能是内嵌视频地址 - * @property {String} video_thumb_img 可能是内嵌视频预览图片 - * @property {Number} bilibili_video_id 可能是关联的 Bilibili av 号 - * @property {String[]} images 内嵌图片地址 - * @property {Card~ImageInfo[]} images_info 内嵌图片信息 - * @property {String} url 原文网址 - * @property {String} url_cover 原文头图 - * @property {String} url_title 原文标题 - * @property {String} url_desc 原文简介 - * @property {String} url_host 原文网址的域名 - * @property {Number} created_time 创建的 Unix 时间戳 - * - * @typedef {Object} Card~ImageInfo - * @property {String} url - * @property {String} format - * @property {String} size - * @property {Number} width - * @property {Number} height - */ - -const got = require('@/utils/got'); - -/** - * @param {String} ctx.params.id - */ -module.exports = async (ctx) => { - const id = ctx.params.id; - - const info_res = await got({ - method: 'post', - url: 'https://kz.sync163.com/api/topic/info', - headers: { - from: 'h5', - token: 'asdfasdfasdf', - 'Content-Type': 'application/json', - }, - data: JSON.stringify({ - topic_id: id, - }), - }); - const info = info_res.data; - - const cards_res = await got({ - method: 'post', - url: 'https://kz.sync163.com/api/topic/cards', - headers: { - from: 'h5', - token: 'asdfasdfasdf', - 'Content-Type': 'application/json', - }, - data: JSON.stringify({ - topic_id: id, - }), - }); - const cardList = cards_res.data.list; - - ctx.state.data = { - title: `快知 - ${info.info.name}`, - description: info.info.description, - link: `https://kz.sync163.com/web/topic/${id}`, - image: info.info.icon, - item: cardList.map(buildFeedItem), - }; -}; - -/** - * @param {Card} cardData - */ -const buildFeedItem = (cardData) => { - const description = ` -

-

${cardData.url_title ? cardData.url_title : ''}${cardData.url_desc ? ` - ${cardData.url_desc}` : ''}

-

${serializeCardText(cardData.text)}

- ${renderImageList(cardData.images)} -

快知中间页

- `; - - return { - title: cardData.title ? cardData.title : cardData.url_title, - description, - pubDate: new Date(cardData.created_time * 1000), - link: cardData.url, - }; -}; - -const renderImageList = (images) => { - const renderItem = (src) => ` -
  • - -
  • - `; - - return ` -
      - ${images.map(renderItem).join('')} -
    - `; -}; - -const serializeCardText = (text) => - text - - /* 快知的 API 里的 a 标签名字叫做 a-link ,我们要把它改过来 */ - .replace(//g, '') - - /* 替换换行符 */ - .replace(/\n/g, '
    '); diff --git a/lib/routes/makeuseof/index.js b/lib/routes/makeuseof/index.js deleted file mode 100644 index 2edc58bf9aefc1..00000000000000 --- a/lib/routes/makeuseof/index.js +++ /dev/null @@ -1,59 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const category = ctx.params.category || ''; - - const rootUrl = 'https://www.makeuseof.com'; - const currentUrl = `${rootUrl}${category === '' ? '' : '/category/' + category}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data); - - const list = $('.home-secondary, .listing-content') - .find('.bc-title-link') - .slice(0, 15) - .map((_, item) => { - item = $(item); - return { - title: item.text(), - link: `${rootUrl}${item.attr('href')}`, - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - }); - const content = cheerio.load(detailResponse.data); - - content('.img-article-item') - .find('img') - .each(function () { - content(this).attr('src', content(this).prev().attr('data-srcset').split('?')[0]); - }); - - content('.ad-zone-container, .sharing, .sentinel-article-nextArticle, .article-tags, .w-article-author-bio, .ml-form-embedContainer').remove(); - - item.description = content('.article-body').html(); - item.author = content('a.author').text().replace('By ', ''); - item.pubDate = new Date(content('time').attr('datetime')).toUTCString(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `MakeUseOf - ${$('.listing-title').text() ? $('.listing-title').text() : 'Trending'}`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/matataki/site/posts/author.js b/lib/routes/matataki/site/posts/author.js deleted file mode 100644 index af84340585f049..00000000000000 --- a/lib/routes/matataki/site/posts/author.js +++ /dev/null @@ -1,17 +0,0 @@ -const matatakiUtils = require('@/routes/matataki/utils/matataki-utils'); - -module.exports = async (ctx) => { - const authorId = ctx.params.authorId; - const ipfsFlag = !!ctx.params.ipfsFlag; - - const authorName = await matatakiUtils.getUserNickname(authorId); - - const items = await matatakiUtils.getPostsAsFeedItems(`/posts/timeRanking?author=${authorId}`, ipfsFlag); - - ctx.state.data = { - title: `瞬Matataki - ${authorName}作品 ${ipfsFlag ? '(IPFS)' : ''}`, - link: `https://www.matataki.io/user/${authorId}`, - description: `瞬Matataki - ${authorName}作品`, - item: items, - }; -}; diff --git a/lib/routes/matataki/site/posts/favorite.js b/lib/routes/matataki/site/posts/favorite.js deleted file mode 100644 index b023588c0784be..00000000000000 --- a/lib/routes/matataki/site/posts/favorite.js +++ /dev/null @@ -1,42 +0,0 @@ -const matatakiUtils = require('@/routes/matataki/utils/matataki-utils'); - -module.exports = async (ctx) => { - const userId = ctx.params.userId; - const favoriteListId = ctx.params.favoriteListId; - const ipfsFlag = !!ctx.params.ipfsFlag; - - const response = await matatakiUtils.get(`/favorites/post?userId=${userId}&fid=${favoriteListId}&page=1`); - let items; - - if (ipfsFlag) { - items = await Promise.all( - response.data.data.list.map(async (item) => { - const ipfsHtmlHash = await matatakiUtils.getPostIpfsHtmlHash(item.pid); - - return { - title: item.title, - description: item.short_content, - link: `${matatakiUtils.IPFS_GATEWAY_URL}/ipfs/${ipfsHtmlHash}`, - pubDate: item.create_time, - guid: ipfsHtmlHash, - }; - }) - ); - } else { - items = response.data.data.list.map((item) => ({ - title: item.title, - description: item.short_content, - link: `https://www.matataki.io/p/${item.pid}`, - pubDate: item.create_time, - })); - } - - const text = `瞬Matataki - ${response.data.data.info.nickname || response.data.data.info.username} 收藏夹 #${response.data.data.info.name}# ${ipfsFlag ? '(IPFS)' : ''}`; - ctx.state.data = { - title: text, - link: `https://www.matataki.io/user/${userId}/favlist?fid=${favoriteListId}`, - description: text, - allowEmpty: true, - item: items, - }; -}; diff --git a/lib/routes/matataki/site/posts/scoreranking.js b/lib/routes/matataki/site/posts/scoreranking.js deleted file mode 100644 index 5930c60bc7c175..00000000000000 --- a/lib/routes/matataki/site/posts/scoreranking.js +++ /dev/null @@ -1,15 +0,0 @@ -const matatakiUtils = require('@/routes/matataki/utils/matataki-utils'); - -module.exports = async (ctx) => { - const querystring = ctx.request.querystring; - const ipfsFlag = !!ctx.params.ipfsFlag; - - const items = await matatakiUtils.getPostsAsFeedItems(`/posts/scoreRanking?${querystring}`, ipfsFlag); - - ctx.state.data = { - title: `瞬Matataki - 热门作品 ${ipfsFlag ? '(IPFS)' : ''}`, - link: `https://www.matataki.io/article/`, - description: `瞬Matataki - 热门作品`, - item: items, - }; -}; diff --git a/lib/routes/matataki/site/posts/tag.js b/lib/routes/matataki/site/posts/tag.js deleted file mode 100644 index f6e26fd82aaf3a..00000000000000 --- a/lib/routes/matataki/site/posts/tag.js +++ /dev/null @@ -1,16 +0,0 @@ -const matatakiUtils = require('@/routes/matataki/utils/matataki-utils'); - -module.exports = async (ctx) => { - const tagId = ctx.params.tagId; - const tagName = ctx.params.tagName; - const ipfsFlag = !!ctx.params.ipfsFlag; - - const items = await matatakiUtils.getPostsAsFeedItems(`/posts/getPostByTag?pagesize=20&tagid=${tagId}&extra=short_content&orderBy=hot_score&order=desc&page=1`, ipfsFlag); - - ctx.state.data = { - title: `瞬Matataki #${tagName} ${ipfsFlag ? '(IPFS)' : ''}`, - link: `https://www.matataki.io/tags/${tagId}`, - description: `瞬Matataki #${tagName}`, - item: items, - }; -}; diff --git a/lib/routes/matataki/site/posts/timeranking.js b/lib/routes/matataki/site/posts/timeranking.js deleted file mode 100644 index 98128919cdbfb4..00000000000000 --- a/lib/routes/matataki/site/posts/timeranking.js +++ /dev/null @@ -1,15 +0,0 @@ -const matatakiUtils = require('@/routes/matataki/utils/matataki-utils'); - -module.exports = async (ctx) => { - const querystring = ctx.request.querystring; - const ipfsFlag = !!ctx.params.ipfsFlag; - - const items = await matatakiUtils.getPostsAsFeedItems(`/posts/timeRanking?${querystring}`, ipfsFlag); - - ctx.state.data = { - title: `瞬Matataki - 最新作品 ${ipfsFlag ? '(IPFS)' : ''}`, - link: `https://www.matataki.io/article/latest`, - description: `瞬Matataki - 最新作品`, - item: items, - }; -}; diff --git a/lib/routes/matataki/site/posts/token.js b/lib/routes/matataki/site/posts/token.js deleted file mode 100644 index f767ac8f5d6e90..00000000000000 --- a/lib/routes/matataki/site/posts/token.js +++ /dev/null @@ -1,18 +0,0 @@ -const matatakiUtils = require('@/routes/matataki/utils/matataki-utils'); - -module.exports = async (ctx) => { - const id = ctx.params.id; - const filterCode = ctx.params.filterCode; - const ipfsFlag = !!ctx.params.ipfsFlag; - - const tokenName = await matatakiUtils.getTokenName(id); - const items = await matatakiUtils.getPostsAsFeedItems(`/minetoken/${id}/related?filter=${filterCode}&sort=time-desc&onlyCreator=0&page=1`, ipfsFlag); - - ctx.state.data = { - title: `瞬Matataki - ${tokenName ? tokenName : 'Fan票'}关联作品 ${ipfsFlag ? '(IPFS)' : ''}`, - link: `https://www.matataki.io/token/${id}/circle`, - description: `瞬Matataki - ${tokenName ? tokenName : 'Fan票'}关联作品`, - allowEmpty: true, - item: items, - }; -}; diff --git a/lib/routes/matataki/utils/matataki-utils.js b/lib/routes/matataki/utils/matataki-utils.js deleted file mode 100644 index 3c3edfc3c0f9ca..00000000000000 --- a/lib/routes/matataki/utils/matataki-utils.js +++ /dev/null @@ -1,125 +0,0 @@ -const got = require('@/utils/got'); - -/** - * Matataki API 地址 - */ -const MTATAKI_API_URL = 'https://api.mttk.net'; - -/** - * Matataki 官网地址 - */ -const MATATAKI_WEB_URL = 'https://www.matataki.io/'; - -/** - * IPFS网关的URL。可以换成其他公共网关,也可以换成自建的网关地址 - */ -const IPFS_GATEWAY_URL = 'https://10.via0.com'; - -/** - * 以`get` 方式调用Matataki API的简单封装 - * - * @param {string} path 以 / 开始 - */ -function get(path) { - return got({ - method: 'get', - url: MTATAKI_API_URL + path, - headers: { - Referer: MATATAKI_WEB_URL, - }, - }); -} - -/** - * 获取用户信息昵称 - * - * @param {number} userId - */ -async function getUserNickname(userId) { - try { - const userInfoResponse = await get(`/user/${userId}`); - return userInfoResponse.data.data.nickname || userInfoResponse.data.data.username; - } catch (err) { - return ''; - } -} - -/** - * 获取Fan票名称 - * - * @param {number} tokenId - */ -async function getTokenName(tokenId) { - try { - const tokenInfoResponse = await get(`/minetoken/${tokenId}`); - return tokenInfoResponse.data.data.token.name; - } catch (err) { - return ''; - } -} - -/** - * 获取Matataki作品在IPFS上的Hash - * - * @param {number} postId - */ -async function getPostIpfsHtmlHash(postId) { - const ipfsInfoResponse = await get(`/p/${postId}/ipfs`); - return ipfsInfoResponse.data.data[0].htmlHash; -} - -/** - * 将Matataki作品条目转为指向IPFS网关的RSS订阅源条目 - * - * @param {Object} item - */ -async function postToIpfsFeedItem(item) { - const ipfsHtmlHash = await getPostIpfsHtmlHash(item.id); - - return { - title: `${item.title} - ${item.nickname || item.author}${item.token_name ? ' $' + item.token_name : ''}`, - description: item.short_content, - link: `${IPFS_GATEWAY_URL}/ipfs/${ipfsHtmlHash}`, - pubDate: item.create_time, - guid: ipfsHtmlHash, - }; -} - -/** - * 将Matataki作品条目转为指向官网的RSS订阅源条目 - * - * @param {Object} item - */ -function postToFeedItem(item) { - return { - title: `${item.title} - ${item.nickname || item.author}${item.token_name ? ' $' + item.token_name : ''}`, - description: item.short_content, - link: `https://www.matataki.io/p/${item.id}`, - pubDate: item.create_time, - }; -} - -/** - * 获取作品列表并转为Feed Item数组 - * - * @param {string} url Matataki作品相关API的url - * @param {ipfsFlag} ipfsFlag 是否取IPFS地址 - */ -async function getPostsAsFeedItems(url, ipfsFlag) { - const response = await get(url); - if (ipfsFlag) { - return Promise.all(response.data.data.list.map(postToIpfsFeedItem)); - } - return response.data.data.list.map(postToFeedItem); -} - -module.exports = { - IPFS_GATEWAY_URL, - get, - getUserNickname, - getTokenName, - getPostIpfsHtmlHash, - postToIpfsFeedItem, - postToFeedItem, - getPostsAsFeedItems, -}; diff --git a/lib/routes/mitbbs/index.js b/lib/routes/mitbbs/index.js deleted file mode 100644 index f7a85df1f11eb3..00000000000000 --- a/lib/routes/mitbbs/index.js +++ /dev/null @@ -1,54 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const iconv = require('iconv-lite'); - -module.exports = async (ctx) => { - const caty = ctx.params.caty || ''; - const rootUrl = 'http://www.mitbbs.com'; - const currentUrl = `${rootUrl}/${caty === '' ? 'news/mitbbs_news_zahui.php' : 'news_pg/' + ctx.params.caty + '.html'}`; - const response = await got({ - method: 'get', - url: currentUrl, - responseType: 'buffer', - }); - - const $ = cheerio.load(iconv.decode(response.data, 'gb2312')); - const list = $('tr[align=""center""] td a.blue_14p_link, tr[bgcolor=""#FFFFFF""] td a.blue_14p_link') - .slice(0, 10) - .map((_, item) => { - item = $(item); - return { - title: item.text(), - link: `${rootUrl}${item.attr('href')}`, - pubDate: new Date(item.find('div.weinei_left_con_line_date').text() + ' GMT+8').toUTCString(), - }; - }) - .get(); - - const items = await Promise.all( - list.map((item) => - ctx.cache.tryGet(item.link, async () => { - const detailResponse = await got({ - method: 'get', - url: item.link, - responseType: 'buffer', - }); - const content = cheerio.load(iconv.decode(detailResponse.data, 'gb2312')); - - const dateTd = content('.black_32p').parent(); - dateTd.find('span, p').remove(); - - item.pubDate = new Date(dateTd.text().trim().replace(/年|月/g, '-').replace('日', ' ')).toUTCString(); - item.description = content('table').eq(5).find('table').eq(1).html(); - - return item; - }) - ) - ); - - ctx.state.data = { - title: `未名新闻 - ${caty === '' ? '新闻大杂烩' : $('strong').eq(1).text()}`, - link: currentUrl, - item: items, - }; -}; diff --git a/lib/routes/nba/app_news.js b/lib/routes/nba/app_news.js deleted file mode 100644 index b3fcb00375bc2b..00000000000000 --- a/lib/routes/nba/app_news.js +++ /dev/null @@ -1,40 +0,0 @@ -const got = require('@/utils/got'); - -const sourceTimezoneOffset = -8; -module.exports = async (ctx) => { - const id_url = 'https://sportsnba.qq.com/news/index?column=banner'; - const articles = await got.get(id_url); - const articleIds = articles.data.data.map((article) => article.id); - - const url = 'https://sportsnba.qq.com/news/item?column=banner&articleIds=' + articleIds.toString(); - const response = await got.get(url); - const xmls = response.data.data; - const out = Object.keys(xmls).map((xml) => { - const data = xmls[xml]; - const link = data.shareUrl; - - const guid = data.newsId; - const title = data.title; - const time = new Date(data.pub_time); - time.setTime(time.getTime() + (sourceTimezoneOffset - time.getTimezoneOffset() / 60) * 60 * 60 * 1000); - const pubDate = time.toUTCString(); - - const description = ''; - - const item = { - title, - description, - pubDate, - link, - guid, - }; - - return item; - }); - - ctx.state.data = { - title: 'NBA - news', - link: 'https://kbsapp.sports.qq.com', - item: out, - }; -}; diff --git a/lib/routes/northhouse/index.js b/lib/routes/northhouse/index.js deleted file mode 100644 index 012af84e7794af..00000000000000 --- a/lib/routes/northhouse/index.js +++ /dev/null @@ -1,54 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const category = ctx.params.category || ''; - - const rootUrl = 'http://www.northhouse.cc'; - const currentUrl = `${rootUrl}${category === '' ? '' : `/category/${category}`}`; - const response = await got({ - method: 'get', - url: currentUrl, - }); - - const $ = cheerio.load(response.data.replace(/
    <\/div>/g, '