From 08d814338657276b4e5ccd4ac1211bd02389292a Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 27 Jun 2024 21:24:54 +0200 Subject: [PATCH] [backend] Switch to updated summaly version which sends a more descriptive user agent Upstream summaly is sending a user agent that just says SummalyBot, which can be mistaken as a web scraper. --- .pnp.cjs | 424 +++++++--------- ...ummaly-npm-2.7.1-b4a810dbd8-de3ffcd39e.zip | 3 + ...ummaly-npm-2.7.0-e25bfbf6a2-ce49173396.zip | 3 - packages/backend/package.json | 2 +- .../backend/src/server/web/url-preview.ts | 3 +- yarn.lock | 453 +++++++----------- 6 files changed, 349 insertions(+), 539 deletions(-) create mode 100644 .yarn/cache/@iceshrimp-summaly-npm-2.7.1-b4a810dbd8-de3ffcd39e.zip delete mode 100644 .yarn/cache/summaly-npm-2.7.0-e25bfbf6a2-ce49173396.zip diff --git a/.pnp.cjs b/.pnp.cjs index 773bcfa08..895ea5bd6 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -1312,16 +1312,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@emnapi/runtime", [\ - ["npm:1.2.0", {\ - "packageLocation": "./.yarn/cache/@emnapi-runtime-npm-1.2.0-36d2203035-c954b36493.zip/node_modules/@emnapi/runtime/",\ - "packageDependencies": [\ - ["@emnapi/runtime", "npm:1.2.0"],\ - ["tslib", "npm:2.6.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@es-joy/jsdoccomment", [\ ["npm:0.39.4", {\ "packageLocation": "./.yarn/cache/@es-joy-jsdoccomment-npm-0.39.4-48cba32ec8-10d18c2de8.zip/node_modules/@es-joy/jsdoccomment/",\ @@ -1879,182 +1869,22 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@img/sharp-darwin-arm64", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-darwin-arm64-npm-0.33.4-061afc6886/node_modules/@img/sharp-darwin-arm64/",\ + ["@iceshrimp/summaly", [\ + ["npm:2.7.1::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fsummaly%2F-%2F2.7.1%2Fsummaly-2.7.1.tgz", {\ + "packageLocation": "./.yarn/cache/@iceshrimp-summaly-npm-2.7.1-b4a810dbd8-de3ffcd39e.zip/node_modules/@iceshrimp/summaly/",\ "packageDependencies": [\ - ["@img/sharp-darwin-arm64", "npm:0.33.4"],\ - ["@img/sharp-libvips-darwin-arm64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-darwin-x64", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-darwin-x64-npm-0.33.4-6aac8de317/node_modules/@img/sharp-darwin-x64/",\ - "packageDependencies": [\ - ["@img/sharp-darwin-x64", "npm:0.33.4"],\ - ["@img/sharp-libvips-darwin-x64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-libvips-darwin-arm64", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-libvips-darwin-arm64-npm-1.0.2-6c9ede770e/node_modules/@img/sharp-libvips-darwin-arm64/",\ - "packageDependencies": [\ - ["@img/sharp-libvips-darwin-arm64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-libvips-darwin-x64", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-libvips-darwin-x64-npm-1.0.2-01b146c37d/node_modules/@img/sharp-libvips-darwin-x64/",\ - "packageDependencies": [\ - ["@img/sharp-libvips-darwin-x64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-libvips-linux-arm", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-libvips-linux-arm-npm-1.0.2-2f8e5af7fa/node_modules/@img/sharp-libvips-linux-arm/",\ - "packageDependencies": [\ - ["@img/sharp-libvips-linux-arm", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-libvips-linux-arm64", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-libvips-linux-arm64-npm-1.0.2-a3a6e66f3b/node_modules/@img/sharp-libvips-linux-arm64/",\ - "packageDependencies": [\ - ["@img/sharp-libvips-linux-arm64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-libvips-linux-s390x", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-libvips-linux-s390x-npm-1.0.2-45978c229d/node_modules/@img/sharp-libvips-linux-s390x/",\ - "packageDependencies": [\ - ["@img/sharp-libvips-linux-s390x", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-libvips-linux-x64", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-libvips-linux-x64-npm-1.0.2-69e740ab3d/node_modules/@img/sharp-libvips-linux-x64/",\ - "packageDependencies": [\ - ["@img/sharp-libvips-linux-x64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-libvips-linuxmusl-arm64", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-libvips-linuxmusl-arm64-npm-1.0.2-f787a79edb/node_modules/@img/sharp-libvips-linuxmusl-arm64/",\ - "packageDependencies": [\ - ["@img/sharp-libvips-linuxmusl-arm64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-libvips-linuxmusl-x64", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-libvips-linuxmusl-x64-npm-1.0.2-e4d5858946/node_modules/@img/sharp-libvips-linuxmusl-x64/",\ - "packageDependencies": [\ - ["@img/sharp-libvips-linuxmusl-x64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-linux-arm", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-linux-arm-npm-0.33.4-11716810a3/node_modules/@img/sharp-linux-arm/",\ - "packageDependencies": [\ - ["@img/sharp-linux-arm", "npm:0.33.4"],\ - ["@img/sharp-libvips-linux-arm", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-linux-arm64", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-linux-arm64-npm-0.33.4-eee77af7d4/node_modules/@img/sharp-linux-arm64/",\ - "packageDependencies": [\ - ["@img/sharp-linux-arm64", "npm:0.33.4"],\ - ["@img/sharp-libvips-linux-arm64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-linux-s390x", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-linux-s390x-npm-0.33.4-d87dc58494/node_modules/@img/sharp-linux-s390x/",\ - "packageDependencies": [\ - ["@img/sharp-linux-s390x", "npm:0.33.4"],\ - ["@img/sharp-libvips-linux-s390x", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-linux-x64", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-linux-x64-npm-0.33.4-e678be5de4/node_modules/@img/sharp-linux-x64/",\ - "packageDependencies": [\ - ["@img/sharp-linux-x64", "npm:0.33.4"],\ - ["@img/sharp-libvips-linux-x64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-linuxmusl-arm64", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-linuxmusl-arm64-npm-0.33.4-c98abb8a19/node_modules/@img/sharp-linuxmusl-arm64/",\ - "packageDependencies": [\ - ["@img/sharp-linuxmusl-arm64", "npm:0.33.4"],\ - ["@img/sharp-libvips-linuxmusl-arm64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-linuxmusl-x64", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-linuxmusl-x64-npm-0.33.4-6e3f28f5de/node_modules/@img/sharp-linuxmusl-x64/",\ - "packageDependencies": [\ - ["@img/sharp-linuxmusl-x64", "npm:0.33.4"],\ - ["@img/sharp-libvips-linuxmusl-x64", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-wasm32", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-wasm32-npm-0.33.4-f2b467a25b/node_modules/@img/sharp-wasm32/",\ - "packageDependencies": [\ - ["@img/sharp-wasm32", "npm:0.33.4"],\ - ["@emnapi/runtime", "npm:1.2.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-win32-ia32", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-win32-ia32-npm-0.33.4-ac639c6571/node_modules/@img/sharp-win32-ia32/",\ - "packageDependencies": [\ - ["@img/sharp-win32-ia32", "npm:0.33.4"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@img/sharp-win32-x64", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/@img-sharp-win32-x64-npm-0.33.4-0108695db5/node_modules/@img/sharp-win32-x64/",\ - "packageDependencies": [\ - ["@img/sharp-win32-x64", "npm:0.33.4"]\ + ["@iceshrimp/summaly", "npm:2.7.1::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fsummaly%2F-%2F2.7.1%2Fsummaly-2.7.1.tgz"],\ + ["cheerio", "npm:0.22.0"],\ + ["debug", "virtual:b4a810dbd81321c859eb398d1970a66ed827fdee2aac632fe99a420d44666c5db36df3d173758d7c6c233bfcbedac74d2a1133f891b2288588300e5603f3ac1c#npm:4.3.3"],\ + ["escape-regexp", "npm:0.0.1"],\ + ["got", "npm:11.8.5"],\ + ["html-entities", "npm:2.3.2"],\ + ["iconv-lite", "npm:0.6.3"],\ + ["jschardet", "npm:3.0.0"],\ + ["koa", "npm:2.13.4"],\ + ["private-ip", "npm:2.3.3"],\ + ["require-all", "npm:3.0.0"],\ + ["trace-redirect", "npm:1.0.6"]\ ],\ "linkType": "HARD"\ }]\ @@ -7123,6 +6953,7 @@ const RAW_RUNTIME_STATE = ["@bull-board/koa", "npm:5.6.0"],\ ["@bull-board/ui", "npm:5.6.0"],\ ["@discordapp/twemoji", "npm:14.1.2"],\ + ["@iceshrimp/summaly", "npm:2.7.1::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fsummaly%2F-%2F2.7.1%2Fsummaly-2.7.1.tgz"],\ ["@koa/cors", "npm:3.4.3"],\ ["@koa/multer", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:3.0.2"],\ ["@koa/router", "npm:9.0.1"],\ @@ -7271,10 +7102,9 @@ const RAW_RUNTIME_STATE = ["sanitize-html", "npm:2.10.0"],\ ["seedrandom", "npm:3.0.5"],\ ["semver", "npm:7.5.4"],\ - ["sharp", "npm:0.33.4"],\ + ["sharp", "npm:0.32.1"],\ ["strict-event-emitter-types", "npm:2.0.0"],\ ["stringz", "npm:2.1.0"],\ - ["summaly", "npm:2.7.0"],\ ["swc-loader", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:0.2.3"],\ ["syslog-pro", "npm:1.0.0"],\ ["systeminformation", "npm:5.21.12"],\ @@ -8348,6 +8178,13 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["chownr", [\ + ["npm:1.1.4", {\ + "packageLocation": "./.yarn/cache/chownr-npm-1.1.4-5bd400ab08-115648f8eb.zip/node_modules/chownr/",\ + "packageDependencies": [\ + ["chownr", "npm:1.1.4"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:2.0.0", {\ "packageLocation": "./.yarn/cache/chownr-npm-2.0.0-638f1c9c61-c57cf9dd07.zip/node_modules/chownr/",\ "packageDependencies": [\ @@ -9875,10 +9712,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "HARD"\ }],\ - ["virtual:e25bfbf6a21b48b0676f9feb450311244401d305a353e3f897116a12e8c3ea4290af8f75d82293d983ade94477e438f22bd5aef50106ca078894f6d12cb168a2#npm:4.3.3", {\ - "packageLocation": "./.yarn/__virtual__/debug-virtual-bcbb4855d3/0/cache/debug-npm-4.3.3-710fd4cc7f-723a9570dc.zip/node_modules/debug/",\ + ["virtual:b4a810dbd81321c859eb398d1970a66ed827fdee2aac632fe99a420d44666c5db36df3d173758d7c6c233bfcbedac74d2a1133f891b2288588300e5603f3ac1c#npm:4.3.3", {\ + "packageLocation": "./.yarn/__virtual__/debug-virtual-ba5b054d45/0/cache/debug-npm-4.3.3-710fd4cc7f-723a9570dc.zip/node_modules/debug/",\ "packageDependencies": [\ - ["debug", "virtual:e25bfbf6a21b48b0676f9feb450311244401d305a353e3f897116a12e8c3ea4290af8f75d82293d983ade94477e438f22bd5aef50106ca078894f6d12cb168a2#npm:4.3.3"],\ + ["debug", "virtual:b4a810dbd81321c859eb398d1970a66ed827fdee2aac632fe99a420d44666c5db36df3d173758d7c6c233bfcbedac74d2a1133f891b2288588300e5603f3ac1c#npm:4.3.3"],\ ["@types/supports-color", null],\ ["ms", "npm:2.1.2"],\ ["supports-color", "npm:8.1.1"]\ @@ -10052,6 +9889,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["deep-extend", [\ + ["npm:0.6.0", {\ + "packageLocation": "./.yarn/cache/deep-extend-npm-0.6.0-e182924219-7be7e5a8d4.zip/node_modules/deep-extend/",\ + "packageDependencies": [\ + ["deep-extend", "npm:0.6.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["deep-is", [\ ["npm:0.1.4", {\ "packageLocation": "./.yarn/cache/deep-is-npm-0.1.4-88938b5a67-ec12d074ae.zip/node_modules/deep-is/",\ @@ -10256,13 +10102,6 @@ const RAW_RUNTIME_STATE = ["detect-libc", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.0.3", {\ - "packageLocation": "./.yarn/cache/detect-libc-npm-2.0.3-2ddae34945-b4ea018d62.zip/node_modules/detect-libc/",\ - "packageDependencies": [\ - ["detect-libc", "npm:2.0.3"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["detect-newline", [\ @@ -12066,6 +11905,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["expand-template", [\ + ["npm:2.0.3", {\ + "packageLocation": "./.yarn/cache/expand-template-npm-2.0.3-80de959306-588c198472.zip/node_modules/expand-template/",\ + "packageDependencies": [\ + ["expand-template", "npm:2.0.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["expand-tilde", [\ ["npm:2.0.2", {\ "packageLocation": "./.yarn/cache/expand-tilde-npm-2.0.2-a4020a62f5-2efe6ed407.zip/node_modules/expand-tilde/",\ @@ -13168,6 +13016,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["github-from-package", [\ + ["npm:0.0.0", {\ + "packageLocation": "./.yarn/cache/github-from-package-npm-0.0.0-519f80c9a1-2a091ba07f.zip/node_modules/github-from-package/",\ + "packageDependencies": [\ + ["github-from-package", "npm:0.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["glob", [\ ["npm:10.3.10", {\ "packageLocation": "./.yarn/cache/glob-npm-10.3.10-da1ef8b112-38bdb2c9ce.zip/node_modules/glob/",\ @@ -18028,6 +17885,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["mkdirp-classic", [\ + ["npm:0.5.3", {\ + "packageLocation": "./.yarn/cache/mkdirp-classic-npm-0.5.3-3b5c991910-3f4e088208.zip/node_modules/mkdirp-classic/",\ + "packageDependencies": [\ + ["mkdirp-classic", "npm:0.5.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["mocha", [\ ["npm:10.2.0", {\ "packageLocation": "./.yarn/cache/mocha-npm-10.2.0-87db25c7c5-f7362898ae.zip/node_modules/mocha/",\ @@ -18218,6 +18084,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["napi-build-utils", [\ + ["npm:1.0.2", {\ + "packageLocation": "./.yarn/cache/napi-build-utils-npm-1.0.2-892e4bba56-276feb8e30.zip/node_modules/napi-build-utils/",\ + "packageDependencies": [\ + ["napi-build-utils", "npm:1.0.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["natural-compare", [\ ["npm:1.4.0", {\ "packageLocation": "./.yarn/cache/natural-compare-npm-1.4.0-97b75b362d-23ad088b08.zip/node_modules/natural-compare/",\ @@ -18293,6 +18168,16 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["node-abi", [\ + ["npm:3.45.0", {\ + "packageLocation": "./.yarn/cache/node-abi-npm-3.45.0-586bc5cf50-b59b49d515.zip/node_modules/node-abi/",\ + "packageDependencies": [\ + ["node-abi", "npm:3.45.0"],\ + ["semver", "npm:7.5.4"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["node-addon-api", [\ ["npm:5.1.0", {\ "packageLocation": "./.yarn/unplugged/node-addon-api-npm-5.1.0-b50d00f739/node_modules/node-addon-api/",\ @@ -18301,6 +18186,14 @@ const RAW_RUNTIME_STATE = ["node-gyp", "npm:9.4.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:6.1.0", {\ + "packageLocation": "./.yarn/unplugged/node-addon-api-npm-6.1.0-634c545b39/node_modules/node-addon-api/",\ + "packageDependencies": [\ + ["node-addon-api", "npm:6.1.0"],\ + ["node-gyp", "npm:9.4.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["node-domexception", [\ @@ -20231,6 +20124,27 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["prebuild-install", [\ + ["npm:7.1.1", {\ + "packageLocation": "./.yarn/cache/prebuild-install-npm-7.1.1-cb9fc9d341-6c70a2f82f.zip/node_modules/prebuild-install/",\ + "packageDependencies": [\ + ["prebuild-install", "npm:7.1.1"],\ + ["detect-libc", "npm:2.0.2"],\ + ["expand-template", "npm:2.0.3"],\ + ["github-from-package", "npm:0.0.0"],\ + ["minimist", "npm:1.2.8"],\ + ["mkdirp-classic", "npm:0.5.3"],\ + ["napi-build-utils", "npm:1.0.2"],\ + ["node-abi", "npm:3.45.0"],\ + ["pump", "npm:3.0.0"],\ + ["rc", "npm:1.2.8"],\ + ["simple-get", "npm:4.0.1"],\ + ["tar-fs", "npm:2.1.1"],\ + ["tunnel-agent", "npm:0.6.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["prelude-ls", [\ ["npm:1.2.1", {\ "packageLocation": "./.yarn/cache/prelude-ls-npm-1.2.1-3e4d272a55-0b9d2c7680.zip/node_modules/prelude-ls/",\ @@ -20902,6 +20816,19 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["rc", [\ + ["npm:1.2.8", {\ + "packageLocation": "./.yarn/cache/rc-npm-1.2.8-d6768ac936-5c4d72ae7e.zip/node_modules/rc/",\ + "packageDependencies": [\ + ["rc", "npm:1.2.8"],\ + ["deep-extend", "npm:0.6.0"],\ + ["ini", "npm:1.3.8"],\ + ["minimist", "npm:1.2.8"],\ + ["strip-json-comments", "npm:2.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["rdf-canonize", [\ ["npm:3.4.0", {\ "packageLocation": "./.yarn/cache/rdf-canonize-npm-3.4.0-87bb945794-4b77dad3ef.zip/node_modules/rdf-canonize/",\ @@ -21863,13 +21790,6 @@ const RAW_RUNTIME_STATE = ["lru-cache", "npm:6.0.0"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:7.6.2", {\ - "packageLocation": "./.yarn/cache/semver-npm-7.6.2-0fec6944bb-296b17d027.zip/node_modules/semver/",\ - "packageDependencies": [\ - ["semver", "npm:7.6.2"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["semver-greatest-satisfied-range", [\ @@ -21999,32 +21919,19 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["sharp", [\ - ["npm:0.33.4", {\ - "packageLocation": "./.yarn/unplugged/sharp-npm-0.33.4-afc15185a7/node_modules/sharp/",\ + ["npm:0.32.1", {\ + "packageLocation": "./.yarn/unplugged/sharp-npm-0.32.1-5af640fc49/node_modules/sharp/",\ "packageDependencies": [\ - ["sharp", "npm:0.33.4"],\ - ["@img/sharp-darwin-arm64", "npm:0.33.4"],\ - ["@img/sharp-darwin-x64", "npm:0.33.4"],\ - ["@img/sharp-libvips-darwin-arm64", "npm:1.0.2"],\ - ["@img/sharp-libvips-darwin-x64", "npm:1.0.2"],\ - ["@img/sharp-libvips-linux-arm", "npm:1.0.2"],\ - ["@img/sharp-libvips-linux-arm64", "npm:1.0.2"],\ - ["@img/sharp-libvips-linux-s390x", "npm:1.0.2"],\ - ["@img/sharp-libvips-linux-x64", "npm:1.0.2"],\ - ["@img/sharp-libvips-linuxmusl-arm64", "npm:1.0.2"],\ - ["@img/sharp-libvips-linuxmusl-x64", "npm:1.0.2"],\ - ["@img/sharp-linux-arm", "npm:0.33.4"],\ - ["@img/sharp-linux-arm64", "npm:0.33.4"],\ - ["@img/sharp-linux-s390x", "npm:0.33.4"],\ - ["@img/sharp-linux-x64", "npm:0.33.4"],\ - ["@img/sharp-linuxmusl-arm64", "npm:0.33.4"],\ - ["@img/sharp-linuxmusl-x64", "npm:0.33.4"],\ - ["@img/sharp-wasm32", "npm:0.33.4"],\ - ["@img/sharp-win32-ia32", "npm:0.33.4"],\ - ["@img/sharp-win32-x64", "npm:0.33.4"],\ + ["sharp", "npm:0.32.1"],\ ["color", "npm:4.2.3"],\ - ["detect-libc", "npm:2.0.3"],\ - ["semver", "npm:7.6.2"]\ + ["detect-libc", "npm:2.0.2"],\ + ["node-addon-api", "npm:6.1.0"],\ + ["node-gyp", "npm:9.4.0"],\ + ["prebuild-install", "npm:7.1.1"],\ + ["semver", "npm:7.5.4"],\ + ["simple-get", "npm:4.0.1"],\ + ["tar-fs", "npm:2.1.1"],\ + ["tunnel-agent", "npm:0.6.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -22091,6 +21998,27 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["simple-concat", [\ + ["npm:1.0.1", {\ + "packageLocation": "./.yarn/cache/simple-concat-npm-1.0.1-48df70de29-4d211042cc.zip/node_modules/simple-concat/",\ + "packageDependencies": [\ + ["simple-concat", "npm:1.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["simple-get", [\ + ["npm:4.0.1", {\ + "packageLocation": "./.yarn/cache/simple-get-npm-4.0.1-fa2a97645d-93f1b32319.zip/node_modules/simple-get/",\ + "packageDependencies": [\ + ["simple-get", "npm:4.0.1"],\ + ["decompress-response", "npm:6.0.0"],\ + ["once", "npm:1.4.0"],\ + ["simple-concat", "npm:1.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["simple-swizzle", [\ ["npm:0.2.2", {\ "packageLocation": "./.yarn/cache/simple-swizzle-npm-0.2.2-8dee37fad1-c6dffff17a.zip/node_modules/simple-swizzle/",\ @@ -22815,6 +22743,13 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["strip-json-comments", [\ + ["npm:2.0.1", {\ + "packageLocation": "./.yarn/cache/strip-json-comments-npm-2.0.1-e7883b2d04-1074ccb632.zip/node_modules/strip-json-comments/",\ + "packageDependencies": [\ + ["strip-json-comments", "npm:2.0.1"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:3.1.1", {\ "packageLocation": "./.yarn/cache/strip-json-comments-npm-3.1.1-dcb2324823-492f73e272.zip/node_modules/strip-json-comments/",\ "packageDependencies": [\ @@ -22867,26 +22802,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["summaly", [\ - ["npm:2.7.0", {\ - "packageLocation": "./.yarn/cache/summaly-npm-2.7.0-e25bfbf6a2-ce49173396.zip/node_modules/summaly/",\ - "packageDependencies": [\ - ["summaly", "npm:2.7.0"],\ - ["cheerio", "npm:0.22.0"],\ - ["debug", "virtual:e25bfbf6a21b48b0676f9feb450311244401d305a353e3f897116a12e8c3ea4290af8f75d82293d983ade94477e438f22bd5aef50106ca078894f6d12cb168a2#npm:4.3.3"],\ - ["escape-regexp", "npm:0.0.1"],\ - ["got", "npm:11.8.5"],\ - ["html-entities", "npm:2.3.2"],\ - ["iconv-lite", "npm:0.6.3"],\ - ["jschardet", "npm:3.0.0"],\ - ["koa", "npm:2.13.4"],\ - ["private-ip", "npm:2.3.3"],\ - ["require-all", "npm:3.0.0"],\ - ["trace-redirect", "npm:1.0.6"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["supports-color", [\ ["npm:2.0.0", {\ "packageLocation": "./.yarn/cache/supports-color-npm-2.0.0-22c0f0adbc-d2957d19e7.zip/node_modules/supports-color/",\ @@ -23125,6 +23040,19 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["tar-fs", [\ + ["npm:2.1.1", {\ + "packageLocation": "./.yarn/cache/tar-fs-npm-2.1.1-e374d3b7a2-526deae025.zip/node_modules/tar-fs/",\ + "packageDependencies": [\ + ["tar-fs", "npm:2.1.1"],\ + ["chownr", "npm:1.1.4"],\ + ["mkdirp-classic", "npm:0.5.3"],\ + ["pump", "npm:3.0.0"],\ + ["tar-stream", "npm:2.2.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["tar-stream", [\ ["npm:1.6.2", {\ "packageLocation": "./.yarn/cache/tar-stream-npm-1.6.2-f4a7fc08e2-ac9b850bd4.zip/node_modules/tar-stream/",\ diff --git a/.yarn/cache/@iceshrimp-summaly-npm-2.7.1-b4a810dbd8-de3ffcd39e.zip b/.yarn/cache/@iceshrimp-summaly-npm-2.7.1-b4a810dbd8-de3ffcd39e.zip new file mode 100644 index 000000000..5b4aec607 --- /dev/null +++ b/.yarn/cache/@iceshrimp-summaly-npm-2.7.1-b4a810dbd8-de3ffcd39e.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b844f7c19f4556419d90f6baa2d853488e4078bae090658509a40eb705374ab +size 21772 diff --git a/.yarn/cache/summaly-npm-2.7.0-e25bfbf6a2-ce49173396.zip b/.yarn/cache/summaly-npm-2.7.0-e25bfbf6a2-ce49173396.zip deleted file mode 100644 index 594d21c13..000000000 --- a/.yarn/cache/summaly-npm-2.7.0-e25bfbf6a2-ce49173396.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de40cc2e0e31a4becbede073011913bbefc6d5f632d168c14f80a0618d305589 -size 20258 diff --git a/packages/backend/package.json b/packages/backend/package.json index 4f56d198a..f0c858b47 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -27,6 +27,7 @@ "@bull-board/koa": "5.6.0", "@bull-board/ui": "5.6.0", "@discordapp/twemoji": "14.1.2", + "@iceshrimp/summaly": "2.7.1", "@koa/cors": "3.4.3", "@koa/multer": "3.0.2", "@koa/router": "9.0.1", @@ -122,7 +123,6 @@ "semver": "7.5.4", "sharp": "0.33.4", "stringz": "2.1.0", - "summaly": "2.7.0", "syslog-pro": "1.0.0", "systeminformation": "^5.21.12", "tar-stream": "^3.1.6", diff --git a/packages/backend/src/server/web/url-preview.ts b/packages/backend/src/server/web/url-preview.ts index c9f3b6cac..4acb12c08 100644 --- a/packages/backend/src/server/web/url-preview.ts +++ b/packages/backend/src/server/web/url-preview.ts @@ -1,5 +1,5 @@ import type Koa from "koa"; -import summaly from "summaly"; +import summaly from "@iceshrimp/summaly"; import { fetchMeta } from "@/misc/fetch-meta.js"; import Logger from "@/services/logger.js"; import config from "@/config/index.js"; @@ -40,6 +40,7 @@ export const urlPreviewHandler = async (ctx: Koa.Context) => { : await summaly.default(url, { followRedirects: false, lang: lang ?? "en-US", + userAgent: config.userAgent }); logger.succ(`Got preview of ${url}: ${summary.title}`); diff --git a/yarn.lock b/yarn.lock index 44a88d846..81e637c46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -789,15 +789,6 @@ __metadata: languageName: node linkType: hard -"@emnapi/runtime@npm:^1.1.1": - version: 1.2.0 - resolution: "@emnapi/runtime@npm:1.2.0" - dependencies: - tslib: "npm:^2.4.0" - checksum: 10/c954b36493b713e451c74e9f1a48124b5491196700ec458c5d4a94eac3351e14803b4fd48ae6f72c77956d75792093d377f96412a6f59766099cb142e5c5b8f4 - languageName: node - linkType: hard - "@es-joy/jsdoccomment@npm:~0.39.4": version: 0.39.4 resolution: "@es-joy/jsdoccomment@npm:0.39.4" @@ -1190,178 +1181,22 @@ __metadata: languageName: node linkType: hard -"@img/sharp-darwin-arm64@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-darwin-arm64@npm:0.33.4" +"@iceshrimp/summaly@npm:2.7.1": + version: 2.7.1 + resolution: "@iceshrimp/summaly@npm:2.7.1::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fsummaly%2F-%2F2.7.1%2Fsummaly-2.7.1.tgz" dependencies: - "@img/sharp-libvips-darwin-arm64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-darwin-arm64": - optional: true - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"@img/sharp-darwin-x64@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-darwin-x64@npm:0.33.4" - dependencies: - "@img/sharp-libvips-darwin-x64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-darwin-x64": - optional: true - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@img/sharp-libvips-darwin-arm64@npm:1.0.2": - version: 1.0.2 - resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.2" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"@img/sharp-libvips-darwin-x64@npm:1.0.2": - version: 1.0.2 - resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.2" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@img/sharp-libvips-linux-arm64@npm:1.0.2": - version: 1.0.2 - resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.2" - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - -"@img/sharp-libvips-linux-arm@npm:1.0.2": - version: 1.0.2 - resolution: "@img/sharp-libvips-linux-arm@npm:1.0.2" - conditions: os=linux & cpu=arm & libc=glibc - languageName: node - linkType: hard - -"@img/sharp-libvips-linux-s390x@npm:1.0.2": - version: 1.0.2 - resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.2" - conditions: os=linux & cpu=s390x & libc=glibc - languageName: node - linkType: hard - -"@img/sharp-libvips-linux-x64@npm:1.0.2": - version: 1.0.2 - resolution: "@img/sharp-libvips-linux-x64@npm:1.0.2" - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - -"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.2": - version: 1.0.2 - resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.2" - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - -"@img/sharp-libvips-linuxmusl-x64@npm:1.0.2": - version: 1.0.2 - resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.2" - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - -"@img/sharp-linux-arm64@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-linux-arm64@npm:0.33.4" - dependencies: - "@img/sharp-libvips-linux-arm64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linux-arm64": - optional: true - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - -"@img/sharp-linux-arm@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-linux-arm@npm:0.33.4" - dependencies: - "@img/sharp-libvips-linux-arm": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linux-arm": - optional: true - conditions: os=linux & cpu=arm & libc=glibc - languageName: node - linkType: hard - -"@img/sharp-linux-s390x@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-linux-s390x@npm:0.33.4" - dependencies: - "@img/sharp-libvips-linux-s390x": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linux-s390x": - optional: true - conditions: os=linux & cpu=s390x & libc=glibc - languageName: node - linkType: hard - -"@img/sharp-linux-x64@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-linux-x64@npm:0.33.4" - dependencies: - "@img/sharp-libvips-linux-x64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linux-x64": - optional: true - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - -"@img/sharp-linuxmusl-arm64@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.4" - dependencies: - "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linuxmusl-arm64": - optional: true - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - -"@img/sharp-linuxmusl-x64@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-linuxmusl-x64@npm:0.33.4" - dependencies: - "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linuxmusl-x64": - optional: true - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - -"@img/sharp-wasm32@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-wasm32@npm:0.33.4" - dependencies: - "@emnapi/runtime": "npm:^1.1.1" - conditions: cpu=wasm32 - languageName: node - linkType: hard - -"@img/sharp-win32-ia32@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-win32-ia32@npm:0.33.4" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - -"@img/sharp-win32-x64@npm:0.33.4": - version: 0.33.4 - resolution: "@img/sharp-win32-x64@npm:0.33.4" - conditions: os=win32 & cpu=x64 + cheerio: "npm:0.22.0" + debug: "npm:4.3.3" + escape-regexp: "npm:0.0.1" + got: "npm:11.8.5" + html-entities: "npm:2.3.2" + iconv-lite: "npm:0.6.3" + jschardet: "npm:3.0.0" + koa: "npm:2.13.4" + private-ip: "npm:2.3.3" + require-all: "npm:3.0.0" + trace-redirect: "npm:1.0.6" + checksum: 10/de3ffcd39e29f6ee745ead391a4688faf54bc81e476c4f712aba985e32d6e4a35f66e4fba9c8e0648a67dac360eb2dc1fc387bf70fadac19c025f39bfb502034 languageName: node linkType: hard @@ -5433,6 +5268,7 @@ __metadata: "@bull-board/koa": "npm:5.6.0" "@bull-board/ui": "npm:5.6.0" "@discordapp/twemoji": "npm:14.1.2" + "@iceshrimp/summaly": "npm:2.7.1" "@koa/cors": "npm:3.4.3" "@koa/multer": "npm:3.0.2" "@koa/router": "npm:9.0.1" @@ -5581,10 +5417,9 @@ __metadata: sanitize-html: "npm:2.10.0" seedrandom: "npm:^3.0.5" semver: "npm:7.5.4" - sharp: "npm:0.33.4" + sharp: "npm:0.32.1" strict-event-emitter-types: "npm:2.0.0" stringz: "npm:2.1.0" - summaly: "npm:2.7.0" swc-loader: "npm:^0.2.3" syslog-pro: "npm:1.0.0" systeminformation: "npm:^5.21.12" @@ -6513,6 +6348,13 @@ __metadata: languageName: node linkType: hard +"chownr@npm:^1.1.1": + version: 1.1.4 + resolution: "chownr@npm:1.1.4" + checksum: 10/115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d + languageName: node + linkType: hard + "chownr@npm:^2.0.0": version: 2.0.0 resolution: "chownr@npm:2.0.0" @@ -7832,6 +7674,13 @@ __metadata: languageName: node linkType: hard +"deep-extend@npm:^0.6.0": + version: 0.6.0 + resolution: "deep-extend@npm:0.6.0" + checksum: 10/7be7e5a8d468d6b10e6a67c3de828f55001b6eb515d014f7aeb9066ce36bd5717161eb47d6a0f7bed8a9083935b465bc163ee2581c8b128d29bf61092fdf57a7 + languageName: node + linkType: hard + "deep-is@npm:^0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" @@ -8001,20 +7850,13 @@ __metadata: languageName: node linkType: hard -"detect-libc@npm:^2.0.0": +"detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.1": version: 2.0.2 resolution: "detect-libc@npm:2.0.2" checksum: 10/6118f30c0c425b1e56b9d2609f29bec50d35a6af0b762b6ad127271478f3bbfda7319ce869230cf1a351f2b219f39332cde290858553336d652c77b970f15de8 languageName: node linkType: hard -"detect-libc@npm:^2.0.3": - version: 2.0.3 - resolution: "detect-libc@npm:2.0.3" - checksum: 10/b4ea018d623e077bd395f168a9e81db77370dde36a5b01d067f2ad7989924a81d31cb547ff764acb2aa25d50bb7fdde0b0a93bec02212b0cb430621623246d39 - languageName: node - linkType: hard - "detect-newline@npm:^3.0.0": version: 3.1.0 resolution: "detect-newline@npm:3.1.0" @@ -9492,6 +9334,13 @@ __metadata: languageName: node linkType: hard +"expand-template@npm:^2.0.3": + version: 2.0.3 + resolution: "expand-template@npm:2.0.3" + checksum: 10/588c19847216421ed92befb521767b7018dc88f88b0576df98cb242f20961425e96a92cbece525ef28cc5becceae5d544ae0f5b9b5e2aa05acb13716ca5b3099 + languageName: node + linkType: hard + "expand-tilde@npm:^2.0.0, expand-tilde@npm:^2.0.2": version: 2.0.2 resolution: "expand-tilde@npm:2.0.2" @@ -10499,6 +10348,13 @@ __metadata: languageName: node linkType: hard +"github-from-package@npm:0.0.0": + version: 0.0.0 + resolution: "github-from-package@npm:0.0.0" + checksum: 10/2a091ba07fbce22205642543b4ea8aaf068397e1433c00ae0f9de36a3607baf5bcc14da97fbb798cfca6393b3c402031fca06d8b491a44206d6efef391c58537 + languageName: node + linkType: hard + "glob-parent@npm:^3.1.0": version: 3.1.0 resolution: "glob-parent@npm:3.1.0" @@ -11600,7 +11456,7 @@ __metadata: languageName: node linkType: hard -"ini@npm:^1.3.4": +"ini@npm:^1.3.4, ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" checksum: 10/314ae176e8d4deb3def56106da8002b462221c174ddb7ce0c49ee72c8cd1f9044f7b10cc555a7d8850982c3b9ca96fc212122749f5234bc2b6fb05fb942ed566 @@ -14747,7 +14603,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": +"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f @@ -14864,6 +14720,13 @@ __metadata: languageName: node linkType: hard +"mkdirp-classic@npm:^0.5.2, mkdirp-classic@npm:^0.5.3": + version: 0.5.3 + resolution: "mkdirp-classic@npm:0.5.3" + checksum: 10/3f4e088208270bbcc148d53b73e9a5bd9eef05ad2cbf3b3d0ff8795278d50dd1d11a8ef1875ff5aea3fa888931f95bfcb2ad5b7c1061cfefd6284d199e6776ac + languageName: node + linkType: hard + "mkdirp@npm:^0.5.4, mkdirp@npm:~0.5.1": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" @@ -15089,6 +14952,13 @@ __metadata: languageName: node linkType: hard +"napi-build-utils@npm:^1.0.1": + version: 1.0.2 + resolution: "napi-build-utils@npm:1.0.2" + checksum: 10/276feb8e30189fe18718e85b6f82e4f952822baa2e7696f771cc42571a235b789dc5907a14d9ffb6838c3e4ff4c25717c2575e5ce1cf6e02e496e204c11e57f6 + languageName: node + linkType: hard + "natural-compare-lite@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare-lite@npm:1.4.0" @@ -15151,6 +15021,15 @@ __metadata: languageName: node linkType: hard +"node-abi@npm:^3.3.0": + version: 3.45.0 + resolution: "node-abi@npm:3.45.0" + dependencies: + semver: "npm:^7.3.5" + checksum: 10/b59b49d515955e6b3ab67c51b46a424e78dc5d10900de94239156eb7f6aeb085775567e7ed8f7de836d7dacb2a5a7fc7a2ed94454b422d3e2ccc6d5cf4ab9824 + languageName: node + linkType: hard + "node-addon-api@npm:^5.0.0": version: 5.1.0 resolution: "node-addon-api@npm:5.1.0" @@ -15160,6 +15039,15 @@ __metadata: languageName: node linkType: hard +"node-addon-api@npm:^6.1.0": + version: 6.1.0 + resolution: "node-addon-api@npm:6.1.0" + dependencies: + node-gyp: "npm:latest" + checksum: 10/8eea1d4d965930a177a0508695beb0d89b4c1d80bf330646a035357a1e8fc31e0d09686e2374996e96e757b947a7ece319f98ede3146683f162597c0bcb4df90 + languageName: node + linkType: hard + "node-domexception@npm:^1.0.0": version: 1.0.0 resolution: "node-domexception@npm:1.0.0" @@ -16870,6 +16758,28 @@ __metadata: languageName: node linkType: hard +"prebuild-install@npm:^7.1.1": + version: 7.1.1 + resolution: "prebuild-install@npm:7.1.1" + dependencies: + detect-libc: "npm:^2.0.0" + expand-template: "npm:^2.0.3" + github-from-package: "npm:0.0.0" + minimist: "npm:^1.2.3" + mkdirp-classic: "npm:^0.5.3" + napi-build-utils: "npm:^1.0.1" + node-abi: "npm:^3.3.0" + pump: "npm:^3.0.0" + rc: "npm:^1.2.7" + simple-get: "npm:^4.0.0" + tar-fs: "npm:^2.0.0" + tunnel-agent: "npm:^0.6.0" + bin: + prebuild-install: bin.js + checksum: 10/6c70a2f82fbda8903497c560a761b000d861a3e772322c8bed012be0f0a084b5aaca4438a3fad1bd3a24210765f4fae06ddd89ea04dc4c034dde693cc0d9d5f4 + languageName: node + linkType: hard + "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -17470,6 +17380,20 @@ __metadata: languageName: node linkType: hard +"rc@npm:^1.2.7": + version: 1.2.8 + resolution: "rc@npm:1.2.8" + dependencies: + deep-extend: "npm:^0.6.0" + ini: "npm:~1.3.0" + minimist: "npm:^1.2.0" + strip-json-comments: "npm:~2.0.1" + bin: + rc: ./cli.js + checksum: 10/5c4d72ae7eec44357171585938c85ce066da8ca79146b5635baf3d55d74584c92575fa4e2c9eac03efbed3b46a0b2e7c30634c012b4b4fa40d654353d3c163eb + languageName: node + linkType: hard + "rdf-canonize@npm:^3.4.0": version: 3.4.0 resolution: "rdf-canonize@npm:3.4.0" @@ -18414,7 +18338,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4, semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:~7.5.4": +"semver@npm:7.5.4, semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:~7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -18434,15 +18358,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.6.0": - version: 7.6.2 - resolution: "semver@npm:7.6.2" - bin: - semver: bin/semver.js - checksum: 10/296b17d027f57a87ef645e9c725bff4865a38dfc9caf29b26aa084b85820972fbe7372caea1ba6857162fa990702c6d9c1d82297cecb72d56c78ab29070d2ca2 - languageName: node - linkType: hard - "serialize-javascript@npm:6.0.0": version: 6.0.0 resolution: "serialize-javascript@npm:6.0.0" @@ -18532,72 +18447,20 @@ __metadata: languageName: node linkType: hard -"sharp@npm:0.33.4": - version: 0.33.4 - resolution: "sharp@npm:0.33.4" +"sharp@npm:0.32.1": + version: 0.32.1 + resolution: "sharp@npm:0.32.1" dependencies: - "@img/sharp-darwin-arm64": "npm:0.33.4" - "@img/sharp-darwin-x64": "npm:0.33.4" - "@img/sharp-libvips-darwin-arm64": "npm:1.0.2" - "@img/sharp-libvips-darwin-x64": "npm:1.0.2" - "@img/sharp-libvips-linux-arm": "npm:1.0.2" - "@img/sharp-libvips-linux-arm64": "npm:1.0.2" - "@img/sharp-libvips-linux-s390x": "npm:1.0.2" - "@img/sharp-libvips-linux-x64": "npm:1.0.2" - "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.2" - "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.2" - "@img/sharp-linux-arm": "npm:0.33.4" - "@img/sharp-linux-arm64": "npm:0.33.4" - "@img/sharp-linux-s390x": "npm:0.33.4" - "@img/sharp-linux-x64": "npm:0.33.4" - "@img/sharp-linuxmusl-arm64": "npm:0.33.4" - "@img/sharp-linuxmusl-x64": "npm:0.33.4" - "@img/sharp-wasm32": "npm:0.33.4" - "@img/sharp-win32-ia32": "npm:0.33.4" - "@img/sharp-win32-x64": "npm:0.33.4" color: "npm:^4.2.3" - detect-libc: "npm:^2.0.3" - semver: "npm:^7.6.0" - dependenciesMeta: - "@img/sharp-darwin-arm64": - optional: true - "@img/sharp-darwin-x64": - optional: true - "@img/sharp-libvips-darwin-arm64": - optional: true - "@img/sharp-libvips-darwin-x64": - optional: true - "@img/sharp-libvips-linux-arm": - optional: true - "@img/sharp-libvips-linux-arm64": - optional: true - "@img/sharp-libvips-linux-s390x": - optional: true - "@img/sharp-libvips-linux-x64": - optional: true - "@img/sharp-libvips-linuxmusl-arm64": - optional: true - "@img/sharp-libvips-linuxmusl-x64": - optional: true - "@img/sharp-linux-arm": - optional: true - "@img/sharp-linux-arm64": - optional: true - "@img/sharp-linux-s390x": - optional: true - "@img/sharp-linux-x64": - optional: true - "@img/sharp-linuxmusl-arm64": - optional: true - "@img/sharp-linuxmusl-x64": - optional: true - "@img/sharp-wasm32": - optional: true - "@img/sharp-win32-ia32": - optional: true - "@img/sharp-win32-x64": - optional: true - checksum: 10/f396d1363d8e5320596404ae2ce064bdc4378cd1c2b84d7dc5a42d51b566180548b95bfde85ec5b590c6480adce68b4f287495f64b766b8fc2100c3d355a3a91 + detect-libc: "npm:^2.0.1" + node-addon-api: "npm:^6.1.0" + node-gyp: "npm:latest" + prebuild-install: "npm:^7.1.1" + semver: "npm:^7.5.0" + simple-get: "npm:^4.0.1" + tar-fs: "npm:^2.1.1" + tunnel-agent: "npm:^0.6.0" + checksum: 10/07df854f3d69b1ae95ab82ce5416abdea9b8d5c295965a96a9664767c7541a99cb3df7e56171e200425fd555a2853155817ffa9e945af41eef1762c72e7e1670 languageName: node linkType: hard @@ -18658,6 +18521,24 @@ __metadata: languageName: node linkType: hard +"simple-concat@npm:^1.0.0": + version: 1.0.1 + resolution: "simple-concat@npm:1.0.1" + checksum: 10/4d211042cc3d73a718c21ac6c4e7d7a0363e184be6a5ad25c8a1502e49df6d0a0253979e3d50dbdd3f60ef6c6c58d756b5d66ac1e05cda9cacd2e9fc59e3876a + languageName: node + linkType: hard + +"simple-get@npm:^4.0.0, simple-get@npm:^4.0.1": + version: 4.0.1 + resolution: "simple-get@npm:4.0.1" + dependencies: + decompress-response: "npm:^6.0.0" + once: "npm:^1.3.1" + simple-concat: "npm:^1.0.0" + checksum: 10/93f1b32319782f78f2f2234e9ce34891b7ab6b990d19d8afefaa44423f5235ce2676aae42d6743fecac6c8dfff4b808d4c24fe5265be813d04769917a9a44f36 + languageName: node + linkType: hard + "simple-swizzle@npm:^0.2.2": version: 0.2.2 resolution: "simple-swizzle@npm:0.2.2" @@ -19324,6 +19205,13 @@ __metadata: languageName: node linkType: hard +"strip-json-comments@npm:~2.0.1": + version: 2.0.1 + resolution: "strip-json-comments@npm:2.0.1" + checksum: 10/1074ccb63270d32ca28edfb0a281c96b94dc679077828135141f27d52a5a398ef5e78bcf22809d23cadc2b81dfbe345eb5fd8699b385c8b1128907dec4a7d1e1 + languageName: node + linkType: hard + "strip-outer@npm:^2.0.0": version: 2.0.0 resolution: "strip-outer@npm:2.0.0" @@ -19364,25 +19252,6 @@ __metadata: languageName: node linkType: hard -"summaly@npm:2.7.0": - version: 2.7.0 - resolution: "summaly@npm:2.7.0" - dependencies: - cheerio: "npm:0.22.0" - debug: "npm:4.3.3" - escape-regexp: "npm:0.0.1" - got: "npm:11.8.5" - html-entities: "npm:2.3.2" - iconv-lite: "npm:0.6.3" - jschardet: "npm:3.0.0" - koa: "npm:2.13.4" - private-ip: "npm:2.3.3" - require-all: "npm:3.0.0" - trace-redirect: "npm:1.0.6" - checksum: 10/ce491733962e5f3f22c8b80abf78d71e5ae243e9b774b54f2b7832a3246c7e769fb96a1d46c846af9f7c400dbe386f759e8eb8803e8d605d54e16155fa8c7166 - languageName: node - linkType: hard - "supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1": version: 8.1.1 resolution: "supports-color@npm:8.1.1" @@ -19559,6 +19428,18 @@ __metadata: languageName: node linkType: hard +"tar-fs@npm:^2.0.0, tar-fs@npm:^2.1.1": + version: 2.1.1 + resolution: "tar-fs@npm:2.1.1" + dependencies: + chownr: "npm:^1.1.1" + mkdirp-classic: "npm:^0.5.2" + pump: "npm:^3.0.0" + tar-stream: "npm:^2.1.4" + checksum: 10/526deae025453e825f87650808969662fbb12eb0461d033e9b447de60ec951c6c4607d0afe7ce057defe9d4e45cf80399dd74bc15f9d9e0773d5e990a78ce4ac + languageName: node + linkType: hard + "tar-stream@npm:^1.5.2": version: 1.6.2 resolution: "tar-stream@npm:1.6.2" @@ -19574,7 +19455,7 @@ __metadata: languageName: node linkType: hard -"tar-stream@npm:^2.2.0": +"tar-stream@npm:^2.1.4, tar-stream@npm:^2.2.0": version: 2.2.0 resolution: "tar-stream@npm:2.2.0" dependencies: