Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[SILO-454] chore: refactor decorator, logger packages (#7618)

Surya Prashanth258d24bf06c5
diff --git a/apps/admin/package.json b/apps/admin/package.json
index d82ed71705..a7737d4638 100644
--- a/apps/admin/package.json
+++ b/apps/admin/package.json
@@ -45,7 +45,7 @@
"@plane/eslint-config": "workspace:*",
"@plane/tailwind-config": "workspace:*",
"@plane/typescript-config": "workspace:*",
- "@types/lodash": "^4.17.6",
+ "@types/lodash": "4.17.20",
"@types/node": "18.16.1",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.2.18",
diff --git a/apps/space/package.json b/apps/space/package.json
index b3f8715577..3ee32ecccf 100644
--- a/apps/space/package.json
+++ b/apps/space/package.json
@@ -58,7 +58,7 @@
"@plane/eslint-config": "workspace:*",
"@plane/tailwind-config": "workspace:*",
"@plane/typescript-config": "workspace:*",
- "@types/lodash": "^4.17.6",
+ "@types/lodash": "4.17.20",
"@types/node": "18.14.1",
"@types/nprogress": "^0.2.0",
"@types/react": "^18.3.11",
diff --git a/apps/web/package.json b/apps/web/package.json
index 940a5aad10..6ef4e30a03 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -72,7 +72,7 @@
"@plane/eslint-config": "workspace:*",
"@plane/tailwind-config": "workspace:*",
"@plane/typescript-config": "workspace:*",
- "@types/lodash": "^4.17.6",
+ "@types/lodash": "4.17.20",
"@types/node": "18.16.1",
"@types/react": "^18.3.11",
"@types/react-color": "^3.0.6",
diff --git a/packages/decorators/.prettierrc b/packages/decorators/.prettierrc
new file mode 100644
index 0000000000..87d988f1b2
--- /dev/null
+++ b/packages/decorators/.prettierrc
@@ -0,0 +1,5 @@
+{
+ "printWidth": 120,
+ "tabWidth": 2,
+ "trailingComma": "es5"
+}
diff --git a/packages/decorators/README.md b/packages/decorators/README.md
index e33086d516..f607ca2b9c 100644
--- a/packages/decorators/README.md
+++ b/packages/decorators/README.md
@@ -52,11 +52,7 @@ userController.registerRoutes(router);
### WebSocket Controller
```typescript
-import {
- Controller,
- WebSocket,
- BaseWebSocketController,
-} from "@plane/decorators";
+import { Controller, WebSocket, BaseWebSocketController } from "@plane/decorators";
import { Request } from "express";
import { WebSocket as WS } from "ws";
diff --git a/packages/decorators/package.json b/packages/decorators/package.json
index 2e3bf3cbeb..faf2df3cf8 100644
--- a/packages/decorators/package.json
+++ b/packages/decorators/package.json
@@ -11,35 +11,23 @@
"dist/**"
],
"scripts": {
- "build": "tsup src/index.ts --format esm,cjs --dts --external express,ws",
- "dev": "tsup src/index.ts --format esm,cjs --watch --dts --external express,ws",
- "check:lint": "eslint . --max-warnings 0",
+ "build": "tsc --noEmit && tsup --minify",
+ "dev": "tsup --watch",
+ "check:lint": "eslint . --max-warnings 1",
"check:types": "tsc --noEmit",
"check:format": "prettier --check \"**/*.{ts,tsx,md,json,css,scss}\"",
"fix:lint": "eslint . --fix",
"fix:format": "prettier --write \"**/*.{ts,tsx,md,json,css,scss}\"",
"clean": "rm -rf .turbo && rm -rf .next && rm -rf node_modules && rm -rf dist"
},
- "dependencies": {
- "express": "^4.21.2",
- "reflect-metadata": "^0.2.2"
- },
"devDependencies": {
"@plane/eslint-config": "workspace:*",
"@plane/typescript-config": "workspace:*",
"@types/express": "^4.17.21",
"@types/node": "^20.14.9",
"@types/ws": "^8.5.10",
+ "reflect-metadata": "^0.2.2",
"tsup": "8.4.0",
"typescript": "5.8.3"
- },
- "peerDependencies": {
- "express": ">=4.21.2",
- "ws": ">=8.0.0"
- },
- "peerDependenciesMeta": {
- "ws": {
- "optional": true
- }
}
}
diff --git a/packages/decorators/src/controller.ts b/packages/decorators/src/controller.ts
index 60112658c5..3f25e87144 100644
--- a/packages/decorators/src/controller.ts
+++ b/packages/decorators/src/controller.ts
@@ -1,15 +1,9 @@
-import { RequestHandler, Router } from "express";
+import type { RequestHandler, Router, Request } from "express";
+import type { WebSocket } from "ws";
+
import "reflect-metadata";
-type HttpMethod =
- | "get"
- | "post"
- | "put"
- | "delete"
- | "patch"
- | "options"
- | "head"
- | "ws";
+type HttpMethod = "get" | "post" | "put" | "delete" | "patch" | "options" | "head" | "ws";
interface ControllerInstance {
[key: string]: unknown;
@@ -22,40 +16,85 @@ interface ControllerConstructor {
export function registerControllers(
router: Router,
- Controller: ControllerConstructor,
+ controllers: ControllerConstructor[],
+ dependencies: any[] = []
): void {
+ controllers.forEach((Controller) => {
+ // Create the controller instance with dependencies
+ const instance = new Controller(...dependencies);
+
+ // Determine if it's a WebSocket controller or REST controller by checking
+ // if it has any methods with the "ws" method metadata
+ const isWebsocket = Object.getOwnPropertyNames(Controller.prototype).some((methodName) => {
+ if (methodName === "constructor") return false;
+ return Reflect.getMetadata("method", instance, methodName) === "ws";
+ });
+
+ if (isWebsocket) {
+ // Register as WebSocket controller
+ // Pass the existing instance with dependencies to avoid creating a new instance without them
+ registerWebSocketController(router, Controller, instance);
+ } else {
+ // Register as REST controller - doesn't accept an instance parameter
+ registerRestController(router, Controller);
+ }
+ });
+}
+
+function registerRestController(router: Router, Controller: ControllerConstructor): void {
const instance = new Controller();
const baseRoute = Reflect.getMetadata("baseRoute", Controller) as string;
Object.getOwnPropertyNames(Controller.prototype).forEach((methodName) => {
if (methodName === "constructor") return; // Skip the constructor
- const method = Reflect.getMetadata(
- "method",
- instance,
- methodName,
- ) as HttpMethod;
+ const method = Reflect.getMetadata("method", instance, methodName) as HttpMethod;
const route = Reflect.getMetadata("route", instance, methodName) as string;
- const middlewares =
- (Reflect.getMetadata(
- "middlewares",
- instance,
- methodName,
- ) as RequestHandler[]) || [];
+ const middlewares = (Reflect.getMetadata("middlewares", instance, methodName) as RequestHandler[]) || [];
if (method && route) {
const handler = instance[methodName] as unknown;
if (typeof handler === "function") {
if (method !== "ws") {
- (
- router[method] as (
- path: string,
- ...handlers: RequestHandler[]
- ) => void
- )(`${baseRoute}${route}`, ...middlewares, handler.bind(instance));
+ (router[method] as (path: string, ...handlers: RequestHandler[]) => void)(
+ `${baseRoute}${route}`,
+ ...middlewares,
+ handler.bind(instance)
+ );
}
}
}
});
}
+
+function registerWebSocketController(
+ router: Router,
+ Controller: ControllerConstructor,
+ existingInstance?: ControllerInstance
+): void {
+ const instance = existingInstance || new Controller();
+ const baseRoute = Reflect.getMetadata("baseRoute", Controller) as string;
+
+ Object.getOwnPropertyNames(Controller.prototype).forEach((methodName) => {
+ if (methodName === "constructor") return; // Skip the constructor
+
+ const method = Reflect.getMetadata("method", instance, methodName) as string;
+ const route = Reflect.getMetadata("route", instance, methodName) as string;
+
+ if (method === "ws" && route) {
+ const handler = instance[methodName] as unknown;
+
+ if (typeof handler === "function" && "ws" in router && typeof router.ws === "function") {
+ router.ws(`${baseRoute}${route}`, (ws: WebSocket, req: Request) => {
+ try {
+ handler.call(instance, ws, req);
+ } catch (error) {
+ console.error(`WebSocket error in ${Controller.name}.${methodName}`, error);
+ ws.close(1011, error instanceof Error ? error.message : "Internal server error");
+ }
+ });
+ }
+ }
+ });
+}
diff --git a/packages/decorators/src/index.ts b/packages/decorators/src/index.ts
index 4050664c3f..03306c67c3 100644
--- a/packages/decorators/src/index.ts
+++ b/packages/decorators/src/index.ts
@@ -3,7 +3,6 @@ export { Controller, Middleware } from "./rest";
export { Get, Post, Put, Patch, Delete } from "./rest";
export { WebSocket } from "./websocket";
export { registerControllers } from "./controller";
-export { registerWebSocketControllers } from "./websocket-controller";
// Also provide namespaced exports for better organization
import * as RestDecorators from "./rest";
diff --git a/packages/decorators/src/rest.ts b/packages/decorators/src/rest.ts
index 5a80a9f519..bfad3540bc 100644
--- a/packages/decorators/src/rest.ts
+++ b/packages/decorators/src/rest.ts
@@ -21,9 +21,7 @@ export function Controller(baseRoute: string = ""): ClassDecorator {
* @param method HTTP method to handle
* @returns Method decorator
*/
-function createHttpMethodDecorator(
- method: RestMethod,
-): (route: string) => MethodDecorator {
+function createHttpMethodDecorator(method: RestMethod): (route: string) => MethodDecorator {
return function (route: string): MethodDecorator {
return function (target: object, propertyKey: string | symbol) {
Reflect.defineMetadata("method", method, target, propertyKey);
@@ -46,8 +44,7 @@ export const Delete = createHttpMethodDecorator("delete");
*/
export function Middleware(middleware: RequestHandler): MethodDecorator {
return function (target: object, propertyKey: string | symbol) {
- const middlewares =
- Reflect.getMetadata("middlewares", target, propertyKey) || [];
+ const middlewares = Reflect.getMetadata("middlewares", target, propertyKey) || [];
middlewares.push(middleware);
Reflect.defineMetadata("middlewares", middlewares, target, propertyKey);
};
diff --git a/packages/decorators/src/websocket-controller.ts b/packages/decorators/src/websocket-controller.ts
deleted file mode 100644
index 776d2d7a33..0000000000
--- a/packages/decorators/src/websocket-controller.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Router, Request } from "express";
-import type { WebSocket } from "ws";
-import "reflect-metadata";
-
-interface ControllerInstance {
- [key: string]: unknown;
-}
-
-interface ControllerConstructor {
- new (...args: unknown[]): ControllerInstance;
- prototype: ControllerInstance;
-}
-
-export function registerWebSocketControllers(
- router: Router,
- Controller: ControllerConstructor,
- existingInstance?: ControllerInstance,
-): void {
- const instance = existingInstance || new Controller();
- const baseRoute = Reflect.getMetadata("baseRoute", Controller) as string;
-
- Object.getOwnPropertyNames(Controller.prototype).forEach((methodName) => {
- if (methodName === "constructor") return; // Skip the constructor
-
- const method = Reflect.getMetadata(
- "method",
- instance,
- methodName,
- ) as string;
- const route = Reflect.getMetadata("route", instance, methodName) as string;
-
- if (method === "ws" && route) {
- const handler = instance[methodName] as unknown;
-
- if (
- typeof handler === "function" &&
- "ws" in router &&
- typeof router.ws === "function"
- ) {
- router.ws(`${baseRoute}${route}`, (ws: WebSocket, req: Request) => {
- try {
- handler.call(instance, ws, req);
- } catch (error) {
- console.error(
- `WebSocket error in ${Controller.name}.${methodName}`,
- error,
- );
- ws.close(
- 1011,
- error instanceof Error ? error.message : "Internal server error",
- );
- }
- });
- }
- }
- });
-}
-
-/**
- * Base controller class for WebSocket endpoints
- */
-export abstract class BaseWebSocketController {
- protected router: Router;
-
- constructor() {
- this.router = Router();
- }
-
- /**
- * Get the base route for this controller
- */
- protected getBaseRoute(): string {
- return Reflect.getMetadata("baseRoute", this.constructor) || "";
- }
-
- /**
- * Abstract method to handle WebSocket connections
- * Implement this in your derived class
- */
- abstract handleConnection(ws: WebSocket, req: Request): void;
-}
diff --git a/packages/decorators/tsconfig.json b/packages/decorators/tsconfig.json
index e88bae24bb..0fd863c96a 100644
--- a/packages/decorators/tsconfig.json
+++ b/packages/decorators/tsconfig.json
@@ -6,7 +6,6 @@
"lib": ["ES2020"],
"rootDir": ".",
"baseUrl": ".",
-
"paths": {
"@/*": ["./src/*"]
}
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 564414e63f..5a0fcad130 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -25,7 +25,7 @@
"@plane/eslint-config": "workspace:*",
"@plane/typescript-config": "workspace:*",
"@types/node": "^22.5.4",
- "@types/lodash": "^4.17.6",
+ "@types/lodash": "4.17.20",
"@types/react": "^18.3.11",
"typescript": "5.8.3"
}
diff --git a/packages/logger/package.json b/packages/logger/package.json
index e3597faf81..26fbbc0d2c 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -28,15 +28,14 @@
"clean": "rm -rf .turbo && rm -rf .next && rm -rf node_modules && rm -rf dist"
},
"dependencies": {
- "express": "^4.21.2",
- "winston": "^3.17.0",
- "winston-daily-rotate-file": "^5.0.0"
+ "express-winston": "^4.2.0",
+ "winston": "^3.17.0"
},
"devDependencies": {
"@plane/eslint-config": "workspace:*",
"@plane/typescript-config": "workspace:*",
"@types/express": "^4.17.21",
- "@types/node": "^22.5.4",
+ "@types/node": "^20.14.9",
"tsup": "8.4.0",
"typescript": "5.8.3"
}
diff --git a/packages/logger/src/config.ts b/packages/logger/src/config.ts
index 84bb98e5f1..f571c87115 100644
--- a/packages/logger/src/config.ts
+++ b/packages/logger/src/config.ts
@@ -1,66 +1,14 @@
-import path from "path";
-import winston from "winston";
-import DailyRotateFile from "winston-daily-rotate-file";
+import { createLogger, format, LoggerOptions, transports } from "winston";
-// Define log levels
-const levels = {
- error: 0,
- warn: 1,
- info: 2,
- http: 3,
- debug: 4,
-};
-
-// Define colors for each level
-const colors = {
- error: "red",
- warn: "yellow",
- info: "green",
- http: "magenta",
- debug: "white",
+export const loggerConfig: LoggerOptions = {
+ level: process.env.LOG_LEVEL || "info",
+ format: format.combine(
+ format.timestamp({
+ format: "YYYY-MM-DD HH:mm:ss:ms",
+ }),
+ format.json()
+ ),
+ transports: [new transports.Console()],
};
-// Tell winston about our colors
-winston.addColors(colors);
-
-// Custom format for logging
-const format = winston.format.combine(
- winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss:ms" }),
- winston.format.colorize({ all: true }),
- winston.format.printf(
- (info: winston.Logform.TransformableInfo) => `[${info?.timestamp}] ${info.level}: ${info.message}`
- )
-);
-
-// Define which transports to use
-const transports = [
- // Console transport
- new winston.transports.Console(),
-
- // Rotating file transport for errors
- new DailyRotateFile({
- filename: path.join(process.cwd(), "logs", "error-%DATE%.log"),
- datePattern: "YYYY-MM-DD",
- zippedArchive: true,
- maxSize: process.env.LOG_MAX_SIZE || "20m",
- maxFiles: process.env.LOG_RETENTION || "7d",
- level: "error",
- }),
-
- // Rotating file transport for all logs
- new DailyRotateFile({
- filename: path.join(process.cwd(), "logs", "combined-%DATE%.log"),
- datePattern: "YYYY-MM-DD",
- zippedArchive: true,
- maxSize: process.env.LOG_MAX_SIZE || "20m",
- maxFiles: process.env.LOG_RETENTION || "7d",
- }),
-];
-
-// Create the logger
-export const logger = winston.createLogger({
- level: process.env.LOG_LEVEL || "info",
- levels,
- format,
- transports,
-});
+export const logger = createLogger(loggerConfig);
diff --git a/packages/logger/src/middleware.ts b/packages/logger/src/middleware.ts
index e251a5837d..b1e9e68ccc 100644
--- a/packages/logger/src/middleware.ts
+++ b/packages/logger/src/middleware.ts
@@ -1,23 +1,11 @@
-import { Request, Response, NextFunction } from "express";
-import { logger } from "./config";
-
-export const requestLogger = (req: Request, res: Response, next: NextFunction) => {
- // Log when the request starts
- const startTime = Date.now();
-
- // Log request details
- logger.http(`Incoming ${req.method} request to ${req.url} from ${req.ip}`);
-
- // Log request body if present
- if (Object.keys(req.body).length > 0) {
- logger.debug("Request body:", req.body);
- }
-
- // Capture response
- res.on("finish", () => {
- const duration = Date.now() - startTime;
- logger.http(`Completed ${req.method} ${req.url} with status ${res.statusCode} in ${duration}ms`);
- });
-
- next();
-};
+import type { RequestHandler } from "express";
+import expressWinston from "express-winston";
+import { transports } from "winston";
+import { loggerConfig } from "./config";
+
+export const loggerMiddleware: RequestHandler = expressWinston.logger({
+ ...loggerConfig,
+ transports: [new transports.Console()],
+ msg: "{{req.method}} {{req.url}} {{res.statusCode}} {{res.responseTime}}ms",
+ expressFormat: true,
+});
diff --git a/packages/ui/package.json b/packages/ui/package.json
index f4e2d4bb3e..3e81024419 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -66,7 +66,7 @@
"@storybook/react": "^8.1.1",
"@storybook/react-webpack5": "^8.1.1",
"@storybook/test": "^8.1.1",
- "@types/lodash": "^4.17.6",
+ "@types/lodash": "4.17.20",
"@types/node": "^20.5.2",
"@types/react": "^18.3.11",
"@types/react-color": "^3.0.9",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index e4f72157c3..f27552471a 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -36,7 +36,7 @@
"devDependencies": {
"@plane/eslint-config": "workspace:*",
"@plane/typescript-config": "workspace:*",
- "@types/lodash": "^4.17.6",
+ "@types/lodash": "4.17.20",
"@types/node": "^22.5.4",
"@types/react": "^18.3.11",
"@types/uuid": "^9.0.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7d60c48e02..0d6d6aba84 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -113,7 +113,7 @@ importers:
specifier: workspace:*
version: link:../../packages/typescript-config
'@types/lodash':
- specifier: ^4.17.6
+ specifier: 4.17.20
version: 4.17.20
'@types/node':
specifier: 18.16.1
@@ -135,16 +135,16 @@ importers:
dependencies:
'@hocuspocus/extension-database':
specifier: ^2.15.0
'@hocuspocus/extension-logger':
specifier: ^2.15.0
'@hocuspocus/extension-redis':
specifier: ^2.15.0
'@hocuspocus/server':
specifier: ^2.15.0
'@plane/editor':
specifier: workspace:*
version: link:../../packages/editor
@@ -180,7 +180,7 @@ importers:
version: 7.2.0
ioredis:
specifier: ^5.4.1
- version: 5.7.0
+ version: 5.6.1
lodash:
specifier: ^4.17.21
version: 4.17.21
@@ -198,7 +198,7 @@ importers:
version: 10.0.0
y-prosemirror:
specifier: ^1.2.15
y-protocols:
specifier: ^1.0.6
version: 1.0.6([email protected])
@@ -265,13 +265,13 @@ importers:
version: 11.14.0(@types/[email protected])([email protected])
'@emotion/styled':
specifier: ^11.11.0
'@headlessui/react':
specifier: ^1.7.13
'@mui/material':
specifier: ^5.14.1
'@plane/constants':
specifier: workspace:*
version: link:../../packages/constants
@@ -379,7 +379,7 @@ importers:
specifier: workspace:*
version: link:../../packages/typescript-config
'@types/lodash':
- specifier: ^4.17.6
+ specifier: 4.17.20
version: 4.17.20
'@types/node':
specifier: 18.14.1
@@ -479,13 +479,13 @@ importers:
version: 16.6.1
emoji-picker-react:
specifier: ^4.5.16
- version: 4.13.2([email protected])
+ version: 4.12.2([email protected])
export-to-csv:
specifier: ^1.4.0
version: 1.4.0
isomorphic-dompurify:
specifier: ^2.12.0
- version: 2.26.0
+ version: 2.25.0
lodash:
specifier: ^4.17.21
version: 4.17.21
@@ -509,7 +509,7 @@ importers:
posthog-js:
specifier: ^1.131.3
- version: 1.258.5
+ version: 1.255.1
react:
specifier: ^18.3.1
version: 18.3.1
@@ -572,7 +572,7 @@ importers:
specifier: workspace:*
version: link:../../packages/typescript-config
'@types/lodash':
- specifier: ^4.17.6
+ specifier: 4.17.20
version: 4.17.20
'@types/node':
specifier: 18.16.1
@@ -622,16 +622,6 @@ importers:
version: 5.8.3
packages/decorators:
- dependencies:
- express:
- specifier: ^4.21.2
- version: 4.21.2
- reflect-metadata:
- specifier: ^0.2.2
- version: 0.2.2
- ws:
- specifier: '>=8.0.0'
- version: 8.18.3
devDependencies:
'@plane/eslint-config':
specifier: workspace:*
@@ -648,6 +638,9 @@ importers:
'@types/ws':
specifier: ^8.5.10
version: 8.18.1
+ reflect-metadata:
+ specifier: ^0.2.2
+ version: 0.2.2
tsup:
specifier: 8.4.0
@@ -695,7 +688,7 @@ importers:
version: 2.26.1(@tiptap/[email protected](@tiptap/[email protected]))(@tiptap/[email protected])
'@tiptap/extension-collaboration':
specifier: ^2.22.3
'@tiptap/extension-emoji':
specifier: ^2.22.3
@@ -785,7 +778,7 @@ importers:
version: 9.0.12([email protected])
y-prosemirror:
specifier: ^1.2.15
y-protocols:
specifier: ^1.0.6
version: 1.0.6([email protected])
@@ -904,7 +897,7 @@ importers:
specifier: workspace:*
version: link:../typescript-config
'@types/lodash':
- specifier: ^4.17.6
+ specifier: 4.17.20
version: 4.17.20
'@types/node':
specifier: ^22.5.4
@@ -918,15 +911,12 @@ importers:
packages/logger:
dependencies:
- express:
- specifier: ^4.21.2
- version: 4.21.2
+ express-winston:
+ specifier: ^4.2.0
+ version: 4.2.0([email protected])
winston:
specifier: ^3.17.0
version: 3.17.0
- winston-daily-rotate-file:
- specifier: ^5.0.0
- version: 5.0.0([email protected])
devDependencies:
'@plane/eslint-config':
specifier: workspace:*
@@ -938,8 +928,8 @@ importers:
specifier: 4.17.23
version: 4.17.23
'@types/node':
- specifier: ^22.5.4
- version: 22.17.2
+ specifier: ^20.14.9
+ version: 20.19.11
tsup:
specifier: 8.4.0
@@ -1152,7 +1142,7 @@ importers:
version: 2.1.1
emoji-picker-react:
specifier: ^4.5.16
- version: 4.13.2([email protected])
+ version: 4.12.2([email protected])
lodash:
specifier: ^4.17.21
version: 4.17.21
@@ -1227,7 +1217,7 @@ importers:
specifier: ^8.1.1
'@types/lodash':
- specifier: ^4.17.6
+ specifier: 4.17.20
version: 4.17.20
'@types/node':
specifier: ^20.5.2
@@ -1276,7 +1266,7 @@ importers:
version: 4.1.0
isomorphic-dompurify:
specifier: ^2.16.0
- version: 2.26.0
+ version: 2.25.0
lodash:
specifier: ^4.17.21
version: 4.17.21
@@ -1303,7 +1293,7 @@ importers:
specifier: workspace:*
version: link:../typescript-config
'@types/lodash':
- specifier: ^4.17.6
+ specifier: 4.17.20
version: 4.17.20
'@types/node':
specifier: ^22.5.4
@@ -1566,8 +1556,8 @@ packages:
'@emotion/[email protected]':
resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==}
- '@emotion/[email protected]':
- resolution: {integrity: sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==}
+ '@emotion/[email protected]':
+ resolution: {integrity: sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==}
peerDependencies:
'@emotion/react': ^11.0.0-rc.0
'@types/react': '*'
@@ -1807,16 +1797,16 @@ packages:
'@hocuspocus/[email protected]':
resolution: {integrity: sha512-Rzh1HF0a2o/tf90A3w2XNdXd9Ym3aQzMDfD3lAUONCX9B9QOdqdyiORrj6M25QEaJrEIbXFy8LtAFcL0wRdWzA==}
- '@hocuspocus/[email protected]':
- resolution: {integrity: sha512-+PVlPwfdVyOase68WEBb105ZwglhCLVeGpyNa3uwnmH+Ers7OKGLma2SDMKn3Vcb5oHzTzEGx7jNt+32KTEKXA==}
+ '@hocuspocus/[email protected]':
+ resolution: {integrity: sha512-BkYDfKA99udx7AEkqWReBS61kvGMC9SqoPJs3v8xNgpaj2GGyMJQlUdQRMhPyZTn2osV+pqhk8Hn7xUJCW1RJg==}
peerDependencies:
yjs: ^13.6.8
- '@hocuspocus/[email protected]':
- resolution: {integrity: sha512-NufsjXldlVX1c2B98Hyg8Vq9GblPmnIvw9QGdsBK6SNEgWzDwfVrjljrigMAVGuQ4pbBVz8TaY5DcsmOCi5jqA==}
+ '@hocuspocus/[email protected]':
+ resolution: {integrity: sha512-nqSnSFI+xO7dBTsgzSANKvx09ptq8J4Doz3AdLgxfaweYC85qFao7mAx1ZCtWoVHseVwBYua6S3dTwQq5IsWEg==}
- '@hocuspocus/[email protected]':
- resolution: {integrity: sha512-gKeiiuQcAoRYb+QK9vyIczRrjNy8NW6ky+oyVv7raMcaizfFxeWP3TaAHPyC2pjGKfXsqN2m3YM0GbBGZfMiCg==}
+ '@hocuspocus/[email protected]':
+ resolution: {integrity: sha512-2BNBLnDEQq2v3uQSidBSdUOIbHhH383SGxn+hmy6tDQfrt2hLE4MwilgDdcCO0FKOCYaJrV7HyKu6/WyzLbAOg==}
peerDependencies:
y-protocols: ^1.0.6
yjs: ^13.6.8
@@ -1827,8 +1817,8 @@ packages:
y-protocols: ^1.0.6
yjs: ^13.6.8
- '@hocuspocus/[email protected]':
- resolution: {integrity: sha512-Ju4ty4/7JtmvivcP7gKReOLf8KrFwN7Yx/5VhXYh4TRULy4kSo2fsDVUaluPp0neZa6PbVhizJuzlOim73IEbQ==}
+ '@hocuspocus/[email protected]':
+ resolution: {integrity: sha512-+fLRVswg+bkgfHqJ+wFgywivw3H08WMOtVvJF7dJzWT2ZR/Sc3nDMFh2KqMF6Ygh4z6mt23xr7SKIm3eP1zoLA==}
peerDependencies:
y-protocols: ^1.0.6
yjs: ^13.6.8
@@ -2015,8 +2005,8 @@ packages:
resolution: {integrity: sha512-jbhwoQ1AY200PSSOrNXmrFCaSDSJWP7qk6urkTmIirvRXDROkqe+QwcLlUiw/PrREwsIF/vm3/dAXvjlMHF0RA==}
- resolution: {integrity: sha512-bbH/HaJZpFtXGvWg3TsBWG4eyt3gah3E7nCNU8GLyRjVoWcA91Vm/T+sjHfUcwgJSw9iLtucfHBoq+qW/T30aA==}
+ resolution: {integrity: sha512-2B33kQf+GmPnrvXXweWAx+crbiUEsxCdCN979QDYnlH9ox4pd+0/IBriWLV+l6ORoBF60w39cWjFnJYGFdzXcw==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -3303,9 +3293,6 @@ packages:
resolution: {integrity: sha512-uug3FEEGv0r+jrecvUUpbY8lLisvIjg6AAic6a2bSP5OEOLeJsDSnvhCDov7ipFFMXS3orMpzlmi0ZcuGkBbow==}
- '@types/[email protected]':
- resolution: {integrity: sha512-OP+We5WV8Xnbuvw0zC2m4qfB/BJvjyCwtNjhHdJxV1639SGSKrLmJkc3fMnp2Qy8nJyHp8RO6umxELN/dS1/EA==}
-
resolution: {integrity: sha512-gL6z5N9Jm9mhY+U2KXZpteb+09zyffliRkZyZOHODGATyC5B1Jt/7TzuuiLkFsSUMLbS1OLmlj/E+/3KF4Q/4w==}
@@ -3752,6 +3739,10 @@ packages:
resolution: {integrity: sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==}
engines: {node: '>=12'}
+ resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+ engines: {node: '>=4'}
+
resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
engines: {node: '>=8'}
@@ -4017,6 +4008,10 @@ packages:
resolution: {integrity: sha512-48af6xm9gQK8rhIcOxWwdGzIervm8BVTin+yRp9HEvU20BtVZ2lBywlIJBzwaDtvo0FvjeL7QdCADoUoqIbV3A==}
engines: {node: '>=18'}
+ resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+ engines: {node: '>=4'}
+
resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
engines: {node: '>=8'}
@@ -4534,8 +4529,8 @@ packages:
resolution: {integrity: sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==}
- resolution: {integrity: sha512-azaJQLTshEOZVhksgU136izJWJyZ4Clx6xQ6Vctzk1gOdPPAUbTa/JYDwZJ8rh97QxnjpyeftXl99eRlYr3vNA==}
+ resolution: {integrity: sha512-6PDYZGlhidt+Kc0ay890IU4HLNfIR7/OxPvcNxw+nJ4HQhMKd8pnGnPn4n2vqC/arRFCNWQhgJP8rpsYKsz0GQ==}
engines: {node: '>=10'}
peerDependencies:
react: '>=16'
@@ -4649,6 +4644,10 @@ packages:
resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+ resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+ engines: {node: '>=0.8.0'}
+
resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
engines: {node: '>=10'}
@@ -4835,6 +4834,12 @@ packages:
resolution: {integrity: sha512-6CX17Cu+rC2Fi2CyZ4CkgVG3hLl6BFsdAxfXiZkmDFIDY4mRx2y2spdeH6dqPHI9rP+AsHEfGeKz84Uuw7+Pmg==}
engines: {node: ^v12.20.0 || >=v14.13.0}
+ resolution: {integrity: sha512-EMD74g63nVHi7pFleQw7KHCxiA1pjF5uCwbCfzGqmFxs9KvlDPIVS3cMGpULm6MshExMT9TjC3SqmRGB9kb7yw==}
+ engines: {node: '>= 6'}
+ peerDependencies:
+ winston: '>=3.x <4'
+
resolution: {integrity: sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==}
engines: {node: '>=4.5.0'}
@@ -4910,9 +4915,6 @@ packages:
resolution: {integrity: sha512-QgXo+mXTe8ljeqUFaX3QVHc5osSItJ/Km+xpocx0aSqWGMSCf6qYs/VnzZgS864Pjn5iceMRFigeAV7AfTlaig==}
engines: {node: '>= 12'}
- resolution: {integrity: sha512-u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ==}
-
resolution: {integrity: sha512-sJslQKU2uM33qH5nqewAwVB2QgR6w1aMNsYUp3aN5rMRyXEwJGmZvaWzeJFNTOXWlHQyBFCWrdj3fV/fsTOX8w==}
engines: {node: '>= 10.4.0'}
@@ -5288,8 +5290,8 @@ packages:
resolution: {integrity: sha512-P9F4Eo6zicYsIJbEy/mPJmSxKY0rVcmiy5H8oXPxPDotQRCvCBjBuI5QWoQQanVE9jdeocnum5iqYAHl4pHdLA==}
engines: {node: '>=6'}
- resolution: {integrity: sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==}
+ resolution: {integrity: sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==}
engines: {node: '>=12.22.0'}
@@ -5457,8 +5459,8 @@ packages:
resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
- resolution: {integrity: sha512-nZmoK4wKdzPs5USq4JHBiimjdKSVAOm2T1KyDoadtMPNXYHxiENd19ou4iU/V4juFM6LVgYQnpxCYmxqNP4Obw==}
+ resolution: {integrity: sha512-bcpJzu9DOjN21qaCVpcoCwUX1ytpvA6EFqCK5RNtPg5+F0Jz9PX50jl6jbEicBNeO87eDDfC7XtPs4zjDClZJg==}
engines: {node: '>=18'}
@@ -5888,9 +5890,6 @@ packages:
resolution: {integrity: sha512-aChaVU/DO5aRPmk1GX8L+whocagUUpBQqoPtJk+cm7UOXUk87J4PeWCh6nNmTTIfEhiR9DI/+FnA8dln/hTK7g==}
- resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
-
resolution: {integrity: sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==}
engines: {node: '>= 0.8.0'}
@@ -6369,8 +6368,8 @@ packages:
resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
engines: {node: ^10 || ^12 || >=14}
- resolution: {integrity: sha512-Tx6CzS8MsGAQGPrQth5TbkGxGQgAY01SktNW773/KDmVOWiRVZq/WQF/MRJRiuFxJ7qjethZQi3aBWfWKdr1RA==}
+ resolution: {integrity: sha512-KMh0o9MhORhEZVjXpktXB5rJ8PfDk+poqBoTSoLzWgNjhJf6D8jcyB9jUMA6vVPfn4YeepVX5NuclDRqOwr5Mw==}
peerDependencies:
'@rrweb/types': 2.0.0-alpha.17
rrweb-snapshot: 2.0.0-alpha.17
@@ -7799,12 +7798,6 @@ packages:
engines: {node: '>= 8'}
hasBin: true
- resolution: {integrity: sha512-JDjiXXkM5qvwY06733vf09I2wnMXpZEhxEVOSPenZMii+g7pcDcTBt2MRugnoi8BwVSuCT2jfRXBUy+n1Zz/Yw==}
- engines: {node: '>=8'}
- peerDependencies:
- winston: ^3
-
resolution: {integrity: sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==}
engines: {node: '>= 12.0.0'}
@@ -7865,8 +7858,8 @@ packages:
peerDependencies:
yjs: ^13.0.0
- resolution: {integrity: sha512-NpM99WSdD4Fx4if5xOMDpPtU3oAmTSjlzh5U4353ABbRHl1HtAFUx6HlebLZfyFxXN9jzKMDkVbcRjqOZVkYQg==}
+ resolution: {integrity: sha512-vtS2rv8+ll/TBQRqwUiqflgSuN/DhfvUQX0r5O3o5i0pO6K4pSNgFtVkOKtNWPBVkS6l9BDQjbtnDNftZnxq7Q==}
engines: {node: '>=16.0.0', npm: '>=8.0.0'}
peerDependencies:
prosemirror-model: ^1.7.1
@@ -8273,7 +8266,7 @@ snapshots:
'@emotion/[email protected]': {}
dependencies:
'@babel/runtime': 7.26.10
'@emotion/babel-plugin': 11.13.5
@@ -8463,27 +8456,27 @@ snapshots:
dependencies:
lib0: 0.2.114
dependencies:
- '@hocuspocus/server': 2.15.3([email protected]([email protected]))([email protected])
+ '@hocuspocus/server': 2.15.2([email protected]([email protected]))([email protected])
yjs: 13.6.27
transitivePeerDependencies:
- bufferutil
- utf-8-validate
- y-protocols
dependencies:
- '@hocuspocus/server': 2.15.3([email protected]([email protected]))([email protected])
+ '@hocuspocus/server': 2.15.2([email protected]([email protected]))([email protected])
transitivePeerDependencies:
- bufferutil
- utf-8-validate
- y-protocols
- yjs
dependencies:
- '@hocuspocus/server': 2.15.3([email protected]([email protected]))([email protected])
+ '@hocuspocus/server': 2.15.2([email protected]([email protected]))([email protected])
ioredis: 4.30.0
kleur: 4.1.5
lodash.debounce: 4.0.8
@@ -8508,7 +8501,7 @@ snapshots:
- bufferutil
- utf-8-validate
dependencies:
'@hocuspocus/common': 2.15.3
async-lock: 1.4.1
@@ -8678,11 +8671,11 @@ snapshots:
'@mui/[email protected]': {}
dependencies:
'@babel/runtime': 7.26.10
'@mui/core-downloads-tracker': 5.18.0
'@mui/types': 7.2.24(@types/[email protected])
'@mui/utils': 5.17.1(@types/[email protected])([email protected])
'@popperjs/core': 2.11.8
@@ -8696,7 +8689,7 @@ snapshots:
react-transition-group: 4.4.5([email protected]([email protected]))([email protected])
optionalDependencies:
'@emotion/react': 11.14.0(@types/[email protected])([email protected])
- '@emotion/styled': 11.14.1(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])
+ '@emotion/styled': 11.14.0(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])
'@types/react': 18.3.11
@@ -8708,7 +8701,7 @@ snapshots:
optionalDependencies:
'@types/react': 18.3.11
dependencies:
'@babel/runtime': 7.26.10
'@emotion/cache': 11.14.0
@@ -8718,13 +8711,13 @@ snapshots:
react: 18.3.1
optionalDependencies:
'@emotion/react': 11.14.0(@types/[email protected])([email protected])
- '@emotion/styled': 11.14.1(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])
+ '@emotion/styled': 11.14.0(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])
dependencies:
'@babel/runtime': 7.26.10
'@mui/private-theming': 5.17.1(@types/[email protected])([email protected])
'@mui/types': 7.2.24(@types/[email protected])
'@mui/utils': 5.17.1(@types/[email protected])([email protected])
clsx: 2.1.1
@@ -8733,7 +8726,7 @@ snapshots:
react: 18.3.1
optionalDependencies:
'@emotion/react': 11.14.0(@types/[email protected])([email protected])
- '@emotion/styled': 11.14.1(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])
+ '@emotion/styled': 11.14.0(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])
'@types/react': 18.3.11
@@ -9726,11 +9719,11 @@ snapshots:
dependencies:
'@tiptap/core': 2.26.1(@tiptap/[email protected])
dependencies:
'@tiptap/core': 2.26.1(@tiptap/[email protected])
'@tiptap/pm': 2.26.1
dependencies:
@@ -10096,10 +10089,6 @@ snapshots:
dependencies:
undici-types: 6.21.0
- '@types/[email protected]':
- dependencies:
- undici-types: 6.21.0
-
dependencies:
undici-types: 6.21.0
@@ -10122,7 +10111,7 @@ snapshots:
dependencies:
- '@types/node': 20.19.4
+ '@types/node': 20.19.11
'@types/pino-pretty': 5.0.0
'@types/pino-std-serializers': 4.0.0
sonic-boom: 2.8.0
@@ -10595,6 +10584,10 @@ snapshots:
+ dependencies:
+ color-convert: 1.9.3
+
dependencies:
color-convert: 2.0.1
@@ -10893,6 +10886,12 @@ snapshots:
loupe: 3.2.0
pathval: 2.0.1
+ dependencies:
+ ansi-styles: 3.2.1
+ escape-string-regexp: 1.0.5
+ supports-color: 5.5.0
+
dependencies:
ansi-styles: 4.3.0
@@ -11405,7 +11404,7 @@ snapshots:
dependencies:
batch-processor: 1.0.0
dependencies:
flairup: 1.0.0
react: 18.3.1
@@ -11597,6 +11596,8 @@ snapshots:
+
@@ -11851,6 +11852,12 @@ snapshots:
+ dependencies:
+ chalk: 2.4.2
+ lodash: 4.17.21
+ winston: 3.17.0
+
dependencies:
express: 4.21.2
@@ -11947,10 +11954,6 @@ snapshots:
dependencies:
tslib: 2.8.1
- dependencies:
- moment: 2.30.1
-
@@ -12369,7 +12372,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@ioredis/commands': 1.3.0
cluster-key-slot: 1.1.2
@@ -12535,7 +12538,7 @@ snapshots:
dependencies:
dompurify: 3.2.6
jsdom: 26.1.0
@@ -12574,7 +12577,7 @@ snapshots:
dependencies:
- '@types/node': 20.19.4
+ '@types/node': 20.19.11
merge-stream: 2.0.0
supports-color: 8.1.1
@@ -13047,8 +13050,6 @@ snapshots:
-
dependencies:
basic-auth: 2.0.1
@@ -13535,7 +13536,7 @@ snapshots:
picocolors: 1.1.1
source-map-js: 1.2.1
dependencies:
core-js: 3.45.0
fflate: 0.4.8
@@ -15230,14 +15231,6 @@ snapshots:
dependencies:
isexe: 2.0.0
- dependencies:
- file-stream-rotator: 0.6.1
- object-hash: 3.0.0
- triple-beam: 1.4.1
- winston: 3.17.0
- winston-transport: 4.9.0
-
dependencies:
logform: 2.7.0
@@ -15287,7 +15280,7 @@ snapshots:
lib0: 0.2.114
yjs: 13.6.27
dependencies:
lib0: 0.2.114
prosemirror-model: 1.25.3