From e9fdad57d5ea964f7a59ceda5ea59fcfc91802f4 Mon Sep 17 00:00:00 2001 From: Mae Dartmann Date: Mon, 29 Apr 2024 16:07:41 +0200 Subject: [PATCH 01/60] [chart] make maxNoteLength configurable Signed-off-by: Mae Dartmann --- chart/README.md | 1 + chart/templates/_helpers.tpl | 2 +- chart/values.yaml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chart/README.md b/chart/README.md index 9738a5974..855141c13 100644 --- a/chart/README.md +++ b/chart/README.md @@ -31,6 +31,7 @@ A fun, new, open way to experience social media https://iceshrimp.dev | iceshrimp.libreTranslate.apiKey | string | `""` | | | iceshrimp.libreTranslate.apiUrl | string | `""` | | | iceshrimp.libreTranslate.managed | bool | `false` | | +| iceshrimp.maxNoteLength | integer | `3000` | Max note length | | iceshrimp.objectStorage.access_key | string | `""` | | | iceshrimp.objectStorage.access_secret | string | `""` | | | iceshrimp.objectStorage.baseUrl | string | `""` | | diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 7b7d35734..699d1e96d 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -211,7 +211,7 @@ id: 'aid' #───┘ Other configuration └───────────────────────────────────── # Max note length, should be < 8000. -#maxNoteLength: 3000 +maxNoteLength: {{ .Values.iceshrimp.maxNoteLength | default 3000 }} # Maximum lenght of an image caption or file comment (default 1500, max 8192) #maxCaptionLength: 1500 diff --git a/chart/values.yaml b/chart/values.yaml index c705d3ee3..5fef382e2 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -68,6 +68,9 @@ iceshrimp: # Number of worker processes per replica clusterLimit: 1 + # Max note length + maxNoteLength: 3000 + # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters postgresql: # -- disable if you want to use an existing db; in which case the values below From 33c4efbcd4ed555fc7b667286ce7b9feeac35d6e Mon Sep 17 00:00:00 2001 From: Mae Dartmann Date: Mon, 29 Apr 2024 16:21:20 +0200 Subject: [PATCH 02/60] [chart] bump version Signed-off-by: Mae Dartmann --- chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index ba688bcc8..31ae13bb5 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.2 +version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 84af6f49c83c53a54b9a4263e66f6b857e23dd8a Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 30 Apr 2024 15:01:50 -0400 Subject: [PATCH 03/60] [yarn] Bump packaged version to 4.1.1 --- .yarn/corepack.tgz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yarn/corepack.tgz b/.yarn/corepack.tgz index c614eba3b..d556c57dd 100644 --- a/.yarn/corepack.tgz +++ b/.yarn/corepack.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:013f0172eead8f0dfd513538725e35d13440d1fad30e2ed2cd097b83239d1624 -size 982775 +oid sha256:0be71e7aa5eabf6010b56188df17c4b42fcf67d181d9e236db4fd06b51022930 +size 983421 From df5734523fe508b2b191a8042ee7b6d9fa684edb Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Wed, 1 May 2024 23:47:51 +0200 Subject: [PATCH 04/60] [backend] Correctly set CW on note update Resolves: #547 --- packages/backend/src/remote/activitypub/models/note.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts index ad88170fb..d7e11e297 100644 --- a/packages/backend/src/remote/activitypub/models/note.ts +++ b/packages/backend/src/remote/activitypub/models/note.ts @@ -584,7 +584,7 @@ export async function updateNote(value: string | IObject, resolver?: Resolver) { text = await htmlToMfm(post.content, post.tag); } - const cw = post.sensitive && post.summary; + const cw = post.summary === "" ? null : post.summary; // File parsing const fileList = post.attachment From 3562a3e19d4acb88b586e1a4f821c08e9d34c711 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 6 May 2024 19:26:37 +0200 Subject: [PATCH 05/60] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b147e010a..a198c597b 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ It was forked from Calckey Firefish (itself a fork of Misskey) in mid - Check out [FediDB](https://fedidb.org/software/iceshrimp) or [Fediverse Observer](https://iceshrimp.fediverse.observer/list) to get an overview of the instances that are out there. - Please note that we do not operate a "flagship instance", the only project-affiliated domain is `iceshrimp.dev`. - Want to donate to the project? - - Our backend lead dev (zotan) is in need of a better laptop, as their current one does not have enough memory. You can contribute [here](https://bunq.me/zotanlaptopcrowdfund). Any leftover money will be given to queers in need. + - Our frontend dev (Lilian) needs help paying for healthcare costs. You can contribute [here](https://bunq.me/lilianhealthcarefund). Money from the fund will be used for co-pays, and medical expenses not covered by insurance. - Need help or want to contribute? Join the [chat room](https://chat.iceshrimp.dev)! --- From dfe01652f043eb05bb0dd6b5c3bc602d23eedcb3 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 13 May 2024 14:00:12 +0200 Subject: [PATCH 06/60] [backend] Fix build on node v22 --- .pnp.cjs | 16 +++++++-------- .../nan-npm-2.18.0-a51ed5bed5-5520e22c64.zip | 3 --- .../nan-npm-2.19.0-2f5da4a528-b97f680753.zip | 3 +++ .../re2-npm-1.20.11-ab65de125e-a8665c861c.zip | 3 +++ .../re2-npm-1.20.9-65a014d791-0ecd9f849b.zip | 3 --- packages/backend/package.json | 2 +- yarn.lock | 20 +++++++++---------- 7 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 .yarn/cache/nan-npm-2.18.0-a51ed5bed5-5520e22c64.zip create mode 100644 .yarn/cache/nan-npm-2.19.0-2f5da4a528-b97f680753.zip create mode 100644 .yarn/cache/re2-npm-1.20.11-ab65de125e-a8665c861c.zip delete mode 100644 .yarn/cache/re2-npm-1.20.9-65a014d791-0ecd9f849b.zip diff --git a/.pnp.cjs b/.pnp.cjs index d5dcd8c83..0506c1cd8 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -7070,7 +7070,7 @@ const RAW_RUNTIME_STATE = ["qs", "npm:6.11.2"],\ ["random-seed", "npm:0.3.0"],\ ["ratelimiter", "npm:3.4.1"],\ - ["re2", "npm:1.20.9"],\ + ["re2", "npm:1.20.11"],\ ["redis-lock", "npm:0.1.4"],\ ["redis-semaphore", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:5.3.1"],\ ["reflect-metadata", "npm:0.1.13"],\ @@ -18018,10 +18018,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["nan", [\ - ["npm:2.18.0", {\ - "packageLocation": "./.yarn/unplugged/nan-npm-2.18.0-a51ed5bed5/node_modules/nan/",\ + ["npm:2.19.0", {\ + "packageLocation": "./.yarn/unplugged/nan-npm-2.19.0-2f5da4a528/node_modules/nan/",\ "packageDependencies": [\ - ["nan", "npm:2.18.0"],\ + ["nan", "npm:2.19.0"],\ ["node-gyp", "npm:9.4.0"]\ ],\ "linkType": "HARD"\ @@ -20819,12 +20819,12 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["re2", [\ - ["npm:1.20.9", {\ - "packageLocation": "./.yarn/unplugged/re2-npm-1.20.9-65a014d791/node_modules/re2/",\ + ["npm:1.20.11", {\ + "packageLocation": "./.yarn/unplugged/re2-npm-1.20.11-ab65de125e/node_modules/re2/",\ "packageDependencies": [\ - ["re2", "npm:1.20.9"],\ + ["re2", "npm:1.20.11"],\ ["install-artifact-from-github", "npm:1.3.5"],\ - ["nan", "npm:2.18.0"],\ + ["nan", "npm:2.19.0"],\ ["node-gyp", "npm:10.0.1"]\ ],\ "linkType": "HARD"\ diff --git a/.yarn/cache/nan-npm-2.18.0-a51ed5bed5-5520e22c64.zip b/.yarn/cache/nan-npm-2.18.0-a51ed5bed5-5520e22c64.zip deleted file mode 100644 index 7a8538bc1..000000000 --- a/.yarn/cache/nan-npm-2.18.0-a51ed5bed5-5520e22c64.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:870f55abfb614870f3c40934a56d0a6023c820914cda133fbfe0837ca9478f0e -size 99501 diff --git a/.yarn/cache/nan-npm-2.19.0-2f5da4a528-b97f680753.zip b/.yarn/cache/nan-npm-2.19.0-2f5da4a528-b97f680753.zip new file mode 100644 index 000000000..4143ec163 --- /dev/null +++ b/.yarn/cache/nan-npm-2.19.0-2f5da4a528-b97f680753.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb4ff42d414f1c2a732d520e2b25bedf23587ff4d22cf672519bf53b83ddc0dd +size 99593 diff --git a/.yarn/cache/re2-npm-1.20.11-ab65de125e-a8665c861c.zip b/.yarn/cache/re2-npm-1.20.11-ab65de125e-a8665c861c.zip new file mode 100644 index 000000000..0aeeee346 --- /dev/null +++ b/.yarn/cache/re2-npm-1.20.11-ab65de125e-a8665c861c.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd730daae349d8804e42069a82df2177c548618e71e096de3d7527f216750f01 +size 3524278 diff --git a/.yarn/cache/re2-npm-1.20.9-65a014d791-0ecd9f849b.zip b/.yarn/cache/re2-npm-1.20.9-65a014d791-0ecd9f849b.zip deleted file mode 100644 index 16218225b..000000000 --- a/.yarn/cache/re2-npm-1.20.9-65a014d791-0ecd9f849b.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3978f0ca811c4a8cbdff0d9a510d74d36facb8dc9591d7c762241588586dc543 -size 3557852 diff --git a/packages/backend/package.json b/packages/backend/package.json index 7ff83b54d..3c6813fae 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -110,7 +110,7 @@ "qs": "6.11.2", "random-seed": "0.3.0", "ratelimiter": "3.4.1", - "re2": "^1.20.9", + "re2": "^1.20.11", "redis-lock": "0.1.4", "redis-semaphore": "5.3.1", "reflect-metadata": "0.1.13", diff --git a/yarn.lock b/yarn.lock index 2574f9f44..7610920dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5387,7 +5387,7 @@ __metadata: qs: "npm:6.11.2" random-seed: "npm:0.3.0" ratelimiter: "npm:3.4.1" - re2: "npm:^1.20.9" + re2: "npm:^1.20.11" redis-lock: "npm:0.1.4" redis-semaphore: "npm:5.3.1" reflect-metadata: "npm:0.1.13" @@ -14887,12 +14887,12 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.18.0": - version: 2.18.0 - resolution: "nan@npm:2.18.0" +"nan@npm:^2.19.0": + version: 2.19.0 + resolution: "nan@npm:2.19.0" dependencies: node-gyp: "npm:latest" - checksum: 10/5520e22c64e2b5b495b1d765d6334c989b848bbe1502fec89c5857cabcc7f9f0474563377259e7574bff1c8a041d3b90e9ffa1f5e15502ffddee7b2550cc26a0 + checksum: 10/b97f680753113bcd803cb174e40baa01e04aa4cb95ee62b48841336d9c48b278a2eeff71a4a0d7315b8f639fb1e38049925d3be1c6e266c158dc8f7d95d67eaa languageName: node linkType: hard @@ -17384,14 +17384,14 @@ __metadata: languageName: node linkType: hard -"re2@npm:^1.20.9": - version: 1.20.9 - resolution: "re2@npm:1.20.9" +"re2@npm:^1.20.11": + version: 1.20.11 + resolution: "re2@npm:1.20.11" dependencies: install-artifact-from-github: "npm:^1.3.5" - nan: "npm:^2.18.0" + nan: "npm:^2.19.0" node-gyp: "npm:^10.0.1" - checksum: 10/0ecd9f849b74c89757c98b530ca4f76eac8f9f9e095c6b8b2f65c14a8315ba2a796e9a77fb5149286eadd166adcb573d74344882a20d76999499796e4b814b13 + checksum: 10/a8665c861c632c67db448832a5a6a0092a1a29b8b6b731d6ce10f0017ba2871620780a745a8b2cbdd77e57ecf9e7bc8983c7ec5e10e6da6c06079a98146db443 languageName: node linkType: hard From fb0ebd6079d0f6189640b14de62b227cacb247d7 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 13 May 2024 14:01:29 +0200 Subject: [PATCH 07/60] [yarn] Update version to 4.2.2 --- .pnp.cjs | 56 ++++++++++++++++++++++++++++++++++++++++++++++ .pnp.loader.mjs | 42 ++++++++++++++++++++++++++++++---- .yarn/corepack.tgz | 4 ++-- package.json | 2 +- 4 files changed, 97 insertions(+), 7 deletions(-) diff --git a/.pnp.cjs b/.pnp.cjs index 0506c1cd8..5a429bcc1 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -1,5 +1,6 @@ #!/usr/bin/env node /* eslint-disable */ +// @ts-nocheck "use strict"; const RAW_RUNTIME_STATE = @@ -27281,6 +27282,12 @@ class ProxiedFS extends FakeFS { rmdirSync(p, opts) { return this.baseFs.rmdirSync(this.mapToBase(p), opts); } + async rmPromise(p, opts) { + return this.baseFs.rmPromise(this.mapToBase(p), opts); + } + rmSync(p, opts) { + return this.baseFs.rmSync(this.mapToBase(p), opts); + } async linkPromise(existingP, newP) { return this.baseFs.linkPromise(this.mapToBase(existingP), this.mapToBase(newP)); } @@ -27662,6 +27669,18 @@ class NodeFS extends BasePortableFakeFS { rmdirSync(p, opts) { return this.realFs.rmdirSync(npath.fromPortablePath(p), opts); } + async rmPromise(p, opts) { + return await new Promise((resolve, reject) => { + if (opts) { + this.realFs.rm(npath.fromPortablePath(p), opts, this.makeCallback(resolve, reject)); + } else { + this.realFs.rm(npath.fromPortablePath(p), this.makeCallback(resolve, reject)); + } + }); + } + rmSync(p, opts) { + return this.realFs.rmSync(npath.fromPortablePath(p), opts); + } async linkPromise(existingP, newP) { return await new Promise((resolve, reject) => { this.realFs.link(npath.fromPortablePath(existingP), npath.fromPortablePath(newP), this.makeCallback(resolve, reject)); @@ -28317,6 +28336,20 @@ class MountFS extends BasePortableFakeFS { return mountFs.rmdirSync(subPath, opts); }); } + async rmPromise(p, opts) { + return await this.makeCallPromise(p, async () => { + return await this.baseFs.rmPromise(p, opts); + }, async (mountFs, { subPath }) => { + return await mountFs.rmPromise(subPath, opts); + }); + } + rmSync(p, opts) { + return this.makeCallSync(p, () => { + return this.baseFs.rmSync(p, opts); + }, (mountFs, { subPath }) => { + return mountFs.rmSync(subPath, opts); + }); + } async linkPromise(existingP, newP) { return await this.makeCallPromise(newP, async () => { return await this.baseFs.linkPromise(existingP, newP); @@ -28955,6 +28988,7 @@ const SYNC_IMPLEMENTATIONS = /* @__PURE__ */ new Set([ `realpathSync`, `renameSync`, `rmdirSync`, + `rmSync`, `statSync`, `symlinkSync`, `truncateSync`, @@ -28990,6 +29024,7 @@ const ASYNC_IMPLEMENTATIONS = /* @__PURE__ */ new Set([ `readlinkPromise`, `renamePromise`, `rmdirPromise`, + `rmPromise`, `statPromise`, `symlinkPromise`, `truncatePromise`, @@ -31015,6 +31050,27 @@ class ZipFS extends BasePortableFakeFS { throw EINVAL(`rmdir '${p}'`); this.deleteEntry(p, index); } + async rmPromise(p, opts) { + return this.rmSync(p, opts); + } + rmSync(p, { recursive = false } = {}) { + if (this.readOnly) + throw EROFS(`rm '${p}'`); + if (recursive) { + this.removeSync(p); + return; + } + const resolvedP = this.resolveFilename(`rm '${p}'`, p); + const directoryListing = this.listings.get(resolvedP); + if (!directoryListing) + throw ENOTDIR(`rm '${p}'`); + if (directoryListing.size > 0) + throw ENOTEMPTY(`rm '${p}'`); + const index = this.entries.get(resolvedP); + if (typeof index === `undefined`) + throw EINVAL(`rm '${p}'`); + this.deleteEntry(p, index); + } hydrateDirectory(resolvedP) { const index = this.libzip.dir.add(this.zip, ppath.relative(PortablePath.root, resolvedP)); if (index === -1) diff --git a/.pnp.loader.mjs b/.pnp.loader.mjs index 81ae9a6b2..6815830b6 100644 --- a/.pnp.loader.mjs +++ b/.pnp.loader.mjs @@ -1,3 +1,6 @@ +/* eslint-disable */ +// @ts-nocheck + import fs from 'fs'; import { URL as URL$1, fileURLToPath, pathToFileURL } from 'url'; import path from 'path'; @@ -830,6 +833,12 @@ class ProxiedFS extends FakeFS { rmdirSync(p, opts) { return this.baseFs.rmdirSync(this.mapToBase(p), opts); } + async rmPromise(p, opts) { + return this.baseFs.rmPromise(this.mapToBase(p), opts); + } + rmSync(p, opts) { + return this.baseFs.rmSync(this.mapToBase(p), opts); + } async linkPromise(existingP, newP) { return this.baseFs.linkPromise(this.mapToBase(existingP), this.mapToBase(newP)); } @@ -1211,6 +1220,18 @@ class NodeFS extends BasePortableFakeFS { rmdirSync(p, opts) { return this.realFs.rmdirSync(npath.fromPortablePath(p), opts); } + async rmPromise(p, opts) { + return await new Promise((resolve, reject) => { + if (opts) { + this.realFs.rm(npath.fromPortablePath(p), opts, this.makeCallback(resolve, reject)); + } else { + this.realFs.rm(npath.fromPortablePath(p), this.makeCallback(resolve, reject)); + } + }); + } + rmSync(p, opts) { + return this.realFs.rmSync(npath.fromPortablePath(p), opts); + } async linkPromise(existingP, newP) { return await new Promise((resolve, reject) => { this.realFs.link(npath.fromPortablePath(existingP), npath.fromPortablePath(newP), this.makeCallback(resolve, reject)); @@ -1403,6 +1424,8 @@ const URL = Number(process.versions.node.split('.', 1)[0]) < 20 ? URL$1 : global const [major, minor] = process.versions.node.split(`.`).map((value) => parseInt(value, 10)); const WATCH_MODE_MESSAGE_USES_ARRAYS = major > 19 || major === 19 && minor >= 2 || major === 18 && minor >= 13; const HAS_LAZY_LOADED_TRANSLATORS = major === 20 && minor < 6 || major === 19 && minor >= 3; +const SUPPORTS_IMPORT_ATTRIBUTES = major >= 21 || major === 20 && minor >= 10 || major === 18 && minor >= 20; +const SUPPORTS_IMPORT_ATTRIBUTES_ONLY = major >= 22; function readPackageScope(checkPath) { const rootSeparatorIndex = checkPath.indexOf(npath.sep); @@ -1493,10 +1516,21 @@ async function load$1(urlString, context, nextLoad) { const format = getFileFormat(filePath); if (!format) return nextLoad(urlString, context, nextLoad); - if (format === `json` && context.importAssertions?.type !== `json`) { - const err = new TypeError(`[ERR_IMPORT_ASSERTION_TYPE_MISSING]: Module "${urlString}" needs an import assertion of type "json"`); - err.code = `ERR_IMPORT_ASSERTION_TYPE_MISSING`; - throw err; + if (format === `json`) { + if (SUPPORTS_IMPORT_ATTRIBUTES_ONLY) { + if (context.importAttributes?.type !== `json`) { + const err = new TypeError(`[ERR_IMPORT_ATTRIBUTE_MISSING]: Module "${urlString}" needs an import attribute of "type: json"`); + err.code = `ERR_IMPORT_ATTRIBUTE_MISSING`; + throw err; + } + } else { + const type = `importAttributes` in context ? context.importAttributes?.type : context.importAssertions?.type; + if (type !== `json`) { + const err = new TypeError(`[ERR_IMPORT_ASSERTION_TYPE_MISSING]: Module "${urlString}" needs an import ${SUPPORTS_IMPORT_ATTRIBUTES ? `attribute` : `assertion`} of type "json"`); + err.code = `ERR_IMPORT_ASSERTION_TYPE_MISSING`; + throw err; + } + } } if (process.env.WATCH_REPORT_DEPENDENCIES && process.send) { const pathToSend = pathToFileURL( diff --git a/.yarn/corepack.tgz b/.yarn/corepack.tgz index d556c57dd..6aab5c972 100644 --- a/.yarn/corepack.tgz +++ b/.yarn/corepack.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0be71e7aa5eabf6010b56188df17c4b42fcf67d181d9e236db4fd06b51022930 -size 983421 +oid sha256:d959daf507a8a46f1100da8fa970368fac7ecdacbf8a9ede0649163275999980 +size 985138 diff --git a/package.json b/package.json index 00cba6cda..93d6f4c3d 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "typescript": "5.1.6", "yaml": "^2.3.4" }, - "packageManager": "yarn@4.1.1", + "packageManager": "yarn@4.2.2", "dependenciesMeta": { "@discordapp/twemoji@14.1.2": { "unplugged": true From d8a75cdd08e2a1dae78ef37bd80c4b2c35875efa Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 31 May 2024 20:52:54 +0200 Subject: [PATCH 08/60] [backend] Render pinned notes as links instead of objects --- .../src/remote/activitypub/renderer/ordered-collection.ts | 4 ++-- packages/backend/src/server/activitypub/featured.ts | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/remote/activitypub/renderer/ordered-collection.ts b/packages/backend/src/remote/activitypub/renderer/ordered-collection.ts index b975399b6..b5457553a 100644 --- a/packages/backend/src/remote/activitypub/renderer/ordered-collection.ts +++ b/packages/backend/src/remote/activitypub/renderer/ordered-collection.ts @@ -11,14 +11,14 @@ export default function ( totalItems: any, first?: string, last?: string, - orderedItems?: Record[], + orderedItems?: (Record | string)[], ): { id: string | null; type: "OrderedCollection"; totalItems: any; first?: string; last?: string; - orderedItems?: Record[]; + orderedItems?: (Record | string)[]; } { const page: any = { id, diff --git a/packages/backend/src/server/activitypub/featured.ts b/packages/backend/src/server/activitypub/featured.ts index 82bb19fa1..149202423 100644 --- a/packages/backend/src/server/activitypub/featured.ts +++ b/packages/backend/src/server/activitypub/featured.ts @@ -37,9 +37,7 @@ export default async (ctx: Router.RouterContext) => { pinings.map((pining) => Notes.findOneByOrFail({ id: pining.noteId })), ); - const renderedNotes = await Promise.all( - pinnedNotes.map((note) => renderNote(note)), - ); + const renderedNotes = pinnedNotes.map((note) => `${config.url}/notes/${note.id}`); const rendered = renderOrderedCollection( `${config.url}/users/${userId}/collections/featured`, From 1c6ec9ad0815185b3b9f86f98f4a20b51258e08d Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 10 Jun 2024 18:31:50 +0200 Subject: [PATCH 09/60] [backend] Catch errors in UserRepository.userFromURI This fixes sporadic errors during rendering of follower/following lists. --- .../backend/src/models/repositories/user.ts | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts index 37a84779a..963c0daa7 100644 --- a/packages/backend/src/models/repositories/user.ts +++ b/packages/backend/src/models/repositories/user.ts @@ -241,24 +241,29 @@ export const UserRepository = db.getRepository(User).extend({ }, async userFromURI(uri: string): Promise { - const dbResolver = new DbResolver(); - let local = await dbResolver.getUserFromApId(uri); - if (local) { - return local; + try { + const dbResolver = new DbResolver(); + let local = await dbResolver.getUserFromApId(uri); + if (local) { + return local; + } + + // fetching Object once from remote + const resolver = new Resolver(); + const object = (await resolver.resolve(uri)) as any; + + // /@user If a URI other than the id is specified, + // the URI is determined here + if (uri !== object.id) { + local = await dbResolver.getUserFromApId(object.id); + if (local != null) return local; + } + + return isActor(object) ? await createPerson(getApId(object)) : null; } - - // fetching Object once from remote - const resolver = new Resolver(); - const object = (await resolver.resolve(uri)) as any; - - // /@user If a URI other than the id is specified, - // the URI is determined here - if (uri !== object.id) { - local = await dbResolver.getUserFromApId(object.id); - if (local != null) return local; + catch { + return null; } - - return isActor(object) ? await createPerson(getApId(object)) : null; }, async getHasUnreadAntenna(userId: User["id"]): Promise { From 6a678b688eef07c58c8f6ec4edfe8aa7c8fb6a8e Mon Sep 17 00:00:00 2001 From: mia Date: Sun, 16 Jun 2024 02:16:33 -0700 Subject: [PATCH 10/60] update sharp to 0.33.4 --- .pnp.cjs | 386 +++++++++------- ...untime-npm-1.2.0-36d2203035-c954b36493.zip | 3 + ...-darwin-arm64-npm-0.33.4-061afc6886-10.zip | 3 + ...rp-darwin-x64-npm-0.33.4-6aac8de317-10.zip | 3 + ...s-darwin-arm64-npm-1.0.2-6c9ede770e-10.zip | 3 + ...ips-darwin-x64-npm-1.0.2-01b146c37d-10.zip | 3 + ...ps-linux-arm64-npm-1.0.2-a3a6e66f3b-10.zip | 3 + ...vips-linux-x64-npm-1.0.2-69e740ab3d-10.zip | 3 + ...inuxmusl-arm64-npm-1.0.2-f787a79edb-10.zip | 3 + ...-linuxmusl-x64-npm-1.0.2-e4d5858946-10.zip | 3 + ...p-linux-arm64-npm-0.33.4-eee77af7d4-10.zip | 3 + ...arp-linux-x64-npm-0.33.4-e678be5de4-10.zip | 3 + ...nuxmusl-arm64-npm-0.33.4-c98abb8a19-10.zip | 3 + ...linuxmusl-x64-npm-0.33.4-6e3f28f5de-10.zip | 3 + ...chownr-npm-1.1.4-5bd400ab08-115648f8eb.zip | 3 - ...extend-npm-0.6.0-e182924219-7be7e5a8d4.zip | 3 - ...t-libc-npm-2.0.3-2ddae34945-b4ea018d62.zip | 3 + ...mplate-npm-2.0.3-80de959306-588c198472.zip | 3 - ...ackage-npm-0.0.0-519f80c9a1-2a091ba07f.zip | 3 - ...lassic-npm-0.5.3-3b5c991910-3f4e088208.zip | 3 - ...-utils-npm-1.0.2-892e4bba56-276feb8e30.zip | 3 - ...e-abi-npm-3.45.0-586bc5cf50-b59b49d515.zip | 3 - ...on-api-npm-6.1.0-634c545b39-8eea1d4d96.zip | 3 - ...nstall-npm-7.1.1-cb9fc9d341-6c70a2f82f.zip | 3 - .../rc-npm-1.2.8-d6768ac936-5c4d72ae7e.zip | 3 - ...semver-npm-7.6.2-0fec6944bb-296b17d027.zip | 3 + ...sharp-npm-0.32.1-5af640fc49-07df854f3d.zip | 3 - ...sharp-npm-0.33.4-afc15185a7-f396d1363d.zip | 3 + ...concat-npm-1.0.1-48df70de29-4d211042cc.zip | 3 - ...le-get-npm-4.0.1-fa2a97645d-93f1b32319.zip | 3 - ...mments-npm-2.0.1-e7883b2d04-1074ccb632.zip | 3 - ...tar-fs-npm-2.1.1-e374d3b7a2-526deae025.zip | 3 - packages/backend/package.json | 2 +- yarn.lock | 421 +++++++++++------- 34 files changed, 548 insertions(+), 354 deletions(-) create mode 100644 .yarn/cache/@emnapi-runtime-npm-1.2.0-36d2203035-c954b36493.zip create mode 100644 .yarn/cache/@img-sharp-darwin-arm64-npm-0.33.4-061afc6886-10.zip create mode 100644 .yarn/cache/@img-sharp-darwin-x64-npm-0.33.4-6aac8de317-10.zip create mode 100644 .yarn/cache/@img-sharp-libvips-darwin-arm64-npm-1.0.2-6c9ede770e-10.zip create mode 100644 .yarn/cache/@img-sharp-libvips-darwin-x64-npm-1.0.2-01b146c37d-10.zip create mode 100644 .yarn/cache/@img-sharp-libvips-linux-arm64-npm-1.0.2-a3a6e66f3b-10.zip create mode 100644 .yarn/cache/@img-sharp-libvips-linux-x64-npm-1.0.2-69e740ab3d-10.zip create mode 100644 .yarn/cache/@img-sharp-libvips-linuxmusl-arm64-npm-1.0.2-f787a79edb-10.zip create mode 100644 .yarn/cache/@img-sharp-libvips-linuxmusl-x64-npm-1.0.2-e4d5858946-10.zip create mode 100644 .yarn/cache/@img-sharp-linux-arm64-npm-0.33.4-eee77af7d4-10.zip create mode 100644 .yarn/cache/@img-sharp-linux-x64-npm-0.33.4-e678be5de4-10.zip create mode 100644 .yarn/cache/@img-sharp-linuxmusl-arm64-npm-0.33.4-c98abb8a19-10.zip create mode 100644 .yarn/cache/@img-sharp-linuxmusl-x64-npm-0.33.4-6e3f28f5de-10.zip delete mode 100644 .yarn/cache/chownr-npm-1.1.4-5bd400ab08-115648f8eb.zip delete mode 100644 .yarn/cache/deep-extend-npm-0.6.0-e182924219-7be7e5a8d4.zip create mode 100644 .yarn/cache/detect-libc-npm-2.0.3-2ddae34945-b4ea018d62.zip delete mode 100644 .yarn/cache/expand-template-npm-2.0.3-80de959306-588c198472.zip delete mode 100644 .yarn/cache/github-from-package-npm-0.0.0-519f80c9a1-2a091ba07f.zip delete mode 100644 .yarn/cache/mkdirp-classic-npm-0.5.3-3b5c991910-3f4e088208.zip delete mode 100644 .yarn/cache/napi-build-utils-npm-1.0.2-892e4bba56-276feb8e30.zip delete mode 100644 .yarn/cache/node-abi-npm-3.45.0-586bc5cf50-b59b49d515.zip delete mode 100644 .yarn/cache/node-addon-api-npm-6.1.0-634c545b39-8eea1d4d96.zip delete mode 100644 .yarn/cache/prebuild-install-npm-7.1.1-cb9fc9d341-6c70a2f82f.zip delete mode 100644 .yarn/cache/rc-npm-1.2.8-d6768ac936-5c4d72ae7e.zip create mode 100644 .yarn/cache/semver-npm-7.6.2-0fec6944bb-296b17d027.zip delete mode 100644 .yarn/cache/sharp-npm-0.32.1-5af640fc49-07df854f3d.zip create mode 100644 .yarn/cache/sharp-npm-0.33.4-afc15185a7-f396d1363d.zip delete mode 100644 .yarn/cache/simple-concat-npm-1.0.1-48df70de29-4d211042cc.zip delete mode 100644 .yarn/cache/simple-get-npm-4.0.1-fa2a97645d-93f1b32319.zip delete mode 100644 .yarn/cache/strip-json-comments-npm-2.0.1-e7883b2d04-1074ccb632.zip delete mode 100644 .yarn/cache/tar-fs-npm-2.1.1-e374d3b7a2-526deae025.zip diff --git a/.pnp.cjs b/.pnp.cjs index 5a429bcc1..773bcfa08 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -1312,6 +1312,16 @@ 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/",\ @@ -1869,6 +1879,186 @@ 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/",\ + "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"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@ioredis/commands", [\ ["npm:1.2.0", {\ "packageLocation": "./.yarn/cache/@ioredis-commands-npm-1.2.0-47541de88b-a8253c9539.zip/node_modules/@ioredis/commands/",\ @@ -7081,7 +7271,7 @@ const RAW_RUNTIME_STATE = ["sanitize-html", "npm:2.10.0"],\ ["seedrandom", "npm:3.0.5"],\ ["semver", "npm:7.5.4"],\ - ["sharp", "npm:0.32.1"],\ + ["sharp", "npm:0.33.4"],\ ["strict-event-emitter-types", "npm:2.0.0"],\ ["stringz", "npm:2.1.0"],\ ["summaly", "npm:2.7.0"],\ @@ -8158,13 +8348,6 @@ 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": [\ @@ -9869,15 +10052,6 @@ 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/",\ @@ -10082,6 +10256,13 @@ 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", [\ @@ -11885,15 +12066,6 @@ 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/",\ @@ -12996,15 +13168,6 @@ 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/",\ @@ -17865,15 +18028,6 @@ 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/",\ @@ -18064,15 +18218,6 @@ 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/",\ @@ -18148,16 +18293,6 @@ 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/",\ @@ -18166,14 +18301,6 @@ 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", [\ @@ -20104,27 +20231,6 @@ 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/",\ @@ -20796,19 +20902,6 @@ 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/",\ @@ -21770,6 +21863,13 @@ 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", [\ @@ -21899,19 +21999,32 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["sharp", [\ - ["npm:0.32.1", {\ - "packageLocation": "./.yarn/unplugged/sharp-npm-0.32.1-5af640fc49/node_modules/sharp/",\ + ["npm:0.33.4", {\ + "packageLocation": "./.yarn/unplugged/sharp-npm-0.33.4-afc15185a7/node_modules/sharp/",\ "packageDependencies": [\ - ["sharp", "npm:0.32.1"],\ + ["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"],\ ["color", "npm:4.2.3"],\ - ["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"]\ + ["detect-libc", "npm:2.0.3"],\ + ["semver", "npm:7.6.2"]\ ],\ "linkType": "HARD"\ }]\ @@ -21978,27 +22091,6 @@ 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/",\ @@ -22723,13 +22815,6 @@ 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": [\ @@ -23040,19 +23125,6 @@ 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/@emnapi-runtime-npm-1.2.0-36d2203035-c954b36493.zip b/.yarn/cache/@emnapi-runtime-npm-1.2.0-36d2203035-c954b36493.zip new file mode 100644 index 000000000..d3c4cbfc3 --- /dev/null +++ b/.yarn/cache/@emnapi-runtime-npm-1.2.0-36d2203035-c954b36493.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f55f261eeccf10a7439daaece365db141f635a7e9a1f9016e00ab8f28943399f +size 91230 diff --git a/.yarn/cache/@img-sharp-darwin-arm64-npm-0.33.4-061afc6886-10.zip b/.yarn/cache/@img-sharp-darwin-arm64-npm-0.33.4-061afc6886-10.zip new file mode 100644 index 000000000..02e4bdd75 --- /dev/null +++ b/.yarn/cache/@img-sharp-darwin-arm64-npm-0.33.4-061afc6886-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac3a0b044e43091fa1f4bc6f3d5986f269dc8f93de6291426c9578674a38e2af +size 100906 diff --git a/.yarn/cache/@img-sharp-darwin-x64-npm-0.33.4-6aac8de317-10.zip b/.yarn/cache/@img-sharp-darwin-x64-npm-0.33.4-6aac8de317-10.zip new file mode 100644 index 000000000..a66ab6df0 --- /dev/null +++ b/.yarn/cache/@img-sharp-darwin-x64-npm-0.33.4-6aac8de317-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:723b51d409908aa6afafeca67892dc83b016696018d449e18a81d11bd1110b95 +size 106850 diff --git a/.yarn/cache/@img-sharp-libvips-darwin-arm64-npm-1.0.2-6c9ede770e-10.zip b/.yarn/cache/@img-sharp-libvips-darwin-arm64-npm-1.0.2-6c9ede770e-10.zip new file mode 100644 index 000000000..e26fe6327 --- /dev/null +++ b/.yarn/cache/@img-sharp-libvips-darwin-arm64-npm-1.0.2-6c9ede770e-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e00b4d72355e50af073adb1d02fcae5f858e91ab2323022f560b0fff36f3d5cb +size 7008013 diff --git a/.yarn/cache/@img-sharp-libvips-darwin-x64-npm-1.0.2-01b146c37d-10.zip b/.yarn/cache/@img-sharp-libvips-darwin-x64-npm-1.0.2-01b146c37d-10.zip new file mode 100644 index 000000000..d3a787820 --- /dev/null +++ b/.yarn/cache/@img-sharp-libvips-darwin-x64-npm-1.0.2-01b146c37d-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ffccca8cd6273fcc7a24fc1ec2cc621247c31e6d69dfe6200190186653d8330 +size 7894090 diff --git a/.yarn/cache/@img-sharp-libvips-linux-arm64-npm-1.0.2-a3a6e66f3b-10.zip b/.yarn/cache/@img-sharp-libvips-linux-arm64-npm-1.0.2-a3a6e66f3b-10.zip new file mode 100644 index 000000000..147657197 --- /dev/null +++ b/.yarn/cache/@img-sharp-libvips-linux-arm64-npm-1.0.2-a3a6e66f3b-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:960c543ea58bd5b47db2712a57be4e8111c66143c12b365530dfa30aa2c94868 +size 7066434 diff --git a/.yarn/cache/@img-sharp-libvips-linux-x64-npm-1.0.2-69e740ab3d-10.zip b/.yarn/cache/@img-sharp-libvips-linux-x64-npm-1.0.2-69e740ab3d-10.zip new file mode 100644 index 000000000..303bf69ad --- /dev/null +++ b/.yarn/cache/@img-sharp-libvips-linux-x64-npm-1.0.2-69e740ab3d-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea483f46badaa08e822c042624dfcf7c329449fb10df307ae8ea93c053bc109e +size 7060637 diff --git a/.yarn/cache/@img-sharp-libvips-linuxmusl-arm64-npm-1.0.2-f787a79edb-10.zip b/.yarn/cache/@img-sharp-libvips-linuxmusl-arm64-npm-1.0.2-f787a79edb-10.zip new file mode 100644 index 000000000..64d5aab96 --- /dev/null +++ b/.yarn/cache/@img-sharp-libvips-linuxmusl-arm64-npm-1.0.2-f787a79edb-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bfedd5b2cfa0952e02cdd4d72f83e32df9de82db18cf5195e16f72891d815ac +size 7099479 diff --git a/.yarn/cache/@img-sharp-libvips-linuxmusl-x64-npm-1.0.2-e4d5858946-10.zip b/.yarn/cache/@img-sharp-libvips-linuxmusl-x64-npm-1.0.2-e4d5858946-10.zip new file mode 100644 index 000000000..bdcd86b43 --- /dev/null +++ b/.yarn/cache/@img-sharp-libvips-linuxmusl-x64-npm-1.0.2-e4d5858946-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:737651fc2b1963b06609484ac20fedd163bdd57b51ab4eb693cd506d5841695a +size 7204642 diff --git a/.yarn/cache/@img-sharp-linux-arm64-npm-0.33.4-eee77af7d4-10.zip b/.yarn/cache/@img-sharp-linux-arm64-npm-0.33.4-eee77af7d4-10.zip new file mode 100644 index 000000000..bdf21f3ca --- /dev/null +++ b/.yarn/cache/@img-sharp-linux-arm64-npm-0.33.4-eee77af7d4-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80752717166479cd78d3a4477293e80d7d96de70a09785489f51b86bc177296e +size 107298 diff --git a/.yarn/cache/@img-sharp-linux-x64-npm-0.33.4-e678be5de4-10.zip b/.yarn/cache/@img-sharp-linux-x64-npm-0.33.4-e678be5de4-10.zip new file mode 100644 index 000000000..e29b15db2 --- /dev/null +++ b/.yarn/cache/@img-sharp-linux-x64-npm-0.33.4-e678be5de4-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37df8739ba92bd891180a9fe4aa2a372cfd4ea92223bd14ccc5f0526661df978 +size 114780 diff --git a/.yarn/cache/@img-sharp-linuxmusl-arm64-npm-0.33.4-c98abb8a19-10.zip b/.yarn/cache/@img-sharp-linuxmusl-arm64-npm-0.33.4-c98abb8a19-10.zip new file mode 100644 index 000000000..d90b07634 --- /dev/null +++ b/.yarn/cache/@img-sharp-linuxmusl-arm64-npm-0.33.4-c98abb8a19-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:507a08f66569fb890d3459241a989b257ae758b7cec2014ee18d4574f4233a61 +size 111591 diff --git a/.yarn/cache/@img-sharp-linuxmusl-x64-npm-0.33.4-6e3f28f5de-10.zip b/.yarn/cache/@img-sharp-linuxmusl-x64-npm-0.33.4-6e3f28f5de-10.zip new file mode 100644 index 000000000..a0298c18d --- /dev/null +++ b/.yarn/cache/@img-sharp-linuxmusl-x64-npm-0.33.4-6e3f28f5de-10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb0ca07851c9935e2889d79d613591929b83d9274b8636e247665ca1a1c6f57f +size 118348 diff --git a/.yarn/cache/chownr-npm-1.1.4-5bd400ab08-115648f8eb.zip b/.yarn/cache/chownr-npm-1.1.4-5bd400ab08-115648f8eb.zip deleted file mode 100644 index 2e10cc78d..000000000 --- a/.yarn/cache/chownr-npm-1.1.4-5bd400ab08-115648f8eb.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05b6a09af0916f441b36b2eeff975bf94e7dfa0e7bd447007214d3d0e611c70b -size 2841 diff --git a/.yarn/cache/deep-extend-npm-0.6.0-e182924219-7be7e5a8d4.zip b/.yarn/cache/deep-extend-npm-0.6.0-e182924219-7be7e5a8d4.zip deleted file mode 100644 index 12914e421..000000000 --- a/.yarn/cache/deep-extend-npm-0.6.0-e182924219-7be7e5a8d4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7c6cbe8c52803c77a54772f73389ecce8a55a2cd1751f30826f14d945fe4d75 -size 5505 diff --git a/.yarn/cache/detect-libc-npm-2.0.3-2ddae34945-b4ea018d62.zip b/.yarn/cache/detect-libc-npm-2.0.3-2ddae34945-b4ea018d62.zip new file mode 100644 index 000000000..b957cefeb --- /dev/null +++ b/.yarn/cache/detect-libc-npm-2.0.3-2ddae34945-b4ea018d62.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23b86d525b50e2419c6def32d652247d834dac64ca9e61f89b7d893febfbca34 +size 9395 diff --git a/.yarn/cache/expand-template-npm-2.0.3-80de959306-588c198472.zip b/.yarn/cache/expand-template-npm-2.0.3-80de959306-588c198472.zip deleted file mode 100644 index a14edda63..000000000 --- a/.yarn/cache/expand-template-npm-2.0.3-80de959306-588c198472.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dc63bdafc4ff6dc41de7e46dec6b24b2eafb986431a7d4b31773381e3af0834 -size 3435 diff --git a/.yarn/cache/github-from-package-npm-0.0.0-519f80c9a1-2a091ba07f.zip b/.yarn/cache/github-from-package-npm-0.0.0-519f80c9a1-2a091ba07f.zip deleted file mode 100644 index dbc6cff2d..000000000 --- a/.yarn/cache/github-from-package-npm-0.0.0-519f80c9a1-2a091ba07f.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c5f78cfcf5d81c2d6f9c7c533dbd78c71fa3b453f855f0ef3a79d4bdbb28e48 -size 5216 diff --git a/.yarn/cache/mkdirp-classic-npm-0.5.3-3b5c991910-3f4e088208.zip b/.yarn/cache/mkdirp-classic-npm-0.5.3-3b5c991910-3f4e088208.zip deleted file mode 100644 index a39ef4b04..000000000 --- a/.yarn/cache/mkdirp-classic-npm-0.5.3-3b5c991910-3f4e088208.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6a75adc9f8d6dee8d00505d6b5828bdba05563f377149450fe5cca845efb2e8 -size 2685 diff --git a/.yarn/cache/napi-build-utils-npm-1.0.2-892e4bba56-276feb8e30.zip b/.yarn/cache/napi-build-utils-npm-1.0.2-892e4bba56-276feb8e30.zip deleted file mode 100644 index 64720f484..000000000 --- a/.yarn/cache/napi-build-utils-npm-1.0.2-892e4bba56-276feb8e30.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c1f5518b11d4a9b08d0f14a6aee2d089102d0c25829cc52b46e2079068f4bb4 -size 6232 diff --git a/.yarn/cache/node-abi-npm-3.45.0-586bc5cf50-b59b49d515.zip b/.yarn/cache/node-abi-npm-3.45.0-586bc5cf50-b59b49d515.zip deleted file mode 100644 index 80f044fe0..000000000 --- a/.yarn/cache/node-abi-npm-3.45.0-586bc5cf50-b59b49d515.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3cb7bfef0087ecdd7f1b43d40d650e6bf5c17cf09274a318b8a1524d55dfbef -size 13450 diff --git a/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-8eea1d4d96.zip b/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-8eea1d4d96.zip deleted file mode 100644 index 29d85691a..000000000 --- a/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-8eea1d4d96.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77f7f87cbf0b689e8338adf5442ddbdd40af8c5bdf3b2057091cfd50ab566302 -size 65066 diff --git a/.yarn/cache/prebuild-install-npm-7.1.1-cb9fc9d341-6c70a2f82f.zip b/.yarn/cache/prebuild-install-npm-7.1.1-cb9fc9d341-6c70a2f82f.zip deleted file mode 100644 index d9e3c0182..000000000 --- a/.yarn/cache/prebuild-install-npm-7.1.1-cb9fc9d341-6c70a2f82f.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6b807a6b2a4b27cee124159b0d591428d040b5dddba47da7d17ed78509faeb7 -size 15090 diff --git a/.yarn/cache/rc-npm-1.2.8-d6768ac936-5c4d72ae7e.zip b/.yarn/cache/rc-npm-1.2.8-d6768ac936-5c4d72ae7e.zip deleted file mode 100644 index ee47bc263..000000000 --- a/.yarn/cache/rc-npm-1.2.8-d6768ac936-5c4d72ae7e.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf239e909ca372beb42112cb7e51dbcd85cba5a0ca240645b51f32333a29b45f -size 9802 diff --git a/.yarn/cache/semver-npm-7.6.2-0fec6944bb-296b17d027.zip b/.yarn/cache/semver-npm-7.6.2-0fec6944bb-296b17d027.zip new file mode 100644 index 000000000..010ea921e --- /dev/null +++ b/.yarn/cache/semver-npm-7.6.2-0fec6944bb-296b17d027.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88b2bade8e34e4c9240a2b5cf0cb0e03a0ff58874db716e372e078243b8c2642 +size 40755 diff --git a/.yarn/cache/sharp-npm-0.32.1-5af640fc49-07df854f3d.zip b/.yarn/cache/sharp-npm-0.32.1-5af640fc49-07df854f3d.zip deleted file mode 100644 index f9c68a091..000000000 --- a/.yarn/cache/sharp-npm-0.32.1-5af640fc49-07df854f3d.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed3d339622e1f3c21b44a9ecd0c04d22416a7a1877bc5f71cc2b73a99d960141 -size 144090 diff --git a/.yarn/cache/sharp-npm-0.33.4-afc15185a7-f396d1363d.zip b/.yarn/cache/sharp-npm-0.33.4-afc15185a7-f396d1363d.zip new file mode 100644 index 000000000..290255a51 --- /dev/null +++ b/.yarn/cache/sharp-npm-0.33.4-afc15185a7-f396d1363d.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f52cdd9cac5c6c9f693e54bf82cbee4870ed051ff9a586d23d79eb5f04e61c3 +size 129490 diff --git a/.yarn/cache/simple-concat-npm-1.0.1-48df70de29-4d211042cc.zip b/.yarn/cache/simple-concat-npm-1.0.1-48df70de29-4d211042cc.zip deleted file mode 100644 index 7b1082ec7..000000000 --- a/.yarn/cache/simple-concat-npm-1.0.1-48df70de29-4d211042cc.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38ce8993546816d3d51045c79ab9e5c2721122ca02bcff89f68a166731d3bf9a -size 3416 diff --git a/.yarn/cache/simple-get-npm-4.0.1-fa2a97645d-93f1b32319.zip b/.yarn/cache/simple-get-npm-4.0.1-fa2a97645d-93f1b32319.zip deleted file mode 100644 index d12e4bf82..000000000 --- a/.yarn/cache/simple-get-npm-4.0.1-fa2a97645d-93f1b32319.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:206aaadbb95acb5a9956026c79afc7fe76a5998e3a0cee9148ed2f136495d282 -size 7148 diff --git a/.yarn/cache/strip-json-comments-npm-2.0.1-e7883b2d04-1074ccb632.zip b/.yarn/cache/strip-json-comments-npm-2.0.1-e7883b2d04-1074ccb632.zip deleted file mode 100644 index cddf70db3..000000000 --- a/.yarn/cache/strip-json-comments-npm-2.0.1-e7883b2d04-1074ccb632.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb9c3bf9e769a889ff51690780c480416341c9b14b1c6b0cb4e65ec42e757105 -size 3072 diff --git a/.yarn/cache/tar-fs-npm-2.1.1-e374d3b7a2-526deae025.zip b/.yarn/cache/tar-fs-npm-2.1.1-e374d3b7a2-526deae025.zip deleted file mode 100644 index 4577f15cb..000000000 --- a/.yarn/cache/tar-fs-npm-2.1.1-e374d3b7a2-526deae025.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:566de027f10129034b5ccf65ba338449aaaec55ba16635afb8db534e0802dcff -size 11668 diff --git a/packages/backend/package.json b/packages/backend/package.json index 3c6813fae..4f56d198a 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -120,7 +120,7 @@ "sanitize-html": "2.10.0", "seedrandom": "^3.0.5", "semver": "7.5.4", - "sharp": "0.32.1", + "sharp": "0.33.4", "stringz": "2.1.0", "summaly": "2.7.0", "syslog-pro": "1.0.0", diff --git a/yarn.lock b/yarn.lock index 7610920dd..44a88d846 100644 --- a/yarn.lock +++ b/yarn.lock @@ -789,6 +789,15 @@ __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" @@ -1181,6 +1190,181 @@ __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" + 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 + languageName: node + linkType: hard + "@ioredis/commands@npm:^1.1.1": version: 1.2.0 resolution: "@ioredis/commands@npm:1.2.0" @@ -5397,7 +5581,7 @@ __metadata: sanitize-html: "npm:2.10.0" seedrandom: "npm:^3.0.5" semver: "npm:7.5.4" - sharp: "npm:0.32.1" + sharp: "npm:0.33.4" strict-event-emitter-types: "npm:2.0.0" stringz: "npm:2.1.0" summaly: "npm:2.7.0" @@ -6329,13 +6513,6 @@ __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" @@ -7655,13 +7832,6 @@ __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" @@ -7831,13 +8001,20 @@ __metadata: languageName: node linkType: hard -"detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.1": +"detect-libc@npm:^2.0.0": 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" @@ -9315,13 +9492,6 @@ __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" @@ -10329,13 +10499,6 @@ __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" @@ -11437,7 +11600,7 @@ __metadata: languageName: node linkType: hard -"ini@npm:^1.3.4, ini@npm:~1.3.0": +"ini@npm:^1.3.4": version: 1.3.8 resolution: "ini@npm:1.3.8" checksum: 10/314ae176e8d4deb3def56106da8002b462221c174ddb7ce0c49ee72c8cd1f9044f7b10cc555a7d8850982c3b9ca96fc212122749f5234bc2b6fb05fb942ed566 @@ -14584,7 +14747,7 @@ __metadata: languageName: node linkType: hard -"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": +"minimist@npm:^1.2.0, 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 @@ -14701,13 +14864,6 @@ __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" @@ -14933,13 +15089,6 @@ __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" @@ -15002,15 +15151,6 @@ __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" @@ -15020,15 +15160,6 @@ __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" @@ -16739,28 +16870,6 @@ __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" @@ -17361,20 +17470,6 @@ __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" @@ -18319,7 +18414,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.0, 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.3, semver@npm:^7.5.4, semver@npm:~7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -18339,6 +18434,15 @@ __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" @@ -18428,20 +18532,72 @@ __metadata: languageName: node linkType: hard -"sharp@npm:0.32.1": - version: 0.32.1 - resolution: "sharp@npm:0.32.1" +"sharp@npm:0.33.4": + version: 0.33.4 + resolution: "sharp@npm:0.33.4" 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.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 + 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 languageName: node linkType: hard @@ -18502,24 +18658,6 @@ __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" @@ -19186,13 +19324,6 @@ __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" @@ -19428,18 +19559,6 @@ __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" @@ -19455,7 +19574,7 @@ __metadata: languageName: node linkType: hard -"tar-stream@npm:^2.1.4, tar-stream@npm:^2.2.0": +"tar-stream@npm:^2.2.0": version: 2.2.0 resolution: "tar-stream@npm:2.2.0" dependencies: From a695ffaf49a150840db7fb3e60e644468693689a Mon Sep 17 00:00:00 2001 From: mia Date: Sun, 16 Jun 2024 02:26:36 -0700 Subject: [PATCH 11/60] update alpine version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dda1fe090..568263abe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.2 ## Install dev and compilation dependencies, build files -FROM alpine:3.18 as build +FROM alpine:3.20 as build WORKDIR /iceshrimp # Install compilation dependencies @@ -31,7 +31,7 @@ RUN yarn focus-production RUN --mount=type=cache,target=/iceshrimp/.yarncache_focused rm -rf .yarncache/* && cp -r .yarn/. .yarncache_focused ## Runtime container -FROM alpine:3.18 +FROM alpine:3.20 WORKDIR /iceshrimp # Install runtime dependencies From 50b25c88c72a38824a8c975920e5e203976ddfc1 Mon Sep 17 00:00:00 2001 From: Mae Dartmann Date: Mon, 24 Jun 2024 23:05:42 +0200 Subject: [PATCH 12/60] [client] remove unimplemented timetravel button & handlers Signed-off-by: Mae Dartmann --- .../client/src/pages/antenna-timeline.vue | 17 +++++------ packages/client/src/pages/timeline.vue | 17 +++++------ .../client/src/pages/user-list-timeline.vue | 28 ++++++++++--------- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/packages/client/src/pages/antenna-timeline.vue b/packages/client/src/pages/antenna-timeline.vue index 3306f8c76..32060fafb 100644 --- a/packages/client/src/pages/antenna-timeline.vue +++ b/packages/client/src/pages/antenna-timeline.vue @@ -44,14 +44,15 @@ const keymap = $computed(() => ({ t: focus, })); -async function timetravel() { - const { canceled, result: date } = await os.inputDate({ - title: i18n.ts.date, - }); - if (canceled) return; - - tlEl.timetravel(date); -} +// removed for iceshrimp.dev/iceshrimp/iceshrimp !551 +// async function timetravel() { +// const { canceled, result: date } = await os.inputDate({ +// title: i18n.ts.date, +// }); +// if (canceled) return; +// +// tlEl.timetravel(date); +// } function settings() { router.push(`/my/antennas/${props.antennaId}`); diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 930a9635a..380bacc70 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -187,14 +187,15 @@ function saveSrc( }); } -async function timetravel(): Promise { - const { canceled, result: date } = await os.inputDate({ - title: i18n.ts.date, - }); - if (canceled) return; - - tlComponent.timetravel(date); -} +// removed for iceshrimp.dev/iceshrimp/iceshrimp !551 +// async function timetravel(): Promise { +// const { canceled, result: date } = await os.inputDate({ +// title: i18n.ts.date, +// }); +// if (canceled) return; +// +// tlComponent.timetravel(date); +// } function focus(): void { tlComponent.focus(); diff --git a/packages/client/src/pages/user-list-timeline.vue b/packages/client/src/pages/user-list-timeline.vue index b6e1127eb..74970ef0c 100644 --- a/packages/client/src/pages/user-list-timeline.vue +++ b/packages/client/src/pages/user-list-timeline.vue @@ -50,23 +50,25 @@ function settings() { router.push(`/my/lists/${props.listId}`); } -async function timetravel() { - const { canceled, result: date } = await os.inputDate({ - title: i18n.ts.date, - }); - if (canceled) return; - - tlEl.timetravel(date); -} +// removed for iceshrimp.dev/iceshrimp/iceshrimp !551 +// async function timetravel() { +// const { canceled, result: date } = await os.inputDate({ +// title: i18n.ts.date, +// }); +// if (canceled) return; +// +// tlEl.timetravel(date); +// } const headerActions = $computed(() => list ? [ - { - icon: "ph-calendar-blank ph-bold ph-lg", - text: i18n.ts.jumpToSpecifiedDate, - handler: timetravel, - }, + // removed for iceshrimp.dev/iceshrimp/iceshrimp !551 + // { + // icon: "ph-calendar-blank ph-bold ph-lg", + // text: i18n.ts.jumpToSpecifiedDate, + // handler: timetravel, + // }, { icon: "ph-gear-six ph-bold ph-lg", text: i18n.ts.settings, From 5f60e7fc49ead98094cf13a7a8cd7e5a338e06f8 Mon Sep 17 00:00:00 2001 From: Mae Dartmann Date: Tue, 25 Jun 2024 15:34:46 +0200 Subject: [PATCH 13/60] [chart] allow specifying DeploymentStrategy --- chart/Chart.yaml | 2 +- chart/README.md | 1 + chart/templates/deployment.yaml | 8 +++++++- chart/values.yaml | 11 +++++++++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 31ae13bb5..29b6d9c1c 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.3 +version: 0.1.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/chart/README.md b/chart/README.md index 855141c13..f41df6a37 100644 --- a/chart/README.md +++ b/chart/README.md @@ -52,6 +52,7 @@ A fun, new, open way to experience social media https://iceshrimp.dev | iceshrimp.smtp.port | int | `587` | | | iceshrimp.smtp.server | string | `"smtp.mailgun.org"` | | | iceshrimp.smtp.useImplicitSslTls | bool | `false` | | +| iceshrimp.strategy | object | `{}` | Override DeploymentStrategy for Iceshrimp | | elasticsearch | object | `{"auth":{},"enabled":false,"hostname":"","port":9200,"ssl":false}` | https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 9485ae7c3..114f13daf 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -5,9 +5,15 @@ metadata: labels: {{- include "iceshrimp.labels" . | nindent 4 }} spec: - {{- if not .Values.autoscaling.enabled }} + {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} + + {{- if .Values.iceshrimp.deploymentStrategy }} + strategy: + {{- toYaml .Values.iceshrimp.deploymentStrategy | nindent 4 }} + {{- end }} + selector: matchLabels: {{- include "iceshrimp.selectorLabels" . | nindent 6 }} diff --git a/chart/values.yaml b/chart/values.yaml index 5fef382e2..1046931e1 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -42,7 +42,7 @@ iceshrimp: prefix: files endpoint: "" # e.g. "nyc3.digitaloceanspaces.com:443" region: "" # e.g. "nyc3" - + localStorage: enabled: true claimName: null @@ -53,7 +53,14 @@ iceshrimp: annotations: helm.sh/resource-policy: keep size: 10Gi - + + # Deployment strategy (optional), see https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy + # deploymentStrategy: + # type: RollingUpdate + # rollingUpdate: + # maxUnavailable: 0 + # maxSurge: 1 + # -- If you want to allow iceshrimp to connect to private ips, enter the cidrs here. allowedPrivateNetworks: [] # - "10.0.0.0/8" From e63592d5d11efdc59d0c69385913f5488214da8d Mon Sep 17 00:00:00 2001 From: AverageDood Date: Thu, 11 Apr 2024 15:38:34 +0000 Subject: [PATCH 14/60] [client] Update translations (Spanish) Currently translated at 100.0% (1883 of 1883 strings) Translation: Iceshrimp/locales Translate-URL: https://translate.iceshrimp.dev/projects/iceshrimp/locales/es/ --- locales/es-ES.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 581cbe6dc..0bd66199c 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -447,7 +447,7 @@ title: "Título" text: "Texto" enable: "Activar" next: "Siguiente" -retype: "Intentar de nuevo" +retype: "otra vez" noteOf: "Publicaciones de {user}" inviteToGroup: "Invitar al grupo" quoteAttached: "Cita añadida" @@ -468,9 +468,9 @@ weakPassword: "Contraseña débil" normalPassword: "Contraseña aceptable" strongPassword: "Contraseña fuerte" passwordMatched: "Coincide" -passwordNotMatched: "Las contraseñas no coinciden" +passwordNotMatched: "No coincide" signinWith: "Inicia sesión con {x}" -signinFailed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario +signinFailed: "Inicio de sesión fallido. Asegúrate de haber usado el nombre de usuario y contraseña correctos." tapSecurityKey: "Toque la clave de seguridad" or: "O" From ac4202075dc5381212975a876fa594543a787962 Mon Sep 17 00:00:00 2001 From: Gersonzao Date: Wed, 8 May 2024 02:07:26 +0000 Subject: [PATCH 15/60] [client] Update translations (Portuguese (Brazil)) Currently translated at 7.8% (148 of 1883 strings) Translation: Iceshrimp/locales Translate-URL: https://translate.iceshrimp.dev/projects/iceshrimp/locales/pt_BR/ --- locales/pt-BR.yml | 61 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/locales/pt-BR.yml b/locales/pt-BR.yml index bab6a4f0c..19a6e9772 100644 --- a/locales/pt-BR.yml +++ b/locales/pt-BR.yml @@ -57,7 +57,7 @@ login: Entrar loggingIn: Entrando logout: Sair signup: Criar conta -uploading: Enviando... +uploading: Enviando… users: Usuários addUser: Adicione um usuário addInstance: Adicionar um servidor @@ -95,7 +95,7 @@ alreadyFavorited: Já foi adicionado aos marcadores. download: Download pageLoadError: Ocorreu um erro ao carregar a página. pageLoadErrorDescription: Isso normalmente é causado por erros de rede ou pelo cache - do navegador. Tente limpar o cache e, depois de esperar um pouquinho, tente novamente. + do navegador. Tente limpar o cache ou esperar um pouquinho e recarregar a página. serverIsDead: Esse servidos não está respondendo. Por favor espere um pouco e tente novamente. youShouldUpgradeClient: Para visualizar essa página, favor reiniciar para atualizar @@ -110,3 +110,60 @@ followRequests: Pedidos de seguimento unfollow: Parar de seguir followRequestPending: Pedido de seguimento pendente enterEmoji: Insira um emoji +markAsSensitive: Marcar como sensível +unmarkAsSensitive: Desmarcar como sensível +processing: Processando… +renoted: Impulsionado. +blockConfirm: Tem certeza de que deseja bloquear esta conta? +unsuspendConfirm: Tem certeza de que deseja remover a suspensão desta conta? +flagAsBotDescription: Habilite esta opção se esta conta for controlada por um programa. + Se ativado, ela funcionará como um sinalizador para outros desenvolvedores, evitando + intermináveis cadeias de interação com outros bots e ajustando os sistemas internos + do Iceshrimp para tratar esta conta como um bot. +sendErrorReportsDescription: "Quando ativado, informações de erro detalhadas serão + compartilhadas com o Iceshrimp quando ocorrer um problema, ajudando a melhorar a + qualidade do Iceshrimp.\n Isso incluirá informações como a versão do seu sistema + operacional, qual navegador você está usando, sua atividade no Iceshrimp, etc." +general: Geral +federation: Federação +receiveFollowRequest: Pedido de seguidor recebido +followRequestAccepted: Pedido de seguidor aceito +pinned: Fixar no perfil +reaction: Reações +removeReaction: Remover sua reação +enableEmojiReactions: Ativar reações de emoji +showEmojisInReactionNotifications: Mostrar emojis em notificações de reação +reactionSetting: Reações a serem mostradas no seletor de reações +reactionSettingDescription2: Arraste para organizar, clique para excluir, aperte "+" + para adicionar. +attachCancel: Remover anexo +enterFileName: Insira nome de arquivo +suspend: Suspender +unsuspend: Remover suspensão +unblockConfirm: Tem certeza de que deseja desbloquear esta conta? +suspendConfirm: Tem certeza de que deseja suspender esta conta? +editWidgetsExit: Feito +sensitive: Sensível +block: Bloquear +unblock: Desbloquear +emoji: Emoji +emojis: Emoji +wallpaper: Plano de fundo +recipient: Destinatário(s) +annotation: Comentários +instances: Servidores +charts: Gráficos +operations: Operações +software: Programa +version: Versão +metadata: Metadados +network: Rede +disk: Disco +statistics: Estatísticas +done: Feito +default: Padrão +blocked: '' +migrationConfirm: "Você tem certeza absoluta de que deseja migrar sua conta para {account}? + Depois de fazer isso, você não poderá reverter e não poderá usar sua conta normalmente + novamente.\nAlém disso, certifique-se de definir esta conta atual como a conta da + qual você está migrando." From 08d814338657276b4e5ccd4ac1211bd02389292a Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 27 Jun 2024 21:24:54 +0200 Subject: [PATCH 16/60] [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: From 8364c4ee460f040c770c5c78279d7592dd76f3e9 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 27 Jun 2024 21:34:12 +0200 Subject: [PATCH 17/60] [yarn] Update lockfile --- .pnp.cjs | 386 +++++++++++++++++++++++++++++-------------------- yarn.lock | 421 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 499 insertions(+), 308 deletions(-) diff --git a/.pnp.cjs b/.pnp.cjs index 895ea5bd6..463481768 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -1312,6 +1312,16 @@ 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/",\ @@ -1889,6 +1899,186 @@ 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/",\ + "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"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@ioredis/commands", [\ ["npm:1.2.0", {\ "packageLocation": "./.yarn/cache/@ioredis-commands-npm-1.2.0-47541de88b-a8253c9539.zip/node_modules/@ioredis/commands/",\ @@ -7102,7 +7292,7 @@ const RAW_RUNTIME_STATE = ["sanitize-html", "npm:2.10.0"],\ ["seedrandom", "npm:3.0.5"],\ ["semver", "npm:7.5.4"],\ - ["sharp", "npm:0.32.1"],\ + ["sharp", "npm:0.33.4"],\ ["strict-event-emitter-types", "npm:2.0.0"],\ ["stringz", "npm:2.1.0"],\ ["swc-loader", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:0.2.3"],\ @@ -8178,13 +8368,6 @@ 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": [\ @@ -9889,15 +10072,6 @@ 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/",\ @@ -10102,6 +10276,13 @@ 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", [\ @@ -11905,15 +12086,6 @@ 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/",\ @@ -13016,15 +13188,6 @@ 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/",\ @@ -17885,15 +18048,6 @@ 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/",\ @@ -18084,15 +18238,6 @@ 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/",\ @@ -18168,16 +18313,6 @@ 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/",\ @@ -18186,14 +18321,6 @@ 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", [\ @@ -20124,27 +20251,6 @@ 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/",\ @@ -20816,19 +20922,6 @@ 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/",\ @@ -21790,6 +21883,13 @@ 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", [\ @@ -21919,19 +22019,32 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["sharp", [\ - ["npm:0.32.1", {\ - "packageLocation": "./.yarn/unplugged/sharp-npm-0.32.1-5af640fc49/node_modules/sharp/",\ + ["npm:0.33.4", {\ + "packageLocation": "./.yarn/unplugged/sharp-npm-0.33.4-afc15185a7/node_modules/sharp/",\ "packageDependencies": [\ - ["sharp", "npm:0.32.1"],\ + ["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"],\ ["color", "npm:4.2.3"],\ - ["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"]\ + ["detect-libc", "npm:2.0.3"],\ + ["semver", "npm:7.6.2"]\ ],\ "linkType": "HARD"\ }]\ @@ -21998,27 +22111,6 @@ 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/",\ @@ -22743,13 +22835,6 @@ 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": [\ @@ -23040,19 +23125,6 @@ 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.lock b/yarn.lock index 81e637c46..ae98e6abf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -789,6 +789,15 @@ __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" @@ -1200,6 +1209,181 @@ __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" + 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 + languageName: node + linkType: hard + "@ioredis/commands@npm:^1.1.1": version: 1.2.0 resolution: "@ioredis/commands@npm:1.2.0" @@ -5417,7 +5601,7 @@ __metadata: sanitize-html: "npm:2.10.0" seedrandom: "npm:^3.0.5" semver: "npm:7.5.4" - sharp: "npm:0.32.1" + sharp: "npm:0.33.4" strict-event-emitter-types: "npm:2.0.0" stringz: "npm:2.1.0" swc-loader: "npm:^0.2.3" @@ -6348,13 +6532,6 @@ __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" @@ -7674,13 +7851,6 @@ __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" @@ -7850,13 +8020,20 @@ __metadata: languageName: node linkType: hard -"detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.1": +"detect-libc@npm:^2.0.0": 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" @@ -9334,13 +9511,6 @@ __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" @@ -10348,13 +10518,6 @@ __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" @@ -11456,7 +11619,7 @@ __metadata: languageName: node linkType: hard -"ini@npm:^1.3.4, ini@npm:~1.3.0": +"ini@npm:^1.3.4": version: 1.3.8 resolution: "ini@npm:1.3.8" checksum: 10/314ae176e8d4deb3def56106da8002b462221c174ddb7ce0c49ee72c8cd1f9044f7b10cc555a7d8850982c3b9ca96fc212122749f5234bc2b6fb05fb942ed566 @@ -14603,7 +14766,7 @@ __metadata: languageName: node linkType: hard -"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": +"minimist@npm:^1.2.0, 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 @@ -14720,13 +14883,6 @@ __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" @@ -14952,13 +15108,6 @@ __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" @@ -15021,15 +15170,6 @@ __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" @@ -15039,15 +15179,6 @@ __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" @@ -16758,28 +16889,6 @@ __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" @@ -17380,20 +17489,6 @@ __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" @@ -18338,7 +18433,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.0, 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.3, semver@npm:^7.5.4, semver@npm:~7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -18358,6 +18453,15 @@ __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" @@ -18447,20 +18551,72 @@ __metadata: languageName: node linkType: hard -"sharp@npm:0.32.1": - version: 0.32.1 - resolution: "sharp@npm:0.32.1" +"sharp@npm:0.33.4": + version: 0.33.4 + resolution: "sharp@npm:0.33.4" 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.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 + 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 languageName: node linkType: hard @@ -18521,24 +18677,6 @@ __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" @@ -19205,13 +19343,6 @@ __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" @@ -19428,18 +19559,6 @@ __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" @@ -19455,7 +19574,7 @@ __metadata: languageName: node linkType: hard -"tar-stream@npm:^2.1.4, tar-stream@npm:^2.2.0": +"tar-stream@npm:^2.2.0": version: 2.2.0 resolution: "tar-stream@npm:2.2.0" dependencies: From a220810f76be1aecf9993db8f84afa7c8e26b522 Mon Sep 17 00:00:00 2001 From: Tournesol Date: Wed, 26 Jun 2024 21:59:42 +0200 Subject: [PATCH 18/60] Remove Experiments page --- .../client/src/pages/admin/experiments.vue | 74 ------------------- packages/client/src/pages/admin/index.vue | 6 -- packages/client/src/router.ts | 5 -- 3 files changed, 85 deletions(-) delete mode 100644 packages/client/src/pages/admin/experiments.vue diff --git a/packages/client/src/pages/admin/experiments.vue b/packages/client/src/pages/admin/experiments.vue deleted file mode 100644 index 32ce9bfae..000000000 --- a/packages/client/src/pages/admin/experiments.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index 4e04a3c93..a377eda06 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -274,12 +274,6 @@ const menuDef = $computed(() => [ to: "/admin/database", active: currentPage?.route.name === "database", }, - { - icon: "ph-flask ph-bold ph-lg", - text: i18n.ts._experiments.title, - to: "/admin/experiments", - active: currentPage?.route.name === "experiments", - }, ], }, ] diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index ff224bba3..7a14cf680 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -543,11 +543,6 @@ export const routes = [ name: "other-settings", component: page(() => import("./pages/admin/custom-css.vue")), }, - { - path: "/experiments", - name: "experiments", - component: page(() => import("./pages/admin/experiments.vue")), - }, { path: "/", component: page(() => import("./pages/_empty_.vue")), From 671b52c6639511a3f05d83451d4d45e1429015f6 Mon Sep 17 00:00:00 2001 From: Tournesol Date: Wed, 26 Jun 2024 22:00:25 +0200 Subject: [PATCH 19/60] clean locales from experiments mentions --- locales/ca-ES.yml | 9 --------- locales/de-DE.yml | 6 ------ locales/en-US.yml | 6 ------ locales/es-ES.yml | 6 ------ locales/fr-FR.yml | 9 --------- locales/ja-JP.yml | 5 ----- locales/nl-NL.yml | 5 ----- locales/pl-PL.yml | 6 ------ locales/tr-TR.yml | 6 ------ locales/uk-UA.yml | 6 ------ locales/zh-CN.yml | 4 ---- locales/zh-TW.yml | 2 -- 12 files changed, 70 deletions(-) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index ee58c9c96..27ad20012 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -2092,15 +2092,6 @@ preventAiLearning: Evita l'indexació dels bots preventAiLearningDescription: Sol·liciteu que els models de llenguatge d'IA de tercers no estudiïn el contingut que pengeu, com ara publicacions i imatges. pwa: Instal·lar PWA -_experiments: - alpha: Alfa - beta: Beta - release: Publicà - title: Experiments - enablePostImports: Activar l'importació de publicacions - postImportsCaption: Permet els usuaris importar publicacions desde comptes a Iceshrimp, - Iceshrimp, Mastodon, Akkoma i Pleroma. Pot fer que el servidor vagi més lent durant - la càrrega si tens un coll d'ampolla a la cua. noGraze: Si us plau, desactiva l'extensió del navegador "Graze for Mastodon", ja que interfereix amb Iceshrimp. accessibility: Accessibilitat diff --git a/locales/de-DE.yml b/locales/de-DE.yml index a5f25e097..9b1051883 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -2101,12 +2101,6 @@ accessibility: Erreichbarkeit jumpToPrevious: Zum Vorherigen springen silencedWarning: Diese Meldung wird angezeigt, weil diese Nutzer von Servern stammen, die Ihr Administrator abgeschaltet hat, so dass es sich möglicherweise um Spam handelt. -_experiments: - title: Funktionstests - enablePostImports: Beitragsimporte aktivieren - postImportsCaption: Erlaubt es Nutzer:innen ihre Posts von alten Iceshrimp, Iceshrimp, - Mastodon, Akkoma und Pleroma Accounts zu importieren. Bei Engpässen in der Warteschlange - kann es zu Verlangsamungen beim Laden während des Imports kommen. noGraze: Bitte deaktivieren Sie die Browsererweiterung "Graze for Mastodon", da sie die Funktion von Iceshrimp stört. indexFrom: Indexieren ab Beitragskennung aufwärts diff --git a/locales/en-US.yml b/locales/en-US.yml index 02a2c6aef..bdfb1c6b4 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -2143,12 +2143,6 @@ _deck: channel: "Channel" mentions: "Mentions" direct: "Direct messages" -_experiments: - title: "Experiments" - enablePostImports: "Enable post imports" - postImportsCaption: "Allows users to import their posts from past Iceshrimp, Misskey, - Mastodon, Akkoma, and Pleroma accounts. It may cause slowdowns during load if - your queue is bottlenecked." _dialog: charactersExceeded: "Max characters exceeded! Current: {current}/Limit: {max}" charactersBelow: "Not enough characters! Current: {current}/Limit: {min}" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 0bd66199c..c623e7953 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -2188,12 +2188,6 @@ _feeds: copyFeed: Copiar feed rss: RSS atom: Atom -_experiments: - title: Experimentos - enablePostImports: Activar importaciones de publicaciones - postImportsCaption: Permite a los usuarios importar publicaciones de cuentas antiguas - de Iceshrimp, Misskey, Mastodon, Akkoma y Pleroma. Puede que cause ralentizaciones - durante la carga si sufres cuello de botella. _skinTones: mediumDark: Medio oscuro dark: Oscuro diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 5190352e4..4ba6b853b 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -2103,15 +2103,6 @@ editNote: Modifier publication edited: "Modifié à {date} {time}" flagShowTimelineRepliesDescription: Si activé, affiche dans le fil les réponses des utilisatieur·rice·s aux publications des autres. -_experiments: - alpha: Alpha - beta: Beta - enablePostImports: Autoriser l’importation de publications - title: Expérimentations - postImportsCaption: Permet aux utilisateurs d’importer leurs publications à partir - de leurs anciens comptes Iceshrimp, Misskey, Mastodon, Akkoma et Pleroma. Cela - peut entraîner des ralentissements lors du chargement si votre file d’attente - est congestionnée. findOtherInstance: Trouver une autre instance userSaysSomethingReasonQuote: "{name} a cité une publication contenant {reason}" signupsDisabled: Les inscriptions sur cette instance sont actuellement désactivés, diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 0023c0f5b..cb27f6a83 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1898,11 +1898,6 @@ noteId: 投稿のID hiddenTagsDescription: 'トレンドと「みつける」から除外したいハッシュタグを（先頭の # を除いて）改行区切りで入力してください。この設定はトレンドと「みつける」以外には影響しません。' hiddenTags: 非表示にするハッシュタグ apps: "アプリ" -_experiments: - title: 試験的な機能 - postImportsCaption: - ユーザーが過去の投稿をIceshrimp・Iceshrimp・Mastodon・Akkoma・Pleromaからインポートすることを許可します。キューが溜まっているときにインポートするとサーバーに負荷がかかる可能性があります。 - enablePostImports: 投稿のインポートを有効にする sendModMail: モデレーション通知を送る deleted: 削除済み editNote: 投稿を編集 diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml index f42d11921..fc0945282 100644 --- a/locales/nl-NL.yml +++ b/locales/nl-NL.yml @@ -1257,11 +1257,6 @@ _aboutIceshrimp: de bovenstaande link om je naam hier te krijgen! contributors: Belangrijkste bijdragers allContributors: Alle bijdragers -_experiments: - postImportsCaption: Hiermee kunnen gebruikers hun posts van eerdere Iceshrimp, Misskey, - Mastodon, Akkoma en Pleroma-accounts importen. Dit kan tijdensh het laden voor - traagheid zorgen als de wachtrij vol zit. - enablePostImports: Post-importeren aanzetten hiddenTagsDescription: 'Geef de hashtags (zonder #) op die je uit Trending en Verkennen wilt verbergen. Verborgen hashtags zijn nog steeds ontdekbaar via andere manieren.' pinnedClipId: ID van de clip on vast te zetten diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 51fd32289..254b06c66 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -2098,12 +2098,6 @@ preventAiLearningDescription: Zażądaj, by modele językowe AI osób trzecich n silencedWarning: Ta strona się pokazuje, ponieważ wymienieni użytkownicy są z serwerów które Twój admin wyciszył, więc mogą być oni potencjalnymi spamerami. verifiedLink: Zweryfikowany link -_experiments: - enablePostImports: Włącz import postów - postImportsCaption: Pozwala użytkownikom na zaimportowanie ich postów z poprzednich - kont Iceshrimp, Misskey, Mastodon, Akkomy czy Pleromy. Może to spowodować spowolnienia - podczas ładowania, jeśli twoja kolejka ma wąskie gardło. - title: Eksperymenty alwaysExpandCws: Zawsze rozwijaj posty z CW video: Film swipeOnMobile: Zezwól na przesuwanie palcem między stronami diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml index 3aade1a70..bd900aeab 100644 --- a/locales/tr-TR.yml +++ b/locales/tr-TR.yml @@ -1859,12 +1859,6 @@ _notification: youReceivedFollowRequest: Bir takip isteği geldi youGotPoll: '{name} anketinde oylama yaptı' youGotMessagingMessageFromUser: '{name} sana bir sohbet mesajı gönderdi' -_experiments: - title: Deneyler - postImportsCaption: Kullanıcıların geçmiş Iceshrimp, Iceshrimp, Mastodon, Akkoma ve - Pleroma hesaplarından gönderilerini içe aktarmalarına izin verir. Kuyruğunuz tıkanırsa - yükleme sırasında yavaşlamalara neden olabilir. - enablePostImports: Gönderi içeri aktarmasını aktif et _dialog: charactersExceeded: 'Maksimum karakter aşıldı! Geçerli: {current}/Sınır: {max}' charactersBelow: 'Yeterli karakter yok! Geçerli: {current}/Sınır: {min}' diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index 25ac46b41..9ea0d5f3f 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -1904,12 +1904,6 @@ _instanceMute: title: Приховує записи з перелічених серверів. instanceMuteDescription2: Розділити новими рядками heading: Список серверів для заглушення -_experiments: - enablePostImports: Ввімкнути імпорт записів - title: Експерименти - postImportsCaption: Дозволяє користувачам імпортувати свої публікації з минулих - облікових записів Iceshrimp, Misskey, Mastodon, Akkoma і Pleroma. Це може знизити - швидкість під час завантаження, якщо ваша черга перевантажена. _dialog: charactersExceeded: 'Перевищено максимальну кількість символів! Обмеження: {current}/{max}' charactersBelow: 'Недостатньо символів! Обмеження: {current}/{min}' diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index ad41598ac..f5c9394c4 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1815,10 +1815,6 @@ _messaging: dms: 私信 groups: 群组 migration: 迁移 -_experiments: - title: 实验性功能 - postImportsCaption: 允许用户从过去的 Iceshrimp、Iceshrimp、Mastodon、Akkoma 和 Pleroma 账号导入帖子。如果您的队列出现拥堵，则可能会导致加载速度减慢。 - enablePostImports: 启用帖子导入 license: 许可证 flagSpeakAsCatDescription: 在猫模式下您的帖子会喵化 allowedInstances: 白名单服务器 diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index ec558ef92..512e1aabf 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1823,8 +1823,6 @@ flagSpeakAsCat: 像貓一樣地說話 silenceThisInstance: 靜音此伺服器 silencedInstances: 已靜音的伺服器 silenced: 已靜音 -_experiments: - title: 試驗功能 findOtherInstance: 找找另一個伺服器 noGraze: 瀏覽器擴展 "Graze for Mastodon" 會與Iceshrimp發生衝突，請停用該擴展。 userSaysSomethingReasonRenote: '{name} 轉傳了包含 {reason} 的貼文' From 2ebd907c473c47938a9a40b046f9b098680f0f4b Mon Sep 17 00:00:00 2001 From: ari melody Date: Mon, 1 Jul 2024 05:59:55 +0100 Subject: [PATCH 20/60] [backend/masto-client] Add follow_requests_count to verify_credentials response --- packages/backend/src/server/api/mastodon/helpers/user.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/backend/src/server/api/mastodon/helpers/user.ts b/packages/backend/src/server/api/mastodon/helpers/user.ts index 77dd6cce8..4cc52714a 100644 --- a/packages/backend/src/server/api/mastodon/helpers/user.ts +++ b/packages/backend/src/server/api/mastodon/helpers/user.ts @@ -215,6 +215,7 @@ export class UserHelpers { const user = ctx.user as ILocalUser; const acct = UserConverter.encode(user, ctx); const profile = UserProfiles.findOneByOrFail({ userId: user.id }); + const followRequests = FollowRequests.count({ where: { followeeId: user.id } }); const privacy = this.getDefaultNoteVisibility(ctx); const fields = profile.then(profile => profile.fields.map(field => { return { @@ -229,6 +230,7 @@ export class UserHelpers { privacy: privacy.then(p => VisibilityConverter.encode(p)), sensitive: profile.then(p => p.alwaysMarkNsfw), language: profile.then(p => p.lang ?? ''), + follow_requests_count: followRequests, }; const result = { From 9a932865b70d8bebe102732c75cd0c888a0978b2 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 2 Jul 2024 22:57:04 +0200 Subject: [PATCH 21/60] [docs] Switch to valkey for key/value storage (#558) --- docs/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index cbe07bc5c..f4272bc71 100644 --- a/docs/install.md +++ b/docs/install.md @@ -14,7 +14,7 @@ This document will guide you through manual installation of Iceshrimp. We also p - [**Node.js**](https://nodejs.org) v18.16.0+ (v20 recommended) - [**PostgreSQL**](https://www.postgresql.org/) 12+ (including modules, usually packaged as postgresql-contrib) -- [**Redis**](https://redis.io/) 6+ +- [**Valkey**](https://valkey.io/) (or any other Redis 6 compatible fork) - [**libvips**](https://www.libvips.org/) - **Web proxy** - nginx From 3de130e9327d08b829a88fe2c08a6ec399e1a8e6 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 2 Jul 2024 22:57:11 +0200 Subject: [PATCH 22/60] [docker] Switch to valkey for key/value storage (#558) --- dev/docker-compose.yml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/docker-compose.yml.example b/dev/docker-compose.yml.example index 5858cbd28..fc5e2bd48 100644 --- a/dev/docker-compose.yml.example +++ b/dev/docker-compose.yml.example @@ -22,7 +22,7 @@ services: redis: restart: always container_name: iceshrimp_redis - image: docker.io/redis:7.0-alpine + image: docker.io/valkey/valkey:7-alpine networks: - network volumes: From 01555c995ec787c2cdeb0379401060fc580d6599 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Wed, 3 Jul 2024 23:12:47 +0200 Subject: [PATCH 23/60] [docker] Fix build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 568263abe..04a0c3b9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM alpine:3.20 as build WORKDIR /iceshrimp # Install compilation dependencies -RUN apk add --no-cache --no-progress git alpine-sdk vips-dev python3 nodejs-current npm vips +RUN apk add --no-cache --no-progress git alpine-sdk vips-dev python3 py3-setuptools nodejs-current npm vips # Copy in all files for the build COPY . ./ From 09afdeb04cd394a8f45d2ad2bc9404f070dc4057 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Wed, 3 Jul 2024 23:51:17 +0200 Subject: [PATCH 24/60] [backend] Fix build on Node 22 --- packages/backend/src/server/web/manifest.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/server/web/manifest.ts b/packages/backend/src/server/web/manifest.ts index e1bee8aae..723458afb 100644 --- a/packages/backend/src/server/web/manifest.ts +++ b/packages/backend/src/server/web/manifest.ts @@ -1,12 +1,12 @@ import type Koa from "koa"; import { fetchMeta } from "@/misc/fetch-meta.js"; -import manifest from "./manifest.json" assert { type: "json" }; +import fs from "fs"; +import path from 'path'; + +const manifest = JSON.parse(fs.readFileSync(path.resolve('./src/server/web/manifest.json'), 'utf-8')); export const manifestHandler = async (ctx: Koa.Context) => { - // TODO - //const res = structuredClone(manifest); - const res = JSON.parse(JSON.stringify(manifest)); - + const res = manifest; const instance = await fetchMeta(true); res.short_name = instance.name || "Iceshrimp"; From e2b7d80871e17885e04729d5e6d32bf4f1bab480 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 4 Jul 2024 00:08:21 +0200 Subject: [PATCH 25/60] [backend] Reset home timeline query heuristic after importing follows --- packages/backend/src/queue/processors/db/import-following.ts | 2 ++ .../backend/src/server/api/common/generate-following-query.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/queue/processors/db/import-following.ts b/packages/backend/src/queue/processors/db/import-following.ts index b1a7cd2c9..d58c71276 100644 --- a/packages/backend/src/queue/processors/db/import-following.ts +++ b/packages/backend/src/queue/processors/db/import-following.ts @@ -9,6 +9,7 @@ import { Users, DriveFiles } from "@/models/index.js"; import type { DbUserImportJobData } from "@/queue/types.js"; import { queueLogger } from "../../logger.js"; import type Bull from "bull"; +import { cache as heuristic } from "@/server/api/common/generate-following-query.js"; const logger = queueLogger.createSubLogger("import-following"); @@ -111,6 +112,7 @@ export async function importFollowing( } } + await heuristic.delete(user.id); logger.succ("Imported"); done(); } diff --git a/packages/backend/src/server/api/common/generate-following-query.ts b/packages/backend/src/server/api/common/generate-following-query.ts index 14835f7f5..c6a592d34 100644 --- a/packages/backend/src/server/api/common/generate-following-query.ts +++ b/packages/backend/src/server/api/common/generate-following-query.ts @@ -4,7 +4,7 @@ import { Followings, Notes } from "@/models/index.js"; import { Cache } from "@/misc/cache.js"; import { apiLogger } from "@/server/api/logger.js"; -const cache = new Cache("homeTlQueryData", 60 * 60 * 24); +export const cache = new Cache("homeTlQueryData", 60 * 60 * 24); const cutoff = 250; // 250 posts in the last 7 days, constant determined by comparing benchmarks for cutoff values between 100 and 2500 const logger = apiLogger.createSubLogger("heuristics"); From 4f21fd9b91edbe674819e44efc27577bf89f23c4 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 4 Jul 2024 03:24:40 +0200 Subject: [PATCH 26/60] [backend/masto-client] Fall back to full-res url if an attachment's thumbnailUrl is null The API docs say this field is nullable, but the official android app crashes if it is set to null. --- packages/backend/src/server/api/mastodon/converters/file.ts | 2 +- packages/backend/src/server/api/mastodon/entities/attachment.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/server/api/mastodon/converters/file.ts b/packages/backend/src/server/api/mastodon/converters/file.ts index 31a34b9ee..7cf064b5e 100644 --- a/packages/backend/src/server/api/mastodon/converters/file.ts +++ b/packages/backend/src/server/api/mastodon/converters/file.ts @@ -7,7 +7,7 @@ export class FileConverter { type: this.encodefileType(f.type), url: f.url ?? "", remote_url: f.url, - preview_url: f.thumbnailUrl, + preview_url: f.thumbnailUrl ?? f.url ?? "", text_url: f.url, meta: { width: f.properties.width, diff --git a/packages/backend/src/server/api/mastodon/entities/attachment.ts b/packages/backend/src/server/api/mastodon/entities/attachment.ts index 3cdc67b76..0945097f0 100644 --- a/packages/backend/src/server/api/mastodon/entities/attachment.ts +++ b/packages/backend/src/server/api/mastodon/entities/attachment.ts @@ -40,7 +40,7 @@ namespace MastodonEntity { type: "unknown" | "image" | "gifv" | "video" | "audio"; url: string; remote_url: string | null; - preview_url: string | null; + preview_url: string; text_url: string | null; meta: Meta | null; description: string | null; From 6b5f74a76fc21a9fefc30a039364558fe80c5f61 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 8 Jul 2024 04:01:16 +0200 Subject: [PATCH 27/60] [ci] Update CI workflows --- .forgejo/workflows/commit.yaml | 47 ++++++++++++++++++++++++++++++ .forgejo/workflows/test-build.yaml | 12 ++++---- 2 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 .forgejo/workflows/commit.yaml diff --git a/.forgejo/workflows/commit.yaml b/.forgejo/workflows/commit.yaml new file mode 100644 index 000000000..f7fe969d7 --- /dev/null +++ b/.forgejo/workflows/commit.yaml @@ -0,0 +1,47 @@ +on: + push: + branches: + - 'dev' +jobs: + test-build: + runs-on: docker + container: + image: iceshrimp.dev/iceshrimp/ci-env:latest + options: --volume /opt/iceshrimp-cache/yarn:/iceshrimp-caches/yarn + services: + database: + image: postgres:15 + env: + POSTGRES_PASSWORD: "test" + redis: + image: redis + steps: + - name: Clone repository + run: git clone https://iceshrimp.dev/iceshrimp/iceshrimp.git --branch=${{ github.ref_name }} --depth=1 . + - name: Install build dependencies + run: | + cp -Tr /iceshrimp-caches/yarn .yarn + yarn --immutable + rm -rf /iceshrimp-caches/yarn/* && cp -Tr .yarn /iceshrimp-caches/yarn + - name: Build the shrimp + run: yarn build:debug + - name: Test the shrimp + run: | + cp .config/ci.yml .config/default.yml + yarn run migrate + build-and-push: + runs-on: docker + needs: test-build + container: + image: iceshrimp.dev/iceshrimp/ci-env:latest + options: --volume /root/.docker:/root/.docker + steps: + - name: Clone repository + run: git clone https://iceshrimp.dev/iceshrimp/iceshrimp.git --branch=${{ github.ref_name }} --depth=1 . + - name: Build docker image + shell: bash + run: | + docker login iceshrimp.dev -u ${{ github.actor }} -p ${{ secrets.REGISTRY_TOKEN }} + docker buildx create --name iceshrimp-ci 2>&1 &>/dev/null || true + docker buildx build -t iceshrimp.dev/${GITHUB_REPOSITORY@L}:$GITHUB_REF_NAME --provenance=false --platform=linux/amd64,linux/arm64 --push --builder iceshrimp-ci . + docker buildx prune --keep-storage 20G diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 40a35e831..0ff90b0ef 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -1,5 +1,7 @@ on: - - push + push: + branches-ignore: + - 'dev' jobs: test-build: runs-on: docker @@ -15,19 +17,15 @@ jobs: image: redis steps: - name: Clone repository - run: git clone https://iceshrimp.dev/iceshrimp/iceshrimp.git --branch=${{ github.ref_name }} --depth=1 /iceshrimp + run: git clone https://iceshrimp.dev/iceshrimp/iceshrimp.git --branch=${{ github.ref_name }} --depth=1 . - name: Install build dependencies run: | - cd /iceshrimp cp -Tr /iceshrimp-caches/yarn .yarn yarn --immutable rm -rf /iceshrimp-caches/yarn/* && cp -Tr .yarn /iceshrimp-caches/yarn - name: Build the shrimp - run: | - cd /iceshrimp - yarn build:debug + run: yarn build:debug - name: Test the shrimp run: | - cd /iceshrimp cp .config/ci.yml .config/default.yml yarn run migrate From d004e6e2cdc4928c80edaed50653dcb101cd69af Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 8 Jul 2024 04:07:17 +0200 Subject: [PATCH 28/60] [ci] Build on build-cluster instead of iceshrimp-ci --- .forgejo/workflows/commit.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/commit.yaml b/.forgejo/workflows/commit.yaml index f7fe969d7..6c06953ae 100644 --- a/.forgejo/workflows/commit.yaml +++ b/.forgejo/workflows/commit.yaml @@ -42,6 +42,5 @@ jobs: shell: bash run: | docker login iceshrimp.dev -u ${{ github.actor }} -p ${{ secrets.REGISTRY_TOKEN }} - docker buildx create --name iceshrimp-ci 2>&1 &>/dev/null || true - docker buildx build -t iceshrimp.dev/${GITHUB_REPOSITORY@L}:$GITHUB_REF_NAME --provenance=false --platform=linux/amd64,linux/arm64 --push --builder iceshrimp-ci . - docker buildx prune --keep-storage 20G + docker buildx build -t iceshrimp.dev/${GITHUB_REPOSITORY@L}:$GITHUB_REF_NAME --provenance=false --platform=linux/amd64,linux/arm64 --push --builder build-cluster . + docker buildx prune --keep-storage 20G --builder build-cluster From 85c143825284bdf98dd934cdc1fb71f28f9831c7 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 8 Jul 2024 04:10:17 +0200 Subject: [PATCH 29/60] [ci] Mount correct .docker folder --- .forgejo/workflows/commit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/commit.yaml b/.forgejo/workflows/commit.yaml index 6c06953ae..7bb513105 100644 --- a/.forgejo/workflows/commit.yaml +++ b/.forgejo/workflows/commit.yaml @@ -34,7 +34,7 @@ jobs: needs: test-build container: image: iceshrimp.dev/iceshrimp/ci-env:latest - options: --volume /root/.docker:/root/.docker + options: --volume /home/zotan/.docker:/root/.docker steps: - name: Clone repository run: git clone https://iceshrimp.dev/iceshrimp/iceshrimp.git --branch=${{ github.ref_name }} --depth=1 . From c3e685a925a89b4abc19684263e87691dd9f0c6d Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 8 Jul 2024 04:15:33 +0200 Subject: [PATCH 30/60] [ci] Don't build images in CI It seems to not be possible to (safely) communicate with a remote builder instance. --- .forgejo/workflows/commit.yaml | 46 ------------------------------ .forgejo/workflows/test-build.yaml | 2 -- 2 files changed, 48 deletions(-) delete mode 100644 .forgejo/workflows/commit.yaml diff --git a/.forgejo/workflows/commit.yaml b/.forgejo/workflows/commit.yaml deleted file mode 100644 index 7bb513105..000000000 --- a/.forgejo/workflows/commit.yaml +++ /dev/null @@ -1,46 +0,0 @@ -on: - push: - branches: - - 'dev' -jobs: - test-build: - runs-on: docker - container: - image: iceshrimp.dev/iceshrimp/ci-env:latest - options: --volume /opt/iceshrimp-cache/yarn:/iceshrimp-caches/yarn - services: - database: - image: postgres:15 - env: - POSTGRES_PASSWORD: "test" - redis: - image: redis - steps: - - name: Clone repository - run: git clone https://iceshrimp.dev/iceshrimp/iceshrimp.git --branch=${{ github.ref_name }} --depth=1 . - - name: Install build dependencies - run: | - cp -Tr /iceshrimp-caches/yarn .yarn - yarn --immutable - rm -rf /iceshrimp-caches/yarn/* && cp -Tr .yarn /iceshrimp-caches/yarn - - name: Build the shrimp - run: yarn build:debug - - name: Test the shrimp - run: | - cp .config/ci.yml .config/default.yml - yarn run migrate - build-and-push: - runs-on: docker - needs: test-build - container: - image: iceshrimp.dev/iceshrimp/ci-env:latest - options: --volume /home/zotan/.docker:/root/.docker - steps: - - name: Clone repository - run: git clone https://iceshrimp.dev/iceshrimp/iceshrimp.git --branch=${{ github.ref_name }} --depth=1 . - - name: Build docker image - shell: bash - run: | - docker login iceshrimp.dev -u ${{ github.actor }} -p ${{ secrets.REGISTRY_TOKEN }} - docker buildx build -t iceshrimp.dev/${GITHUB_REPOSITORY@L}:$GITHUB_REF_NAME --provenance=false --platform=linux/amd64,linux/arm64 --push --builder build-cluster . - docker buildx prune --keep-storage 20G --builder build-cluster diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 0ff90b0ef..a0c521e56 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -1,7 +1,5 @@ on: push: - branches-ignore: - - 'dev' jobs: test-build: runs-on: docker From a2f9a7c374ed4e86d76ab478d74463574da5f24d Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Wed, 10 Jul 2024 21:04:52 +0200 Subject: [PATCH 31/60] [docs] Update firefish link in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7648c565d..40b25fd78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -718,4 +718,4 @@ It also includes cherry-picked contributions from external contributors: Namekuj --- -This file lists all major changes made since the fork from Firefish on 2023-07-21. For changes prior to that date, please reference the [Firefish](https://git.joinfirefish.org/firefish/firefish/-/tree/76ad0a19b3a64eaecb4da31f20c229e423ee2095/) repository. +This file lists all major changes made since the fork from Firefish on 2023-07-21. For changes prior to that date, please reference the [Firefish](https://firefish.dev/firefish/firefish/-/tree/76ad0a19b3a64eaecb4da31f20c229e423ee2095/) repository. From 206d2f246e37bb1c888cb8f0eadb4478b49b34ba Mon Sep 17 00:00:00 2001 From: zotan Date: Fri, 12 Jul 2024 19:08:02 +0200 Subject: [PATCH 32/60] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a198c597b..c65681962 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ It was forked from Calckey Firefish (itself a fork of Misskey) in mid > **Note** > This project is **not** inactive. > -> Most of our current development resources are going into the [rewrite](/iceshrimp/Iceshrimp.NET), to further our goal of increasing stability and performance. +> Almost all of our current development efforts are going into the Iceshrimp.NET [rewrite](/iceshrimp/Iceshrimp.NET), to further our goal of increasing stability and performance.
+> This means that Iceshrimp-JS (this project) is only receiving security patches and minor bug fixes. Support is of course still available on the usual channels. > -> This means that major changes to the JS codebase (this project), and especially to the database schema, are on hold for the time being. Bugs will of course still be fixed, and support is still available on the usual channels. -> -> Once the rewrite is finished, there will be an easy upgrade path for existing Iceshrimp instances. +> There is already an easy upgrade path available for existing Iceshrimp instances, though we don't recommend taking it just yet.
+> With Iceshrimp.NET getting ever-closer to a stable release, we hope you're just as excited as we are. Check out the [repository](/iceshrimp/Iceshrimp.NET) for more information. --- - Highlighted changes: From bb4f4b4b0056d06169be8c38cdc207af277d80e8 Mon Sep 17 00:00:00 2001 From: naskya Date: Fri, 17 Nov 2023 05:04:05 +0900 Subject: [PATCH 33/60] fix: upgrade AiScript! There are braking changes in the AiScript syntax, so existing plugins must alse be upgraded Also, I didn't include the function that can call remote servers' API (which is present in the latest Misskey) Co-authored-by: syuilo Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com> --- .pnp.cjs | 36 +++------ ...cript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip | 3 - ...cript-npm-0.16.0-078d966ef6-5c77fc596d.zip | 3 + .../chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip | 3 - .../uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip | 3 - .../uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip | 3 + packages/backend/package.json | 1 - packages/client/package.json | 2 +- packages/client/src/components/page/page.vue | 6 +- packages/client/src/pages/scratchpad.vue | 10 ++- .../src/pages/settings/plugin.install.vue | 57 +++++++++++---- packages/client/src/plugin.ts | 73 ++++++++++++++----- packages/client/src/scripts/aiscript/api.ts | 3 + packages/client/src/scripts/hpml/evaluator.ts | 6 +- packages/client/src/widgets/aiscript.vue | 23 +++--- packages/client/src/widgets/button.vue | 30 +++----- yarn.lock | 43 ++++------- 17 files changed, 170 insertions(+), 135 deletions(-) delete mode 100644 .yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip create mode 100644 .yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip delete mode 100644 .yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip delete mode 100644 .yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip create mode 100644 .yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip diff --git a/.pnp.cjs b/.pnp.cjs index 463481768..967537240 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -3726,15 +3726,13 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@syuilo/aiscript", [\ - ["npm:0.11.1", {\ - "packageLocation": "./.yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip/node_modules/@syuilo/aiscript/",\ + ["npm:0.16.0", {\ + "packageLocation": "./.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip/node_modules/@syuilo/aiscript/",\ "packageDependencies": [\ - ["@syuilo/aiscript", "npm:0.11.1"],\ - ["autobind-decorator", "npm:2.4.0"],\ - ["chalk", "npm:4.0.0"],\ + ["@syuilo/aiscript", "npm:0.16.0"],\ ["seedrandom", "npm:3.0.5"],\ ["stringz", "npm:2.1.0"],\ - ["uuid", "npm:7.0.3"]\ + ["uuid", "npm:9.0.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -7154,7 +7152,6 @@ const RAW_RUNTIME_STATE = ["@swc/cli", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:0.1.62"],\ ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ ["@swc/core-android-arm64", "npm:1.3.11"],\ - ["@syuilo/aiscript", "npm:0.11.1"],\ ["@types/adm-zip", "npm:0.5.0"],\ ["@types/async-lock", "npm:1.4.0"],\ ["@types/bcryptjs", "npm:2.4.2"],\ @@ -8122,15 +8119,6 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "HARD"\ }],\ - ["npm:4.0.0", {\ - "packageLocation": "./.yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip/node_modules/chalk/",\ - "packageDependencies": [\ - ["chalk", "npm:4.0.0"],\ - ["ansi-styles", "npm:4.3.0"],\ - ["supports-color", "npm:7.2.0"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:4.1.2", {\ "packageLocation": "./.yarn/cache/chalk-npm-4.1.2-ba8b67ab80-cb3f3e5949.zip/node_modules/chalk/",\ "packageDependencies": [\ @@ -8524,7 +8512,7 @@ const RAW_RUNTIME_STATE = ["@rollup/plugin-alias", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:5.1.0"],\ ["@rollup/plugin-json", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:6.0.1"],\ ["@rollup/pluginutils", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:5.1.0"],\ - ["@syuilo/aiscript", "npm:0.11.1"],\ + ["@syuilo/aiscript", "npm:0.16.0"],\ ["@types/escape-regexp", "npm:0.0.1"],\ ["@types/glob", "npm:8.1.0"],\ ["@types/gulp", "npm:4.0.13"],\ @@ -24627,13 +24615,6 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["uuid", [\ - ["npm:7.0.3", {\ - "packageLocation": "./.yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip/node_modules/uuid/",\ - "packageDependencies": [\ - ["uuid", "npm:7.0.3"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:8.0.0", {\ "packageLocation": "./.yarn/cache/uuid-npm-8.0.0-591e3a2e23-5086c43bbe.zip/node_modules/uuid/",\ "packageDependencies": [\ @@ -24654,6 +24635,13 @@ const RAW_RUNTIME_STATE = ["uuid", "npm:9.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:9.0.1", {\ + "packageLocation": "./.yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip/node_modules/uuid/",\ + "packageDependencies": [\ + ["uuid", "npm:9.0.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["v8-compile-cache-lib", [\ diff --git a/.yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip b/.yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip deleted file mode 100644 index 03a21f1a0..000000000 --- a/.yarn/cache/@syuilo-aiscript-npm-0.11.1-451b9d1a3f-4df4bb5a25.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fa9222eb49fe8cb2b23d2910c82afdfc4d37c3af1b0a01c636bf5e91e7a369c -size 46113 diff --git a/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip b/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip new file mode 100644 index 000000000..b3ef0b306 --- /dev/null +++ b/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fb77fa49be7052b16c7a261da8f2a3ddaa933547c55760c8cde8e42403deac9 +size 181843 diff --git a/.yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip b/.yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip deleted file mode 100644 index be67166cf..000000000 --- a/.yarn/cache/chalk-npm-4.0.0-50e5418ea0-f8ae363f43.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab2429f73cdef64b4e43ef9648f4288162a51bf399d60f5365b7d9c19334a44a -size 13166 diff --git a/.yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip b/.yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip deleted file mode 100644 index 0895e9662..000000000 --- a/.yarn/cache/uuid-npm-7.0.3-2b088bd924-b2a4d30ecd.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96655d1ba659598733dc27c4d783e48b20aff24182ee5ca08208484b1841767c -size 46227 diff --git a/.yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip b/.yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip new file mode 100644 index 000000000..196ca8b45 --- /dev/null +++ b/.yarn/cache/uuid-npm-9.0.1-39a8442bc6-9d0b6adb72.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74f080b144165817c0dbf45fc9cf659b170800964efaebf6f6b49dc8b0eb7018 +size 60894 diff --git a/packages/backend/package.json b/packages/backend/package.json index f0c858b47..797f8c21f 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -35,7 +35,6 @@ "@peertube/http-signature": "1.7.0", "@redocly/openapi-core": "1.0.0-beta.131", "@sinonjs/fake-timers": "9.1.2", - "@syuilo/aiscript": "0.11.1", "adm-zip": "^0.5.10", "ajv": "8.12.0", "archiver": "5.3.1", diff --git a/packages/client/package.json b/packages/client/package.json index c519f5cd8..6ca7893eb 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -17,7 +17,7 @@ "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-json": "^6.0.1", "@rollup/pluginutils": "^5.1.0", - "@syuilo/aiscript": "0.11.1", + "@syuilo/aiscript": "0.16.0", "@types/escape-regexp": "0.0.1", "@types/glob": "8.1.0", "@types/gulp": "4.0.13", diff --git a/packages/client/src/components/page/page.vue b/packages/client/src/components/page/page.vue index f2079c9ba..2ca4d8fd2 100644 --- a/packages/client/src/components/page/page.vue +++ b/packages/client/src/components/page/page.vue @@ -22,7 +22,7 @@ import { onUnmounted, PropType, } from "vue"; -import { parse } from "@syuilo/aiscript"; +import { Parser } from "@syuilo/aiscript"; import XBlock from "./page.block.vue"; import { Hpml } from "@/scripts/hpml/evaluator"; import { url } from "@/config"; @@ -47,12 +47,14 @@ export default defineComponent({ enableAiScript: !defaultStore.state.disablePagesScript, }); + const parser = new Parser(); + onMounted(() => { nextTick(() => { if (props.page.script && hpml.aiscript) { let ast; try { - ast = parse(props.page.script); + ast = parser.parse(props.page.script); } catch (err) { console.error(err); /*os.alert({ diff --git a/packages/client/src/pages/scratchpad.vue b/packages/client/src/pages/scratchpad.vue index 77b4bf835..c6f2a23b3 100644 --- a/packages/client/src/pages/scratchpad.vue +++ b/packages/client/src/pages/scratchpad.vue @@ -45,7 +45,7 @@ import "prismjs/components/prism-javascript"; import "prismjs/themes/prism-okaidia.css"; import { PrismEditor } from "vue-prism-editor"; import "vue-prism-editor/dist/prismeditor.min.css"; -import { AiScript, parse, utils } from "@syuilo/aiscript"; +import { Interpreter, Parser, utils } from "@syuilo/aiscript"; import MkContainer from "@/components/MkContainer.vue"; import MkButton from "@/components/MkButton.vue"; import { createAiScriptEnv } from "@/scripts/aiscript/api"; @@ -57,6 +57,8 @@ import { definePageMetadata } from "@/scripts/page-metadata"; const code = ref(""); const logs = ref([]); +const parser = new Parser(); + const saved = localStorage.getItem("scratchpad"); if (saved) { code.value = saved; @@ -68,7 +70,7 @@ watch(code, () => { async function run() { logs.value = []; - const aiscript = new AiScript( + const aiscript = new Interpreter( createAiScriptEnv({ storageKey: "scratchpad", token: $i?.token, @@ -111,11 +113,11 @@ async function run() { let ast; try { - ast = parse(code.value); + ast = parser.parse(code.value); } catch (error) { os.alert({ type: "error", - text: "Syntax error :(", + text: `Syntax error : ${error}`, }); return; } diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue index a38c4a062..15af1db52 100644 --- a/packages/client/src/pages/settings/plugin.install.vue +++ b/packages/client/src/pages/settings/plugin.install.vue @@ -19,8 +19,7 @@ - - diff --git a/yarn.lock b/yarn.lock index ae98e6abf..5d6b335f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2691,16 +2691,14 @@ __metadata: languageName: node linkType: hard -"@syuilo/aiscript@npm:0.11.1": - version: 0.11.1 - resolution: "@syuilo/aiscript@npm:0.11.1" +"@syuilo/aiscript@npm:0.16.0": + version: 0.16.0 + resolution: "@syuilo/aiscript@npm:0.16.0" dependencies: - autobind-decorator: "npm:2.4.0" - chalk: "npm:4.0.0" seedrandom: "npm:3.0.5" stringz: "npm:2.1.0" - uuid: "npm:7.0.3" - checksum: 10/4df4bb5a25e8334dbfecac5dfa047b7637821d31daa1ada6fb14d2f13e94be4655c3845f6f61643be327b682608456d22fc5557c23c6c68bc1cfb7c76b6970d6 + uuid: "npm:9.0.1" + checksum: 10/5c77fc596dcff0e7ac30ba33f2550430dc1d69bd33075811d7822efb6102bae4169f455c867eac5821bee88993941bc6003bd981ad64885b2e643cb4bc260d4a languageName: node linkType: hard @@ -5463,7 +5461,6 @@ __metadata: "@swc/cli": "npm:^0.1.62" "@swc/core": "npm:^1.3.68" "@swc/core-android-arm64": "npm:1.3.11" - "@syuilo/aiscript": "npm:0.11.1" "@types/adm-zip": "npm:^0.5.0" "@types/async-lock": "npm:1.4.0" "@types/bcryptjs": "npm:2.4.2" @@ -6339,16 +6336,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:4.0.0": - version: 4.0.0 - resolution: "chalk@npm:4.0.0" - dependencies: - ansi-styles: "npm:^4.1.0" - supports-color: "npm:^7.1.0" - checksum: 10/f8ae363f43826f0eea96f94dbf5c544ec3cda1422ec998040b82381702db54e2a056a724445f6295842790bb7a3cb352cf83c704a4fdfee2bfcd2a74ce7fea13 - languageName: node - linkType: hard - "chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" @@ -6673,7 +6660,7 @@ __metadata: "@rollup/plugin-alias": "npm:^5.1.0" "@rollup/plugin-json": "npm:^6.0.1" "@rollup/pluginutils": "npm:^5.1.0" - "@syuilo/aiscript": "npm:0.11.1" + "@syuilo/aiscript": "npm:0.16.0" "@types/escape-regexp": "npm:0.0.1" "@types/glob": "npm:8.1.0" "@types/gulp": "npm:4.0.13" @@ -20813,15 +20800,6 @@ __metadata: languageName: node linkType: hard -"uuid@npm:7.0.3": - version: 7.0.3 - resolution: "uuid@npm:7.0.3" - bin: - uuid: dist/bin/uuid - checksum: 10/b2a4d30ecd6581015175487426558aafd7f7b4013a2e30802c128cc28cad9abe46ecd36c02f7fbcde7908fd4672334818d56a441c0871963d6bd89d911bef2ea - languageName: node - linkType: hard - "uuid@npm:8.0.0": version: 8.0.0 resolution: "uuid@npm:8.0.0" @@ -20840,6 +20818,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:9.0.1": + version: 9.0.1 + resolution: "uuid@npm:9.0.1" + bin: + uuid: dist/bin/uuid + checksum: 10/9d0b6adb72b736e36f2b1b53da0d559125ba3e39d913b6072f6f033e0c87835b414f0836b45bcfaf2bdf698f92297fea1c3cc19b0b258bc182c9c43cc0fab9f2 + languageName: node + linkType: hard + "uuid@npm:^8.3.0, uuid@npm:^8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2" From 5a158b8de0459d20284705d52342fdf9ac5ca555 Mon Sep 17 00:00:00 2001 From: Kopper Date: Sat, 13 Jul 2024 17:55:26 +0300 Subject: [PATCH 34/60] Update AiScript to 0.17.0 Doesn't seem to break any worse than the previous update. 0.18.0, which is the latest one, does break. --- .pnp.cjs | 8 ++++---- ...yuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip | 3 --- ...yuilo-aiscript-npm-0.17.0-005e068ae6-2a10b3d29a.zip | 3 +++ packages/client/package.json | 2 +- yarn.lock | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 .yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip create mode 100644 .yarn/cache/@syuilo-aiscript-npm-0.17.0-005e068ae6-2a10b3d29a.zip diff --git a/.pnp.cjs b/.pnp.cjs index 967537240..6fcee1188 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -3726,10 +3726,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@syuilo/aiscript", [\ - ["npm:0.16.0", {\ - "packageLocation": "./.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip/node_modules/@syuilo/aiscript/",\ + ["npm:0.17.0", {\ + "packageLocation": "./.yarn/cache/@syuilo-aiscript-npm-0.17.0-005e068ae6-2a10b3d29a.zip/node_modules/@syuilo/aiscript/",\ "packageDependencies": [\ - ["@syuilo/aiscript", "npm:0.16.0"],\ + ["@syuilo/aiscript", "npm:0.17.0"],\ ["seedrandom", "npm:3.0.5"],\ ["stringz", "npm:2.1.0"],\ ["uuid", "npm:9.0.1"]\ @@ -8512,7 +8512,7 @@ const RAW_RUNTIME_STATE = ["@rollup/plugin-alias", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:5.1.0"],\ ["@rollup/plugin-json", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:6.0.1"],\ ["@rollup/pluginutils", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:5.1.0"],\ - ["@syuilo/aiscript", "npm:0.16.0"],\ + ["@syuilo/aiscript", "npm:0.17.0"],\ ["@types/escape-regexp", "npm:0.0.1"],\ ["@types/glob", "npm:8.1.0"],\ ["@types/gulp", "npm:4.0.13"],\ diff --git a/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip b/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip deleted file mode 100644 index b3ef0b306..000000000 --- a/.yarn/cache/@syuilo-aiscript-npm-0.16.0-078d966ef6-5c77fc596d.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fb77fa49be7052b16c7a261da8f2a3ddaa933547c55760c8cde8e42403deac9 -size 181843 diff --git a/.yarn/cache/@syuilo-aiscript-npm-0.17.0-005e068ae6-2a10b3d29a.zip b/.yarn/cache/@syuilo-aiscript-npm-0.17.0-005e068ae6-2a10b3d29a.zip new file mode 100644 index 000000000..c34dc778b --- /dev/null +++ b/.yarn/cache/@syuilo-aiscript-npm-0.17.0-005e068ae6-2a10b3d29a.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efc418b0cc9ffe3683b1cf5f5c2be1f614a8babd885446b88111c9f2f8308379 +size 168922 diff --git a/packages/client/package.json b/packages/client/package.json index 6ca7893eb..76f63fe46 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -17,7 +17,7 @@ "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-json": "^6.0.1", "@rollup/pluginutils": "^5.1.0", - "@syuilo/aiscript": "0.16.0", + "@syuilo/aiscript": "0.17.0", "@types/escape-regexp": "0.0.1", "@types/glob": "8.1.0", "@types/gulp": "4.0.13", diff --git a/yarn.lock b/yarn.lock index 5d6b335f6..ca455c5ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2691,14 +2691,14 @@ __metadata: languageName: node linkType: hard -"@syuilo/aiscript@npm:0.16.0": - version: 0.16.0 - resolution: "@syuilo/aiscript@npm:0.16.0" +"@syuilo/aiscript@npm:0.17.0": + version: 0.17.0 + resolution: "@syuilo/aiscript@npm:0.17.0" dependencies: seedrandom: "npm:3.0.5" stringz: "npm:2.1.0" uuid: "npm:9.0.1" - checksum: 10/5c77fc596dcff0e7ac30ba33f2550430dc1d69bd33075811d7822efb6102bae4169f455c867eac5821bee88993941bc6003bd981ad64885b2e643cb4bc260d4a + checksum: 10/2a10b3d29ab94cc267957aa9a8e0ca199fabc298a5e111fcce2a355d70eee141aae87c015f77c398f8a3bbd107fbf49e2054ec2e343c36dd4f8f2e1a64e9e631 languageName: node linkType: hard @@ -6660,7 +6660,7 @@ __metadata: "@rollup/plugin-alias": "npm:^5.1.0" "@rollup/plugin-json": "npm:^6.0.1" "@rollup/pluginutils": "npm:^5.1.0" - "@syuilo/aiscript": "npm:0.16.0" + "@syuilo/aiscript": "npm:0.17.0" "@types/escape-regexp": "npm:0.0.1" "@types/glob": "npm:8.1.0" "@types/gulp": "npm:4.0.13" From 4781e1971e5daca3741a28763361c9b7f5da6989 Mon Sep 17 00:00:00 2001 From: mia Date: Sun, 14 Jul 2024 19:08:36 -0700 Subject: [PATCH 35/60] fix (client): don't return undefined from native Mk:dialog implementation fixes #10839 --- packages/client/src/scripts/aiscript/api.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/scripts/aiscript/api.ts b/packages/client/src/scripts/aiscript/api.ts index c111180e8..f803ca75e 100644 --- a/packages/client/src/scripts/aiscript/api.ts +++ b/packages/client/src/scripts/aiscript/api.ts @@ -14,6 +14,7 @@ export function createAiScriptEnv(opts) { title: title.value, text: text.value, }); + return values.NULL; }), "Mk:confirm": values.FN_NATIVE(async ([title, text, type]) => { const confirm = await os.confirm({ From 7571de37cf99c8e5f6ce9bed92d9fe1e025f517d Mon Sep 17 00:00:00 2001 From: limepotato Date: Sun, 14 Jul 2024 05:46:32 -0600 Subject: [PATCH 36/60] add border mfm --- packages/client/src/components/mfm.ts | 20 ++++++++++++++++++++ packages/client/src/scripts/safe-parse.ts | 11 +++++++++++ 2 files changed, 31 insertions(+) create mode 100644 packages/client/src/scripts/safe-parse.ts diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index cb0942a33..8ef22c479 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -14,6 +14,7 @@ import MkA from "@/components/global/MkA.vue"; import { host } from "@/config"; import { reducedMotion } from "@/scripts/reduced-motion"; import { defaultStore } from "@/store"; +import { safeParseFloat } from "@/scripts/safe-parse"; export default defineComponent({ props: { @@ -70,6 +71,11 @@ export default defineComponent({ // : null // } + const validColor = (c: unknown): string | null => { + if (typeof c !== 'string') return null; + return c.match(/^[0-9a-f]{3,6}$/i) ? c : null; + }; + const genEl = (ast: mfm.MfmNode[]) => concat( ast.map((token, index): VNode[] => { @@ -300,6 +306,20 @@ export default defineComponent({ style = `background-color: #${color};`; break; } + case 'border': { + let color = validColor(token.props.args.color); + color = color ? `#${color}` : 'var(--accent)'; + let b_style = token.props.args.style; + if ( + typeof b_style !== 'string' || + !['hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'] + .includes(b_style) + ) b_style = 'solid'; + const width = safeParseFloat(token.props.args.width) ?? 1; + const radius = safeParseFloat(token.props.args.radius) ?? 0; + style = `border: ${width}px ${b_style} ${color}; border-radius: ${radius}px;${token.props.args.noclip ? '' : ' overflow: clip;'}`; + break; + } case "small": { return h( "small", diff --git a/packages/client/src/scripts/safe-parse.ts b/packages/client/src/scripts/safe-parse.ts new file mode 100644 index 000000000..6bfcef6c3 --- /dev/null +++ b/packages/client/src/scripts/safe-parse.ts @@ -0,0 +1,11 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +export function safeParseFloat(str: unknown): number | null { + if (typeof str !== 'string' || str === '') return null; + const num = parseFloat(str); + if (isNaN(num)) return null; + return num; +} From 134167e6488a6b3b6fed51a647d3e3a110bf343e Mon Sep 17 00:00:00 2001 From: limepotato Date: Sun, 14 Jul 2024 06:01:33 -0600 Subject: [PATCH 37/60] ruby mfm --- packages/client/src/components/mfm.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index 8ef22c479..fc96931ae 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -320,6 +320,17 @@ export default defineComponent({ style = `border: ${width}px ${b_style} ${color}; border-radius: ${radius}px;${token.props.args.noclip ? '' : ' overflow: clip;'}`; break; } + case 'ruby': { + if (token.children.length === 1) { + const child = token.children[0]; + let text = child.type === 'text' ? child.props.text : ''; + return h('ruby', {}, [text.split(' ')[0], h('rt', text.split(' ')[1])]); + } else { + const rt = token.children.at(-1)!; + let text = rt.type === 'text' ? rt.props.text : ''; + return h('ruby', {}, [...genEl(token.children.slice(0, token.children.length - 1), scale), h('rt', text.trim())]); + } + } case "small": { return h( "small", From 57d642198515636d1847c54f6a5c25dde722ee3e Mon Sep 17 00:00:00 2001 From: limepotato Date: Sun, 14 Jul 2024 06:09:33 -0600 Subject: [PATCH 38/60] Unix Time MFM --- packages/client/src/components/mfm.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index fc96931ae..a194de9cd 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -2,6 +2,7 @@ import { defineComponent, h } from "vue"; import * as mfm from "mfm-js"; import type { VNode } from "vue"; import MkUrl from "@/components/global/MkUrl.vue"; +import MkTime from '@/components/global/MkTime.vue'; import MkLink from "@/components/MkLink.vue"; import MkMention from "@/components/MkMention.vue"; import MkEmoji from "@/components/global/MkEmoji.vue"; @@ -331,6 +332,23 @@ export default defineComponent({ return h('ruby', {}, [...genEl(token.children.slice(0, token.children.length - 1), scale), h('rt', text.trim())]); } } + case 'unixtime': { + const child = token.children[0]; + const unixtime = parseInt(child.type === 'text' ? child.props.text : ''); + return h('span', { + style: 'display: inline-block; font-size: 90%; border: solid 1px var(--divider); border-radius: var(--radius-ellipse); padding: 4px 10px 4px 6px;', + }, [ + h('i', { + class: 'ph-clock ph-bold ph-lg', + style: 'margin-right: 0.25em;', + }), + h(MkTime, { + key: Math.random(), + time: unixtime * 1000, + mode: 'detail', + }), + ]); + } case "small": { return h( "small", From 972244f3e1932508ad3ef681635633a71b77c94a Mon Sep 17 00:00:00 2001 From: limepotato Date: Sun, 14 Jul 2024 06:11:58 -0600 Subject: [PATCH 39/60] Follow Mouse MFM --- .../client/src/components/CkFollowMouse.vue | 86 +++++++++++++++++++ packages/client/src/components/mfm.ts | 19 ++++ 2 files changed, 105 insertions(+) create mode 100644 packages/client/src/components/CkFollowMouse.vue diff --git a/packages/client/src/components/CkFollowMouse.vue b/packages/client/src/components/CkFollowMouse.vue new file mode 100644 index 000000000..ce7e3c79a --- /dev/null +++ b/packages/client/src/components/CkFollowMouse.vue @@ -0,0 +1,86 @@ + + + + + + + diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index a194de9cd..19e7623c7 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -1,6 +1,7 @@ import { defineComponent, h } from "vue"; import * as mfm from "mfm-js"; import type { VNode } from "vue"; +import CkFollowMouse from "./CkFollowMouse.vue"; import MkUrl from "@/components/global/MkUrl.vue"; import MkTime from '@/components/global/MkTime.vue'; import MkLink from "@/components/MkLink.vue"; @@ -275,6 +276,24 @@ export default defineComponent({ style = `transform: ${rotate}(${degrees}deg); transform-origin: center center;`; break; } + case 'followmouse': { + // Make sure advanced MFM is on and that reduced motion is off + + let x = (!!token.props.args.x); + let y = (!!token.props.args.y); + + if (!x && !y) { + x = true; + y = true; + } + + return h(CkFollowMouse, { + x: x, + y: y, + speed: validTime(token.props.args.speed) ?? '0.1s', + rotateByVelocity: !!token.props.args.rotateByVelocity, + }, genEl(token.children)); + } case "position": { const x = parseFloat(token.props.args.x ?? "0"); const y = parseFloat(token.props.args.y ?? "0"); From ae38a65db6abbf59c5399e80478b938ba879c68f Mon Sep 17 00:00:00 2001 From: limepotato Date: Sun, 14 Jul 2024 06:23:21 -0600 Subject: [PATCH 40/60] add mfm autocomplete --- packages/client/src/scripts/mfm-tags.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/client/src/scripts/mfm-tags.ts b/packages/client/src/scripts/mfm-tags.ts index a3b51e483..2b15df815 100644 --- a/packages/client/src/scripts/mfm-tags.ts +++ b/packages/client/src/scripts/mfm-tags.ts @@ -11,10 +11,14 @@ export const MFM_TAGS = [ "x3", "x4", "scale", + "followmouse", "position", "crop", "fg", "bg", + "border", + "ruby", + "unixtime", "font", "blur", "rainbow", From ac535a5f0d9e804e00d4e5a9d7f21042c23c9d96 Mon Sep 17 00:00:00 2001 From: Kopper Date: Tue, 16 Jul 2024 11:41:53 +0300 Subject: [PATCH 41/60] Update MFM cheatsheet --- locales/en-US.yml | 9 +++ packages/client/src/pages/mfm-cheat-sheet.vue | 64 +++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/locales/en-US.yml b/locales/en-US.yml index bdfb1c6b4..046be6788 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1341,6 +1341,15 @@ _mfm: plain: "Plain" plainDescription: "Deactivates the effects of all MFM contained within this MFM effect." + border: "Border" + borderDescription: "Adds a border around content." + ruby: "Ruby" + rubyDescription: "Render a small annotation above text, Usually used for showing pronounciations of East Asian characters." + unixtime: "Unix Time" + unixtimeDescription: "Convert a number of seconds since 1st of January, 1970 to a readable date." + followmouse: "Follow Mouse" + followmouseDescription: "Make content follow the mouse cursor." + followmouseToggle: "Toggle preview" _instanceTicker: none: "Never show" remote: "Show for remote users" diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue index e870ecbdf..1f0d57853 100644 --- a/packages/client/src/pages/mfm-cheat-sheet.vue +++ b/packages/client/src/pages/mfm-cheat-sheet.vue @@ -437,6 +437,55 @@ +
+
{{ i18n.ts._mfm.border }}
+
+

