From 53e7e321d20cd7071ff617ecfcf42f6122020bcd Mon Sep 17 00:00:00 2001 From: Gavin Mogan Date: Mon, 28 Apr 2025 19:16:28 -0700 Subject: switch to 3rd party merge which doesn't mutate config --- src/lib/middleware.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/middleware.ts') diff --git a/src/lib/middleware.ts b/src/lib/middleware.ts index 5073137..69fbe4e 100644 --- a/src/lib/middleware.ts +++ b/src/lib/middleware.ts @@ -1,7 +1,7 @@ import { NextFunction, Request, Response } from "express"; import MagicLink from "../models/MagicLink.js"; import getConfig, { GathioConfig } from "../lib/config.js"; -import { deepMerge } from "../util/object.js"; +import { merge as deepMerge } from "ts-deepmerge"; export const checkMagicLink = async ( req: Request, -- cgit v1.2.3 From d2c2147ac6a02d647217a303e5810125e0d112c0 Mon Sep 17 00:00:00 2001 From: INOUE Daisuke Date: Sun, 11 May 2025 18:26:06 +0900 Subject: Avoid "Type 'GathioConfig' is missing the following properties from type 'IObject[]':..." --- src/lib/middleware.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/middleware.ts') diff --git a/src/lib/middleware.ts b/src/lib/middleware.ts index 69fbe4e..be05c3f 100644 --- a/src/lib/middleware.ts +++ b/src/lib/middleware.ts @@ -62,7 +62,7 @@ export const getConfigMiddleware = ( if (process.env.CYPRESS === "true" && req.cookies?.cypressConfigOverride) { console.log("Overriding config with Cypress config"); const override = JSON.parse(req.cookies.cypressConfigOverride); - res.locals.config = deepMerge(config, override); + res.locals.config = deepMerge(config, override); return next(); } res.locals.config = config; -- cgit v1.2.3