From 5a8d170a7dd91191cd2e39f0875361f2c45580af Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Wed, 22 Nov 2023 15:33:27 +0100 Subject: [PATCH] Use our own re2 fork again, temporarily --- .pnp.cjs | 26 +++++++++---------- ...p-re2-npm-1.20.8-b353b420a2-141c074ff1.zip | 3 +++ .../re2-npm-1.20.8-777a96c6f5-9187df2eea.zip | 3 --- packages/backend/package.json | 2 +- yarn.lock | 24 ++++++++--------- 5 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 .yarn/cache/@iceshrimp-re2-npm-1.20.8-b353b420a2-141c074ff1.zip delete mode 100644 .yarn/cache/re2-npm-1.20.8-777a96c6f5-9187df2eea.zip diff --git a/.pnp.cjs b/.pnp.cjs index 162228a6f..a02b111af 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -2070,6 +2070,18 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@iceshrimp/re2", [\ + ["npm:1.20.8::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.8%2Fre2-1.20.8.tgz", {\ + "packageLocation": "./.yarn/unplugged/@iceshrimp-re2-npm-1.20.8-b353b420a2/node_modules/@iceshrimp/re2/",\ + "packageDependencies": [\ + ["@iceshrimp/re2", "npm:1.20.8::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.8%2Fre2-1.20.8.tgz"],\ + ["install-artifact-from-github", "npm:1.3.5"],\ + ["nan", "npm:2.18.0"],\ + ["node-gyp", "npm:10.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@ioredis/commands", [\ ["npm:1.2.0", {\ "packageLocation": "./.yarn/cache/@ioredis-commands-npm-1.2.0-47541de88b-a8253c9539.zip/node_modules/@ioredis/commands/",\ @@ -6978,6 +6990,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/re2", "npm:1.20.8::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.8%2Fre2-1.20.8.tgz"],\ ["@koa/cors", "npm:3.4.3"],\ ["@koa/multer", "virtual:aa59773ac87791c4813d53447077fcf8a847d6de5a301d34dc31286584b1dbb26d30d3adb5b4c41c1e8aea04371e926fda05c09c6253647c432e11d872a304ba#npm:3.0.2"],\ ["@koa/router", "npm:9.0.1"],\ @@ -7114,7 +7127,6 @@ 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"],\ @@ -20817,18 +20829,6 @@ 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/",\ diff --git a/.yarn/cache/@iceshrimp-re2-npm-1.20.8-b353b420a2-141c074ff1.zip b/.yarn/cache/@iceshrimp-re2-npm-1.20.8-b353b420a2-141c074ff1.zip new file mode 100644 index 000000000..849231f2b --- /dev/null +++ b/.yarn/cache/@iceshrimp-re2-npm-1.20.8-b353b420a2-141c074ff1.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f965a9e3b0eaa2560fd86e8673c76abe57092ca446ffda87226baab9507aa45b +size 3597905 diff --git a/.yarn/cache/re2-npm-1.20.8-777a96c6f5-9187df2eea.zip b/.yarn/cache/re2-npm-1.20.8-777a96c6f5-9187df2eea.zip deleted file mode 100644 index 33c533a1f..000000000 --- a/.yarn/cache/re2-npm-1.20.8-777a96c6f5-9187df2eea.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df117cb1b63360e8aae9d14600c0113c7d6ffa2d7837268210625468ec7d9c0d -size 3557828 diff --git a/packages/backend/package.json b/packages/backend/package.json index a35129a96..d8db2ef31 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/re2": "^1.20.8", "@koa/cors": "3.4.3", "@koa/multer": "3.0.2", "@koa/router": "9.0.1", @@ -108,7 +109,6 @@ "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 a9b2f3d7d..f8e8242b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1375,6 +1375,17 @@ __metadata: languageName: node linkType: hard +"@iceshrimp/re2@npm:^1.20.8": + version: 1.20.8 + resolution: "@iceshrimp/re2@npm:1.20.8::__archiveUrl=https%3A%2F%2Ficeshrimp.dev%2Fapi%2Fpackages%2Ficeshrimp%2Fnpm%2F%2540iceshrimp%252Fre2%2F-%2F1.20.8%2Fre2-1.20.8.tgz" + dependencies: + install-artifact-from-github: "npm:^1.3.5" + nan: "npm:^2.18.0" + node-gyp: "npm:^10.0.1" + checksum: 141c074ff1027606ee69fc4c01a5fc283e4e275cbc7e65fe3ff74c95b6b54616d2f62fc1ec0980612960de38ff219e5e94c46952905c3b472ede5d1347e60920 + languageName: node + linkType: hard + "@ioredis/commands@npm:^1.1.1": version: 1.2.0 resolution: "@ioredis/commands@npm:1.2.0" @@ -5296,6 +5307,7 @@ __metadata: "@bull-board/koa": "npm:5.6.0" "@bull-board/ui": "npm:5.6.0" "@discordapp/twemoji": "npm:14.1.2" + "@iceshrimp/re2": "npm:^1.20.8" "@koa/cors": "npm:3.4.3" "@koa/multer": "npm:3.0.2" "@koa/router": "npm:9.0.1" @@ -5432,7 +5444,6 @@ __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" @@ -17376,17 +17387,6 @@ __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"