From 20410b054308ee8595f15bae088d176c2a8bc45a Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Wed, 15 Nov 2023 15:12:44 +0100 Subject: [PATCH] [backend] Move back to upstream re2 dependency Upstream accepted my patches for both re2 (fixing build on arm64-musl) and the install-artifact-from-github dependency (cutting down build times for architectures where prebuilts are available from ~2 minutes to ~2 seconds), so there's no reason to stick with our fork. --- .pnp.cjs | 202 ++++++++++++++++-- ...p-re2-npm-1.20.6-2ee015ddd5-642a2f70ef.zip | 3 - ...-agent-npm-2.2.0-cf04e8a830-822ea07755.zip | 3 + ...abbrev-npm-2.0.0-0eb38a17e5-ca0a54e35b.zip | 3 + ...cache-npm-18.0.0-32582cfebc-b71fefe97b.zip | 3 + ...-agent-npm-7.0.0-106a57cc8c-dbaaf3d9f3.zip | 3 + ...-agent-npm-7.0.2-83ea6a5d42-9ec844f78f.zip | 3 + ...github-npm-1.3.3-909f6f3e67-c66997cdc1.zip | 3 - ...github-npm-1.3.5-07f075ffb7-b746e79ae3.zip | 3 + .../isexe-npm-3.1.1-9c0061eead-7fe1931ee4.zip | 3 + ...cache-npm-10.0.2-fcff47e16f-a675b71a19.zip | 3 + ...appen-npm-13.0.0-f87a92bb87-ded5a91a02.zip | 3 + ...nipass-npm-7.0.4-eacb4e042e-e864bd02ce.zip | 3 + ...e-gyp-npm-10.0.1-48708ce70b-578cf0c821.zip | 3 + .../nopt-npm-7.2.0-dd734b678d-1e7489f17c.zip | 3 + ...oc-log-npm-3.0.0-a8c21c2f0f-02b64e1b39.zip | 3 + .../re2-npm-1.20.8-777a96c6f5-9187df2eea.zip | 3 + ...-agent-npm-8.0.2-df165543cf-ea727734bd.zip | 3 + .../which-npm-4.0.0-dd31cd4928-f17e84c042.zip | 3 + packages/backend/package.json | 2 +- yarn.lock | 200 +++++++++++++++-- 21 files changed, 410 insertions(+), 48 deletions(-) delete mode 100644 .yarn/cache/@iceshrimp-re2-npm-1.20.6-2ee015ddd5-642a2f70ef.zip create mode 100644 .yarn/cache/@npmcli-agent-npm-2.2.0-cf04e8a830-822ea07755.zip create mode 100644 .yarn/cache/abbrev-npm-2.0.0-0eb38a17e5-ca0a54e35b.zip create mode 100644 .yarn/cache/cacache-npm-18.0.0-32582cfebc-b71fefe97b.zip create mode 100644 .yarn/cache/http-proxy-agent-npm-7.0.0-106a57cc8c-dbaaf3d9f3.zip create mode 100644 .yarn/cache/https-proxy-agent-npm-7.0.2-83ea6a5d42-9ec844f78f.zip delete mode 100644 .yarn/cache/install-artifact-from-github-npm-1.3.3-909f6f3e67-c66997cdc1.zip create mode 100644 .yarn/cache/install-artifact-from-github-npm-1.3.5-07f075ffb7-b746e79ae3.zip create mode 100644 .yarn/cache/isexe-npm-3.1.1-9c0061eead-7fe1931ee4.zip create mode 100644 .yarn/cache/lru-cache-npm-10.0.2-fcff47e16f-a675b71a19.zip create mode 100644 .yarn/cache/make-fetch-happen-npm-13.0.0-f87a92bb87-ded5a91a02.zip create mode 100644 .yarn/cache/minipass-npm-7.0.4-eacb4e042e-e864bd02ce.zip create mode 100644 .yarn/cache/node-gyp-npm-10.0.1-48708ce70b-578cf0c821.zip create mode 100644 .yarn/cache/nopt-npm-7.2.0-dd734b678d-1e7489f17c.zip create mode 100644 .yarn/cache/proc-log-npm-3.0.0-a8c21c2f0f-02b64e1b39.zip create mode 100644 .yarn/cache/re2-npm-1.20.8-777a96c6f5-9187df2eea.zip create mode 100644 .yarn/cache/socks-proxy-agent-npm-8.0.2-df165543cf-ea727734bd.zip create mode 100644 .yarn/cache/which-npm-4.0.0-dd31cd4928-f17e84c042.zip diff --git a/.pnp.cjs b/.pnp.cjs index 04ec38280..7b927600e 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -412,10 +412,6 @@ const RAW_RUNTIME_STATE = "@humanwhocodes/object-schema",\ "npm:1.2.1"\ ],\ - [\ - "@iceshrimp/re2",\ - "npm:1.20.6::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.6%2Fre2-1.20.6.tgz"\ - ],\ [\ "@ioredis/commands",\ "npm:1.2.0"\ @@ -596,6 +592,10 @@ const RAW_RUNTIME_STATE = "@nodelib/fs.walk",\ "npm:1.2.8"\ ],\ + [\ + "@npmcli/agent",\ + "npm:2.2.0"\ + ],\ [\ "@npmcli/fs",\ "npm:3.1.0"\ @@ -1450,7 +1450,7 @@ const RAW_RUNTIME_STATE = ],\ [\ "agent-base",\ - "npm:6.0.2"\ + "npm:7.1.0"\ ],\ [\ "agentkeepalive",\ @@ -3606,7 +3606,7 @@ const RAW_RUNTIME_STATE = ],\ [\ "install-artifact-from-github",\ - "npm:1.3.3"\ + "npm:1.3.5"\ ],\ [\ "install-peers",\ @@ -5408,6 +5408,10 @@ const RAW_RUNTIME_STATE = "probe-image-size",\ "npm:7.2.3"\ ],\ + [\ + "proc-log",\ + "npm:3.0.0"\ + ],\ [\ "process-nextick-args",\ "npm:2.0.1"\ @@ -5588,6 +5592,10 @@ const RAW_RUNTIME_STATE = "rdf-canonize",\ "npm:3.4.0"\ ],\ + [\ + "re2",\ + "npm:1.20.8"\ + ],\ [\ "react-is",\ "npm:18.2.0"\ @@ -9047,18 +9055,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@iceshrimp/re2", [\ - ["npm:1.20.6::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.6%2Fre2-1.20.6.tgz", {\ - "packageLocation": "./.yarn/unplugged/@iceshrimp-re2-npm-1.20.6-2ee015ddd5/node_modules/@iceshrimp/re2/",\ - "packageDependencies": [\ - ["@iceshrimp/re2", "npm:1.20.6::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.6%2Fre2-1.20.6.tgz"],\ - ["install-artifact-from-github", "npm:1.3.3"],\ - ["nan", "npm:2.18.0"],\ - ["node-gyp", "npm:9.4.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@ioredis/commands", [\ ["npm:1.2.0", {\ "packageLocation": "./.yarn/cache/@ioredis-commands-npm-1.2.0-47541de88b-a8253c9539.zip/node_modules/@ioredis/commands/",\ @@ -9921,6 +9917,20 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@npmcli/agent", [\ + ["npm:2.2.0", {\ + "packageLocation": "./.yarn/cache/@npmcli-agent-npm-2.2.0-cf04e8a830-822ea07755.zip/node_modules/@npmcli/agent/",\ + "packageDependencies": [\ + ["@npmcli/agent", "npm:2.2.0"],\ + ["agent-base", "npm:7.1.0"],\ + ["http-proxy-agent", "npm:7.0.0"],\ + ["https-proxy-agent", "npm:7.0.2"],\ + ["lru-cache", "npm:10.0.2"],\ + ["socks-proxy-agent", "npm:8.0.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@npmcli/fs", [\ ["npm:3.1.0", {\ "packageLocation": "./.yarn/cache/@npmcli-fs-npm-3.1.0-0844a57978-f3a7ab3a31.zip/node_modules/@npmcli/fs/",\ @@ -12737,6 +12747,13 @@ const RAW_RUNTIME_STATE = ["abbrev", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.0.0", {\ + "packageLocation": "./.yarn/cache/abbrev-npm-2.0.0-0eb38a17e5-ca0a54e35b.zip/node_modules/abbrev/",\ + "packageDependencies": [\ + ["abbrev", "npm:2.0.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["abort-controller", [\ @@ -13946,7 +13963,6 @@ const RAW_RUNTIME_STATE = ["@bull-board/ui", "npm:5.6.0"],\ ["@discordapp/twemoji", "npm:14.1.2"],\ ["@elastic/elasticsearch", "npm:7.17.0"],\ - ["@iceshrimp/re2", "npm:1.20.6::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.6%2Fre2-1.20.6.tgz"],\ ["@koa/cors", "npm:3.4.3"],\ ["@koa/multer", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:3.0.2"],\ ["@koa/router", "npm:9.0.1"],\ @@ -14084,6 +14100,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.8"],\ ["redis-lock", "npm:0.1.4"],\ ["redis-semaphore", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:5.3.1"],\ ["reflect-metadata", "npm:0.1.13"],\ @@ -14675,6 +14692,25 @@ const RAW_RUNTIME_STATE = ["unique-filename", "npm:3.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:18.0.0", {\ + "packageLocation": "./.yarn/cache/cacache-npm-18.0.0-32582cfebc-b71fefe97b.zip/node_modules/cacache/",\ + "packageDependencies": [\ + ["cacache", "npm:18.0.0"],\ + ["@npmcli/fs", "npm:3.1.0"],\ + ["fs-minipass", "npm:3.0.2"],\ + ["glob", "npm:10.3.3"],\ + ["lru-cache", "npm:10.0.2"],\ + ["minipass", "npm:7.0.4"],\ + ["minipass-collect", "npm:1.0.2"],\ + ["minipass-flush", "npm:1.0.5"],\ + ["minipass-pipeline", "npm:1.2.4"],\ + ["p-map", "npm:4.0.0"],\ + ["ssri", "npm:10.0.4"],\ + ["tar", "npm:6.1.15"],\ + ["unique-filename", "npm:3.0.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["cache-base", [\ @@ -20796,6 +20832,15 @@ const RAW_RUNTIME_STATE = ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:7.0.0", {\ + "packageLocation": "./.yarn/cache/http-proxy-agent-npm-7.0.0-106a57cc8c-dbaaf3d9f3.zip/node_modules/http-proxy-agent/",\ + "packageDependencies": [\ + ["http-proxy-agent", "npm:7.0.0"],\ + ["agent-base", "npm:7.1.0"],\ + ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["http-signature", [\ @@ -20858,6 +20903,15 @@ const RAW_RUNTIME_STATE = ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:7.0.2", {\ + "packageLocation": "./.yarn/cache/https-proxy-agent-npm-7.0.2-83ea6a5d42-9ec844f78f.zip/node_modules/https-proxy-agent/",\ + "packageDependencies": [\ + ["https-proxy-agent", "npm:7.0.2"],\ + ["agent-base", "npm:7.1.0"],\ + ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["human-signals", [\ @@ -21155,10 +21209,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["install-artifact-from-github", [\ - ["npm:1.3.3", {\ - "packageLocation": "./.yarn/cache/install-artifact-from-github-npm-1.3.3-909f6f3e67-c66997cdc1.zip/node_modules/install-artifact-from-github/",\ + ["npm:1.3.5", {\ + "packageLocation": "./.yarn/cache/install-artifact-from-github-npm-1.3.5-07f075ffb7-b746e79ae3.zip/node_modules/install-artifact-from-github/",\ "packageDependencies": [\ - ["install-artifact-from-github", "npm:1.3.3"]\ + ["install-artifact-from-github", "npm:1.3.5"]\ ],\ "linkType": "HARD"\ }]\ @@ -22052,6 +22106,13 @@ const RAW_RUNTIME_STATE = ["isexe", "npm:2.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.1.1", {\ + "packageLocation": "./.yarn/cache/isexe-npm-3.1.1-9c0061eead-7fe1931ee4.zip/node_modules/isexe/",\ + "packageDependencies": [\ + ["isexe", "npm:3.1.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["isobject", [\ @@ -24156,6 +24217,14 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "HARD"\ }],\ + ["npm:10.0.2", {\ + "packageLocation": "./.yarn/cache/lru-cache-npm-10.0.2-fcff47e16f-a675b71a19.zip/node_modules/lru-cache/",\ + "packageDependencies": [\ + ["lru-cache", "npm:10.0.2"],\ + ["semver", "npm:7.5.4"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:4.1.5", {\ "packageLocation": "./.yarn/cache/lru-cache-npm-4.1.5-ede304cc43-9ec7d73f11.zip/node_modules/lru-cache/",\ "packageDependencies": [\ @@ -24274,6 +24343,24 @@ const RAW_RUNTIME_STATE = ["ssri", "npm:10.0.4"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:13.0.0", {\ + "packageLocation": "./.yarn/cache/make-fetch-happen-npm-13.0.0-f87a92bb87-ded5a91a02.zip/node_modules/make-fetch-happen/",\ + "packageDependencies": [\ + ["make-fetch-happen", "npm:13.0.0"],\ + ["@npmcli/agent", "npm:2.2.0"],\ + ["cacache", "npm:18.0.0"],\ + ["http-cache-semantics", "npm:4.1.1"],\ + ["is-lambda", "npm:1.0.1"],\ + ["minipass", "npm:7.0.4"],\ + ["minipass-fetch", "npm:3.0.3"],\ + ["minipass-flush", "npm:1.0.5"],\ + ["minipass-pipeline", "npm:1.2.4"],\ + ["negotiator", "npm:0.6.3"],\ + ["promise-retry", "npm:2.0.1"],\ + ["ssri", "npm:10.0.4"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["make-iterator", [\ @@ -24674,6 +24761,13 @@ const RAW_RUNTIME_STATE = ["minipass", "npm:7.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:7.0.4", {\ + "packageLocation": "./.yarn/cache/minipass-npm-7.0.4-eacb4e042e-e864bd02ce.zip/node_modules/minipass/",\ + "packageDependencies": [\ + ["minipass", "npm:7.0.4"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["minipass-collect", [\ @@ -25148,6 +25242,23 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["node-gyp", [\ + ["npm:10.0.1", {\ + "packageLocation": "./.yarn/unplugged/node-gyp-npm-10.0.1-48708ce70b/node_modules/node-gyp/",\ + "packageDependencies": [\ + ["node-gyp", "npm:10.0.1"],\ + ["env-paths", "npm:2.2.1"],\ + ["exponential-backoff", "npm:3.1.1"],\ + ["glob", "npm:10.3.10"],\ + ["graceful-fs", "npm:4.2.11"],\ + ["make-fetch-happen", "npm:13.0.0"],\ + ["nopt", "npm:7.2.0"],\ + ["proc-log", "npm:3.0.0"],\ + ["semver", "npm:7.5.4"],\ + ["tar", "npm:6.1.15"],\ + ["which", "npm:4.0.0"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:9.4.0", {\ "packageLocation": "./.yarn/unplugged/node-gyp-npm-9.4.0-ebf5f5573e/node_modules/node-gyp/",\ "packageDependencies": [\ @@ -25237,6 +25348,14 @@ const RAW_RUNTIME_STATE = ["abbrev", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:7.2.0", {\ + "packageLocation": "./.yarn/cache/nopt-npm-7.2.0-dd734b678d-1e7489f17c.zip/node_modules/nopt/",\ + "packageDependencies": [\ + ["nopt", "npm:7.2.0"],\ + ["abbrev", "npm:2.0.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["normalize-package-data", [\ @@ -27163,6 +27282,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["proc-log", [\ + ["npm:3.0.0", {\ + "packageLocation": "./.yarn/cache/proc-log-npm-3.0.0-a8c21c2f0f-02b64e1b39.zip/node_modules/proc-log/",\ + "packageDependencies": [\ + ["proc-log", "npm:3.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["process-nextick-args", [\ ["npm:2.0.1", {\ "packageLocation": "./.yarn/cache/process-nextick-args-npm-2.0.1-b8d7971609-1d38588e52.zip/node_modules/process-nextick-args/",\ @@ -27686,6 +27814,18 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["re2", [\ + ["npm:1.20.8", {\ + "packageLocation": "./.yarn/unplugged/re2-npm-1.20.8-777a96c6f5/node_modules/re2/",\ + "packageDependencies": [\ + ["re2", "npm:1.20.8"],\ + ["install-artifact-from-github", "npm:1.3.5"],\ + ["nan", "npm:2.18.0"],\ + ["node-gyp", "npm:10.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["react-is", [\ ["npm:17.0.2", {\ "packageLocation": "./.yarn/cache/react-is-npm-17.0.2-091bbb8db6-73b36281e5.zip/node_modules/react-is/",\ @@ -28978,6 +29118,16 @@ const RAW_RUNTIME_STATE = ["socks", "npm:2.7.1"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:8.0.2", {\ + "packageLocation": "./.yarn/cache/socks-proxy-agent-npm-8.0.2-df165543cf-ea727734bd.zip/node_modules/socks-proxy-agent/",\ + "packageDependencies": [\ + ["socks-proxy-agent", "npm:8.0.2"],\ + ["agent-base", "npm:7.1.0"],\ + ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"],\ + ["socks", "npm:2.7.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["sonic-channel", [\ @@ -32228,6 +32378,14 @@ const RAW_RUNTIME_STATE = ["isexe", "npm:2.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:4.0.0", {\ + "packageLocation": "./.yarn/cache/which-npm-4.0.0-dd31cd4928-f17e84c042.zip/node_modules/which/",\ + "packageDependencies": [\ + ["which", "npm:4.0.0"],\ + ["isexe", "npm:3.1.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["which-boxed-primitive", [\ diff --git a/.yarn/cache/@iceshrimp-re2-npm-1.20.6-2ee015ddd5-642a2f70ef.zip b/.yarn/cache/@iceshrimp-re2-npm-1.20.6-2ee015ddd5-642a2f70ef.zip deleted file mode 100644 index 51a9ad6be..000000000 --- a/.yarn/cache/@iceshrimp-re2-npm-1.20.6-2ee015ddd5-642a2f70ef.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e4a4395c8bbba93309d2cf581774b0bba23775adb474985e67ab2b266300ec0 -size 3597773 diff --git a/.yarn/cache/@npmcli-agent-npm-2.2.0-cf04e8a830-822ea07755.zip b/.yarn/cache/@npmcli-agent-npm-2.2.0-cf04e8a830-822ea07755.zip new file mode 100644 index 000000000..4414afb84 --- /dev/null +++ b/.yarn/cache/@npmcli-agent-npm-2.2.0-cf04e8a830-822ea07755.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:391b7f67d3225aa92932210c17e1c09b607487c89d729ed27f9a413e076db8b3 +size 8417 diff --git a/.yarn/cache/abbrev-npm-2.0.0-0eb38a17e5-ca0a54e35b.zip b/.yarn/cache/abbrev-npm-2.0.0-0eb38a17e5-ca0a54e35b.zip new file mode 100644 index 000000000..86c1cf18c --- /dev/null +++ b/.yarn/cache/abbrev-npm-2.0.0-0eb38a17e5-ca0a54e35b.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb33cebdfb4debe949187737668fa62493f640a88e02a81c0b62ad36b1121574 +size 3145 diff --git a/.yarn/cache/cacache-npm-18.0.0-32582cfebc-b71fefe97b.zip b/.yarn/cache/cacache-npm-18.0.0-32582cfebc-b71fefe97b.zip new file mode 100644 index 000000000..09e94abc3 --- /dev/null +++ b/.yarn/cache/cacache-npm-18.0.0-32582cfebc-b71fefe97b.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8fbdde9b21b000292e5c99bf2cc7b191e2963c1c417c957d2922eefc2e73afc +size 25252 diff --git a/.yarn/cache/http-proxy-agent-npm-7.0.0-106a57cc8c-dbaaf3d9f3.zip b/.yarn/cache/http-proxy-agent-npm-7.0.0-106a57cc8c-dbaaf3d9f3.zip new file mode 100644 index 000000000..41c6cf88d --- /dev/null +++ b/.yarn/cache/http-proxy-agent-npm-7.0.0-106a57cc8c-dbaaf3d9f3.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e02486e7422bcea4b37f9fc6cf5cea718dc9d91712db37f65069b28bebafef3 +size 8523 diff --git a/.yarn/cache/https-proxy-agent-npm-7.0.2-83ea6a5d42-9ec844f78f.zip b/.yarn/cache/https-proxy-agent-npm-7.0.2-83ea6a5d42-9ec844f78f.zip new file mode 100644 index 000000000..0f8a814b7 --- /dev/null +++ b/.yarn/cache/https-proxy-agent-npm-7.0.2-83ea6a5d42-9ec844f78f.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90b40c4c5d492a012636211dd7f782cd23ecb66d14eb3c6b8940cc600ed3a9b8 +size 12064 diff --git a/.yarn/cache/install-artifact-from-github-npm-1.3.3-909f6f3e67-c66997cdc1.zip b/.yarn/cache/install-artifact-from-github-npm-1.3.3-909f6f3e67-c66997cdc1.zip deleted file mode 100644 index 8014b666a..000000000 --- a/.yarn/cache/install-artifact-from-github-npm-1.3.3-909f6f3e67-c66997cdc1.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f43aa4c1739ed2514a8fbc980f90c2d690369b815940e6aed5001b0617db3e83 -size 8599 diff --git a/.yarn/cache/install-artifact-from-github-npm-1.3.5-07f075ffb7-b746e79ae3.zip b/.yarn/cache/install-artifact-from-github-npm-1.3.5-07f075ffb7-b746e79ae3.zip new file mode 100644 index 000000000..7066bd9d5 --- /dev/null +++ b/.yarn/cache/install-artifact-from-github-npm-1.3.5-07f075ffb7-b746e79ae3.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0abdc61343d6d341b2441bc662c1f5f12a422f2a5390051d0c213d9623cf0123 +size 8707 diff --git a/.yarn/cache/isexe-npm-3.1.1-9c0061eead-7fe1931ee4.zip b/.yarn/cache/isexe-npm-3.1.1-9c0061eead-7fe1931ee4.zip new file mode 100644 index 000000000..7b44a3304 --- /dev/null +++ b/.yarn/cache/isexe-npm-3.1.1-9c0061eead-7fe1931ee4.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81686278785581d560e3234b6f59a99b94be3145286d39f132dbe5dc0fe5e9ea +size 23319 diff --git a/.yarn/cache/lru-cache-npm-10.0.2-fcff47e16f-a675b71a19.zip b/.yarn/cache/lru-cache-npm-10.0.2-fcff47e16f-a675b71a19.zip new file mode 100644 index 000000000..fce66997d --- /dev/null +++ b/.yarn/cache/lru-cache-npm-10.0.2-fcff47e16f-a675b71a19.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1ea2244209d0b23a9f7300d52d07a57b4ef5e6c75199bd10e104a17d4cf20b8 +size 105309 diff --git a/.yarn/cache/make-fetch-happen-npm-13.0.0-f87a92bb87-ded5a91a02.zip b/.yarn/cache/make-fetch-happen-npm-13.0.0-f87a92bb87-ded5a91a02.zip new file mode 100644 index 000000000..9cd78490d --- /dev/null +++ b/.yarn/cache/make-fetch-happen-npm-13.0.0-f87a92bb87-ded5a91a02.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aea8d43835d2701549bf1ad7198d1819fcec9eeb2602d692ad4b64bcd673fb24 +size 20820 diff --git a/.yarn/cache/minipass-npm-7.0.4-eacb4e042e-e864bd02ce.zip b/.yarn/cache/minipass-npm-7.0.4-eacb4e042e-e864bd02ce.zip new file mode 100644 index 000000000..996088814 --- /dev/null +++ b/.yarn/cache/minipass-npm-7.0.4-eacb4e042e-e864bd02ce.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ee4e615baa1bc61de3b828ce2052a28a13ff41cef54011f49eb908702c430d2 +size 73520 diff --git a/.yarn/cache/node-gyp-npm-10.0.1-48708ce70b-578cf0c821.zip b/.yarn/cache/node-gyp-npm-10.0.1-48708ce70b-578cf0c821.zip new file mode 100644 index 000000000..48bbd8ded --- /dev/null +++ b/.yarn/cache/node-gyp-npm-10.0.1-48708ce70b-578cf0c821.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7450feb994e2815b974fa9dd33106f6b2009249d7983e9514785faebc564caf2 +size 461986 diff --git a/.yarn/cache/nopt-npm-7.2.0-dd734b678d-1e7489f17c.zip b/.yarn/cache/nopt-npm-7.2.0-dd734b678d-1e7489f17c.zip new file mode 100644 index 000000000..325f395bc --- /dev/null +++ b/.yarn/cache/nopt-npm-7.2.0-dd734b678d-1e7489f17c.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85ee9eb9447a06ebcdff7f2d1931dfd0077a081dbdcc638688139b26439754ae +size 11096 diff --git a/.yarn/cache/proc-log-npm-3.0.0-a8c21c2f0f-02b64e1b39.zip b/.yarn/cache/proc-log-npm-3.0.0-a8c21c2f0f-02b64e1b39.zip new file mode 100644 index 000000000..b67bd7a43 --- /dev/null +++ b/.yarn/cache/proc-log-npm-3.0.0-a8c21c2f0f-02b64e1b39.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:390ced19e313bbff530085c2af4533283a2de862a5468012f2006643b6a50646 +size 3328 diff --git a/.yarn/cache/re2-npm-1.20.8-777a96c6f5-9187df2eea.zip b/.yarn/cache/re2-npm-1.20.8-777a96c6f5-9187df2eea.zip new file mode 100644 index 000000000..33c533a1f --- /dev/null +++ b/.yarn/cache/re2-npm-1.20.8-777a96c6f5-9187df2eea.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df117cb1b63360e8aae9d14600c0113c7d6ffa2d7837268210625468ec7d9c0d +size 3557828 diff --git a/.yarn/cache/socks-proxy-agent-npm-8.0.2-df165543cf-ea727734bd.zip b/.yarn/cache/socks-proxy-agent-npm-8.0.2-df165543cf-ea727734bd.zip new file mode 100644 index 000000000..e96c81a96 --- /dev/null +++ b/.yarn/cache/socks-proxy-agent-npm-8.0.2-df165543cf-ea727734bd.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d1b86d8cae782b554cd8343a7b13da2236ff55952d1f542204548978d4bd6fd +size 7886 diff --git a/.yarn/cache/which-npm-4.0.0-dd31cd4928-f17e84c042.zip b/.yarn/cache/which-npm-4.0.0-dd31cd4928-f17e84c042.zip new file mode 100644 index 000000000..ddfb6b623 --- /dev/null +++ b/.yarn/cache/which-npm-4.0.0-dd31cd4928-f17e84c042.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8a0768881467d84e21df461b48a29c8948b21801546a621a83d82a9697bd11f +size 4498 diff --git a/packages/backend/package.json b/packages/backend/package.json index 6fa70887e..eb3baa958 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -28,7 +28,6 @@ "@bull-board/ui": "5.6.0", "@discordapp/twemoji": "14.1.2", "@elastic/elasticsearch": "7.17.0", - "@iceshrimp/re2": "^1.20.6", "@koa/cors": "3.4.3", "@koa/multer": "3.0.2", "@koa/router": "9.0.1", @@ -111,6 +110,7 @@ "qs": "6.11.2", "random-seed": "0.3.0", "ratelimiter": "3.4.1", + "re2": "^1.20.8", "redis-lock": "0.1.4", "redis-semaphore": "5.3.1", "reflect-metadata": "0.1.13", diff --git a/yarn.lock b/yarn.lock index 28846ad4d..6367f7fac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1387,17 +1387,6 @@ __metadata: languageName: node linkType: hard -"@iceshrimp/re2@npm:^1.20.6": - version: 1.20.6 - resolution: "@iceshrimp/re2@npm:1.20.6::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.6%2Fre2-1.20.6.tgz" - dependencies: - install-artifact-from-github: "npm:^1.3.3" - nan: "npm:^2.18.0" - node-gyp: "npm:^9.4.0" - checksum: 642a2f70efafc3a3e6f6c09b801c566a3f3924739c3a14d65899ae65340dfbba373047e9e7a86730570ae8a4f7294f499e4c02a3265a30f4df77046d6c6b1812 - languageName: node - linkType: hard - "@ioredis/commands@npm:^1.1.1": version: 1.2.0 resolution: "@ioredis/commands@npm:1.2.0" @@ -2116,6 +2105,19 @@ __metadata: languageName: node linkType: hard +"@npmcli/agent@npm:^2.0.0": + version: 2.2.0 + resolution: "@npmcli/agent@npm:2.2.0" + dependencies: + agent-base: "npm:^7.1.0" + http-proxy-agent: "npm:^7.0.0" + https-proxy-agent: "npm:^7.0.1" + lru-cache: "npm:^10.0.1" + socks-proxy-agent: "npm:^8.0.1" + checksum: 822ea077553cd9cfc5cbd6d92380b0950fcb054a7027cd1b63a33bd0cbb16b0c6626ea75d95ec0e804643c8904472d3361d2da8c2444b1fb02a9b525d9c07c41 + languageName: node + linkType: hard + "@npmcli/fs@npm:^3.1.0": version: 3.1.0 resolution: "@npmcli/fs@npm:3.1.0" @@ -4308,6 +4310,13 @@ __metadata: languageName: node linkType: hard +"abbrev@npm:^2.0.0": + version: 2.0.0 + resolution: "abbrev@npm:2.0.0" + checksum: ca0a54e35bea4ece0ecb68a47b312e1a9a6f772408d5bcb9051230aaa94b0460671c5b5c9cb3240eb5b7bc94c52476550eb221f65a0bbd0145bdc9f3113a6707 + languageName: node + linkType: hard + "abort-controller@npm:^3.0.0": version: 3.0.0 resolution: "abort-controller@npm:3.0.0" @@ -4413,7 +4422,7 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:^7.0.2": +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": version: 7.1.0 resolution: "agent-base@npm:7.1.0" dependencies: @@ -5300,7 +5309,6 @@ __metadata: "@bull-board/ui": "npm:5.6.0" "@discordapp/twemoji": "npm:14.1.2" "@elastic/elasticsearch": "npm:7.17.0" - "@iceshrimp/re2": "npm:^1.20.6" "@koa/cors": "npm:3.4.3" "@koa/multer": "npm:3.0.2" "@koa/router": "npm:9.0.1" @@ -5438,6 +5446,7 @@ __metadata: qs: "npm:6.11.2" random-seed: "npm:0.3.0" ratelimiter: "npm:3.4.1" + re2: "npm:^1.20.8" redis-lock: "npm:0.1.4" redis-semaphore: "npm:5.3.1" reflect-metadata: "npm:0.1.13" @@ -5973,6 +5982,26 @@ __metadata: languageName: node linkType: hard +"cacache@npm:^18.0.0": + version: 18.0.0 + resolution: "cacache@npm:18.0.0" + dependencies: + "@npmcli/fs": "npm:^3.1.0" + fs-minipass: "npm:^3.0.0" + glob: "npm:^10.2.2" + lru-cache: "npm:^10.0.1" + minipass: "npm:^7.0.3" + minipass-collect: "npm:^1.0.2" + minipass-flush: "npm:^1.0.5" + minipass-pipeline: "npm:^1.2.4" + p-map: "npm:^4.0.0" + ssri: "npm:^10.0.0" + tar: "npm:^6.1.11" + unique-filename: "npm:^3.0.0" + checksum: b71fefe97b9799a863dc48ac79da2bd57a724ff0922fddd3aef4f3b70395ba00d1ef9547a0594d3d6d3cd57aeaeaf4d938c54f89695053eb2198cf8758b47511 + languageName: node + linkType: hard + "cache-base@npm:^1.0.1": version: 1.0.1 resolution: "cache-base@npm:1.0.1" @@ -11109,6 +11138,16 @@ __metadata: languageName: node linkType: hard +"http-proxy-agent@npm:^7.0.0": + version: 7.0.0 + resolution: "http-proxy-agent@npm:7.0.0" + dependencies: + agent-base: "npm:^7.1.0" + debug: "npm:^4.3.4" + checksum: dbaaf3d9f3fc4df4a5d7ec45d456ec50f575240b557160fa63427b447d1f812dd7fe4a4f17d2e1ba003d231f07edf5a856ea6d91cb32d533062ff20a7803ccac + languageName: node + linkType: hard + "http-signature@npm:~1.3.6": version: 1.3.6 resolution: "http-signature@npm:1.3.6" @@ -11169,6 +11208,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^7.0.1": + version: 7.0.2 + resolution: "https-proxy-agent@npm:7.0.2" + dependencies: + agent-base: "npm:^7.0.2" + debug: "npm:4" + checksum: 9ec844f78fd643608239c9c3f6819918631df5cd3e17d104cc507226a39b5d4adda9d790fc9fd63ac0d2bb8a761b2f9f60faa80584a9bf9d7f2e8c5ed0acd330 + languageName: node + linkType: hard + "human-signals@npm:^1.1.1": version: 1.1.1 resolution: "human-signals@npm:1.1.1" @@ -11435,13 +11484,13 @@ __metadata: languageName: node linkType: hard -"install-artifact-from-github@npm:^1.3.3": - version: 1.3.3 - resolution: "install-artifact-from-github@npm:1.3.3" +"install-artifact-from-github@npm:^1.3.5": + version: 1.3.5 + resolution: "install-artifact-from-github@npm:1.3.5" bin: install-from-cache: bin/install-from-cache.js save-to-github-cache: bin/save-to-github-cache.js - checksum: c66997cdc1bdb8b326bcbcd3579f244b67c9de9f7e64c2e5e4fda041b789578ac46b2d2e314c919dd39abbba137bc06ab14a8c678d10b953dbcb8d58909bb376 + checksum: b746e79ae3b8b94058aef5f7021d119fb3da4fef37c6500e240b1c3d3fdc1ab9275f730af628b98ad2e28ce24c26291cd9325ed9563da97f9ad68135fd40c22d languageName: node linkType: hard @@ -12233,6 +12282,13 @@ __metadata: languageName: node linkType: hard +"isexe@npm:^3.1.1": + version: 3.1.1 + resolution: "isexe@npm:3.1.1" + checksum: 7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e + languageName: node + linkType: hard + "isobject@npm:^2.0.0": version: 2.1.0 resolution: "isobject@npm:2.1.0" @@ -14082,6 +14138,15 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^10.0.1": + version: 10.0.2 + resolution: "lru-cache@npm:10.0.2" + dependencies: + semver: "npm:^7.3.5" + checksum: a675b71a19f4b23186549e343792c3eb6196a5fca2a96b59e31a44289459b7e166b3c6cb08952f45ac29d8cfe561cabee88d906fdd5c98fb7cbda8f5d47431a3 + languageName: node + linkType: hard + "lru-cache@npm:^4.0.1": version: 4.1.5 resolution: "lru-cache@npm:4.1.5" @@ -14204,6 +14269,25 @@ __metadata: languageName: node linkType: hard +"make-fetch-happen@npm:^13.0.0": + version: 13.0.0 + resolution: "make-fetch-happen@npm:13.0.0" + dependencies: + "@npmcli/agent": "npm:^2.0.0" + cacache: "npm:^18.0.0" + http-cache-semantics: "npm:^4.1.1" + is-lambda: "npm:^1.0.1" + minipass: "npm:^7.0.2" + minipass-fetch: "npm:^3.0.0" + minipass-flush: "npm:^1.0.5" + minipass-pipeline: "npm:^1.2.4" + negotiator: "npm:^0.6.3" + promise-retry: "npm:^2.0.1" + ssri: "npm:^10.0.0" + checksum: ded5a91a02b76381b06a4ec4d5c1d23ebbde15d402b3c3e4533b371dac7e2f7ca071ae71ae6dae72aa261182557b7b1b3fd3a705b39252dc17f74fa509d3e76f + languageName: node + linkType: hard + "make-iterator@npm:^1.0.0": version: 1.0.1 resolution: "make-iterator@npm:1.0.1" @@ -14614,6 +14698,13 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^7.0.2, minipass@npm:^7.0.3": + version: 7.0.4 + resolution: "minipass@npm:7.0.4" + checksum: e864bd02ceb5e0707696d58f7ce3a0b89233f0d686ef0d447a66db705c0846a8dc6f34865cd85256c1472ff623665f616b90b8ff58058b2ad996c5de747d2d18 + languageName: node + linkType: hard + "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": version: 2.1.2 resolution: "minizlib@npm:2.1.2" @@ -15036,7 +15127,27 @@ __metadata: languageName: node linkType: hard -"node-gyp@npm:^9.4.0, node-gyp@npm:latest": +"node-gyp@npm:^10.0.1": + version: 10.0.1 + resolution: "node-gyp@npm:10.0.1" + dependencies: + env-paths: "npm:^2.2.0" + exponential-backoff: "npm:^3.1.1" + glob: "npm:^10.3.10" + graceful-fs: "npm:^4.2.6" + make-fetch-happen: "npm:^13.0.0" + nopt: "npm:^7.0.0" + proc-log: "npm:^3.0.0" + semver: "npm:^7.3.5" + tar: "npm:^6.1.2" + which: "npm:^4.0.0" + bin: + node-gyp: bin/node-gyp.js + checksum: 578cf0c821f258ce4b6ebce4461eca4c991a4df2dee163c0624f2fe09c7d6d37240be4942285a0048d307230248ee0b18382d6623b9a0136ce9533486deddfa8 + languageName: node + linkType: hard + +"node-gyp@npm:latest": version: 9.4.0 resolution: "node-gyp@npm:9.4.0" dependencies: @@ -15107,6 +15218,17 @@ __metadata: languageName: node linkType: hard +"nopt@npm:^7.0.0": + version: 7.2.0 + resolution: "nopt@npm:7.2.0" + dependencies: + abbrev: "npm:^2.0.0" + bin: + nopt: bin/nopt.js + checksum: 1e7489f17cbda452c8acaf596a8defb4ae477d2a9953b76eb96f4ec3f62c6b421cd5174eaa742f88279871fde9586d8a1d38fb3f53fa0c405585453be31dff4c + languageName: node + linkType: hard + "normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.5.0": version: 2.5.0 resolution: "normalize-package-data@npm:2.5.0" @@ -16805,6 +16927,13 @@ __metadata: languageName: node linkType: hard +"proc-log@npm:^3.0.0": + version: 3.0.0 + resolution: "proc-log@npm:3.0.0" + checksum: 02b64e1b3919e63df06f836b98d3af002b5cd92655cab18b5746e37374bfb73e03b84fe305454614b34c25b485cc687a9eebdccf0242cda8fda2475dd2c97e02 + languageName: node + linkType: hard + "process-nextick-args@npm:^2.0.0, process-nextick-args@npm:~2.0.0": version: 2.0.1 resolution: "process-nextick-args@npm:2.0.1" @@ -17270,6 +17399,17 @@ __metadata: languageName: node linkType: hard +"re2@npm:^1.20.8": + version: 1.20.8 + resolution: "re2@npm:1.20.8" + dependencies: + install-artifact-from-github: "npm:^1.3.5" + nan: "npm:^2.18.0" + node-gyp: "npm:^10.0.1" + checksum: 9187df2eeaeaec2ca8070646ad57e89a1b15b825e350f62e5af74194b59f64d3632e9f0c9c1750d5da23f7b4104cce7f9ce94fdeae56aa5bcf37af4d6329df63 + languageName: node + linkType: hard + "react-is@npm:^17.0.1": version: 17.0.2 resolution: "react-is@npm:17.0.2" @@ -18479,7 +18619,18 @@ __metadata: languageName: node linkType: hard -"socks@npm:^2.6.2": +"socks-proxy-agent@npm:^8.0.1": + version: 8.0.2 + resolution: "socks-proxy-agent@npm:8.0.2" + dependencies: + agent-base: "npm:^7.0.2" + debug: "npm:^4.3.4" + socks: "npm:^2.7.1" + checksum: ea727734bd5b2567597aa0eda14149b3b9674bb44df5937bbb9815280c1586994de734d965e61f1dd45661183d7b41f115fb9e432d631287c9063864cfcc2ecc + languageName: node + linkType: hard + +"socks@npm:^2.6.2, socks@npm:^2.7.1": version: 2.7.1 resolution: "socks@npm:2.7.1" dependencies: @@ -21264,6 +21415,17 @@ __metadata: languageName: node linkType: hard +"which@npm:^4.0.0": + version: 4.0.0 + resolution: "which@npm:4.0.0" + dependencies: + isexe: "npm:^3.1.1" + bin: + node-which: bin/which.js + checksum: f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651 + languageName: node + linkType: hard + "wide-align@npm:^1.1.2, wide-align@npm:^1.1.5": version: 1.1.5 resolution: "wide-align@npm:1.1.5"