diff --git a/.pnp.cjs b/.pnp.cjs index a7f5e45f6..bc731db79 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -7069,7 +7069,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.10"],\ + ["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"],\ @@ -17969,10 +17969,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["nan", [\ - ["npm:2.18.0", {\ - "packageLocation": "./.yarn/unplugged/nan-npm-2.18.0-a51ed5bed5/node_modules/nan/",\ + ["npm:2.20.0", {\ + "packageLocation": "./.yarn/unplugged/nan-npm-2.20.0-5b5be83e88/node_modules/nan/",\ "packageDependencies": [\ - ["nan", "npm:2.18.0"],\ + ["nan", "npm:2.20.0"],\ ["node-gyp", "npm:9.4.0"]\ ],\ "linkType": "HARD"\ @@ -20777,12 +20777,12 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["re2", [\ - ["npm:1.20.10", {\ - "packageLocation": "./.yarn/unplugged/re2-npm-1.20.10-d70122e1f7/node_modules/re2/",\ + ["npm:1.20.11", {\ + "packageLocation": "./.yarn/unplugged/re2-npm-1.20.11-ab65de125e/node_modules/re2/",\ "packageDependencies": [\ - ["re2", "npm:1.20.10"],\ + ["re2", "npm:1.20.11"],\ ["install-artifact-from-github", "npm:1.3.5"],\ - ["nan", "npm:2.18.0"],\ + ["nan", "npm:2.20.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.20.0-5b5be83e88-5f16e4c995.zip similarity index 65% rename from .yarn/cache/nan-npm-2.18.0-a51ed5bed5-5520e22c64.zip rename to .yarn/cache/nan-npm-2.20.0-5b5be83e88-5f16e4c995.zip index 77f600022..080a5ceb7 100644 Binary files a/.yarn/cache/nan-npm-2.18.0-a51ed5bed5-5520e22c64.zip and b/.yarn/cache/nan-npm-2.20.0-5b5be83e88-5f16e4c995.zip differ diff --git a/.yarn/cache/re2-npm-1.20.10-d70122e1f7-7bc738ee15.zip b/.yarn/cache/re2-npm-1.20.11-ab65de125e-a8665c861c.zip similarity index 94% rename from .yarn/cache/re2-npm-1.20.10-d70122e1f7-7bc738ee15.zip rename to .yarn/cache/re2-npm-1.20.11-ab65de125e-a8665c861c.zip index 0e060f310..a6f35fb0f 100644 Binary files a/.yarn/cache/re2-npm-1.20.10-d70122e1f7-7bc738ee15.zip and b/.yarn/cache/re2-npm-1.20.11-ab65de125e-a8665c861c.zip differ diff --git a/.yarnrc.yml b/.yarnrc.yml index 0128bdfe9..9f260a1f7 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -4,7 +4,7 @@ compressionLevel: mixed enableGlobalCache: false -enableImmutableInstalls: false +enableImmutableInstalls: true nodeLinker: pnp diff --git a/packages/backend/package.json b/packages/backend/package.json index b31d6957f..a5f3ae796 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -109,7 +109,7 @@ "qs": "6.11.2", "random-seed": "0.3.0", "ratelimiter": "3.4.1", - "re2": "1.20.10", + "re2": "1.20.11", "redis-lock": "0.1.4", "redis-semaphore": "5.3.1", "reflect-metadata": "0.1.13", diff --git a/packages/backend/src/server/web/manifest.ts b/packages/backend/src/server/web/manifest.ts index 68df05df0..c8902fcc3 100644 --- a/packages/backend/src/server/web/manifest.ts +++ b/packages/backend/src/server/web/manifest.ts @@ -1,11 +1,10 @@ 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'; export const manifestHandler = async (ctx: Koa.Context) => { - // TODO - //const res = structuredClone(manifest); - const res = JSON.parse(JSON.stringify(manifest)); + const res = JSON.parse(fs.readFileSync(path.resolve('./src/server/web/manifest.json'), 'utf-8')); const instance = await fetchMeta(true); diff --git a/yarn.lock b/yarn.lock index 5d2ea841e..692cc374f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5386,7 +5386,7 @@ __metadata: qs: "npm:6.11.2" random-seed: "npm:0.3.0" ratelimiter: "npm:3.4.1" - re2: "npm:1.20.10" + re2: "npm:1.20.11" redis-lock: "npm:0.1.4" redis-semaphore: "npm:5.3.1" reflect-metadata: "npm:0.1.13" @@ -14834,12 +14834,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.20.0 + resolution: "nan@npm:2.20.0" dependencies: node-gyp: "npm:latest" - checksum: 10/5520e22c64e2b5b495b1d765d6334c989b848bbe1502fec89c5857cabcc7f9f0474563377259e7574bff1c8a041d3b90e9ffa1f5e15502ffddee7b2550cc26a0 + checksum: 10/5f16e4c9953075d9920229c703c1d781c0b74118ce3d9e926b448a4eef92b7d8be5ac6adc748a13a5fafb594436cbfe63250e3471aefdd78e3a0cd14603b9ba7 languageName: node linkType: hard @@ -17338,14 +17338,14 @@ __metadata: languageName: node linkType: hard -"re2@npm:1.20.10": - version: 1.20.10 - resolution: "re2@npm:1.20.10" +"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/7bc738ee15bc6ead9991369948fc5e497036b70c3972e091156d5d0a9674303da8fbde40005057ba6cb68844c71a820040f8eb06d7957240db11958a52cee3ae + checksum: 10/a8665c861c632c67db448832a5a6a0092a1a29b8b6b731d6ce10f0017ba2871620780a745a8b2cbdd77e57ecf9e7bc8983c7ec5e10e6da6c06079a98146db443 languageName: node linkType: hard