From af87f6be1c88cfccb74ae4e215de205d69c03199 Mon Sep 17 00:00:00 2001 From: moemoe <90035294+hudatumoe@users.noreply.github.com> Date: Tue, 27 Feb 2024 23:10:30 +0800 Subject: [PATCH 1/7] fix(route): 2048/:type (#14572) --- lib/v2/2048/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/v2/2048/index.js b/lib/v2/2048/index.js index 9761e6bdc8..65a33b23c7 100644 --- a/lib/v2/2048/index.js +++ b/lib/v2/2048/index.js @@ -17,9 +17,8 @@ module.exports = async (ctx) => { }, }); const $ = cheerio.load(response); - return $('ul li a') - .toArray() - .find((item) => $(item).text() === '最新線路1').attribs.href; + const targetLink = $('table.group-table tr').eq(1).find('td a').eq(0).attr('href'); + return targetLink; }); const currentUrl = `${entranceDomain}/2048/thread.php?fid-${id}.html`; From 859c8b785da8b952a775c2583d75e301f67ac769 Mon Sep 17 00:00:00 2001 From: TonyRL Date: Tue, 27 Feb 2024 18:19:05 +0000 Subject: [PATCH 2/7] chore: remove `!` from heading slut --- website/docs/.format/rsshub-heading-id.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/.format/rsshub-heading-id.mjs b/website/docs/.format/rsshub-heading-id.mjs index 7f31de4919..8a5daf77c3 100644 --- a/website/docs/.format/rsshub-heading-id.mjs +++ b/website/docs/.format/rsshub-heading-id.mjs @@ -7,7 +7,7 @@ import { pinyin } from 'pinyin-pro'; import { visitParents } from 'unist-util-visit-parents'; const slugify = (/** @type {string} */ s) => { - s = s?.replace(/[#&'()+,./:[\]_|’“”、「」・（）．：｜]/g, '-'); + s = s?.replace(/[!"#&'()+,./:[\]_|’“”、「」・（）．：｜]/g, '-'); return encodeURIComponent( pinyin(s, { nonZh: 'consecutive', From b8a1a5d98bc5a67db8ce3f510c75640113111b9a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:21:03 +0000 Subject: [PATCH 3/7] style: auto format --- website/docs/routes/anime.mdx | 2 +- website/docs/routes/game.mdx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/routes/anime.mdx b/website/docs/routes/anime.mdx index 8ecb005ee4..b82463fcb9 100644 --- a/website/docs/routes/anime.mdx +++ b/website/docs/routes/anime.mdx @@ -341,7 +341,7 @@ ## lovelive-anime {#lovelive-anime} -### Love Live! Official Website Latest NEWS {#lovelive-anime-love-live!-official-website-latest-news} +### Love Live! Official Website Latest NEWS {#lovelive-anime-love-live-official-website-latest-news} diff --git a/website/docs/routes/game.mdx b/website/docs/routes/game.mdx index 207375c1a4..272623e799 100644 --- a/website/docs/routes/game.mdx +++ b/website/docs/routes/game.mdx @@ -431,9 +431,9 @@ -## osu! {#osu!} +## osu! {#osu} -### Beatmap Packs {#osu!-beatmap-packs} +### Beatmap Packs {#osu-beatmap-packs} From a98079239b0a1e9d4de4802ad58c58f04953ff05 Mon Sep 17 00:00:00 2001 From: randompasser <33059426+randompasser@users.noreply.github.com> Date: Wed, 28 Feb 2024 02:39:33 +0800 Subject: [PATCH 4/7] feat(route/pcr/news): Fetch full text (#14559) * feat(route/pcr/news): Fetch full text * fix(route/pcr/news): add missing language code * fix(route/pcr/news) Use cache.tryGet() * refactor: migrate to v2 --------- --- lib/router.js | 2 +- lib/routes/pcr/news.js | 31 ---------------- lib/v2/priconne-redive/maintainer.js | 3 ++ lib/v2/priconne-redive/news.js | 54 ++++++++++++++++++++++++++++ lib/v2/priconne-redive/radar.js | 13 +++++++ lib/v2/priconne-redive/router.js | 3 ++ website/docs/routes/game.mdx | 40 ++++++++++----------- 7 files changed, 94 insertions(+), 52 deletions(-) delete mode 100644 lib/routes/pcr/news.js create mode 100644 lib/v2/priconne-redive/maintainer.js create mode 100644 lib/v2/priconne-redive/news.js create mode 100644 lib/v2/priconne-redive/radar.js create mode 100644 lib/v2/priconne-redive/router.js diff --git a/lib/router.js b/lib/router.js index 3a2080b478..d2950d08ec 100644 --- a/lib/router.js +++ b/lib/router.js @@ -1005,7 +1005,7 @@ router.get('/avgle/videos/:order?/:time?/:top?', lazyloadRouteHandler('./routes/ router.get('/avgle/search/:keyword/:order?/:time?/:top?', lazyloadRouteHandler('./routes/avgle/videos.js')); // 公主链接公告 -router.get('/pcr/news', lazyloadRouteHandler('./routes/pcr/news')); +// router.get('/pcr/news', lazyloadRouteHandler('./routes/pcr/news')); router.get('/pcr/news-tw', lazyloadRouteHandler('./routes/pcr/news-tw')); router.get('/pcr/news-cn', lazyloadRouteHandler('./routes/pcr/news-cn')); diff --git a/lib/routes/pcr/news.js b/lib/routes/pcr/news.js deleted file mode 100644 index 0869ed4208..0000000000 --- a/lib/routes/pcr/news.js +++ /dev/null @@ -1,31 +0,0 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); - -module.exports = async (ctx) => { - const response = await got({ - method: 'get', - url: 'https://priconne-redive.jp/news/', - }); - const data = response.data; - const $ = cheerio.load(data); - const list = $('.article_box'); - let itemPicUrl; - ctx.state.data = { - title: '公主链接日服-新闻', - link: 'https://priconne-redive.jp/news/', - item: - list && - list - .map((index, item) => { - item = $(item); - itemPicUrl = item.find('img.attachment-news-thumbnail').attr('src'); - return { - title: item.find('h4').text(), - description: `${item.find('.description p').text()}
`, - link: item.find('a').first().attr('href'), - pubDate: item.find('.time').text(), - }; - }) - .get(), - }; -}; diff --git a/lib/v2/priconne-redive/maintainer.js b/lib/v2/priconne-redive/maintainer.js new file mode 100644 index 0000000000..884bdbf8de --- /dev/null +++ b/lib/v2/priconne-redive/maintainer.js @@ -0,0 +1,3 @@ +module.exports = { + '/news': ['SayaSS'], +}; diff --git a/lib/v2/priconne-redive/news.js b/lib/v2/priconne-redive/news.js new file mode 100644 index 0000000000..ee2c5901e4 --- /dev/null +++ b/lib/v2/priconne-redive/news.js @@ -0,0 +1,54 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const parseContent = (htmlString) => { + const $ = cheerio.load(htmlString); + + $('.contents-body h3').remove(); + const time = $('.meta-info .time').text().trim(); + $('.meta-info').remove(); + const content = $('.contents-body'); + + return { + description: content.html(), + pubDate: new Date(time), + }; + }; + + const response = await got({ + method: 'get', + url: 'https://priconne-redive.jp/news/', + }); + const data = response.data; + const $ = cheerio.load(data); + const list = $('.article_box'); + + const out = await Promise.all( + list.map((index, item) => { + item = $(item); + const link = item.find('a').first().attr('href'); + return ctx.cache.tryGet(link, async () => { + const rssitem = { + title: item.find('h4').text(), + link, + }; + + const response = await got(link); + const result = parseContent(response.data); + + rssitem.description = result.description; + rssitem.pubDate = result.pubDate; + + return rssitem; + }); + }) + ); + + ctx.state.data = { + title: '公主链接日服-新闻', + link: 'https://priconne-redive.jp/news/', + language: 'ja', + item: out, + }; +}; diff --git a/lib/v2/priconne-redive/radar.js b/lib/v2/priconne-redive/radar.js new file mode 100644 index 0000000000..cbf29d37f6 --- /dev/null +++ b/lib/v2/priconne-redive/radar.js @@ -0,0 +1,13 @@ +module.exports = { + 'priconne-redive.jp': { + _name: 'プリンセスコネクト！Re:Dive', + '.': [ + { + title: 'News', + docs: 'https://docs.rsshub.app/routes/game#princess-connect-re-dive-%E3%83%97%E3%83%AA%E3%83%B3%E3%82%BB%E3%82%B9%E3%82%B3%E3%83%8D%E3%82%AF%E3%83%88%EF%BC%81re-dive', + source: ['/news'], + target: '/priconne-redive/news', + }, + ], + }, +}; diff --git a/lib/v2/priconne-redive/router.js b/lib/v2/priconne-redive/router.js new file mode 100644 index 0000000000..630036b8e4 --- /dev/null +++ b/lib/v2/priconne-redive/router.js @@ -0,0 +1,3 @@ +module.exports = (router) => { + router.get('/news', require('./news')); +}; diff --git a/website/docs/routes/game.mdx b/website/docs/routes/game.mdx index 272623e799..5a93f2f29e 100644 --- a/website/docs/routes/game.mdx +++ b/website/docs/routes/game.mdx @@ -447,13 +447,27 @@ -## psnine {#psnine} +## PRINCESS CONNECT! Re Dive プリンセスコネクト！Re Dive {#princess-connect-re-dive-%E3%83%97%E3%83%AA%E3%83%B3%E3%82%BB%E3%82%B9%E3%82%B3%E3%83%8D%E3%82%AF%E3%83%88%EF%BC%81re-dive} -### 首页 - 白金攻略 / 游戏开箱 {#psnine-shou-ye-bai-jin-gong-lve-you-xi-kai-xiang} +### 日服公告 {#princess-connect-re-dive-%E3%83%97%E3%83%AA%E3%83%B3%E3%82%BB%E3%82%B9%E3%82%B3%E3%83%8D%E3%82%AF%E3%83%88%EF%BC%81re-dive-ri-fu-gong-gao} + + + +### 台服公告 {#princess-connect-re-dive-%E3%83%97%E3%83%AA%E3%83%B3%E3%82%BB%E3%82%B9%E3%82%B3%E3%83%8D%E3%82%AF%E3%83%88%EF%BC%81re-dive-tai-fu-gong-gao} + + + +### 国服公告 {#princess-connect-re-dive-%E3%83%97%E3%83%AA%E3%83%B3%E3%82%BB%E3%82%B9%E3%82%B3%E3%83%8D%E3%82%AF%E3%83%88%EF%BC%81re-dive-guo-fu-gong-gao} + + + +## PSN 中文站 {#psn-zhong-wen-zhan} + +### 首页 - 白金攻略 / 游戏开箱 {#psn-zhong-wen-zhan-shou-ye-bai-jin-gong-lve-you-xi-kai-xiang} -### 节点 {#psnine-jie-dian} +### 节点 {#psn-zhong-wen-zhan-jie-dian} | 站务 | 活动 | 旅记 | 折扣 | 会免 | @@ -473,15 +487,15 @@ | famitsu | ign | ucg | -### 数折 - 折扣信息推送 {#psnine-shu-zhe-zhe-kou-xin-xi-tui-song} +### 数折 - 折扣信息推送 {#psn-zhong-wen-zhan-shu-zhe-zhe-kou-xin-xi-tui-song} -### 闲游 - 二手盘信息 {#psnine-xian-you-er-shou-pan-xin-xi} +### 闲游 - 二手盘信息 {#psn-zhong-wen-zhan-xian-you-er-shou-pan-xin-xi} -### 游戏 - 新游戏奖杯信息 {#psnine-you-xi-xin-you-xi-jiang-bei-xin-xi} +### 游戏 - 新游戏奖杯信息 {#psn-zhong-wen-zhan-you-xi-xin-you-xi-jiang-bei-xin-xi} @@ -640,20 +654,6 @@ Due to the regional restrictions, an RSSHub deployment in China Mainland may not -## 公主链接 {#gong-zhu-lian-jie} - -### 日服公告 {#gong-zhu-lian-jie-ri-fu-gong-gao} - - - -### 台服公告 {#gong-zhu-lian-jie-tai-fu-gong-gao} - - - -### 国服公告 {#gong-zhu-lian-jie-guo-fu-gong-gao} - - - ## 怪物猎人世界 {#guai-wu-lie-ren-shi-jie} ### 更新情报 {#guai-wu-lie-ren-shi-jie-geng-xin-qing-bao} From 5820625be26f716d606d59c174bea4411a4c90a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 21:22:07 +0000 Subject: [PATCH 5/7] chore(deps-dev): bump @types/react from 18.2.59 to 18.2.60 in /website (#14575) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.59 to 18.2.60. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- website/package.json | 2 +- website/pnpm-lock.yaml | 54 +++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/website/package.json b/website/package.json index 7d8bcb5319..19e0c910fa 100644 --- a/website/package.json +++ b/website/package.json @@ -36,7 +36,7 @@ "@docusaurus/types": "3.1.1", "@types/markdown-it": "^13.0.7", "@types/mdx-js__react": "^1.5.8", - "@types/react": "^18.2.59", + "@types/react": "^18.2.60", "@types/react-dom": "^18.2.19", "typescript": "^5.3.3" }, diff --git a/website/pnpm-lock.yaml b/website/pnpm-lock.yaml index 5dbe3d3666..39f27ac51b 100644 --- a/website/pnpm-lock.yaml +++ b/website/pnpm-lock.yaml @@ -19,10 +19,10 @@ dependencies: version: 3.1.1(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) '@docusaurus/preset-classic': specifier: 3.1.1 - version: 3.1.1(@algolia/client-search@4.22.1)(@types/react@18.2.59)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0)(typescript@5.3.3) + version: 3.1.1(@algolia/client-search@4.22.1)(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0)(typescript@5.3.3) '@mdx-js/react': specifier: ^3.0.1 - version: 3.0.1(@types/react@18.2.59)(react@18.2.0) + version: 3.0.1(@types/react@18.2.60)(react@18.2.0) clsx: specifier: ^2.1.0 version: 2.1.0 @@ -62,8 +62,8 @@ devDependencies: specifier: ^1.5.8 version: 1.5.8 '@types/react': - specifier: ^18.2.59 - version: 18.2.59 + specifier: ^18.2.60 + version: 18.2.60 '@types/react-dom': specifier: ^18.2.19 version: 18.2.19 @@ -1581,7 +1581,7 @@ packages: resolution: {integrity: sha512-SPiDHaWKQZpwR2siD0KQUwlStvIAnEyK6tAE2h2Wuoq8ue9skzhlyVQ1ddzOxX6khULnAALDiR/isSF3bnuciA==} dev: false - /@docsearch/react@3.5.2(@algolia/client-search@4.22.1)(@types/react@18.2.59)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0): + /@docsearch/react@3.5.2(@algolia/client-search@4.22.1)(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0): resolution: {integrity: sha512-9Ahcrs5z2jq/DcAvYtvlqEBHImbm4YJI8M9y0x6Tqg598P40HTEkX7hsMcIuThI+hTFxRGZ9hll0Wygm2yEjng==} peerDependencies: '@types/react': '>= 16.8.0 < 19.0.0' @@ -1601,7 +1601,7 @@ packages: '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0) '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) '@docsearch/css': 3.5.2 - '@types/react': 18.2.59 + '@types/react': 18.2.60 algoliasearch: 4.22.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -1941,7 +1941,7 @@ packages: '@docusaurus/react-loadable': 5.5.2(react@18.2.0) '@docusaurus/types': 3.1.1(react-dom@18.2.0)(react@18.2.0) '@types/history': 4.7.11 - '@types/react': 18.2.59 + '@types/react': 18.2.60 '@types/react-router-config': 5.0.11 '@types/react-router-dom': 5.3.3 react: 18.2.0 @@ -2333,7 +2333,7 @@ packages: - webpack-cli dev: false - /@docusaurus/preset-classic@3.1.1(@algolia/client-search@4.22.1)(@types/react@18.2.59)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0)(typescript@5.3.3): + /@docusaurus/preset-classic@3.1.1(@algolia/client-search@4.22.1)(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0)(typescript@5.3.3): resolution: {integrity: sha512-jG4ys/hWYf69iaN/xOmF+3kjs4Nnz1Ay3CjFLDtYa8KdxbmUhArA9HmP26ru5N0wbVWhY+6kmpYhTJpez5wTyg==} engines: {node: '>=18.0'} peerDependencies: @@ -2349,9 +2349,9 @@ packages: '@docusaurus/plugin-google-gtag': 3.1.1(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) '@docusaurus/plugin-google-tag-manager': 3.1.1(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) '@docusaurus/plugin-sitemap': 3.1.1(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) - '@docusaurus/theme-classic': 3.1.1(@types/react@18.2.59)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) + '@docusaurus/theme-classic': 3.1.1(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) '@docusaurus/theme-common': 3.1.1(@docusaurus/types@3.1.1)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) - '@docusaurus/theme-search-algolia': 3.1.1(@algolia/client-search@4.22.1)(@docusaurus/types@3.1.1)(@types/react@18.2.59)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0)(typescript@5.3.3) + '@docusaurus/theme-search-algolia': 3.1.1(@algolia/client-search@4.22.1)(@docusaurus/types@3.1.1)(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0)(typescript@5.3.3) '@docusaurus/types': 3.1.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -2382,11 +2382,11 @@ packages: peerDependencies: react: '*' dependencies: - '@types/react': 18.2.59 + '@types/react': 18.2.60 prop-types: 15.8.1 react: 18.2.0 - /@docusaurus/theme-classic@3.1.1(@types/react@18.2.59)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3): + /@docusaurus/theme-classic@3.1.1(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3): resolution: {integrity: sha512-GiPE/jbWM8Qv1A14lk6s9fhc0LhPEQ00eIczRO4QL2nAQJZXkjPG6zaVx+1cZxPFWbAsqSjKe2lqkwF3fGkQ7Q==} engines: {node: '>=18.0'} peerDependencies: @@ -2405,7 +2405,7 @@ packages: '@docusaurus/utils': 3.1.1(@docusaurus/types@3.1.1) '@docusaurus/utils-common': 3.1.1(@docusaurus/types@3.1.1) '@docusaurus/utils-validation': 3.1.1(@docusaurus/types@3.1.1) - '@mdx-js/react': 3.0.1(@types/react@18.2.59)(react@18.2.0) + '@mdx-js/react': 3.0.1(@types/react@18.2.60)(react@18.2.0) clsx: 2.1.0 copy-text-to-clipboard: 3.2.0 infima: 0.2.0-alpha.43 @@ -2455,7 +2455,7 @@ packages: '@docusaurus/utils': 3.1.1(@docusaurus/types@3.1.1) '@docusaurus/utils-common': 3.1.1(@docusaurus/types@3.1.1) '@types/history': 4.7.11 - '@types/react': 18.2.59 + '@types/react': 18.2.60 '@types/react-router-config': 5.0.11 clsx: 2.1.0 parse-numeric-range: 1.3.0 @@ -2484,14 +2484,14 @@ packages: - webpack-cli dev: false - /@docusaurus/theme-search-algolia@3.1.1(@algolia/client-search@4.22.1)(@docusaurus/types@3.1.1)(@types/react@18.2.59)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0)(typescript@5.3.3): + /@docusaurus/theme-search-algolia@3.1.1(@algolia/client-search@4.22.1)(@docusaurus/types@3.1.1)(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0)(typescript@5.3.3): resolution: {integrity: sha512-tBH9VY5EpRctVdaAhT+b1BY8y5dyHVZGFXyCHgTrvcXQy5CV4q7serEX7U3SveNT9zksmchPyct6i1sFDC4Z5g==} engines: {node: '>=18.0'} peerDependencies: react: ^18.0.0 react-dom: ^18.0.0 dependencies: - '@docsearch/react': 3.5.2(@algolia/client-search@4.22.1)(@types/react@18.2.59)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0) + '@docsearch/react': 3.5.2(@algolia/client-search@4.22.1)(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0) '@docusaurus/core': 3.1.1(@docusaurus/types@3.1.1)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) '@docusaurus/logger': 3.1.1 '@docusaurus/plugin-content-docs': 3.1.1(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) @@ -2552,7 +2552,7 @@ packages: dependencies: '@mdx-js/mdx': 3.0.0 '@types/history': 4.7.11 - '@types/react': 18.2.59 + '@types/react': 18.2.60 commander: 5.1.0 joi: 17.12.0 react: 18.2.0 @@ -2577,7 +2577,7 @@ packages: dependencies: '@mdx-js/mdx': 3.0.0 '@types/history': 4.7.11 - '@types/react': 18.2.59 + '@types/react': 18.2.60 commander: 5.1.0 joi: 17.12.0 react: 18.2.0 @@ -2816,14 +2816,14 @@ packages: transitivePeerDependencies: - supports-color - /@mdx-js/react@3.0.1(@types/react@18.2.59)(react@18.2.0): + /@mdx-js/react@3.0.1(@types/react@18.2.60)(react@18.2.0): resolution: {integrity: sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A==} peerDependencies: '@types/react': '>=16' react: '>=16' dependencies: '@types/mdx': 2.0.10 - '@types/react': 18.2.59 + '@types/react': 18.2.60 react: 18.2.0 dev: false @@ -3293,7 +3293,7 @@ packages: /@types/mdx-js__react@1.5.8: resolution: {integrity: sha512-iLQL8JZ4AZ+rpZvGUsQwENffpsSCMLYB8kE6OhGasLmdYn7aSLq53uOvZrKx5FM+hymE2nm08HDfq7tFx02ElA==} dependencies: - '@types/react': 18.2.59 + '@types/react': 18.2.60 dev: true /@types/mdx@2.0.10: @@ -3347,31 +3347,31 @@ packages: /@types/react-dom@18.2.19: resolution: {integrity: sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA==} dependencies: - '@types/react': 18.2.59 + '@types/react': 18.2.60 dev: true /@types/react-router-config@5.0.11: resolution: {integrity: sha512-WmSAg7WgqW7m4x8Mt4N6ZyKz0BubSj/2tVUMsAHp+Yd2AMwcSbeFq9WympT19p5heCFmF97R9eD5uUR/t4HEqw==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.2.59 + '@types/react': 18.2.60 '@types/react-router': 5.1.20 /@types/react-router-dom@5.3.3: resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.2.59 + '@types/react': 18.2.60 '@types/react-router': 5.1.20 /@types/react-router@5.1.20: resolution: {integrity: sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.2.59 + '@types/react': 18.2.60 - /@types/react@18.2.59: - resolution: {integrity: sha512-DE+F6BYEC8VtajY85Qr7mmhTd/79rJKIHCg99MU9SWPB4xvLb6D1za2vYflgZfmPqQVEr6UqJTnLXEwzpVPuOg==} + /@types/react@18.2.60: + resolution: {integrity: sha512-dfiPj9+k20jJrLGOu9Nf6eqxm2EyJRrq2NvwOFsfbb7sFExZ9WELPs67UImHj3Ayxg8ruTtKtNnbjaF8olPq0A==} dependencies: '@types/prop-types': 15.7.9 '@types/scheduler': 0.16.5 From c13d096038b9b6415af64b0ae88f3ffe99a94abf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 23:08:26 +0800 Subject: [PATCH 6/7] chore(deps): bump @sentry/node from 7.102.1 to 7.103.0 (#14577) * chore(deps): bump @sentry/node from 7.102.1 to 7.103.0 Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 7.102.1 to 7.103.0. - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/7.103.0/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/7.102.1...7.103.0) --- updated-dependencies: - dependency-name: "@sentry/node" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * chore: fix pnpm install --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index e979e424f1..804bfeb90f 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "@koa/router": "12.0.1", "@notionhq/client": "2.2.14", "@postlight/parser": "2.2.3", - "@sentry/node": "7.102.1", + "@sentry/node": "7.103.0", "@tonyrl/rand-user-agent": "2.0.52", "aes-js": "3.1.2", "art-template": "4.13.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1b71adfea2..21ae25a445 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ dependencies: specifier: 2.2.3 version: 2.2.3 '@sentry/node': - specifier: 7.102.1 - version: 7.102.1 + specifier: 7.103.0 + version: 7.103.0 '@tonyrl/rand-user-agent': specifier: 2.0.52 version: 2.0.52 @@ -1323,43 +1323,43 @@ packages: selderee: 0.11.0 dev: false - /@sentry-internal/tracing@7.102.1: - resolution: {integrity: sha512-RkFlFyAC0fQOvBbBqnq0CLmFW5m3JJz9pKbZd5vXPraWAlniKSb1bC/4DF9SlNx0FN1LWG+IU3ISdpzwwTeAGg==} + /@sentry-internal/tracing@7.103.0: + resolution: {integrity: sha512-sZ/Wao8HOvGaBs7WlOdflMpHGAFkOBWL6hBiirHaOy5d+IDm7n7et5U6zhvcfiyYBO4nY36gy1Tg5mw+aNO0Vw==} engines: {node: '>=8'} dependencies: - '@sentry/core': 7.102.1 - '@sentry/types': 7.102.1 - '@sentry/utils': 7.102.1 + '@sentry/core': 7.103.0 + '@sentry/types': 7.103.0 + '@sentry/utils': 7.103.0 dev: false - /@sentry/core@7.102.1: - resolution: {integrity: sha512-QjY+LSP3du3J/C8x/FfEbRxgZgsWd0jfTJ4P7s9f219I1csK4OeBMC3UA1HwEa0pY/9OF6H/egW2CjOcMM5Pdg==} + /@sentry/core@7.103.0: + resolution: {integrity: sha512-LCI+PIDoF/RLqN41fNXum3ilmS6ukni6L7t38vSdibbe2G0804EbPLtOIpv2PkS8E6CFuRW5zOb+8OwEAAtZWw==} engines: {node: '>=8'} dependencies: - '@sentry/types': 7.102.1 - '@sentry/utils': 7.102.1 + '@sentry/types': 7.103.0 + '@sentry/utils': 7.103.0 dev: false - /@sentry/node@7.102.1: - resolution: {integrity: sha512-mb3vmM3SGuCruckPiv/Vafeh89UQavTfpPFoU6Jwe6dSpQ39BO8fO8k8Zev+/nP6r/FKLtX17mJobErHECXsYw==} + /@sentry/node@7.103.0: + resolution: {integrity: sha512-/bS/WNeO+PEd0r3o3LN0XGJV+l7hLNy1dTcn61VRgWGVs8SqMBb3uAvXAibZ9zGTCkaX/Ky3JumMcOOoxmNCtg==} engines: {node: '>=8'} dependencies: - '@sentry-internal/tracing': 7.102.1 - '@sentry/core': 7.102.1 - '@sentry/types': 7.102.1 - '@sentry/utils': 7.102.1 + '@sentry-internal/tracing': 7.103.0 + '@sentry/core': 7.103.0 + '@sentry/types': 7.103.0 + '@sentry/utils': 7.103.0 dev: false - /@sentry/types@7.102.1: - resolution: {integrity: sha512-htKorf3t/D0XYtM7foTcmG+rM47rDP6XdbvCcX5gBCuCYlzpM1vqCt2rl3FLktZC6TaIpFRJw1TLfx6m+x5jdA==} + /@sentry/types@7.103.0: + resolution: {integrity: sha512-NCvKyx8d2AGBQKPARrJemZmZ16DiMo688OEikZg4BbvFNDUzK5Egm2BH0vfLDhbNkU19o3maJowrYo42m8r9Zw==} engines: {node: '>=8'} dev: false - /@sentry/utils@7.102.1: - resolution: {integrity: sha512-+8WcFjHVV/HROXSAwMuUzveElBFC43EiTG7SNEBNgOUeQzQVTmbUZXyTVgLrUmtoWqvnIxCacoLxtZo1o67kdg==} + /@sentry/utils@7.103.0: + resolution: {integrity: sha512-phkUJt3F0UOkVq+M4GfdAh2ewI3ASrNiJddx9aO7GnT0aDwwVBHZltnqt95qgAB8W+BipTSt1dAh8yUbbq1Ceg==} engines: {node: '>=8'} dependencies: - '@sentry/types': 7.102.1 + '@sentry/types': 7.103.0 dev: false /@sinclair/typebox@0.27.8: From 7e3c1a2b67b4e25975842a3e8c04eff067c8b7c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 23:27:43 +0800 Subject: [PATCH 7/7] chore(deps-dev): bump @types/eslint from 8.56.3 to 8.56.4 (#14578) * chore(deps-dev): bump @types/eslint from 8.56.3 to 8.56.4 Bumps [@types/eslint](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/eslint) from 8.56.3 to 8.56.4. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/eslint) --- updated-dependencies: - dependency-name: "@types/eslint" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * chore: fix pnpm install --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 804bfeb90f..e8843829b5 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "@stylistic/eslint-plugin-js": "1.6.2", "@types/aes-js": "3.1.4", "@types/crypto-js": "4.2.2", - "@types/eslint": "8.56.3", + "@types/eslint": "8.56.4", "@types/eslint-config-prettier": "6.11.3", "@types/etag": "1.8.3", "@types/fs-extra": "11.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 21ae25a445..fbffccbf8b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -230,8 +230,8 @@ devDependencies: specifier: 4.2.2 version: 4.2.2 '@types/eslint': - specifier: 8.56.3 - version: 8.56.3 + specifier: 8.56.4 + version: 8.56.4 '@types/eslint-config-prettier': specifier: 6.11.3 version: 6.11.3 @@ -327,7 +327,7 @@ devDependencies: version: 16.6.2(eslint@8.57.0) eslint-plugin-prettier: specifier: 5.1.3 - version: 5.1.3(@types/eslint@8.56.3)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5) + version: 5.1.3(@types/eslint@8.56.4)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5) eslint-plugin-unicorn: specifier: 51.0.1 version: 51.0.1(eslint@8.57.0) @@ -1394,7 +1394,7 @@ packages: peerDependencies: eslint: '>=8.40.0' dependencies: - '@types/eslint': 8.56.3 + '@types/eslint': 8.56.4 acorn: 8.11.3 escape-string-regexp: 4.0.0 eslint: 8.57.0 @@ -1526,8 +1526,8 @@ packages: resolution: {integrity: sha512-3wXCiM8croUnhg9LdtZUJQwNcQYGWxxdOWDjPe1ykCqJFPVpzAKfs/2dgSoCtAvdPeaponcWPI7mPcGGp9dkKQ==} dev: true - /@types/eslint@8.56.3: - resolution: {integrity: sha512-PvSf1wfv2wJpVIFUMSb+i4PvqNYkB9Rkp9ZDO3oaWzq4SKhsQk4mrMBr3ZH06I0hKrVGLBacmgl8JM4WVjb9dg==} + /@types/eslint@8.56.4: + resolution: {integrity: sha512-lG1GLUnL5vuRBGb3MgWUWLdGMH2Hps+pERuyQXCfWozuGKdnhf9Pbg4pkcrVUHjKrU7Rl+GCZ/299ObBXZFAxg==} dependencies: '@types/estree': 1.0.5 '@types/json-schema': 7.0.15 @@ -3539,7 +3539,7 @@ packages: semver: 7.6.0 dev: true - /eslint-plugin-prettier@5.1.3(@types/eslint@8.56.3)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5): + /eslint-plugin-prettier@5.1.3(@types/eslint@8.56.4)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5): resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -3553,7 +3553,7 @@ packages: eslint-config-prettier: optional: true dependencies: - '@types/eslint': 8.56.3 + '@types/eslint': 8.56.4 eslint: 8.57.0 eslint-config-prettier: 9.1.0(eslint@8.57.0) prettier: 3.2.5