{{ i18n.ts._mfm.borderDescription }}

+
+ + MFM +
+
+
+
+
{{ i18n.ts._mfm.ruby }}
+
+

{{ i18n.ts._mfm.rubyDescription }}

+
+ + MFM +
+
+
+
+
{{ i18n.ts._mfm.unixtime }}
+
+

{{ i18n.ts._mfm.unixtimeDescription }}

+
+ + MFM +
+
+
+
+
{{ i18n.ts._mfm.followmouse }}
+
+

{{ i18n.ts._mfm.followmouseDescription }}

+
+ {{ i18n.ts._mfm.followmouseToggle }} + + MFM +
+
+
@@ -448,6 +497,7 @@ import MkTextarea from "@/components/form/textarea.vue"; import { definePageMetadata } from "@/scripts/page-metadata"; import { i18n } from "@/i18n"; import { instance } from "@/instance"; +import MkButton from "@/components/MkButton.vue"; defineProps<{ popup?: boolean; @@ -529,6 +579,20 @@ let preview_plain = $ref( let preview_fade = $ref( "$[fade 🍮] $[fade.out 🍮] $[fade.speed=3s 🍮] $[fade.delay=3s 🍮]", ); +let preview_border = $ref( + `$[border ${i18n.ts._mfm.dummy}]\n$[border.width=4 ${i18n.ts._mfm.dummy}]\n$[border.radius=8 ${i18n.ts._mfm.dummy}]\n$[border.style=dashed ${i18n.ts._mfm.dummy}]\n$[border.color=0f0 ${i18n.ts._mfm.dummy}]` +); +let preview_unixtime = $ref( + "$[unixtime 1689886800]", +); +let preview_ruby = $ref( + "$[ruby にゃ nya]", +); + +let show_followmouse_preview = $ref(false); +let preview_followmouse = $ref( + "$[followmouse 🍮]\n$[followmouse.speed=1s 🍮slow]\n$[followmouse.rotateByVelocity 🍮rotating]\n$[followmouse.x=10 🍮x]\n$[followmouse.y=10 🍮y]", +); definePageMetadata({ title: i18n.ts._mfm.cheatSheet, From 5966778b958bc30321a43eeba1f60678b27bf334 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 16 Jul 2024 15:54:04 +0200 Subject: [PATCH 42/60] [yarn] Update version to 4.3.1 --- .pnp.loader.mjs | 10 ++++++++-- package.json | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.pnp.loader.mjs b/.pnp.loader.mjs index 6815830b6..0d287915d 100644 --- a/.pnp.loader.mjs +++ b/.pnp.loader.mjs @@ -6,7 +6,7 @@ import { URL as URL$1, fileURLToPath, pathToFileURL } from 'url'; import path from 'path'; import { createHash } from 'crypto'; import { EOL } from 'os'; -import moduleExports, { isBuiltin } from 'module'; +import esmModule, { createRequire, isBuiltin } from 'module'; import assert from 'assert'; const SAFE_TIME = 456789e3; @@ -1975,6 +1975,13 @@ function packageImportsResolve({ name, base, conditions, readFileSyncFn }) { throwImportNotDefined(name, packageJSONUrl, base); } +let findPnpApi = esmModule.findPnpApi; +if (!findPnpApi) { + const require = createRequire(import.meta.url); + const pnpApi = require(`./.pnp.cjs`); + pnpApi.setup(); + findPnpApi = esmModule.findPnpApi; +} const pathRegExp = /^(?![a-zA-Z]:[\\/]|\\\\|\.{0,2}(?:\/|$))((?:node:)?(?:@[^/]+\/)?[^/]+)\/*(.*|)$/; const isRelativeRegexp = /^\.{0,2}\//; function tryReadFile(filePath) { @@ -2002,7 +2009,6 @@ async function resolvePrivateRequest(specifier, issuer, context, nextResolve) { } } async function resolve$1(originalSpecifier, context, nextResolve) { - const { findPnpApi } = moduleExports; if (!findPnpApi || isBuiltin(originalSpecifier)) return nextResolve(originalSpecifier, context, nextResolve); let specifier = originalSpecifier; diff --git a/package.json b/package.json index 93d6f4c3d..e11b23f03 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "typescript": "5.1.6", "yaml": "^2.3.4" }, - "packageManager": "yarn@4.2.2", + "packageManager": "yarn@4.3.1", "dependenciesMeta": { "@discordapp/twemoji@14.1.2": { "unplugged": true From 3dcf64cf82f34d410ff56858163c2a054bfd3733 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 16 Jul 2024 15:55:40 +0200 Subject: [PATCH 43/60] [yarn] Update bundled yarn version --- .yarn/corepack.tgz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yarn/corepack.tgz b/.yarn/corepack.tgz index 6aab5c972..6cc62af11 100644 --- a/.yarn/corepack.tgz +++ b/.yarn/corepack.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d959daf507a8a46f1100da8fa970368fac7ecdacbf8a9ede0649163275999980 -size 985138 +oid sha256:3773ba20763c997734250f220d8dcdc0ab4f2f6e4c9526c5f5cdedc1d014f9e5 +size 985899 From 4306de83f0af55f6d59701766237e7a5ce320224 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 16 Jul 2024 16:35:12 +0200 Subject: [PATCH 44/60] Release: v2023.12.8 --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40b25fd78..903d38c5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +## v2023.12.8 +This release contains minor fixes and improvements. Upgrading is recommended for all server operators. + +### Highlights +- AiScript has been updated to v0.17.0 +- Several new MFM functions have been added + +### Backend +- Pinned notes are rendered as links instead of objects, improving privacy +- Sporadic errors while scrolling through followers/following lists were fixed +- The link preview generator now sends a proper user agent instead of identifying itself as a generic bot +- The home timeline query heuristic now gets reset when follow lists are being imported, resolving a timeline performance edge case + +### Mastodon client API +- The verify_credentials response now includes the follow_requests_count property, improving compatibiltiy with certain Mastodon clients +- Attachments will now fall back to their full res version if they don't have a thumbnail, fixing a crash with the official Mastodon for Android app + +### Frontend +- The placeholder timetravel buttons have been removed +- The experiments page has been removed + +### Miscellaneous +- The helm chart was updated and now has more configuration options +- The yarn version was updated to v4.3.1 +- The README was updated to better reflect the current development situation in relation to the rewrite +- The project now builds against NodeJS 22 +- The dockerfile was updated & now builds against alpine 3.20 +- Backend dependencies have been updated +- The recommended key/value store was switched to valkey +- The CI configuration has been updated +- Various translation updates + +### Attribution +This release was made possible by project contributors: AverageDood, Gersonzao, Kopper, Laura Hausmann, Mae Dartmann, Pyrox, Tournesol, ari melody, limepotato, mia & zotan + +It also includes cherry-picked contributions from external contributors: naskya + ## v2023.12.7 This is a security release. Upgrading is therefore strongly recommended. diff --git a/package.json b/package.json index e11b23f03..545c70690 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iceshrimp", - "version": "2023.12.7", + "version": "2023.12.8", "repository": { "type": "git", "url": "https://iceshrimp.dev/iceshrimp/iceshrimp.git" From a087443b8e9d8bdad4bbf9aacdabeada1d4c61d2 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 16 Jul 2024 16:55:56 +0200 Subject: [PATCH 45/60] [docs] Update attribution in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 903d38c5d..9ab4ed3de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,7 @@ This release contains minor fixes and improvements. Upgrading is recommended for ### Attribution This release was made possible by project contributors: AverageDood, Gersonzao, Kopper, Laura Hausmann, Mae Dartmann, Pyrox, Tournesol, ari melody, limepotato, mia & zotan -It also includes cherry-picked contributions from external contributors: naskya +It also includes cherry-picked contributions from external contributors: naskya (firefish), ChaoticLeah (cutiekey) ## v2023.12.7 This is a security release. Upgrading is therefore strongly recommended. From 5b85853f8f30938c3125404af03a62b4564e96e2 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 16 Jul 2024 17:04:39 +0200 Subject: [PATCH 46/60] [docker] Use bundled libvips --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04a0c3b9b..d612c0851 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM alpine:3.20 as build WORKDIR /iceshrimp # Install compilation dependencies -RUN apk add --no-cache --no-progress git alpine-sdk vips-dev python3 py3-setuptools nodejs-current npm vips +RUN apk add --no-cache --no-progress git alpine-sdk python3 py3-setuptools nodejs-current npm # Copy in all files for the build COPY . ./ @@ -35,7 +35,7 @@ FROM alpine:3.20 WORKDIR /iceshrimp # Install runtime dependencies -RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip nodejs-current libheif-dev +RUN apk add --no-cache --no-progress tini ffmpeg zip unzip nodejs-current libheif-dev # Copy built files COPY --from=build /iceshrimp /iceshrimp From 02040d934f451483926f6082e33fa3a2a4183215 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 16 Jul 2024 17:16:18 +0200 Subject: [PATCH 47/60] [docker] Update example docker-compose.yml --- docs/examples/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/examples/docker-compose.yml b/docs/examples/docker-compose.yml index 1d4da7080..cae9880a6 100644 --- a/docs/examples/docker-compose.yml +++ b/docs/examples/docker-compose.yml @@ -28,7 +28,7 @@ services: redis: restart: unless-stopped - image: docker.io/redis:7.0-alpine + image: docker.io/valkey/valkey:7-alpine container_name: iceshrimp_redis networks: - ishnet @@ -37,7 +37,7 @@ services: db: restart: unless-stopped - image: docker.io/postgres:12.2-alpine + image: docker.io/postgres:16-alpine container_name: iceshrimp_db networks: - ishnet From a2eecc22d2f968bbdba6157d2a94bb4e695f371d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=C3=90?= Date: Mon, 22 Jul 2024 11:50:00 +0000 Subject: [PATCH 48/60] [client] Update translations (French) Currently translated at 100.0% (1889 of 1889 strings) Translation: Iceshrimp/locales Translate-URL: https://translate.iceshrimp.dev/projects/iceshrimp/locales/fr/ --- locales/fr-FR.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 4ba6b853b..a0dbc3296 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -993,9 +993,9 @@ _registry: domain: "Domaine" createKey: "Créer une clé" _aboutIceshrimp: - about: "Iceshrimp est un média social décentralisé et fédéré utilisant ActivityPub.\n\ - C'est un fork de Calckey/Firefish (lui-même fork de Misskey) qui se concentre - sur la stabilité, les performances et la facilité d'utilisation plutôt que sur + about: "Iceshrimp est un média social décentralisé et fédéré utilisant ActivityPub.\n + C’est un fork de Calckey/Firefish (lui-même fork de Misskey) qui se concentre + sur la stabilité, les performances et la facilité d’utilisation plutôt que sur de nouvelles fonctionnalités." contributors: "Principaux contributeurs" allContributors: "Tous les contributeurs" @@ -1114,6 +1114,17 @@ _mfm: backgroundDescription: Changer la couleur d’arrière-plan d’un texte. background: Couleur d’arrière-plan plain: Simple + border: Bordure + rubyDescription: Affiche une petite annotation au-dessus du texte, généralement + utilisée pour afficher les prononciations des caractères d’Asie de l’Est. + borderDescription: Ajoute une bordure autour du contenu. + ruby: Rubis + unixtime: Heure Unix (Posix) + unixtimeDescription: Convertit un nombre de secondes depuis le 1er janvier 1970 + en une date lisible. + followmouse: Suivre la souris + followmouseDescription: Faire en sorte que le contenu suive le curseur de la souris. + followmouseToggle: Afficher/Masquer l’aperçu _instanceTicker: none: "Cacher" remote: "Montrer pour les utilisateur·ice·s distant·e·s" @@ -2206,7 +2217,7 @@ _filters: matchOptions: Modifier la sensibilité à la casse et/ou activer la correspondance exacte avec une suite de caractères info: Nomenclature - info2: Un tiret entre crochets [-] indique la possibilité d'inverser/négativer + info2: Un tiret entre crochets [-] indique la possibilité d’inverser/négativer un filtre avec le caractère tiret - infoEnd: Filtrer par aliases replyTo: En réponse à @@ -2254,10 +2265,10 @@ cwStyle: Apparence des «Avertissement de contenu» collapseAllCws: Cacher le contenu de toutes les réponses searchNotLoggedIn_1: Vous devez être authentifié pour pouvoir utiliser la recherche en texte intégral. -searchNotLoggedIn_2: Toutefois, vous pouvez effectuer des recherches à l'aide de hashtags +searchNotLoggedIn_2: Toutefois, vous pouvez effectuer des recherches à l’aide de hashtags et rechercher des utilisateurs. -antennaTimelineHint: Les antennes affichent les messages correspondants dans l'ordre - dans lequel ils ont été reçus, ce qui n'est pas nécessairement chronologique. +antennaTimelineHint: Les antennes affichent les messages correspondants dans l’ordre + dans lequel ils ont été reçus, ce qui n’est pas nécessairement chronologique. alwaysExpandCws: Toujours dérouler les messages avec des avertissements sur le contenu hideFromHome: Cacher de la timeline «Principal» _wellness: From 0d5220e5056ec188130c957376dff76fa40c8d35 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 23 Jul 2024 20:38:30 +0200 Subject: [PATCH 49/60] [backend] Discard jobs with null/undefined/empty data objects; add no-op handlers for invalid queue jobs This stops corrupted/invalid jobs from clogging up the queue. Ref: https://github.com/OptimalBits/bull/issues/2461 --- packages/backend/src/queue/processors/background/index.ts | 3 +++ packages/backend/src/queue/processors/db/index.ts | 3 +++ packages/backend/src/queue/processors/deliver.ts | 1 + .../backend/src/queue/processors/ended-poll-notification.ts | 4 ++++ packages/backend/src/queue/processors/inbox.ts | 1 + packages/backend/src/queue/processors/noop.ts | 5 +++++ .../backend/src/queue/processors/object-storage/index.ts | 3 +++ packages/backend/src/queue/processors/system/index.ts | 3 +++ packages/backend/src/queue/processors/webhook-deliver.ts | 1 + 9 files changed, 24 insertions(+) create mode 100644 packages/backend/src/queue/processors/noop.ts diff --git a/packages/backend/src/queue/processors/background/index.ts b/packages/backend/src/queue/processors/background/index.ts index 38b58680c..ac3d1d32e 100644 --- a/packages/backend/src/queue/processors/background/index.ts +++ b/packages/backend/src/queue/processors/background/index.ts @@ -1,4 +1,5 @@ import type Bull from "bull"; +import { noop } from "@/queue/processors/noop.js"; const jobs = {} as Record>>; @@ -6,4 +7,6 @@ export default function (q: Bull.Queue) { for (const [k, v] of Object.entries(jobs)) { q.process(k, 16, v); } + + q.process(noop); } diff --git a/packages/backend/src/queue/processors/db/index.ts b/packages/backend/src/queue/processors/db/index.ts index d20fc2c71..9100d458f 100644 --- a/packages/backend/src/queue/processors/db/index.ts +++ b/packages/backend/src/queue/processors/db/index.ts @@ -16,6 +16,7 @@ import { importMastoPost } from "./import-masto-post.js"; import { importCkPost } from "./import-firefish-post.js"; import { importBlocking } from "./import-blocking.js"; import { importCustomEmojis } from "./import-custom-emojis.js"; +import { noop } from "@/queue/processors/noop.js"; const jobs = { deleteDriveFiles, @@ -44,4 +45,6 @@ export default function (dbQueue: Bull.Queue) { for (const [k, v] of Object.entries(jobs)) { dbQueue.process(k, v); } + + dbQueue.process(noop); } diff --git a/packages/backend/src/queue/processors/deliver.ts b/packages/backend/src/queue/processors/deliver.ts index 65471a559..946281c89 100644 --- a/packages/backend/src/queue/processors/deliver.ts +++ b/packages/backend/src/queue/processors/deliver.ts @@ -20,6 +20,7 @@ const logger = new Logger("deliver"); let latest: string | null = null; export default async (job: Bull.Job) => { + if (job.data == null || Object.keys(job.data).length === 0) return "Skip (data was null or empty)"; const { host } = new URL(job.data.to); const puny = toPuny(host); diff --git a/packages/backend/src/queue/processors/ended-poll-notification.ts b/packages/backend/src/queue/processors/ended-poll-notification.ts index c652d6216..cbdc67440 100644 --- a/packages/backend/src/queue/processors/ended-poll-notification.ts +++ b/packages/backend/src/queue/processors/ended-poll-notification.ts @@ -11,6 +11,10 @@ export async function endedPollNotification( job: Bull.Job, done: any, ): Promise { + if (job.data == null || Object.keys(job.data).length === 0) { + done(); + return; + } const note = await Notes.findOneBy({ id: job.data.noteId }); if (note == null || !note.hasPoll) { done(); diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts index 3c87727c4..2fe4bf653 100644 --- a/packages/backend/src/queue/processors/inbox.ts +++ b/packages/backend/src/queue/processors/inbox.ts @@ -28,6 +28,7 @@ const logger = new Logger("inbox"); // Processing when an activity arrives in the user's inbox export default async (job: Bull.Job): Promise => { + if (job.data == null || Object.keys(job.data).length === 0) return "Skip (data was null or empty)"; const signature = job.data.signature; // HTTP-signature let activity = job.data.activity; diff --git a/packages/backend/src/queue/processors/noop.ts b/packages/backend/src/queue/processors/noop.ts new file mode 100644 index 000000000..5be01d1da --- /dev/null +++ b/packages/backend/src/queue/processors/noop.ts @@ -0,0 +1,5 @@ +import Bull from "bull"; + +// Processor to be registered for jobs with __default__ (unnamed) handlers in queues that only have named handlers +// Prevents sporadic bogus jobs from clogging up the queues +export async function noop(_: Bull.Job): Promise { } diff --git a/packages/backend/src/queue/processors/object-storage/index.ts b/packages/backend/src/queue/processors/object-storage/index.ts index 5f90d4cd0..1c24f5244 100644 --- a/packages/backend/src/queue/processors/object-storage/index.ts +++ b/packages/backend/src/queue/processors/object-storage/index.ts @@ -2,6 +2,7 @@ import type Bull from "bull"; import type { ObjectStorageJobData } from "@/queue/types.js"; import deleteFile from "./delete-file.js"; import cleanRemoteFiles from "./clean-remote-files.js"; +import { noop } from "@/queue/processors/noop.js"; const jobs = { deleteFile, @@ -16,4 +17,6 @@ export default function (q: Bull.Queue) { for (const [k, v] of Object.entries(jobs)) { q.process(k, 16, v); } + + q.process(noop); } diff --git a/packages/backend/src/queue/processors/system/index.ts b/packages/backend/src/queue/processors/system/index.ts index 697d24d06..2ff2c636e 100644 --- a/packages/backend/src/queue/processors/system/index.ts +++ b/packages/backend/src/queue/processors/system/index.ts @@ -6,6 +6,7 @@ import { checkExpiredMutings } from "./check-expired-mutings.js"; import { clean } from "./clean.js"; import { setLocalEmojiSizes } from "./local-emoji-size.js"; import { verifyLinks } from "./verify-links.js"; +import { noop } from "@/queue/processors/noop.js"; const jobs = { tickCharts, @@ -25,4 +26,6 @@ export default function (dbQueue: Bull.Queue>) { for (const [k, v] of Object.entries(jobs)) { dbQueue.process(k, v); } + + dbQueue.process(noop); } diff --git a/packages/backend/src/queue/processors/webhook-deliver.ts b/packages/backend/src/queue/processors/webhook-deliver.ts index 904291da2..84397033e 100644 --- a/packages/backend/src/queue/processors/webhook-deliver.ts +++ b/packages/backend/src/queue/processors/webhook-deliver.ts @@ -9,6 +9,7 @@ import config from "@/config/index.js"; const logger = new Logger("webhook"); export default async (job: Bull.Job) => { + if (job.data == null || Object.keys(job.data).length === 0) return "Skip (data was null or empty)"; try { logger.debug(`delivering ${job.data.webhookId}`); From cc9bc7946641e8e7189e35d81eb70490e2b9f18f Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 23 Jul 2024 20:57:12 +0200 Subject: [PATCH 50/60] [backend] Set opts.removeOnComplete when discarding corrupt jobs (since the opts object is likely also corrupted) --- packages/backend/src/queue/processors/deliver.ts | 5 ++++- .../backend/src/queue/processors/ended-poll-notification.ts | 1 + packages/backend/src/queue/processors/inbox.ts | 5 ++++- packages/backend/src/queue/processors/noop.ts | 4 +++- packages/backend/src/queue/processors/webhook-deliver.ts | 5 ++++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/queue/processors/deliver.ts b/packages/backend/src/queue/processors/deliver.ts index 946281c89..0e5b4ac79 100644 --- a/packages/backend/src/queue/processors/deliver.ts +++ b/packages/backend/src/queue/processors/deliver.ts @@ -20,7 +20,10 @@ const logger = new Logger("deliver"); let latest: string | null = null; export default async (job: Bull.Job) => { - if (job.data == null || Object.keys(job.data).length === 0) return "Skip (data was null or empty)"; + if (job.data == null || Object.keys(job.data).length === 0) { + job.opts.removeOnComplete = true; + return "Skip (data was null or empty)"; + } const { host } = new URL(job.data.to); const puny = toPuny(host); diff --git a/packages/backend/src/queue/processors/ended-poll-notification.ts b/packages/backend/src/queue/processors/ended-poll-notification.ts index cbdc67440..dafa11719 100644 --- a/packages/backend/src/queue/processors/ended-poll-notification.ts +++ b/packages/backend/src/queue/processors/ended-poll-notification.ts @@ -12,6 +12,7 @@ export async function endedPollNotification( done: any, ): Promise { if (job.data == null || Object.keys(job.data).length === 0) { + job.opts.removeOnComplete = true; done(); return; } diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts index 2fe4bf653..5c52fb11d 100644 --- a/packages/backend/src/queue/processors/inbox.ts +++ b/packages/backend/src/queue/processors/inbox.ts @@ -28,7 +28,10 @@ const logger = new Logger("inbox"); // Processing when an activity arrives in the user's inbox export default async (job: Bull.Job): Promise => { - if (job.data == null || Object.keys(job.data).length === 0) return "Skip (data was null or empty)"; + if (job.data == null || Object.keys(job.data).length === 0) { + job.opts.removeOnComplete = true; + return "Skip (data was null or empty)"; + } const signature = job.data.signature; // HTTP-signature let activity = job.data.activity; diff --git a/packages/backend/src/queue/processors/noop.ts b/packages/backend/src/queue/processors/noop.ts index 5be01d1da..575a75209 100644 --- a/packages/backend/src/queue/processors/noop.ts +++ b/packages/backend/src/queue/processors/noop.ts @@ -2,4 +2,6 @@ import Bull from "bull"; // Processor to be registered for jobs with __default__ (unnamed) handlers in queues that only have named handlers // Prevents sporadic bogus jobs from clogging up the queues -export async function noop(_: Bull.Job): Promise { } +export async function noop(job: Bull.Job): Promise { + job.opts.removeOnComplete = true; +} diff --git a/packages/backend/src/queue/processors/webhook-deliver.ts b/packages/backend/src/queue/processors/webhook-deliver.ts index 84397033e..e821026dd 100644 --- a/packages/backend/src/queue/processors/webhook-deliver.ts +++ b/packages/backend/src/queue/processors/webhook-deliver.ts @@ -9,7 +9,10 @@ import config from "@/config/index.js"; const logger = new Logger("webhook"); export default async (job: Bull.Job) => { - if (job.data == null || Object.keys(job.data).length === 0) return "Skip (data was null or empty)"; + if (job.data == null || Object.keys(job.data).length === 0) { + job.opts.removeOnComplete = true; + return "Skip (data was null or empty)"; + } try { logger.debug(`delivering ${job.data.webhookId}`); From 91dddc439fc03f0911484947deb20179312165b1 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 23 Jul 2024 23:03:50 +0200 Subject: [PATCH 51/60] [sdk] Rename iceshrimp-js package to iceshrimp-sdk This resolves possible confusion between iceshrimp-js (this project) and iceshrimp-sdk (the package) --- .pnp.cjs | 246 +- biome.json | 2 +- docs/api-doc.md | 2 +- package.json | 20 +- packages/README.md | 2 +- packages/backend/package.json | 2 +- packages/backend/test/utils.ts | 2 +- packages/client/package.json | 2 +- packages/client/src/account.ts | 2 +- .../src/components/MkAbuseReportWindow.vue | 2 +- .../client/src/components/MkAutocomplete.vue | 2 +- .../client/src/components/MkChatPreview.vue | 2 +- .../client/src/components/MkCropperDialog.vue | 2 +- packages/client/src/components/MkCwButton.vue | 4 +- .../client/src/components/MkDrive.file.vue | 2 +- .../client/src/components/MkDrive.folder.vue | 2 +- .../src/components/MkDrive.navFolder.vue | 2 +- packages/client/src/components/MkDrive.vue | 2 +- .../src/components/MkDriveFileThumbnail.vue | 2 +- .../src/components/MkDriveSelectDialog.vue | 2 +- .../client/src/components/MkDriveWindow.vue | 2 +- .../client/src/components/MkEmojiPicker.vue | 2 +- .../src/components/MkFeaturedPhotos.vue | 2 +- .../src/components/MkFileListForAdmin.vue | 2 +- .../client/src/components/MkFollowButton.vue | 2 +- .../client/src/components/MkImageViewer.vue | 2 +- .../src/components/MkInstanceCardMini.vue | 2 +- .../src/components/MkInstanceSelectDialog.vue | 2 +- packages/client/src/components/MkMedia.vue | 2 +- .../client/src/components/MkMediaBanner.vue | 2 +- .../client/src/components/MkMediaList.vue | 2 +- packages/client/src/components/MkNote.vue | 2 +- .../client/src/components/MkNoteDetailed.vue | 4 +- .../client/src/components/MkNoteHeader.vue | 2 +- .../client/src/components/MkNoteSimple.vue | 2 +- packages/client/src/components/MkNoteSub.vue | 2 +- .../client/src/components/MkNotification.vue | 2 +- .../MkNotificationSettingWindow.vue | 2 +- .../client/src/components/MkNotifications.vue | 2 +- .../client/src/components/MkPagination.vue | 2 +- packages/client/src/components/MkPoll.vue | 2 +- packages/client/src/components/MkPostForm.vue | 4 +- .../src/components/MkPostFormDialog.vue | 2 +- .../client/src/components/MkQuoteButton.vue | 2 +- .../client/src/components/MkReactedUsers.vue | 2 +- .../components/MkReactionsViewer.reaction.vue | 2 +- .../src/components/MkReactionsViewer.vue | 2 +- .../client/src/components/MkRenoteButton.vue | 2 +- packages/client/src/components/MkSearch.vue | 2 +- .../client/src/components/MkStarButton.vue | 2 +- .../src/components/MkStarButtonNoEmoji.vue | 2 +- .../src/components/MkSubNoteContent.vue | 2 +- .../src/components/MkTokenGenerateWindow.vue | 2 +- .../client/src/components/MkUserCardMini.vue | 2 +- packages/client/src/components/MkUserInfo.vue | 2 +- .../src/components/MkUserOnlineIndicator.vue | 2 +- .../client/src/components/MkUserPreview.vue | 4 +- .../src/components/MkUserSelectDialog.vue | 2 +- .../components/MkUserSelectLocalDialog.vue | 2 +- .../src/components/MkVisibilityPicker.vue | 6 +- .../client/src/components/global/MkAcct.vue | 2 +- .../client/src/components/global/MkAvatar.vue | 2 +- .../client/src/components/global/MkEmoji.vue | 2 +- .../src/components/global/MkUserName.vue | 2 +- packages/client/src/filters/user.ts | 4 +- packages/client/src/instance.ts | 2 +- packages/client/src/os.ts | 2 +- packages/client/src/pages/_error_.vue | 2 +- packages/client/src/pages/admin/files.vue | 2 +- .../client/src/pages/admin/overview.user.vue | 2 +- packages/client/src/pages/api-console.vue | 2 +- packages/client/src/pages/clip.vue | 2 +- packages/client/src/pages/follow.vue | 2 +- packages/client/src/pages/instance-info.vue | 2 +- packages/client/src/pages/messaging/index.vue | 2 +- .../pages/messaging/messaging-room.form.vue | 2 +- .../messaging/messaging-room.message.vue | 2 +- .../src/pages/messaging/messaging-room.vue | 4 +- .../client/src/pages/my-antennas/editor.vue | 2 +- packages/client/src/pages/note.vue | 2 +- packages/client/src/pages/notifications.vue | 2 +- .../client/src/pages/settings/migration.vue | 2 +- .../src/pages/settings/notifications.vue | 2 +- packages/client/src/pages/share.vue | 6 +- packages/client/src/pages/user-info.vue | 2 +- packages/client/src/pages/user/clips.vue | 2 +- .../client/src/pages/user/follow-list.vue | 2 +- packages/client/src/pages/user/followers.vue | 4 +- packages/client/src/pages/user/following.vue | 4 +- packages/client/src/pages/user/gallery.vue | 2 +- packages/client/src/pages/user/home.vue | 2 +- .../client/src/pages/user/index.activity.vue | 2 +- .../client/src/pages/user/index.photos.vue | 2 +- .../client/src/pages/user/index.timeline.vue | 2 +- packages/client/src/pages/user/index.vue | 4 +- packages/client/src/pages/user/pages.vue | 2 +- packages/client/src/pages/user/reactions.vue | 2 +- .../client/src/scripts/gen-search-query.ts | 2 +- packages/client/src/scripts/get-note-menu.ts | 2 +- .../client/src/scripts/get-note-summary.ts | 2 +- packages/client/src/scripts/get-user-menu.ts | 2 +- packages/client/src/scripts/lookup-user.ts | 2 +- packages/client/src/scripts/page-metadata.ts | 2 +- packages/client/src/scripts/select-file.ts | 2 +- packages/client/src/scripts/upload.ts | 2 +- .../client/src/scripts/use-note-capture.ts | 2 +- packages/client/src/stream.ts | 2 +- packages/client/src/types/menu.ts | 2 +- .../src/ui/_common_/statusbar-federation.vue | 2 +- .../src/ui/_common_/statusbar-user-list.vue | 2 +- packages/client/src/ui/deck/deck-store.ts | 2 +- packages/client/src/ui/universal.vue | 2 +- packages/client/vite.config.ts | 2 +- packages/iceshrimp-js/README.md | 9 - .../iceshrimp-js/etc/iceshrimp-js.api.json | 9814 ----------------- packages/iceshrimp-js/etc/iceshrimp-js.api.md | 2838 ----- .../markdown/iceshrimp-js.acct.md | 14 - ...ceshrimp-js.api.apiclient._constructor_.md | 24 - .../iceshrimp-js.api.apiclient.credential.md | 11 - .../iceshrimp-js.api.apiclient.fetch.md | 11 - .../markdown/iceshrimp-js.api.apiclient.md | 32 - .../iceshrimp-js.api.apiclient.origin.md | 11 - .../iceshrimp-js.api.apiclient.request.md | 57 - .../markdown/iceshrimp-js.api.apierror.md | 17 - .../markdown/iceshrimp-js.api.fetchlike.md | 22 - .../iceshrimp-js/markdown/iceshrimp-js.api.md | 25 - .../iceshrimp-js.channelconnection.channel.md | 11 - .../iceshrimp-js.channelconnection.id.md | 11 - .../iceshrimp-js.channelconnection.incount.md | 11 - .../iceshrimp-js.channelconnection.md | 39 - .../iceshrimp-js.channelconnection.name.md | 11 - ...iceshrimp-js.channelconnection.outcount.md | 11 - .../iceshrimp-js.channelconnection.stream.md | 11 - .../markdown/iceshrimp-js.channels.md | 143 - .../markdown/iceshrimp-js.endpoints.md | 1911 ---- .../markdown/iceshrimp-js.entities.ad.md | 11 - .../iceshrimp-js.entities.announcement.md | 21 - .../markdown/iceshrimp-js.entities.antenna.md | 29 - .../markdown/iceshrimp-js.entities.app.md | 11 - .../iceshrimp-js.entities.authsession.md | 17 - .../iceshrimp-js.entities.blocking.md | 18 - .../markdown/iceshrimp-js.entities.channel.md | 15 - .../markdown/iceshrimp-js.entities.clip.md | 11 - .../iceshrimp-js.entities.customemoji.md | 17 - .../iceshrimp-js.entities.datestring.md | 11 - ...mp-js.entities.detailedinstancemetadata.md | 15 - .../iceshrimp-js.entities.drivefile.md | 26 - .../iceshrimp-js.entities.drivefolder.md | 11 - .../iceshrimp-js.entities.following.md | 18 - ...-js.entities.followingfolloweepopulated.md | 15 - ...-js.entities.followingfollowerpopulated.md | 15 - .../iceshrimp-js.entities.followrequest.md | 17 - .../iceshrimp-js.entities.gallerypost.md | 11 - .../markdown/iceshrimp-js.entities.id.md | 11 - .../iceshrimp-js.entities.instance.md | 40 - .../iceshrimp-js.entities.instancemetadata.md | 15 - ...shrimp-js.entities.liteinstancemetadata.md | 45 - .../markdown/iceshrimp-js.entities.md | 51 - .../iceshrimp-js.entities.medetailed.md | 40 - .../iceshrimp-js.entities.messagingmessage.md | 27 - .../markdown/iceshrimp-js.entities.note.md | 51 - .../iceshrimp-js.entities.notefavorite.md | 18 - .../iceshrimp-js.entities.notereaction.md | 18 - .../iceshrimp-js.entities.notification.md | 82 - .../iceshrimp-js.entities.origintype.md | 11 - .../markdown/iceshrimp-js.entities.page.md | 33 - .../iceshrimp-js.entities.pageevent.md | 19 - .../iceshrimp-js.entities.serverinfo.md | 24 - .../markdown/iceshrimp-js.entities.signin.md | 19 - .../markdown/iceshrimp-js.entities.stats.md | 19 - .../markdown/iceshrimp-js.entities.user.md | 13 - .../iceshrimp-js.entities.userdetailed.md | 56 - .../iceshrimp-js.entities.usergroup.md | 11 - .../iceshrimp-js.entities.userlist.md | 18 - .../iceshrimp-js.entities.userlite.md | 35 - .../iceshrimp-js.entities.usersorting.md | 17 - .../iceshrimp-js/markdown/iceshrimp-js.md | 42 - .../markdown/iceshrimp-js.mutednotereasons.md | 16 - .../markdown/iceshrimp-js.notevisibilities.md | 16 - .../iceshrimp-js.notificationtypes.md | 24 - .../markdown/iceshrimp-js.stream.md | 36 - .../iceshrimp-js.stream.usechannel.md | 28 - .../.editorconfig | 0 .../.gitignore | 0 .../{iceshrimp-js => iceshrimp-sdk}/.swcrc | 0 .../CHANGELOG.md | 0 .../{iceshrimp-js => iceshrimp-sdk}/LICENSE | 0 packages/iceshrimp-sdk/README.md | 5 + .../api-extractor.json | 0 .../codecov.yml | 0 .../iceshrimp-sdk/etc/iceshrimp-sdk.api.json | 9670 ++++++++++++++++ .../etc/iceshrimp-sdk.api.md} | 5372 ++++----- .../jest.config.ts | 0 .../markdown/iceshrimp-sdk.acct.md | 14 + ...eshrimp-sdk.api.apiclient._constructor_.md | 24 + .../iceshrimp-sdk.api.apiclient.credential.md | 11 + .../iceshrimp-sdk.api.apiclient.fetch.md | 11 + .../markdown/iceshrimp-sdk.api.apiclient.md | 32 + .../iceshrimp-sdk.api.apiclient.origin.md | 11 + .../iceshrimp-sdk.api.apiclient.request.md | 29 + .../markdown/iceshrimp-sdk.api.apierror.md | 17 + .../markdown/iceshrimp-sdk.api.fetchlike.md | 19 + .../markdown/iceshrimp-sdk.api.isapierror.md} | 4 +- .../markdown/iceshrimp-sdk.api.md | 25 + ...mp-sdk.channelconnection._constructor_.md} | 4 +- ...iceshrimp-sdk.channelconnection.channel.md | 11 + ...ceshrimp-sdk.channelconnection.dispose.md} | 2 +- .../iceshrimp-sdk.channelconnection.id.md | 11 + ...iceshrimp-sdk.channelconnection.incount.md | 11 + .../iceshrimp-sdk.channelconnection.md | 37 + .../iceshrimp-sdk.channelconnection.name.md | 11 + ...ceshrimp-sdk.channelconnection.outcount.md | 11 + .../iceshrimp-sdk.channelconnection.send.md} | 7 +- .../iceshrimp-sdk.channelconnection.stream.md | 11 + .../markdown/iceshrimp-sdk.channels.md | 143 + .../markdown/iceshrimp-sdk.endpoints.md | 1859 ++++ .../iceshrimp-sdk.entities.announcement.md | 21 + .../iceshrimp-sdk.entities.antenna.md | 29 + .../markdown/iceshrimp-sdk.entities.app.md | 11 + .../iceshrimp-sdk.entities.authsession.md | 17 + .../iceshrimp-sdk.entities.blocking.md | 18 + .../iceshrimp-sdk.entities.channel.md | 15 + .../markdown/iceshrimp-sdk.entities.clip.md | 11 + .../iceshrimp-sdk.entities.customemoji.md | 17 + .../iceshrimp-sdk.entities.datestring.md | 11 + ...p-sdk.entities.detailedinstancemetadata.md | 15 + .../iceshrimp-sdk.entities.drivefile.md | 26 + .../iceshrimp-sdk.entities.drivefolder.md | 11 + .../iceshrimp-sdk.entities.following.md | 18 + ...sdk.entities.followingfolloweepopulated.md | 15 + ...sdk.entities.followingfollowerpopulated.md | 15 + .../iceshrimp-sdk.entities.followrequest.md | 17 + .../iceshrimp-sdk.entities.gallerypost.md | 11 + .../markdown/iceshrimp-sdk.entities.id.md | 11 + .../iceshrimp-sdk.entities.instance.md | 40 + ...iceshrimp-sdk.entities.instancemetadata.md | 13 + ...hrimp-sdk.entities.liteinstancemetadata.md | 43 + .../markdown/iceshrimp-sdk.entities.md | 50 + .../iceshrimp-sdk.entities.medetailed.md | 40 + ...iceshrimp-sdk.entities.messagingmessage.md | 27 + .../markdown/iceshrimp-sdk.entities.note.md | 52 + .../iceshrimp-sdk.entities.notefavorite.md | 18 + .../iceshrimp-sdk.entities.notereaction.md | 18 + .../iceshrimp-sdk.entities.notification.md | 70 + .../iceshrimp-sdk.entities.origintype.md | 11 + .../markdown/iceshrimp-sdk.entities.page.md | 33 + .../iceshrimp-sdk.entities.pageevent.md | 19 + .../iceshrimp-sdk.entities.serverinfo.md | 24 + .../markdown/iceshrimp-sdk.entities.signin.md | 19 + .../markdown/iceshrimp-sdk.entities.stats.md | 19 + .../markdown/iceshrimp-sdk.entities.user.md | 13 + .../iceshrimp-sdk.entities.userdetailed.md | 57 + .../iceshrimp-sdk.entities.usergroup.md | 11 + .../iceshrimp-sdk.entities.userlist.md | 18 + .../iceshrimp-sdk.entities.userlite.md | 35 + .../iceshrimp-sdk.entities.usersorting.md | 11 + .../markdown/iceshrimp-sdk.ffvisibility.md} | 2 +- .../iceshrimp-sdk/markdown/iceshrimp-sdk.md | 42 + .../iceshrimp-sdk.notevisibilities.md | 11 + .../iceshrimp-sdk.notificationtypes.md | 11 + .../markdown/iceshrimp-sdk.permissions.md} | 2 +- .../iceshrimp-sdk.stream._constructor_.md} | 16 +- .../markdown/iceshrimp-sdk.stream.close.md} | 2 +- ...eshrimp-sdk.stream.disconnecttochannel.md} | 2 +- .../markdown/iceshrimp-sdk.stream.md | 36 + ...rimp-sdk.stream.removesharedconnection.md} | 2 +- ...-sdk.stream.removesharedconnectionpool.md} | 2 +- .../markdown/iceshrimp-sdk.stream.send.md} | 2 +- .../markdown/iceshrimp-sdk.stream.state.md} | 2 +- .../iceshrimp-sdk.stream.usechannel.md | 24 + .../markdown/index.md | 2 +- .../package.json | 4 +- .../src/acct.ts | 0 .../src/api.ts | 0 .../src/api.types.ts | 0 .../src/consts.ts | 0 .../src/entities.ts | 0 .../src/index.ts | 0 .../src/streaming.ts | 0 .../src/streaming.types.ts | 0 .../test-d/api.ts | 0 .../test-d/streaming.ts | 0 .../test/api.ts | 0 .../test/streaming.ts | 0 .../tsconfig.json | 0 packages/sw/package.json | 2 +- packages/sw/src/scripts/operations.ts | 2 +- packages/sw/src/sw.ts | 2 +- packages/sw/src/types.ts | 2 +- scripts/clean-all.js | 4 +- scripts/clean.js | 2 +- yarn.lock | 18 +- 292 files changed, 16026 insertions(+), 19142 deletions(-) delete mode 100644 packages/iceshrimp-js/README.md delete mode 100644 packages/iceshrimp-js/etc/iceshrimp-js.api.json delete mode 100644 packages/iceshrimp-js/etc/iceshrimp-js.api.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.acct.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.apiclient._constructor_.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.apiclient.credential.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.apiclient.fetch.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.apiclient.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.apiclient.origin.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.apiclient.request.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.apierror.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.fetchlike.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.api.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.channelconnection.channel.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.channelconnection.id.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.channelconnection.incount.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.channelconnection.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.channelconnection.name.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.channelconnection.outcount.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.channelconnection.stream.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.channels.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.endpoints.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.ad.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.announcement.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.antenna.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.app.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.authsession.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.blocking.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.channel.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.clip.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.customemoji.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.datestring.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.detailedinstancemetadata.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.drivefile.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.drivefolder.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.following.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.followingfolloweepopulated.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.followingfollowerpopulated.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.followrequest.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.gallerypost.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.id.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.instance.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.instancemetadata.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.liteinstancemetadata.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.medetailed.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.messagingmessage.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.note.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.notefavorite.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.notereaction.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.notification.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.origintype.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.page.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.pageevent.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.serverinfo.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.signin.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.stats.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.user.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.userdetailed.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.usergroup.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.userlist.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.userlite.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.entities.usersorting.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.mutednotereasons.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.notevisibilities.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.notificationtypes.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.stream.md delete mode 100644 packages/iceshrimp-js/markdown/iceshrimp-js.stream.usechannel.md rename packages/{iceshrimp-js => iceshrimp-sdk}/.editorconfig (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/.gitignore (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/.swcrc (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/CHANGELOG.md (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/LICENSE (100%) create mode 100644 packages/iceshrimp-sdk/README.md rename packages/{iceshrimp-js => iceshrimp-sdk}/api-extractor.json (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/codecov.yml (100%) create mode 100644 packages/iceshrimp-sdk/etc/iceshrimp-sdk.api.json rename packages/{iceshrimp-js/etc/misskey-js.api.md => iceshrimp-sdk/etc/iceshrimp-sdk.api.md} (66%) rename packages/{iceshrimp-js => iceshrimp-sdk}/jest.config.ts (100%) create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.acct.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.apiclient._constructor_.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.apiclient.credential.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.apiclient.fetch.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.apiclient.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.apiclient.origin.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.apiclient.request.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.apierror.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.fetchlike.md rename packages/{iceshrimp-js/markdown/iceshrimp-js.api.isapierror.md => iceshrimp-sdk/markdown/iceshrimp-sdk.api.isapierror.md} (59%) create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.api.md rename packages/{iceshrimp-js/markdown/iceshrimp-js.channelconnection._constructor_.md => iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection._constructor_.md} (59%) create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.channel.md rename packages/{iceshrimp-js/markdown/iceshrimp-js.channelconnection.dispose.md => iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.dispose.md} (50%) create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.id.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.incount.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.name.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.outcount.md rename packages/{iceshrimp-js/markdown/iceshrimp-js.channelconnection.send.md => iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.send.md} (50%) create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.channelconnection.stream.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.channels.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.endpoints.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.announcement.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.antenna.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.app.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.authsession.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.blocking.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.channel.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.clip.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.customemoji.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.datestring.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.detailedinstancemetadata.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.drivefile.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.drivefolder.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.following.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.followingfolloweepopulated.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.followingfollowerpopulated.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.followrequest.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.gallerypost.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.id.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.instance.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.instancemetadata.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.liteinstancemetadata.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.medetailed.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.messagingmessage.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.note.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.notefavorite.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.notereaction.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.notification.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.origintype.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.page.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.pageevent.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.serverinfo.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.signin.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.stats.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.user.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.userdetailed.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.usergroup.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.userlist.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.userlite.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.entities.usersorting.md rename packages/{iceshrimp-js/markdown/iceshrimp-js.ffvisibility.md => iceshrimp-sdk/markdown/iceshrimp-sdk.ffvisibility.md} (61%) create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.notevisibilities.md create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.notificationtypes.md rename packages/{iceshrimp-js/markdown/iceshrimp-js.permissions.md => iceshrimp-sdk/markdown/iceshrimp-sdk.permissions.md} (57%) rename packages/{iceshrimp-js/markdown/iceshrimp-js.stream._constructor_.md => iceshrimp-sdk/markdown/iceshrimp-sdk.stream._constructor_.md} (55%) rename packages/{iceshrimp-js/markdown/iceshrimp-js.stream.close.md => iceshrimp-sdk/markdown/iceshrimp-sdk.stream.close.md} (52%) rename packages/{iceshrimp-js/markdown/iceshrimp-js.stream.disconnecttochannel.md => iceshrimp-sdk/markdown/iceshrimp-sdk.stream.disconnecttochannel.md} (64%) create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.stream.md rename packages/{iceshrimp-js/markdown/iceshrimp-js.stream.removesharedconnection.md => iceshrimp-sdk/markdown/iceshrimp-sdk.stream.removesharedconnection.md} (63%) rename packages/{iceshrimp-js/markdown/iceshrimp-js.stream.removesharedconnectionpool.md => iceshrimp-sdk/markdown/iceshrimp-sdk.stream.removesharedconnectionpool.md} (60%) rename packages/{iceshrimp-js/markdown/iceshrimp-js.stream.send.md => iceshrimp-sdk/markdown/iceshrimp-sdk.stream.send.md} (67%) rename packages/{iceshrimp-js/markdown/iceshrimp-js.stream.state.md => iceshrimp-sdk/markdown/iceshrimp-sdk.stream.state.md} (55%) create mode 100644 packages/iceshrimp-sdk/markdown/iceshrimp-sdk.stream.usechannel.md rename packages/{iceshrimp-js => iceshrimp-sdk}/markdown/index.md (75%) rename packages/{iceshrimp-js => iceshrimp-sdk}/package.json (94%) rename packages/{iceshrimp-js => iceshrimp-sdk}/src/acct.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/src/api.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/src/api.types.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/src/consts.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/src/entities.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/src/index.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/src/streaming.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/src/streaming.types.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/test-d/api.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/test-d/streaming.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/test/api.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/test/streaming.ts (100%) rename packages/{iceshrimp-js => iceshrimp-sdk}/tsconfig.json (100%) diff --git a/.pnp.cjs b/.pnp.cjs index 6fcee1188..cdbb07e5f 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -23,8 +23,8 @@ const RAW_RUNTIME_STATE = "reference": "workspace:packages/client"\ },\ {\ - "name": "iceshrimp-js",\ - "reference": "workspace:packages/iceshrimp-js"\ + "name": "iceshrimp-sdk",\ + "reference": "workspace:packages/iceshrimp-sdk"\ },\ {\ "name": "sw",\ @@ -37,7 +37,7 @@ const RAW_RUNTIME_STATE = ["backend", ["workspace:packages/backend"]],\ ["client", ["workspace:packages/client"]],\ ["iceshrimp", ["workspace:."]],\ - ["iceshrimp-js", ["workspace:packages/iceshrimp-js"]],\ + ["iceshrimp-sdk", ["workspace:packages/iceshrimp-sdk"]],\ ["sw", ["workspace:packages/sw"]]\ ],\ "fallbackPool": [\ @@ -383,10 +383,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.4", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-async-generators-virtual-68eac2c106/0/cache/@babel-plugin-syntax-async-generators-npm-7.8.4-d10cf993c9-7ed1c1d9b9.zip/node_modules/@babel/plugin-syntax-async-generators/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.4", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-async-generators-virtual-d64357d5ed/0/cache/@babel-plugin-syntax-async-generators-npm-7.8.4-d10cf993c9-7ed1c1d9b9.zip/node_modules/@babel/plugin-syntax-async-generators/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-async-generators", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.4"],\ + ["@babel/plugin-syntax-async-generators", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.4"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -420,10 +420,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-bigint-virtual-eaec044562/0/cache/@babel-plugin-syntax-bigint-npm-7.8.3-b05d971e6c-3a10849d83.zip/node_modules/@babel/plugin-syntax-bigint/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-bigint-virtual-9bffd419bc/0/cache/@babel-plugin-syntax-bigint-npm-7.8.3-b05d971e6c-3a10849d83.zip/node_modules/@babel/plugin-syntax-bigint/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-bigint", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ + ["@babel/plugin-syntax-bigint", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -457,10 +457,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.12.13", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-class-properties-virtual-97d47fc96a/0/cache/@babel-plugin-syntax-class-properties-npm-7.12.13-002ee9d930-24f34b196d.zip/node_modules/@babel/plugin-syntax-class-properties/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.12.13", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-class-properties-virtual-d7a086fe3d/0/cache/@babel-plugin-syntax-class-properties-npm-7.12.13-002ee9d930-24f34b196d.zip/node_modules/@babel/plugin-syntax-class-properties/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-class-properties", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.12.13"],\ + ["@babel/plugin-syntax-class-properties", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.12.13"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -517,10 +517,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-import-meta-virtual-a8990640ee/0/cache/@babel-plugin-syntax-import-meta-npm-7.10.4-4a0a0158bc-166ac1125d.zip/node_modules/@babel/plugin-syntax-import-meta/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-import-meta-virtual-fbbc205d57/0/cache/@babel-plugin-syntax-import-meta-npm-7.10.4-4a0a0158bc-166ac1125d.zip/node_modules/@babel/plugin-syntax-import-meta/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-import-meta", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4"],\ + ["@babel/plugin-syntax-import-meta", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -554,10 +554,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-json-strings-virtual-5be2220c6c/0/cache/@babel-plugin-syntax-json-strings-npm-7.8.3-6dc7848179-bf5aea1f31.zip/node_modules/@babel/plugin-syntax-json-strings/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-json-strings-virtual-e46663a974/0/cache/@babel-plugin-syntax-json-strings-npm-7.8.3-6dc7848179-bf5aea1f31.zip/node_modules/@babel/plugin-syntax-json-strings/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-json-strings", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ + ["@babel/plugin-syntax-json-strings", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -591,10 +591,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-logical-assignment-operators-virtual-ca3925695e/0/cache/@babel-plugin-syntax-logical-assignment-operators-npm-7.10.4-72ae00fdf6-aff3357703.zip/node_modules/@babel/plugin-syntax-logical-assignment-operators/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-logical-assignment-operators-virtual-f49af3dec8/0/cache/@babel-plugin-syntax-logical-assignment-operators-npm-7.10.4-72ae00fdf6-aff3357703.zip/node_modules/@babel/plugin-syntax-logical-assignment-operators/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-logical-assignment-operators", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4"],\ + ["@babel/plugin-syntax-logical-assignment-operators", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -628,10 +628,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-nullish-coalescing-operator-virtual-10c3338f54/0/cache/@babel-plugin-syntax-nullish-coalescing-operator-npm-7.8.3-8a723173b5-87aca49189.zip/node_modules/@babel/plugin-syntax-nullish-coalescing-operator/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-nullish-coalescing-operator-virtual-5145dd1c5e/0/cache/@babel-plugin-syntax-nullish-coalescing-operator-npm-7.8.3-8a723173b5-87aca49189.zip/node_modules/@babel/plugin-syntax-nullish-coalescing-operator/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-nullish-coalescing-operator", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ + ["@babel/plugin-syntax-nullish-coalescing-operator", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -665,10 +665,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-numeric-separator-virtual-320dde8b50/0/cache/@babel-plugin-syntax-numeric-separator-npm-7.10.4-81444be605-01ec5547bd.zip/node_modules/@babel/plugin-syntax-numeric-separator/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-numeric-separator-virtual-85700d2f67/0/cache/@babel-plugin-syntax-numeric-separator-npm-7.10.4-81444be605-01ec5547bd.zip/node_modules/@babel/plugin-syntax-numeric-separator/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-numeric-separator", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4"],\ + ["@babel/plugin-syntax-numeric-separator", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -702,10 +702,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-object-rest-spread-virtual-f49a7c2567/0/cache/@babel-plugin-syntax-object-rest-spread-npm-7.8.3-60bd05b6ae-fddcf581a5.zip/node_modules/@babel/plugin-syntax-object-rest-spread/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-object-rest-spread-virtual-d847650e60/0/cache/@babel-plugin-syntax-object-rest-spread-npm-7.8.3-60bd05b6ae-fddcf581a5.zip/node_modules/@babel/plugin-syntax-object-rest-spread/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-object-rest-spread", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ + ["@babel/plugin-syntax-object-rest-spread", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -739,10 +739,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-optional-catch-binding-virtual-cab0369327/0/cache/@babel-plugin-syntax-optional-catch-binding-npm-7.8.3-ce337427d8-910d90e72b.zip/node_modules/@babel/plugin-syntax-optional-catch-binding/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-optional-catch-binding-virtual-37f2abdbb1/0/cache/@babel-plugin-syntax-optional-catch-binding-npm-7.8.3-ce337427d8-910d90e72b.zip/node_modules/@babel/plugin-syntax-optional-catch-binding/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-optional-catch-binding", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ + ["@babel/plugin-syntax-optional-catch-binding", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -776,10 +776,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-optional-chaining-virtual-02d69908b4/0/cache/@babel-plugin-syntax-optional-chaining-npm-7.8.3-f3f3c79579-eef94d53a1.zip/node_modules/@babel/plugin-syntax-optional-chaining/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-optional-chaining-virtual-f5ea9531ae/0/cache/@babel-plugin-syntax-optional-chaining-npm-7.8.3-f3f3c79579-eef94d53a1.zip/node_modules/@babel/plugin-syntax-optional-chaining/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-optional-chaining", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ + ["@babel/plugin-syntax-optional-chaining", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -813,10 +813,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.14.5", {\ - "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-top-level-await-virtual-7ecef97e27/0/cache/@babel-plugin-syntax-top-level-await-npm-7.14.5-60a0a2e83b-bbd1a56b09.zip/node_modules/@babel/plugin-syntax-top-level-await/",\ + ["virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.14.5", {\ + "packageLocation": "./.yarn/__virtual__/@babel-plugin-syntax-top-level-await-virtual-799b785a9b/0/cache/@babel-plugin-syntax-top-level-await-npm-7.14.5-60a0a2e83b-bbd1a56b09.zip/node_modules/@babel/plugin-syntax-top-level-await/",\ "packageDependencies": [\ - ["@babel/plugin-syntax-top-level-await", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.14.5"],\ + ["@babel/plugin-syntax-top-level-await", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.14.5"],\ ["@babel/core", "npm:7.22.9"],\ ["@babel/helper-plugin-utils", "npm:7.22.5"],\ ["@types/babel__core", "npm:7.20.1"]\ @@ -2158,12 +2158,12 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:5bad70dae6965fedb709435a1f98f6068f949c0c05d437106a92a9193b3e730d8268e7515dad25f5905ae92236992ab8fbfc7410fd0235d954a384668ad19a1c#npm:27.5.1", {\ - "packageLocation": "./.yarn/__virtual__/@jest-core-virtual-055df65b40/0/cache/@jest-core-npm-27.5.1-b2d79816b3-79eb63c319.zip/node_modules/@jest/core/",\ + ["virtual:81227f80305668d3181a7ec43341f7ade14e129495535659497e0ce90d2f1630499dd88ccccec05be3b1a1f7a54282e9375653621e2bcff51f3b95817762e7b6#npm:27.5.1", {\ + "packageLocation": "./.yarn/__virtual__/@jest-core-virtual-a255ba0597/0/cache/@jest-core-npm-27.5.1-b2d79816b3-79eb63c319.zip/node_modules/@jest/core/",\ "packageDependencies": [\ - ["@jest/core", "virtual:5bad70dae6965fedb709435a1f98f6068f949c0c05d437106a92a9193b3e730d8268e7515dad25f5905ae92236992ab8fbfc7410fd0235d954a384668ad19a1c#npm:27.5.1"],\ + ["@jest/core", "virtual:81227f80305668d3181a7ec43341f7ade14e129495535659497e0ce90d2f1630499dd88ccccec05be3b1a1f7a54282e9375653621e2bcff51f3b95817762e7b6#npm:27.5.1"],\ ["@jest/console", "npm:27.5.1"],\ - ["@jest/reporters", "virtual:055df65b400bb3e4fa3657fa6f31b584e462c668e3360eba26d93c777dff436861f1ac977e7529e5b1c04a222ce4c589badeec22e2f87ac202495072a28ceb03#npm:27.5.1"],\ + ["@jest/reporters", "virtual:a255ba05979701bcdf3b1c98495a4eb9b128fdc5198bc258e7b137a1871b9e2573296916afa02e02b7dbbcdc0ec1005f45145f2b321f716ce27d28381df68d88#npm:27.5.1"],\ ["@jest/test-result", "npm:27.5.1"],\ ["@jest/transform", "npm:27.5.1"],\ ["@jest/types", "npm:27.5.1"],\ @@ -2175,7 +2175,7 @@ const RAW_RUNTIME_STATE = ["exit", "npm:0.1.2"],\ ["graceful-fs", "npm:4.2.11"],\ ["jest-changed-files", "npm:27.5.1"],\ - ["jest-config", "virtual:055df65b400bb3e4fa3657fa6f31b584e462c668e3360eba26d93c777dff436861f1ac977e7529e5b1c04a222ce4c589badeec22e2f87ac202495072a28ceb03#npm:27.5.1"],\ + ["jest-config", "virtual:a255ba05979701bcdf3b1c98495a4eb9b128fdc5198bc258e7b137a1871b9e2573296916afa02e02b7dbbcdc0ec1005f45145f2b321f716ce27d28381df68d88#npm:27.5.1"],\ ["jest-haste-map", "npm:27.5.1"],\ ["jest-message-util", "npm:27.5.1"],\ ["jest-regex-util", "npm:27.5.1"],\ @@ -2248,10 +2248,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:055df65b400bb3e4fa3657fa6f31b584e462c668e3360eba26d93c777dff436861f1ac977e7529e5b1c04a222ce4c589badeec22e2f87ac202495072a28ceb03#npm:27.5.1", {\ - "packageLocation": "./.yarn/__virtual__/@jest-reporters-virtual-4daf0b0d91/0/cache/@jest-reporters-npm-27.5.1-a792fda73f-d49aea4e5b.zip/node_modules/@jest/reporters/",\ + ["virtual:a255ba05979701bcdf3b1c98495a4eb9b128fdc5198bc258e7b137a1871b9e2573296916afa02e02b7dbbcdc0ec1005f45145f2b321f716ce27d28381df68d88#npm:27.5.1", {\ + "packageLocation": "./.yarn/__virtual__/@jest-reporters-virtual-4b08fa273d/0/cache/@jest-reporters-npm-27.5.1-a792fda73f-d49aea4e5b.zip/node_modules/@jest/reporters/",\ "packageDependencies": [\ - ["@jest/reporters", "virtual:055df65b400bb3e4fa3657fa6f31b584e462c668e3360eba26d93c777dff436861f1ac977e7529e5b1c04a222ce4c589badeec22e2f87ac202495072a28ceb03#npm:27.5.1"],\ + ["@jest/reporters", "virtual:a255ba05979701bcdf3b1c98495a4eb9b128fdc5198bc258e7b137a1871b9e2573296916afa02e02b7dbbcdc0ec1005f45145f2b321f716ce27d28381df68d88#npm:27.5.1"],\ ["@bcoe/v8-coverage", "npm:0.2.3"],\ ["@jest/console", "npm:27.5.1"],\ ["@jest/test-result", "npm:27.5.1"],\ @@ -2751,7 +2751,7 @@ const RAW_RUNTIME_STATE = ]],\ ["@microsoft/api-documenter", [\ ["npm:7.22.30", {\ - "packageLocation": "./.yarn/cache/@microsoft-api-documenter-npm-7.22.30-6bd13d02bb-fb0f535e9a.zip/node_modules/@microsoft/api-documenter/",\ + "packageLocation": "./.yarn/unplugged/@microsoft-api-documenter-npm-7.22.30-6bd13d02bb/node_modules/@microsoft/api-documenter/",\ "packageDependencies": [\ ["@microsoft/api-documenter", "npm:7.22.30"],\ ["@microsoft/api-extractor-model", "npm:7.27.5"],\ @@ -2767,7 +2767,7 @@ const RAW_RUNTIME_STATE = ]],\ ["@microsoft/api-extractor", [\ ["npm:7.36.3", {\ - "packageLocation": "./.yarn/cache/@microsoft-api-extractor-npm-7.36.3-f34bd66ce7-12cd0b3fb7.zip/node_modules/@microsoft/api-extractor/",\ + "packageLocation": "./.yarn/unplugged/@microsoft-api-extractor-npm-7.36.3-f34bd66ce7/node_modules/@microsoft/api-extractor/",\ "packageDependencies": [\ ["@microsoft/api-extractor", "npm:7.36.3"],\ ["@microsoft/api-extractor-model", "npm:7.27.5"],\ @@ -2788,7 +2788,7 @@ const RAW_RUNTIME_STATE = ]],\ ["@microsoft/api-extractor-model", [\ ["npm:7.27.5", {\ - "packageLocation": "./.yarn/cache/@microsoft-api-extractor-model-npm-7.27.5-e07ffcf28e-785453dfba.zip/node_modules/@microsoft/api-extractor-model/",\ + "packageLocation": "./.yarn/unplugged/@microsoft-api-extractor-model-npm-7.27.5-e07ffcf28e/node_modules/@microsoft/api-extractor-model/",\ "packageDependencies": [\ ["@microsoft/api-extractor-model", "npm:7.27.5"],\ ["@microsoft/tsdoc", "npm:0.14.2"],\ @@ -3537,12 +3537,12 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:0.1.62", {\ - "packageLocation": "./.yarn/__virtual__/@swc-cli-virtual-52ab497700/0/cache/@swc-cli-npm-0.1.62-a16e13398f-be1a44f8e9.zip/node_modules/@swc/cli/",\ + ["virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:0.1.62", {\ + "packageLocation": "./.yarn/__virtual__/@swc-cli-virtual-4c542d4769/0/cache/@swc-cli-npm-0.1.62-a16e13398f-be1a44f8e9.zip/node_modules/@swc/cli/",\ "packageDependencies": [\ - ["@swc/cli", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:0.1.62"],\ + ["@swc/cli", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:0.1.62"],\ ["@mole-inc/bin-wrapper", "npm:8.0.1"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@types/chokidar", null],\ ["@types/swc__core", null],\ ["chokidar", null],\ @@ -3565,7 +3565,7 @@ const RAW_RUNTIME_STATE = "packageDependencies": [\ ["@swc/cli", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:0.1.62"],\ ["@mole-inc/bin-wrapper", "npm:8.0.1"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@types/chokidar", null],\ ["@types/swc__core", null],\ ["chokidar", "npm:3.5.3"],\ @@ -3586,16 +3586,16 @@ const RAW_RUNTIME_STATE = ]],\ ["@swc/core", [\ ["npm:1.3.71", {\ - "packageLocation": "./.yarn/unplugged/@swc-core-virtual-908dbf465c/node_modules/@swc/core/",\ + "packageLocation": "./.yarn/unplugged/@swc-core-virtual-1227ab80b5/node_modules/@swc/core/",\ "packageDependencies": [\ ["@swc/core", "npm:1.3.71"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71", {\ - "packageLocation": "./.yarn/unplugged/@swc-core-virtual-908dbf465c/node_modules/@swc/core/",\ + ["virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-virtual-1227ab80b5/node_modules/@swc/core/",\ "packageDependencies": [\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@swc/core-darwin-arm64", "npm:1.3.71"],\ ["@swc/core-darwin-x64", "npm:1.3.71"],\ ["@swc/core-linux-arm-gnueabihf", "npm:1.3.71"],\ @@ -6974,16 +6974,16 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:22a06fd2523d9a1c7ec843e303e5545630e46567c6023b7a0a724a1e23da515483816d12e5eb6cf98caaf6877afb4ce10ecb0a2a9a0c7eb4000f4c90978167ab#npm:27.5.1", {\ - "packageLocation": "./.yarn/__virtual__/babel-jest-virtual-cfd43a9d69/0/cache/babel-jest-npm-27.5.1-f9f56b9874-d032823796.zip/node_modules/babel-jest/",\ + ["virtual:eb610664e5b7f68ef3b54dc7c483973422c30c6f644ed269f8b9fcb02ae7792ae41e079a1494226b12598e4f3f3720f4207133d2a592610cd97c57f5b570933e#npm:27.5.1", {\ + "packageLocation": "./.yarn/__virtual__/babel-jest-virtual-c52d60175d/0/cache/babel-jest-npm-27.5.1-f9f56b9874-d032823796.zip/node_modules/babel-jest/",\ "packageDependencies": [\ - ["babel-jest", "virtual:22a06fd2523d9a1c7ec843e303e5545630e46567c6023b7a0a724a1e23da515483816d12e5eb6cf98caaf6877afb4ce10ecb0a2a9a0c7eb4000f4c90978167ab#npm:27.5.1"],\ + ["babel-jest", "virtual:eb610664e5b7f68ef3b54dc7c483973422c30c6f644ed269f8b9fcb02ae7792ae41e079a1494226b12598e4f3f3720f4207133d2a592610cd97c57f5b570933e#npm:27.5.1"],\ ["@babel/core", "npm:7.22.9"],\ ["@jest/transform", "npm:27.5.1"],\ ["@jest/types", "npm:27.5.1"],\ ["@types/babel__core", "npm:7.20.1"],\ ["babel-plugin-istanbul", "npm:6.1.1"],\ - ["babel-preset-jest", "virtual:cfd43a9d6960cc7645f06286e13ca12f4af1bd9aa2f0e8d416e14ca1591e5b1347db5f332cdebfcaebbdfd8792fc9c008f58f13134db2e20cfbcc79ca73760a9#npm:27.5.1"],\ + ["babel-preset-jest", "virtual:c52d60175db01db8cedeaa4d9f2f5c12bb4086ccc509c0cfcf8e5dfa89467682ef6ce616a544f5ab330d3e8174fc14b9c4480afd9b3b558ebb574c03d5f4a6f2#npm:27.5.1"],\ ["chalk", "npm:4.1.2"],\ ["graceful-fs", "npm:4.2.11"],\ ["slash", "npm:3.0.0"]\ @@ -7029,23 +7029,23 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:741d833773476bafd42792c023ccf5972d67de9302c1316c40941f4cde29b308af46e1176be8d92bed5eeca2510337cc5340ad1a7724705b9066eaabdd07ce97#npm:1.0.1", {\ - "packageLocation": "./.yarn/__virtual__/babel-preset-current-node-syntax-virtual-a95ec55e88/0/cache/babel-preset-current-node-syntax-npm-1.0.1-849ec71e32-94561959cb.zip/node_modules/babel-preset-current-node-syntax/",\ + ["virtual:80c356581c3d21855cea3b1f28291284e9b5ea97ee58d4b9e631f82d736036087b5b20373b73a93ee5d38f4b63ede6a774feab94b30d76267adbd3e5843fd753#npm:1.0.1", {\ + "packageLocation": "./.yarn/__virtual__/babel-preset-current-node-syntax-virtual-8eba799e51/0/cache/babel-preset-current-node-syntax-npm-1.0.1-849ec71e32-94561959cb.zip/node_modules/babel-preset-current-node-syntax/",\ "packageDependencies": [\ - ["babel-preset-current-node-syntax", "virtual:741d833773476bafd42792c023ccf5972d67de9302c1316c40941f4cde29b308af46e1176be8d92bed5eeca2510337cc5340ad1a7724705b9066eaabdd07ce97#npm:1.0.1"],\ + ["babel-preset-current-node-syntax", "virtual:80c356581c3d21855cea3b1f28291284e9b5ea97ee58d4b9e631f82d736036087b5b20373b73a93ee5d38f4b63ede6a774feab94b30d76267adbd3e5843fd753#npm:1.0.1"],\ ["@babel/core", "npm:7.22.9"],\ - ["@babel/plugin-syntax-async-generators", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.4"],\ - ["@babel/plugin-syntax-bigint", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ - ["@babel/plugin-syntax-class-properties", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.12.13"],\ - ["@babel/plugin-syntax-import-meta", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4"],\ - ["@babel/plugin-syntax-json-strings", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ - ["@babel/plugin-syntax-logical-assignment-operators", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4"],\ - ["@babel/plugin-syntax-nullish-coalescing-operator", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ - ["@babel/plugin-syntax-numeric-separator", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.10.4"],\ - ["@babel/plugin-syntax-object-rest-spread", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ - ["@babel/plugin-syntax-optional-catch-binding", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ - ["@babel/plugin-syntax-optional-chaining", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.8.3"],\ - ["@babel/plugin-syntax-top-level-await", "virtual:a95ec55e88252fb8bb2a9f05ccc4f0e7a21e2222248f9e5ee7e36cd1e168a8129d8fa78dad601ce4e39edaab068261ca7d832685f1bb996f25b6f0ebb880e1fb#npm:7.14.5"],\ + ["@babel/plugin-syntax-async-generators", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.4"],\ + ["@babel/plugin-syntax-bigint", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ + ["@babel/plugin-syntax-class-properties", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.12.13"],\ + ["@babel/plugin-syntax-import-meta", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4"],\ + ["@babel/plugin-syntax-json-strings", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ + ["@babel/plugin-syntax-logical-assignment-operators", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4"],\ + ["@babel/plugin-syntax-nullish-coalescing-operator", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ + ["@babel/plugin-syntax-numeric-separator", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.10.4"],\ + ["@babel/plugin-syntax-object-rest-spread", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ + ["@babel/plugin-syntax-optional-catch-binding", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ + ["@babel/plugin-syntax-optional-chaining", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.8.3"],\ + ["@babel/plugin-syntax-top-level-await", "virtual:8eba799e51a5be9cf6a50fd6cf0aa9ac844f4afa85c897ba691ffba9868328c74a1c0de1023a9e10e6af027d419b151f71931a2852ba5b66d1b38a6becf03dc0#npm:7.14.5"],\ ["@types/babel__core", "npm:7.20.1"]\ ],\ "packagePeers": [\ @@ -7088,14 +7088,14 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:cfd43a9d6960cc7645f06286e13ca12f4af1bd9aa2f0e8d416e14ca1591e5b1347db5f332cdebfcaebbdfd8792fc9c008f58f13134db2e20cfbcc79ca73760a9#npm:27.5.1", {\ - "packageLocation": "./.yarn/__virtual__/babel-preset-jest-virtual-741d833773/0/cache/babel-preset-jest-npm-27.5.1-2c76f7f68c-251bcea11c.zip/node_modules/babel-preset-jest/",\ + ["virtual:c52d60175db01db8cedeaa4d9f2f5c12bb4086ccc509c0cfcf8e5dfa89467682ef6ce616a544f5ab330d3e8174fc14b9c4480afd9b3b558ebb574c03d5f4a6f2#npm:27.5.1", {\ + "packageLocation": "./.yarn/__virtual__/babel-preset-jest-virtual-80c356581c/0/cache/babel-preset-jest-npm-27.5.1-2c76f7f68c-251bcea11c.zip/node_modules/babel-preset-jest/",\ "packageDependencies": [\ - ["babel-preset-jest", "virtual:cfd43a9d6960cc7645f06286e13ca12f4af1bd9aa2f0e8d416e14ca1591e5b1347db5f332cdebfcaebbdfd8792fc9c008f58f13134db2e20cfbcc79ca73760a9#npm:27.5.1"],\ + ["babel-preset-jest", "virtual:c52d60175db01db8cedeaa4d9f2f5c12bb4086ccc509c0cfcf8e5dfa89467682ef6ce616a544f5ab330d3e8174fc14b9c4480afd9b3b558ebb574c03d5f4a6f2#npm:27.5.1"],\ ["@babel/core", "npm:7.22.9"],\ ["@types/babel__core", "npm:7.20.1"],\ ["babel-plugin-jest-hoist", "npm:27.5.1"],\ - ["babel-preset-current-node-syntax", "virtual:741d833773476bafd42792c023ccf5972d67de9302c1316c40941f4cde29b308af46e1176be8d92bed5eeca2510337cc5340ad1a7724705b9066eaabdd07ce97#npm:1.0.1"]\ + ["babel-preset-current-node-syntax", "virtual:80c356581c3d21855cea3b1f28291284e9b5ea97ee58d4b9e631f82d736036087b5b20373b73a93ee5d38f4b63ede6a774feab94b30d76267adbd3e5843fd753#npm:1.0.1"]\ ],\ "packagePeers": [\ "@babel/core",\ @@ -7150,7 +7150,7 @@ const RAW_RUNTIME_STATE = ["@redocly/openapi-core", "npm:1.0.0-beta.131"],\ ["@sinonjs/fake-timers", "npm:9.1.2"],\ ["@swc/cli", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:0.1.62"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@swc/core-android-arm64", "npm:1.3.11"],\ ["@types/adm-zip", "npm:0.5.0"],\ ["@types/async-lock", "npm:1.4.0"],\ @@ -7234,7 +7234,7 @@ const RAW_RUNTIME_STATE = ["gunzip-maybe", "npm:1.4.2"],\ ["happy-dom", "npm:12.10.3"],\ ["hpagent", "npm:0.1.2"],\ - ["iceshrimp-js", "workspace:packages/iceshrimp-js"],\ + ["iceshrimp-sdk", "workspace:packages/iceshrimp-sdk"],\ ["ioredis", "npm:5.3.2"],\ ["ip-cidr", "npm:3.1.0"],\ ["is-svg", "npm:4.3.2"],\ @@ -8552,7 +8552,7 @@ const RAW_RUNTIME_STATE = ["focus-trap", "npm:7.5.2"],\ ["focus-trap-vue", "virtual:658502eb4296e93abedc18b6aa9b26978f434f08d98e21ebb0e725354b8bb54b62db9c4a1893e460c694ff7500ff5cbafa4457b0dfd26b5838868666c861e990#npm:4.0.2"],\ ["gsap", "npm:3.12.2"],\ - ["iceshrimp-js", "workspace:packages/iceshrimp-js"],\ + ["iceshrimp-sdk", "workspace:packages/iceshrimp-sdk"],\ ["idb-keyval", "npm:6.2.1"],\ ["insert-text-at-cursor", "npm:0.3.0"],\ ["json5", "npm:2.2.3"],\ @@ -11919,7 +11919,7 @@ const RAW_RUNTIME_STATE = ]],\ ["eventemitter3", [\ ["npm:4.0.7", {\ - "packageLocation": "./.yarn/cache/eventemitter3-npm-4.0.7-7afcdd74ae-8030029382.zip/node_modules/eventemitter3/",\ + "packageLocation": "./.yarn/unplugged/eventemitter3-npm-4.0.7-7afcdd74ae/node_modules/eventemitter3/",\ "packageDependencies": [\ ["eventemitter3", "npm:4.0.7"]\ ],\ @@ -14153,27 +14153,27 @@ const RAW_RUNTIME_STATE = "linkType": "SOFT"\ }]\ ]],\ - ["iceshrimp-js", [\ - ["workspace:packages/iceshrimp-js", {\ - "packageLocation": "./packages/iceshrimp-js/",\ + ["iceshrimp-sdk", [\ + ["workspace:packages/iceshrimp-sdk", {\ + "packageLocation": "./packages/iceshrimp-sdk/",\ "packageDependencies": [\ - ["iceshrimp-js", "workspace:packages/iceshrimp-js"],\ + ["iceshrimp-sdk", "workspace:packages/iceshrimp-sdk"],\ ["@microsoft/api-documenter", "npm:7.22.30"],\ ["@microsoft/api-extractor", "npm:7.36.3"],\ - ["@swc/cli", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:0.1.62"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/cli", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:0.1.62"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@swc/core-android-arm64", "npm:1.3.11"],\ ["@types/jest", "npm:27.5.2"],\ ["@types/node", "npm:20.3.1"],\ ["eventemitter3", "npm:4.0.7"],\ - ["jest", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:27.5.1"],\ + ["jest", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:27.5.1"],\ ["jest-fetch-mock", "npm:3.0.3"],\ ["jest-websocket-mock", "npm:2.4.0"],\ ["mock-socket", "npm:9.2.1"],\ ["reconnecting-websocket", "npm:4.4.0"],\ ["semver", "npm:7.5.4"],\ - ["ts-jest", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:27.1.5"],\ - ["ts-node", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:10.4.0"],\ + ["ts-jest", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:27.1.5"],\ + ["ts-node", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:10.4.0"],\ ["tsd", "npm:0.28.1"],\ ["typescript", "patch:typescript@npm%3A5.1.6#optional!builtin::version=5.1.6&hash=5da071"]\ ],\ @@ -15410,14 +15410,14 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:27.5.1", {\ - "packageLocation": "./.yarn/__virtual__/jest-virtual-5bad70dae6/0/cache/jest-npm-27.5.1-bacad4fe2a-a1435098e1.zip/node_modules/jest/",\ + ["virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:27.5.1", {\ + "packageLocation": "./.yarn/__virtual__/jest-virtual-81227f8030/0/cache/jest-npm-27.5.1-bacad4fe2a-a1435098e1.zip/node_modules/jest/",\ "packageDependencies": [\ - ["jest", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:27.5.1"],\ - ["@jest/core", "virtual:5bad70dae6965fedb709435a1f98f6068f949c0c05d437106a92a9193b3e730d8268e7515dad25f5905ae92236992ab8fbfc7410fd0235d954a384668ad19a1c#npm:27.5.1"],\ + ["jest", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:27.5.1"],\ + ["@jest/core", "virtual:81227f80305668d3181a7ec43341f7ade14e129495535659497e0ce90d2f1630499dd88ccccec05be3b1a1f7a54282e9375653621e2bcff51f3b95817762e7b6#npm:27.5.1"],\ ["@types/node-notifier", null],\ ["import-local", "npm:3.1.0"],\ - ["jest-cli", "virtual:5bad70dae6965fedb709435a1f98f6068f949c0c05d437106a92a9193b3e730d8268e7515dad25f5905ae92236992ab8fbfc7410fd0235d954a384668ad19a1c#npm:27.5.1"],\ + ["jest-cli", "virtual:81227f80305668d3181a7ec43341f7ade14e129495535659497e0ce90d2f1630499dd88ccccec05be3b1a1f7a54282e9375653621e2bcff51f3b95817762e7b6#npm:27.5.1"],\ ["node-notifier", null]\ ],\ "packagePeers": [\ @@ -15475,11 +15475,11 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:5bad70dae6965fedb709435a1f98f6068f949c0c05d437106a92a9193b3e730d8268e7515dad25f5905ae92236992ab8fbfc7410fd0235d954a384668ad19a1c#npm:27.5.1", {\ - "packageLocation": "./.yarn/__virtual__/jest-cli-virtual-78157380f0/0/cache/jest-cli-npm-27.5.1-e801369688-527be16078.zip/node_modules/jest-cli/",\ + ["virtual:81227f80305668d3181a7ec43341f7ade14e129495535659497e0ce90d2f1630499dd88ccccec05be3b1a1f7a54282e9375653621e2bcff51f3b95817762e7b6#npm:27.5.1", {\ + "packageLocation": "./.yarn/__virtual__/jest-cli-virtual-1b1b9f9091/0/cache/jest-cli-npm-27.5.1-e801369688-527be16078.zip/node_modules/jest-cli/",\ "packageDependencies": [\ - ["jest-cli", "virtual:5bad70dae6965fedb709435a1f98f6068f949c0c05d437106a92a9193b3e730d8268e7515dad25f5905ae92236992ab8fbfc7410fd0235d954a384668ad19a1c#npm:27.5.1"],\ - ["@jest/core", "virtual:5bad70dae6965fedb709435a1f98f6068f949c0c05d437106a92a9193b3e730d8268e7515dad25f5905ae92236992ab8fbfc7410fd0235d954a384668ad19a1c#npm:27.5.1"],\ + ["jest-cli", "virtual:81227f80305668d3181a7ec43341f7ade14e129495535659497e0ce90d2f1630499dd88ccccec05be3b1a1f7a54282e9375653621e2bcff51f3b95817762e7b6#npm:27.5.1"],\ + ["@jest/core", "virtual:81227f80305668d3181a7ec43341f7ade14e129495535659497e0ce90d2f1630499dd88ccccec05be3b1a1f7a54282e9375653621e2bcff51f3b95817762e7b6#npm:27.5.1"],\ ["@jest/test-result", "npm:27.5.1"],\ ["@jest/types", "npm:27.5.1"],\ ["@types/node-notifier", null],\ @@ -15487,7 +15487,7 @@ const RAW_RUNTIME_STATE = ["exit", "npm:0.1.2"],\ ["graceful-fs", "npm:4.2.11"],\ ["import-local", "npm:3.1.0"],\ - ["jest-config", "virtual:055df65b400bb3e4fa3657fa6f31b584e462c668e3360eba26d93c777dff436861f1ac977e7529e5b1c04a222ce4c589badeec22e2f87ac202495072a28ceb03#npm:27.5.1"],\ + ["jest-config", "virtual:a255ba05979701bcdf3b1c98495a4eb9b128fdc5198bc258e7b137a1871b9e2573296916afa02e02b7dbbcdc0ec1005f45145f2b321f716ce27d28381df68d88#npm:27.5.1"],\ ["jest-util", "npm:27.5.1"],\ ["jest-validate", "npm:27.5.1"],\ ["node-notifier", null],\ @@ -15509,15 +15509,15 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:055df65b400bb3e4fa3657fa6f31b584e462c668e3360eba26d93c777dff436861f1ac977e7529e5b1c04a222ce4c589badeec22e2f87ac202495072a28ceb03#npm:27.5.1", {\ - "packageLocation": "./.yarn/__virtual__/jest-config-virtual-22a06fd252/0/cache/jest-config-npm-27.5.1-e70d159078-63bc2dce50.zip/node_modules/jest-config/",\ + ["virtual:a255ba05979701bcdf3b1c98495a4eb9b128fdc5198bc258e7b137a1871b9e2573296916afa02e02b7dbbcdc0ec1005f45145f2b321f716ce27d28381df68d88#npm:27.5.1", {\ + "packageLocation": "./.yarn/__virtual__/jest-config-virtual-eb610664e5/0/cache/jest-config-npm-27.5.1-e70d159078-63bc2dce50.zip/node_modules/jest-config/",\ "packageDependencies": [\ - ["jest-config", "virtual:055df65b400bb3e4fa3657fa6f31b584e462c668e3360eba26d93c777dff436861f1ac977e7529e5b1c04a222ce4c589badeec22e2f87ac202495072a28ceb03#npm:27.5.1"],\ + ["jest-config", "virtual:a255ba05979701bcdf3b1c98495a4eb9b128fdc5198bc258e7b137a1871b9e2573296916afa02e02b7dbbcdc0ec1005f45145f2b321f716ce27d28381df68d88#npm:27.5.1"],\ ["@babel/core", "npm:7.22.9"],\ ["@jest/test-sequencer", "npm:27.5.1"],\ ["@jest/types", "npm:27.5.1"],\ ["@types/ts-node", null],\ - ["babel-jest", "virtual:22a06fd2523d9a1c7ec843e303e5545630e46567c6023b7a0a724a1e23da515483816d12e5eb6cf98caaf6877afb4ce10ecb0a2a9a0c7eb4000f4c90978167ab#npm:27.5.1"],\ + ["babel-jest", "virtual:eb610664e5b7f68ef3b54dc7c483973422c30c6f644ed269f8b9fcb02ae7792ae41e079a1494226b12598e4f3f3720f4207133d2a592610cd97c57f5b570933e#npm:27.5.1"],\ ["chalk", "npm:4.1.2"],\ ["ci-info", "npm:3.8.0"],\ ["deepmerge", "npm:4.3.1"],\ @@ -22968,10 +22968,10 @@ const RAW_RUNTIME_STATE = "packageLocation": "./packages/sw/",\ "packageDependencies": [\ ["sw", "workspace:packages/sw"],\ - ["@swc/cli", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:0.1.62"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/cli", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:0.1.62"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@swc/core-android-arm64", "npm:1.3.11"],\ - ["iceshrimp-js", "workspace:packages/iceshrimp-js"],\ + ["iceshrimp-sdk", "workspace:packages/iceshrimp-sdk"],\ ["idb-keyval", "npm:6.2.1"],\ ["swc-loader", "virtual:ca97bcf58b4df736e59aebf35e2726a99801473dc9e8d2e8b50d915881743bb290aff0829afda73eac01b177f0dbabc037ad0f5cab207f280afc6224bb84bfd8#npm:0.2.3"],\ ["webpack", "virtual:ca97bcf58b4df736e59aebf35e2726a99801473dc9e8d2e8b50d915881743bb290aff0829afda73eac01b177f0dbabc037ad0f5cab207f280afc6224bb84bfd8#npm:5.88.2"],\ @@ -22992,7 +22992,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./.yarn/__virtual__/swc-loader-virtual-93a0cf30c7/0/cache/swc-loader-npm-0.2.3-349484c9ea-010d84d399.zip/node_modules/swc-loader/",\ "packageDependencies": [\ ["swc-loader", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:0.2.3"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@types/swc__core", null],\ ["@types/webpack", null],\ ["webpack", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:5.88.2"]\ @@ -23009,7 +23009,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./.yarn/__virtual__/swc-loader-virtual-cadbca2069/0/cache/swc-loader-npm-0.2.3-349484c9ea-010d84d399.zip/node_modules/swc-loader/",\ "packageDependencies": [\ ["swc-loader", "virtual:ca97bcf58b4df736e59aebf35e2726a99801473dc9e8d2e8b50d915881743bb290aff0829afda73eac01b177f0dbabc037ad0f5cab207f280afc6224bb84bfd8#npm:0.2.3"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@types/swc__core", null],\ ["@types/webpack", null],\ ["webpack", "virtual:ca97bcf58b4df736e59aebf35e2726a99801473dc9e8d2e8b50d915881743bb290aff0829afda73eac01b177f0dbabc037ad0f5cab207f280afc6224bb84bfd8#npm:5.88.2"]\ @@ -23690,10 +23690,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:27.1.5", {\ - "packageLocation": "./.yarn/__virtual__/ts-jest-virtual-15e65b8c94/0/cache/ts-jest-npm-27.1.5-6f0b4fcb08-7675946cef.zip/node_modules/ts-jest/",\ + ["virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:27.1.5", {\ + "packageLocation": "./.yarn/__virtual__/ts-jest-virtual-68e9091f94/0/cache/ts-jest-npm-27.1.5-6f0b4fcb08-7675946cef.zip/node_modules/ts-jest/",\ "packageDependencies": [\ - ["ts-jest", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:27.1.5"],\ + ["ts-jest", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:27.1.5"],\ ["@babel/core", null],\ ["@types/babel-jest", null],\ ["@types/babel__core", null],\ @@ -23704,7 +23704,7 @@ const RAW_RUNTIME_STATE = ["bs-logger", "npm:0.2.6"],\ ["esbuild", null],\ ["fast-json-stable-stringify", "npm:2.1.0"],\ - ["jest", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:27.5.1"],\ + ["jest", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:27.5.1"],\ ["jest-util", "npm:27.5.1"],\ ["json5", "npm:2.2.3"],\ ["lodash.memoize", "npm:4.1.2"],\ @@ -23773,12 +23773,12 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:10.4.0", {\ - "packageLocation": "./.yarn/__virtual__/ts-node-virtual-077029c9f5/0/cache/ts-node-npm-10.4.0-04cb6e2279-5874ac27f6.zip/node_modules/ts-node/",\ + ["virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:10.4.0", {\ + "packageLocation": "./.yarn/__virtual__/ts-node-virtual-290e5828a7/0/cache/ts-node-npm-10.4.0-04cb6e2279-5874ac27f6.zip/node_modules/ts-node/",\ "packageDependencies": [\ - ["ts-node", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:10.4.0"],\ + ["ts-node", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:10.4.0"],\ ["@cspotcode/source-map-support", "npm:0.7.0"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@swc/wasm", null],\ ["@tsconfig/node10", "npm:1.0.9"],\ ["@tsconfig/node12", "npm:1.0.11"],\ @@ -23813,7 +23813,7 @@ const RAW_RUNTIME_STATE = "packageDependencies": [\ ["ts-node", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:10.9.1"],\ ["@cspotcode/source-map-support", "npm:0.8.1"],\ - ["@swc/core", "virtual:21a30884d94fbf67bcf4a1714713cc91d32809a34424c4ce678841dfdc63b58647c5e18570d56e36b3c762ee72f81c251599477127a715978fa6e1d8b9e5d952#npm:1.3.71"],\ + ["@swc/core", "virtual:9edf5f93d67eba3c8380c148f92c9ef44d49ad903cc76cc912170574219df4f3782593d38e7624104e39c45acd9d7b6cc855f78d7141d92f15dca9bd39617c31#npm:1.3.71"],\ ["@swc/wasm", null],\ ["@tsconfig/node10", "npm:1.0.9"],\ ["@tsconfig/node12", "npm:1.0.11"],\ diff --git a/biome.json b/biome.json index 9ee0f1875..5918758eb 100644 --- a/biome.json +++ b/biome.json @@ -8,7 +8,7 @@ }, "formatter": { "ignore": [ - "packages/iceshrimp-js/api-extractor.json", + "packages/iceshrimp-sdk/api-extractor.json", "packages/*/tsconfig.json", "packages/*/built", "packages/*/package-lock.json", diff --git a/docs/api-doc.md b/docs/api-doc.md index 764fd9227..7540f0c8f 100644 --- a/docs/api-doc.md +++ b/docs/api-doc.md @@ -2,4 +2,4 @@ You can find interactive API documentation at any Iceshrimp instance. https://iceshrimp.social/api-doc -You can also find auto-generated documentation for iceshrimp-js [here](../packages/iceshrimp-js/markdown/iceshrimp-js.md). +You can also find auto-generated documentation for iceshrimp-sdk [here](../packages/iceshrimp-sdk/markdown/iceshrimp-sdk.md). diff --git a/package.json b/package.json index 545c70690..8e2fd8da9 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ }, "private": true, "scripts": { - "rebuild": "clean && node ./scripts/build-greet.js && yarn workspace iceshrimp-js build && yarn workspaces foreach -Apitv run build && gulp", - "build": "node ./scripts/build-greet.js && yarn workspace iceshrimp-js run build && yarn workspaces foreach -Apitv run build && gulp", - "build:debug": "node ./scripts/build-greet.js && yarn workspace iceshrimp-js run build:debug && yarn workspaces foreach -Apitv run build:debug && gulp", + "rebuild": "clean && node ./scripts/build-greet.js && yarn workspace iceshrimp-sdk build && yarn workspaces foreach -Apitv run build && gulp", + "build": "node ./scripts/build-greet.js && yarn workspace iceshrimp-sdk run build && yarn workspaces foreach -Apitv run build && gulp", + "build:debug": "node ./scripts/build-greet.js && yarn workspace iceshrimp-sdk run build:debug && yarn workspaces foreach -Apitv run build:debug && gulp", "start": "yarn workspace backend run start", "start:debug": "yarn workspace backend run start:debug", "start:test": "yarn workspace backend run start:test", @@ -39,7 +39,7 @@ "packages/backend", "packages/client", "packages/sw", - "packages/iceshrimp-js" + "packages/iceshrimp-sdk" ], "resolutions": { "chokidar": "^3.3.1" @@ -75,6 +75,18 @@ "dependenciesMeta": { "@discordapp/twemoji@14.1.2": { "unplugged": true + }, + "@microsoft/api-documenter@7.22.30": { + "unplugged": true + }, + "@microsoft/api-extractor@7.36.3": { + "unplugged": true + }, + "@microsoft/api-extractor-model@7.27.5": { + "unplugged": true + }, + "eventemitter3@4.0.7": { + "unplugged": true } } } diff --git a/packages/README.md b/packages/README.md index 670fd5a48..3b6f4bd46 100644 --- a/packages/README.md +++ b/packages/README.md @@ -5,4 +5,4 @@ This directory contains all of the packages Iceshrimp uses. - `backend`: Main backend code written in TypeScript for NodeJS - `client`: Web interface written in Vue3 and TypeScript - `sw`: Web [Service Worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) written in TypeScript -- `iceshrimp-js`: TypeScript SDK for both backend and client, also published on [NPM](https://www.npmjs.com/package/iceshrimp-js) for public use +- `iceshrimp-sdk`: TypeScript SDK for both backend and client diff --git a/packages/backend/package.json b/packages/backend/package.json index 797f8c21f..8119f8616 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -68,7 +68,7 @@ "gunzip-maybe": "^1.4.2", "happy-dom": "^12.10.3", "hpagent": "0.1.2", - "iceshrimp-js": "workspace:*", + "iceshrimp-sdk": "workspace:*", "ioredis": "5.3.2", "ip-cidr": "3.1.0", "is-svg": "4.3.2", diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts index 76f48dbb3..f0490d1d8 100644 --- a/packages/backend/test/utils.ts +++ b/packages/backend/test/utils.ts @@ -6,7 +6,7 @@ import * as childProcess from "child_process"; import * as http from "node:http"; import { SIGKILL } from "constants"; import WebSocket from "ws"; -import * as misskey from "iceshrimp-js"; +import * as misskey from "iceshrimp-sdk"; import fetch from "node-fetch"; import FormData from "form-data"; import { DataSource } from "typeorm"; diff --git a/packages/client/package.json b/packages/client/package.json index 76f63fe46..f56826e62 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -56,7 +56,7 @@ "focus-trap": "^7.5.2", "focus-trap-vue": "^4.0.2", "gsap": "^3.12.2", - "iceshrimp-js": "workspace:*", + "iceshrimp-sdk": "workspace:*", "idb-keyval": "6.2.1", "insert-text-at-cursor": "0.3.0", "json5": "2.2.3", diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts index c51ef8a2e..74c1ad15c 100644 --- a/packages/client/src/account.ts +++ b/packages/client/src/account.ts @@ -1,5 +1,5 @@ import { defineAsyncComponent, reactive } from "vue"; -import * as misskey from "iceshrimp-js"; +import * as misskey from "iceshrimp-sdk"; import { i18n } from "./i18n"; import { del, get, set } from "@/scripts/idb-proxy"; import { apiUrl } from "@/config"; diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue index 6e5171d57..b47adf870 100644 --- a/packages/client/src/components/MkAbuseReportWindow.vue +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -41,7 +41,7 @@ + + diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue index 891f2eb61..a2a4f25f2 100644 --- a/packages/client/src/components/MkNotification.vue +++ b/packages/client/src/components/MkNotification.vue @@ -222,6 +222,21 @@ :hideMenu="true" /> + {{ + notification.bite.targetType === 'user' + ? i18n.ts.bitYou + : i18n.ts.bitYouBack + }} +
+