From afb39185713617b286d1f952dbf45f66e3f44c71 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 13:30:46 +0300 Subject: [PATCH 01/78] refactor(server): switch to esbuild --- apps/server/package.json | 53 +++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index fbc9d50a5..3139c40be 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -105,21 +105,13 @@ "tmp": "0.2.3", "turndown": "7.2.0", "unescape": "1.0.1", - "webpack": "5.99.9", "ws": "8.18.2", "xml2js": "0.6.2", - "yauzl": "3.2.0", - "copy-webpack-plugin": "13.0.0" + "yauzl": "3.2.0" }, "nx": { "name": "server", "targets": { - "build": { - "dependsOn": [ - "^build", - "client:build" - ] - }, "serve": { "executor": "@nx/js:node", "defaultConfiguration": "development", @@ -183,7 +175,46 @@ "command": "docker run -p 8081:8080 triliumnext-alpine" } } + }, + "build": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], + "defaultConfiguration": "production", + "options": { + "main": "apps/server/src/main.ts", + "outputPath": "apps/server/dist", + "outputFileName": "main.js", + "tsConfig": "apps/server/tsconfig.app.json", + "platform": "node", + "format": [ + "esm" + ], + "declarationRootDir": "apps/server/src" + }, + "configurations": { + "development": { + "minify": false + }, + "production": { + "minify": true + } + } } } - } -} \ No newline at end of file + }, + "exports": { + "./package.json": "./package.json", + ".": { + "development": "./src/main.ts", + "types": "./dist/main.d.ts", + "import": "./dist/main.js", + "default": "./dist/main.js" + } + }, + "types": "./dist/main.d.ts", + "module": "./dist/main.js", + "type": "module", + "main": "./dist/main.js" +} From 827a8fc1b4fbc37b8e9334328d8fa725470a040f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 13:31:07 +0300 Subject: [PATCH 02/78] refactor(server): solve some build type errors --- apps/server/tsconfig.app.json | 1 + apps/server/webpack.config.cjs | 69 ---------------------------------- tsconfig.base.json | 2 +- 3 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 apps/server/webpack.config.cjs diff --git a/apps/server/tsconfig.app.json b/apps/server/tsconfig.app.json index 591b4a5db..e5ff1c88f 100644 --- a/apps/server/tsconfig.app.json +++ b/apps/server/tsconfig.app.json @@ -5,6 +5,7 @@ "moduleResolution": "bundler", "target": "ES2020", "outDir": "dist", + "strict": false, "types": [ "node", "express" diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs deleted file mode 100644 index 6a5d7a05c..000000000 --- a/apps/server/webpack.config.cjs +++ /dev/null @@ -1,69 +0,0 @@ -const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin'); -const CopyPlugin = require('copy-webpack-plugin'); -const { join } = require('path'); - -const outputDir = join(__dirname, 'dist'); - -function buildFilesToCopy() { - const files = []; - - files.push({ - from: "../client/dist", - to: join(outputDir, "public") - }); - - const nodePaths = [ - // Required as they are native dependencies and cannot be well bundled. - "better-sqlite3", - "bindings", - "file-uri-to-path" - ]; - - for (const nodePath of nodePaths) { - files.push({ - from: join("node_modules", nodePath), - to: join(outputDir, "node_modules", nodePath) - }) - } - - return files; -} - -module.exports = { - output: { - path: outputDir - }, - module: { - rules: [ - { - test: /\.css$/i, - type: "asset/source" - } - ] - }, - plugins: [ - new NxAppWebpackPlugin({ - target: 'node', - compiler: 'tsc', - main: './src/main.ts', - tsConfig: './tsconfig.app.json', - assets: ["./src/assets"], - optimization: false, - outputHashing: 'none', - generatePackageJson: true, - additionalEntryPoints: [ - "./src/docker_healthcheck.ts" - ], - externalDependencies: [ - "electron/main", - "@electron/remote/main", - "electron", - "@electron/remote", - "better-sqlite3" - ] - }), - new CopyPlugin({ - patterns: buildFilesToCopy() - }) - ] -}; diff --git a/tsconfig.base.json b/tsconfig.base.json index 8b3d9492f..87eba8adc 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -10,7 +10,7 @@ "moduleResolution": "nodenext", "noEmitOnError": true, "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, + "noImplicitAny": false, // TODO: Re-enable it at some point. "noImplicitOverride": false, // TODO: Re-enable it at some point. "noImplicitReturns": false, // TODO: Re-enable it at some point. "noUnusedLocals": false, // TODO: Re-enable it at some point. From 4acdad0a2b5d813c4cd74134de821555023f1297 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 15:19:13 +0300 Subject: [PATCH 03/78] feat(vscode): report project-level errors --- .vscode/settings.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 60b3455da..86eca8e3a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -24,5 +24,7 @@ }, "github-actions.workflows.pinned.workflows": [ ".github/workflows/nightly.yml" - ] + ], + "typescript.validate.enable": true, + "typescript.tsserver.experimental.enableProjectDiagnostics": true } \ No newline at end of file From b9df7073691b1d06932ab41982339787e15605b6 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 15:34:16 +0300 Subject: [PATCH 04/78] refactor(server): type errors due to change in API --- apps/server/src/services/backend_script_api.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/server/src/services/backend_script_api.ts b/apps/server/src/services/backend_script_api.ts index 2f3a68029..2d69ee608 100644 --- a/apps/server/src/services/backend_script_api.ts +++ b/apps/server/src/services/backend_script_api.ts @@ -224,14 +224,14 @@ export interface Api { * @param date in YYYY-MM-DD format * @param rootNote - specify calendar root note, normally leave empty to use the default calendar */ - getDayNote(date: string, rootNote?: BNote): Promise; + getDayNote(date: string, rootNote?: BNote): BNote | null; /** * Returns today's day note. If such note doesn't exist, it is created. * * @param rootNote specify calendar root note, normally leave empty to use the default calendar */ - getTodayNote(rootNote?: BNote): Promise; + getTodayNote(rootNote?: BNote): BNote | null; /** * Returns note for the first date of the week of the given date. @@ -239,7 +239,7 @@ export interface Api { * @param date in YYYY-MM-DD format * @param rootNote - specify calendar root note, normally leave empty to use the default calendar */ - getWeekFirstDayNote(date: string, rootNote: BNote): Promise; + getWeekFirstDayNote(date: string, rootNote: BNote): BNote | null; /** * Returns week note for given date. If such a note doesn't exist, it is created. @@ -247,7 +247,7 @@ export interface Api { * @param date in YYYY-MM-DD format * @param rootNote - specify calendar root note, normally leave empty to use the default calendar */ - getWeekNote(date: string, rootNote: BNote): Promise; + getWeekNote(date: string, rootNote: BNote): BNote | null; /** * Returns month note for given date. If such a note doesn't exist, it is created. @@ -255,7 +255,7 @@ export interface Api { * @param date in YYYY-MM format * @param rootNote - specify calendar root note, normally leave empty to use the default calendar */ - getMonthNote(date: string, rootNote: BNote): Promise; + getMonthNote(date: string, rootNote: BNote): BNote | null; /** * Returns quarter note for given date. If such a note doesn't exist, it is created. @@ -263,7 +263,7 @@ export interface Api { * @param date in YYYY-MM format * @param rootNote - specify calendar root note, normally leave empty to use the default calendar */ - getQuarterNote(date: string, rootNote: BNote): Promise; + getQuarterNote(date: string, rootNote: BNote): BNote | null; /** * Returns year note for given year. If such a note doesn't exist, it is created. From 7aaa94d01bcb751346eb4aa3eda09126f3c17b84 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 15:34:31 +0300 Subject: [PATCH 05/78] refactor(server): missing exports causing hidden types --- apps/server/src/services/tree.ts | 2 +- apps/server/src/services/utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/server/src/services/tree.ts b/apps/server/src/services/tree.ts index 9b695cd69..71f432395 100644 --- a/apps/server/src/services/tree.ts +++ b/apps/server/src/services/tree.ts @@ -7,7 +7,7 @@ import entityChangesService from "./entity_changes.js"; import becca from "../becca/becca.js"; import type BNote from "../becca/entities/bnote.js"; -interface ValidationResponse { +export interface ValidationResponse { branch: BBranch | null; success: boolean; message?: string; diff --git a/apps/server/src/services/utils.ts b/apps/server/src/services/utils.ts index 3ec2e1c62..2ef921f35 100644 --- a/apps/server/src/services/utils.ts +++ b/apps/server/src/services/utils.ts @@ -226,7 +226,7 @@ export function timeLimit(promise: Promise, limitMs: number, errorMessage? }); } -interface DeferredPromise extends Promise { +export interface DeferredPromise extends Promise { resolve: (value: T | PromiseLike) => void; reject: (reason?: any) => void; } From 6414dd71aba1048b0751c823fba9ade1d4ced26e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 15:42:35 +0300 Subject: [PATCH 06/78] refactor(server): more unaccessible types --- apps/server/src/becca/similarity.ts | 2 +- apps/server/src/services/llm/context_extractors/index.ts | 2 +- apps/server/src/services/llm/index_service.ts | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/server/src/becca/similarity.ts b/apps/server/src/becca/similarity.ts index 5b031df35..8f4bdf0ff 100644 --- a/apps/server/src/becca/similarity.ts +++ b/apps/server/src/becca/similarity.ts @@ -36,7 +36,7 @@ interface DateLimits { maxDate: string; } -interface SimilarNote { +export interface SimilarNote { score: number; notePath: string[]; noteId: string; diff --git a/apps/server/src/services/llm/context_extractors/index.ts b/apps/server/src/services/llm/context_extractors/index.ts index bbb0861ea..f6cd07b28 100644 --- a/apps/server/src/services/llm/context_extractors/index.ts +++ b/apps/server/src/services/llm/context_extractors/index.ts @@ -26,7 +26,7 @@ import type { * * Manages and provides access to all available agent tools. */ -class AgentToolsManager { +export class AgentToolsManager { private vectorSearchTool: VectorSearchTool | null = null; private noteNavigatorTool: NoteNavigatorTool | null = null; private queryDecompositionTool: QueryDecompositionTool | null = null; diff --git a/apps/server/src/services/llm/index_service.ts b/apps/server/src/services/llm/index_service.ts index 7006a13b1..18eb17b79 100644 --- a/apps/server/src/services/llm/index_service.ts +++ b/apps/server/src/services/llm/index_service.ts @@ -16,14 +16,12 @@ import vectorStore from "./embeddings/index.js"; import providerManager from "./providers/providers.js"; import { ContextExtractor } from "./context/index.js"; import eventService from "../events.js"; -import type { NoteEmbeddingContext } from "./embeddings/embeddings_interface.js"; -import type { OptionDefinitions } from "@triliumnext/commons"; import sql from "../sql.js"; import sqlInit from "../sql_init.js"; import { CONTEXT_PROMPTS } from './constants/llm_prompt_constants.js'; import { SEARCH_CONSTANTS } from './constants/search_constants.js'; -class IndexService { +export class IndexService { private initialized = false; private indexingInProgress = false; private contextExtractor = new ContextExtractor(); From de83029c3a7c652341e5ef63105938d4b659583c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 15:42:53 +0300 Subject: [PATCH 07/78] refactor(server): various type errors --- apps/server/src/etapi/etapi_utils.ts | 2 +- apps/server/src/routes/electron.ts | 2 +- apps/server/src/services/request.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/server/src/etapi/etapi_utils.ts b/apps/server/src/etapi/etapi_utils.ts index ce5a840a9..e4f40c927 100644 --- a/apps/server/src/etapi/etapi_utils.ts +++ b/apps/server/src/etapi/etapi_utils.ts @@ -6,7 +6,7 @@ import etapiTokenService from "../services/etapi_tokens.js"; import config from "../services/config.js"; import type { NextFunction, Request, RequestHandler, Response, Router } from "express"; import type { ValidatorMap } from "./etapi-interface.js"; -import type { ApiRequestHandler } from "../routes/routes.js"; +import type { ApiRequestHandler } from "../routes/route_api.js"; const GENERIC_CODE = "GENERIC"; type HttpMethod = "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head"; diff --git a/apps/server/src/routes/electron.ts b/apps/server/src/routes/electron.ts index eac07e171..6990bab79 100644 --- a/apps/server/src/routes/electron.ts +++ b/apps/server/src/routes/electron.ts @@ -50,7 +50,7 @@ function init(app: Express.Application) { } }; - return app._router.handle(req, res, () => {}); + return (app as any)._router.handle(req, res, () => {}); }); } diff --git a/apps/server/src/services/request.ts b/apps/server/src/services/request.ts index 46d2c75e3..688c61753 100644 --- a/apps/server/src/services/request.ts +++ b/apps/server/src/services/request.ts @@ -207,7 +207,7 @@ async function getClient(opts: ClientOpts): Promise { // it's not clear how to explicitly configure proxy (as opposed to system proxy), // so in that case, we always use node's modules if (isElectron && !opts.proxy) { - return (await import("electron")).net as Client; + return (await import("electron")).net as unknown as Client; } else { const { protocol } = url.parse(opts.url); From 0a56587c754ae923c4c8d7f5f18d99cd4b7389a0 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 15:43:02 +0300 Subject: [PATCH 08/78] fix(server): import issue for share template --- apps/server/src/share/routes.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/server/src/share/routes.ts b/apps/server/src/share/routes.ts index 764860c72..ee36621ed 100644 --- a/apps/server/src/share/routes.ts +++ b/apps/server/src/share/routes.ts @@ -195,9 +195,11 @@ function register(router: Router) { try { const content = templateNote.getContent(); if (typeof content === "string") { - const ejsResult = ejs.render(content, opts, { includer }); - res.send(ejsResult); - useDefaultView = false; // Rendering went okay, don't use default view + import("ejs").then((ejs) => { + const ejsResult = ejs.render(content, opts, { includer }); + res.send(ejsResult); + useDefaultView = false; // Rendering went okay, don't use default view + }); } } catch (e: unknown) { const [errMessage, errStack] = safeExtractMessageAndStackFromError(e); From d8cb933b2be3712352374abe524f123caa7f3fb5 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 15:57:31 +0300 Subject: [PATCH 09/78] refactor(serve): enforce same version of express-serve-static-core typings --- pnpm-lock.yaml | 241 +++++++++++++++++++++----------------------- pnpm-workspace.yaml | 1 + 2 files changed, 114 insertions(+), 128 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92c4308f4..52e5b1553 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,7 @@ settings: overrides: node-abi: 4.8.0 + '@types/express-serve-static-core': 5.0.6 patchedDependencies: '@ckeditor/ckeditor5-code-block': @@ -329,7 +330,7 @@ importers: version: 19.1.5(@types/react@19.1.4) copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + version: 13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) happy-dom: specifier: 17.4.7 version: 17.4.7 @@ -411,7 +412,7 @@ importers: version: 1.0.2 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + version: 13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) electron: specifier: 36.2.1 version: 36.2.1 @@ -464,7 +465,7 @@ importers: version: 11.0.4 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + version: 13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) electron: specifier: 36.2.1 version: 36.2.1 @@ -616,9 +617,6 @@ importers: cookie-parser: specifier: 1.4.7 version: 1.4.7 - copy-webpack-plugin: - specifier: 13.0.0 - version: 13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) csrf-csrf: specifier: 3.2.2 version: 3.2.2 @@ -775,9 +773,6 @@ importers: unescape: specifier: 1.0.1 version: 1.0.1 - webpack: - specifier: 5.99.9 - version: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) ws: specifier: 8.18.2 version: 8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5) @@ -829,7 +824,7 @@ importers: version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1(webpack@5.98.0)) + version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -889,7 +884,7 @@ importers: version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1(webpack@5.98.0)) + version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -949,7 +944,7 @@ importers: version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1(webpack@5.98.0)) + version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -1010,13 +1005,13 @@ importers: version: 43.0.1(@swc/helpers@0.5.17)(tslib@2.8.1)(typescript@5.8.3) '@ckeditor/ckeditor5-dev-utils': specifier: 43.0.1 - version: 43.0.1(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + version: 43.0.1(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) '@ckeditor/ckeditor5-inspector': specifier: '>=4.1.0' version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1(webpack@5.98.0)) + version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -1083,7 +1078,7 @@ importers: version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1(webpack@5.98.0)) + version: 3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -5049,9 +5044,6 @@ packages: '@types/express-http-proxy@1.6.6': resolution: {integrity: sha512-J8ZqHG76rq1UB716IZ3RCmUhg406pbWxsM3oFCFccl5xlWUPzoR4if6Og/cE4juK8emH0H9quZa5ltn6ZdmQJg==} - '@types/express-serve-static-core@4.19.6': - resolution: {integrity: sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==} - '@types/express-serve-static-core@5.0.6': resolution: {integrity: sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==} @@ -15079,11 +15071,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@ckeditor/ckeditor5-dev-translations@45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)))': + '@ckeditor/ckeditor5-dev-translations@45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1))': dependencies: '@babel/parser': 7.27.0 '@babel/traverse': 7.27.0 - '@ckeditor/ckeditor5-dev-utils': 45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + '@ckeditor/ckeditor5-dev-utils': 45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) chalk: 5.4.1 fs-extra: 11.3.0 glob: 10.4.5 @@ -15101,58 +15093,58 @@ snapshots: - uglify-js - webpack - '@ckeditor/ckeditor5-dev-utils@43.0.1(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)))': + '@ckeditor/ckeditor5-dev-utils@43.0.1(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1))': dependencies: '@ckeditor/ckeditor5-dev-translations': 43.0.1 chalk: 3.0.0 cli-cursor: 3.1.0 cli-spinners: 2.9.2 - css-loader: 5.2.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + css-loader: 5.2.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) cssnano: 6.1.2(postcss@8.5.3) del: 5.1.0 - esbuild-loader: 3.0.1(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + esbuild-loader: 3.0.1(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) fs-extra: 11.3.0 is-interactive: 1.0.0 javascript-stringify: 1.6.0 - mini-css-extract-plugin: 2.4.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + mini-css-extract-plugin: 2.4.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) mocha: 7.2.0 postcss: 8.5.3 postcss-import: 14.1.0(postcss@8.5.3) - postcss-loader: 4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + postcss-loader: 4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) postcss-mixins: 9.0.4(postcss@8.5.3) postcss-nesting: 13.0.1(postcss@8.5.3) - raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) shelljs: 0.8.5 - style-loader: 2.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) - terser-webpack-plugin: 4.2.3(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + style-loader: 2.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + terser-webpack-plugin: 4.2.3(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) through2: 3.0.2 transitivePeerDependencies: - bluebird - supports-color - webpack - '@ckeditor/ckeditor5-dev-utils@45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)))': + '@ckeditor/ckeditor5-dev-utils@45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1))': dependencies: - '@ckeditor/ckeditor5-dev-translations': 45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + '@ckeditor/ckeditor5-dev-translations': 45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) chalk: 5.4.1 cli-cursor: 5.0.0 cli-spinners: 3.2.0 - css-loader: 7.1.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + css-loader: 7.1.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) cssnano: 7.0.6(postcss@8.5.3) - esbuild-loader: 4.3.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + esbuild-loader: 4.3.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) fs-extra: 11.3.0 is-interactive: 2.0.0 - mini-css-extract-plugin: 2.4.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + mini-css-extract-plugin: 2.4.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) mocha: 10.8.2 postcss: 8.5.3 postcss-import: 16.1.0(postcss@8.5.3) - postcss-loader: 8.1.1(postcss@8.5.3)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + postcss-loader: 8.1.1(postcss@8.5.3)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) postcss-mixins: 11.0.3(postcss@8.5.3) postcss-nesting: 13.0.1(postcss@8.5.3) - raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) shelljs: 0.8.5 - style-loader: 4.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) - terser-webpack-plugin: 5.3.14(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + style-loader: 4.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + terser-webpack-plugin: 5.3.14(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) through2: 4.0.2 transitivePeerDependencies: - '@rspack/core' @@ -15433,29 +15425,29 @@ snapshots: '@ckeditor/ckeditor5-utils': 45.1.0 ckeditor5: 45.1.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) - '@ckeditor/ckeditor5-package-tools@3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1(webpack@5.98.0))': + '@ckeditor/ckeditor5-package-tools@3.0.1(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)': dependencies: - '@ckeditor/ckeditor5-dev-translations': 45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) - '@ckeditor/ckeditor5-dev-utils': 45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + '@ckeditor/ckeditor5-dev-translations': 45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + '@ckeditor/ckeditor5-dev-utils': 45.0.10(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) buffer: 6.0.3 chalk: 5.4.1 - css-loader: 5.2.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + css-loader: 5.2.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) fs-extra: 11.3.0 glob: 7.2.3 minimist: 1.2.8 postcss: 8.5.3 - postcss-loader: 4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + postcss-loader: 4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) process: 0.11.10 - raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) - style-loader: 2.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + style-loader: 2.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) stylelint: 16.19.1(typescript@5.0.4) stylelint-config-ckeditor5: 2.0.1(stylelint@16.19.1(typescript@5.8.3)) - terser-webpack-plugin: 5.3.14(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) - ts-loader: 9.5.2(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + terser-webpack-plugin: 5.3.14(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + ts-loader: 9.5.2(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) ts-node: 10.9.2(@swc/core@1.11.24(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.0.4) typescript: 5.0.4 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) - webpack-dev-server: 5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1(webpack@5.98.0))(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack-dev-server: 5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) transitivePeerDependencies: - '@rspack/core' - '@swc/core' @@ -18972,13 +18964,6 @@ snapshots: dependencies: '@types/express': 5.0.2 - '@types/express-serve-static-core@4.19.6': - dependencies: - '@types/node': 22.15.21 - '@types/qs': 6.14.0 - '@types/range-parser': 1.2.7 - '@types/send': 0.17.4 - '@types/express-serve-static-core@5.0.6': dependencies: '@types/node': 22.15.21 @@ -18993,7 +18978,7 @@ snapshots: '@types/express@4.17.22': dependencies: '@types/body-parser': 1.19.5 - '@types/express-serve-static-core': 4.19.6 + '@types/express-serve-static-core': 5.0.6 '@types/qs': 6.14.0 '@types/serve-static': 1.15.7 @@ -20990,14 +20975,14 @@ snapshots: serialize-javascript: 6.0.2 webpack: 5.98.0(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - copy-webpack-plugin@13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + copy-webpack-plugin@13.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: glob-parent: 6.0.2 normalize-path: 3.0.0 schema-utils: 4.3.2 serialize-javascript: 6.0.2 tinyglobby: 0.2.13 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) core-js-compat@3.41.0: dependencies: @@ -21105,7 +21090,7 @@ snapshots: css-functions-list@3.2.3: {} - css-loader@5.2.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + css-loader@5.2.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: icss-utils: 5.1.0(postcss@8.5.3) loader-utils: 2.0.4 @@ -21117,7 +21102,7 @@ snapshots: postcss-value-parser: 4.2.0 schema-utils: 3.3.0 semver: 7.7.2 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) css-loader@6.11.0(webpack@5.98.0): dependencies: @@ -21132,7 +21117,7 @@ snapshots: optionalDependencies: webpack: 5.98.0(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - css-loader@7.1.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + css-loader@7.1.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: icss-utils: 5.1.0(postcss@8.5.3) postcss: 8.5.3 @@ -21143,7 +21128,7 @@ snapshots: postcss-value-parser: 4.2.0 semver: 7.7.2 optionalDependencies: - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) css-minimizer-webpack-plugin@5.0.1(esbuild@0.25.4)(webpack@5.98.0): dependencies: @@ -22185,20 +22170,20 @@ snapshots: es6-promise@4.2.8: {} - esbuild-loader@3.0.1(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + esbuild-loader@3.0.1(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: esbuild: 0.17.19 get-tsconfig: 4.10.0 loader-utils: 2.0.4 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) webpack-sources: 1.4.3 - esbuild-loader@4.3.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + esbuild-loader@4.3.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: esbuild: 0.25.3 get-tsconfig: 4.10.0 loader-utils: 2.0.4 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) webpack-sources: 1.4.3 esbuild@0.17.19: @@ -25134,10 +25119,10 @@ snapshots: schema-utils: 4.3.2 webpack: 5.98.0(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - mini-css-extract-plugin@2.4.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + mini-css-extract-plugin@2.4.7(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: schema-utils: 4.3.2 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) minimalistic-assert@1.0.1: {} @@ -26236,7 +26221,7 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.5.3 - postcss-loader@4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + postcss-loader@4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: cosmiconfig: 7.1.0 klona: 2.0.6 @@ -26244,7 +26229,7 @@ snapshots: postcss: 8.5.3 schema-utils: 3.3.0 semver: 7.7.2 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) postcss-loader@6.2.1(postcss@8.5.3)(webpack@5.98.0): dependencies: @@ -26254,14 +26239,14 @@ snapshots: semver: 7.7.2 webpack: 5.98.0(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - postcss-loader@8.1.1(postcss@8.5.3)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + postcss-loader@8.1.1(postcss@8.5.3)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: cosmiconfig: 9.0.0(typescript@5.0.4) jiti: 1.21.7 postcss: 8.5.3 semver: 7.7.2 optionalDependencies: - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) transitivePeerDependencies: - typescript @@ -26835,11 +26820,11 @@ snapshots: raw-loader@0.5.1: {} - raw-loader@4.0.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + raw-loader@4.0.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) rc@1.2.8: dependencies: @@ -27972,19 +27957,19 @@ snapshots: '@tokenizer/token': 0.3.0 peek-readable: 5.4.2 - style-loader@2.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + style-loader@2.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) style-loader@3.3.4(webpack@5.98.0): dependencies: webpack: 5.98.0(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - style-loader@4.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + style-loader@4.0.0(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) style-mod@4.1.2: {} @@ -28345,7 +28330,7 @@ snapshots: rimraf: 2.6.3 optional: true - terser-webpack-plugin@4.2.3(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + terser-webpack-plugin@4.2.3(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: cacache: 15.3.0 find-cache-dir: 3.3.2 @@ -28355,7 +28340,7 @@ snapshots: serialize-javascript: 5.0.1 source-map: 0.6.1 terser: 5.39.0 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) webpack-sources: 1.4.3 transitivePeerDependencies: - bluebird @@ -28372,14 +28357,14 @@ snapshots: '@swc/core': 1.11.24(@swc/helpers@0.5.17) esbuild: 0.25.4 - terser-webpack-plugin@5.3.14(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + terser-webpack-plugin@5.3.14(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.2 serialize-javascript: 6.0.2 terser: 5.39.0 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) optionalDependencies: '@swc/core': 1.11.24(@swc/helpers@0.5.17) esbuild: 0.25.4 @@ -28532,7 +28517,7 @@ snapshots: ts-dedent@2.2.0: {} - ts-loader@9.5.2(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + ts-loader@9.5.2(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: chalk: 4.1.2 enhanced-resolve: 5.18.1 @@ -28540,7 +28525,7 @@ snapshots: semver: 7.7.2 source-map: 0.7.4 typescript: 5.0.4 - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) ts-loader@9.5.2(typescript@5.8.3)(webpack@5.98.0): dependencies: @@ -29204,7 +29189,7 @@ snapshots: optionalDependencies: webpack: 5.98.0(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-dev-middleware@7.4.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): + webpack-dev-middleware@7.4.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): dependencies: colorette: 2.0.20 memfs: 4.17.0 @@ -29213,53 +29198,14 @@ snapshots: range-parser: 1.2.1 schema-utils: 4.3.2 optionalDependencies: - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) - - webpack-dev-server@5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1(webpack@5.98.0))(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))): - dependencies: - '@types/bonjour': 3.5.13 - '@types/connect-history-api-fallback': 1.5.4 - '@types/express': 4.17.22 - '@types/express-serve-static-core': 4.19.6 - '@types/serve-index': 1.9.4 - '@types/serve-static': 1.15.7 - '@types/sockjs': 0.3.36 - '@types/ws': 8.18.1 - ansi-html-community: 0.0.8 - bonjour-service: 1.3.0 - chokidar: 3.6.0 - colorette: 2.0.20 - compression: 1.8.0 - connect-history-api-fallback: 2.0.0 - express: 4.21.2 - graceful-fs: 4.2.11 - http-proxy-middleware: 2.0.9(@types/express@4.17.22) - ipaddr.js: 2.2.0 - launch-editor: 2.10.0 - open: 10.1.1 - p-retry: 6.2.1 - schema-utils: 4.3.2 - selfsigned: 2.4.1 - serve-index: 1.9.1 - sockjs: 0.3.24 - spdy: 4.0.2 - webpack-dev-middleware: 7.4.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) - ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5) - optionalDependencies: - webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)) - webpack-cli: 6.0.1(webpack@5.98.0) - transitivePeerDependencies: - - bufferutil - - debug - - supports-color - - utf-8-validate + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) webpack-dev-server@5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)(webpack@5.98.0): dependencies: '@types/bonjour': 3.5.13 '@types/connect-history-api-fallback': 1.5.4 '@types/express': 4.17.22 - '@types/express-serve-static-core': 4.19.6 + '@types/express-serve-static-core': 5.0.6 '@types/serve-index': 1.9.4 '@types/serve-static': 1.15.7 '@types/sockjs': 0.3.36 @@ -29293,6 +29239,45 @@ snapshots: - supports-color - utf-8-validate + webpack-dev-server@5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + dependencies: + '@types/bonjour': 3.5.13 + '@types/connect-history-api-fallback': 1.5.4 + '@types/express': 4.17.22 + '@types/express-serve-static-core': 5.0.6 + '@types/serve-index': 1.9.4 + '@types/serve-static': 1.15.7 + '@types/sockjs': 0.3.36 + '@types/ws': 8.18.1 + ansi-html-community: 0.0.8 + bonjour-service: 1.3.0 + chokidar: 3.6.0 + colorette: 2.0.20 + compression: 1.8.0 + connect-history-api-fallback: 2.0.0 + express: 4.21.2 + graceful-fs: 4.2.11 + http-proxy-middleware: 2.0.9(@types/express@4.17.22) + ipaddr.js: 2.2.0 + launch-editor: 2.10.0 + open: 10.1.1 + p-retry: 6.2.1 + schema-utils: 4.3.2 + selfsigned: 2.4.1 + serve-index: 1.9.1 + sockjs: 0.3.24 + spdy: 4.0.2 + webpack-dev-middleware: 7.4.2(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5) + optionalDependencies: + webpack: 5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack-cli: 6.0.1(webpack@5.98.0) + transitivePeerDependencies: + - bufferutil + - debug + - supports-color + - utf-8-validate + webpack-merge@6.0.1: dependencies: clone-deep: 4.0.1 @@ -29350,7 +29335,7 @@ snapshots: - esbuild - uglify-js - webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0)): + webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -29373,7 +29358,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 4.3.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.14(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1(webpack@5.98.0))) + terser-webpack-plugin: 5.3.14(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.24(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 339879e18..62b88dfd8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -22,6 +22,7 @@ onlyBuiltDependencies: overrides: "node-abi": 4.8.0 + "@types/express-serve-static-core": 5.0.6 shamefullyHoist: true nodeLinker: isolated From 3b6679a74415327e8253f7970dc53e2a0332668e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 16:00:57 +0300 Subject: [PATCH 10/78] refactor(serve): solve some more type errors --- apps/server/src/routes/api/note_map.ts | 2 +- apps/server/src/routes/api/notes.ts | 2 +- apps/server/src/routes/route_api.ts | 4 ++-- apps/server/src/routes/session_parser.ts | 3 ++- apps/server/src/services/script.ts | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/server/src/routes/api/note_map.ts b/apps/server/src/routes/api/note_map.ts index 684227009..f621c7b2f 100644 --- a/apps/server/src/routes/api/note_map.ts +++ b/apps/server/src/routes/api/note_map.ts @@ -116,7 +116,7 @@ function getLinkMap(req: Request) { }).notes; } - const noteIds = new Set(unfilteredNotes.filter((note) => ignoreExcludeFromNoteMap || !note.isLabelTruthy("excludeFromNoteMap")).map((note) => note.noteId)); + const noteIds = new Set(unfilteredNotes.filter((note) => ignoreExcludeFromNoteMap || !note.isLabelTruthy("excludeFromNoteMap")).map((note) => note.noteId)); if (mapRootNote.type === "search") { noteIds.delete(mapRootNote.noteId); diff --git a/apps/server/src/routes/api/notes.ts b/apps/server/src/routes/api/notes.ts index f8e152320..40a955be9 100644 --- a/apps/server/src/routes/api/notes.ts +++ b/apps/server/src/routes/api/notes.ts @@ -118,7 +118,7 @@ function createNote(req: Request) { throw new ValidationError("Missing or incorrect type for target branch ID."); } - const { note, branch } = noteService.createNewNoteWithTarget(target, targetBranchId, params); + const { note, branch } = noteService.createNewNoteWithTarget(target, String(targetBranchId), params); return { note, diff --git a/apps/server/src/routes/route_api.ts b/apps/server/src/routes/route_api.ts index c2c1ef2d7..5a4f490c8 100644 --- a/apps/server/src/routes/route_api.ts +++ b/apps/server/src/routes/route_api.ts @@ -1,4 +1,4 @@ -import express from "express"; +import express, { type RequestHandler } from "express"; import multer from "multer"; import log from "../services/log.js"; import cls from "../services/cls.js"; @@ -166,7 +166,7 @@ function handleException(e: unknown | Error, method: HttpMethod, path: string, r } -export function createUploadMiddleware() { +export function createUploadMiddleware(): RequestHandler { const multerOptions: multer.Options = { fileFilter: (req: express.Request, file, cb) => { // UTF-8 file names are not well decoded by multer/busboy, so we handle the conversion on our side. diff --git a/apps/server/src/routes/session_parser.ts b/apps/server/src/routes/session_parser.ts index b036657a2..240341ef7 100644 --- a/apps/server/src/routes/session_parser.ts +++ b/apps/server/src/routes/session_parser.ts @@ -3,6 +3,7 @@ import session, { Store } from "express-session"; import sessionSecret from "../services/session_secret.js"; import config from "../services/config.js"; import log from "../services/log.js"; +import type express from "express"; class SQLiteSessionStore extends Store { @@ -51,7 +52,7 @@ class SQLiteSessionStore extends Store { } -const sessionParser = session({ +const sessionParser: express.RequestHandler = session({ secret: sessionSecret, resave: false, // true forces the session to be saved back to the session store, even if the session was never modified during the request. saveUninitialized: false, // true forces a session that is "uninitialized" to be saved to the store. A session is uninitialized when it is new but not modified. diff --git a/apps/server/src/services/script.ts b/apps/server/src/services/script.ts index 50bbb9fd5..aedab83bf 100644 --- a/apps/server/src/services/script.ts +++ b/apps/server/src/services/script.ts @@ -5,7 +5,7 @@ import becca from "../becca/becca.js"; import type BNote from "../becca/entities/bnote.js"; import type { ApiParams } from "./backend_script_api_interface.js"; -interface Bundle { +export interface Bundle { note?: BNote; noteId?: string; script: string; From fe8b9059221b751f64a43e8fdf62cfe98c38c92e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 16:32:30 +0300 Subject: [PATCH 11/78] refactor(serve): unnecessary export causing issues with types --- apps/server/src/services/sql.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/server/src/services/sql.ts b/apps/server/src/services/sql.ts index f686b0876..0ea7cda9a 100644 --- a/apps/server/src/services/sql.ts +++ b/apps/server/src/services/sql.ts @@ -352,7 +352,6 @@ function disableSlowQueryLogging(cb: () => T) { } export default { - dbConnection, insert, replace, From 9d6758b3158cd1b0851eb9b2057c49c527fcee0c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 16:32:51 +0300 Subject: [PATCH 12/78] refactor(server); electron imports causing issues in bundle --- apps/server/src/app.ts | 2 +- apps/server/src/routes/electron.ts | 4 ++-- apps/server/src/services/tray.ts | 16 ++++++++-------- apps/server/src/services/window.ts | 24 ++++++++++++------------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index b48c7ced8..3ac3ee5c4 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -137,7 +137,7 @@ export default async function buildApp() { startScheduledCleanup(); if (utils.isElectron) { - (await import("@electron/remote/main")).initialize(); + (await import("@electron/remote/main/index.js")).initialize(); } return app; diff --git a/apps/server/src/routes/electron.ts b/apps/server/src/routes/electron.ts index 6990bab79..feb9dceae 100644 --- a/apps/server/src/routes/electron.ts +++ b/apps/server/src/routes/electron.ts @@ -1,4 +1,4 @@ -import { ipcMain } from "electron"; +import electron from "electron"; interface Response { statusCode: number; @@ -10,7 +10,7 @@ interface Response { } function init(app: Express.Application) { - ipcMain.on("server-request", (event, arg) => { + electron.ipcMain.on("server-request", (event, arg) => { const req = { url: arg.url, method: arg.method, diff --git a/apps/server/src/services/tray.ts b/apps/server/src/services/tray.ts index 0d054d9ec..0866439e3 100644 --- a/apps/server/src/services/tray.ts +++ b/apps/server/src/services/tray.ts @@ -1,7 +1,7 @@ -import { BrowserWindow, Menu, Tray, ipcMain, nativeTheme } from "electron"; +import electron from "electron"; +import type { BrowserWindow, Tray } from "electron"; import { default as i18next, t } from "i18next"; import path from "path"; -import { fileURLToPath } from "url"; import becca from "../becca/becca.js"; import becca_service from "../becca/becca_service.js"; @@ -33,7 +33,7 @@ function getTrayIconPath() { } function getIconPath(name: string) { - const suffix = !isMac && nativeTheme.shouldUseDarkColors ? "-inverted" : ""; + const suffix = !isMac && electron.nativeTheme.shouldUseDarkColors ? "-inverted" : ""; return path.resolve(path.join(getResourceDir(), "assets", "images", "tray", `${name}Template${suffix}.png`)); } @@ -216,7 +216,7 @@ function updateTrayMenu() { } - const contextMenu = Menu.buildFromTemplate([ + const contextMenu = electron.Menu.buildFromTemplate([ ...windowVisibilityMenuItems, { type: "separator" }, { @@ -255,7 +255,7 @@ function updateTrayMenu() { type: "normal", icon: getIconPath("close"), click: () => { - const windows = BrowserWindow.getAllWindows(); + const windows = electron.BrowserWindow.getAllWindows(); windows.forEach(window => { window.close(); }); @@ -287,7 +287,7 @@ function createTray() { return; } - tray = new Tray(getTrayIconPath()); + tray = new electron.Tray(getTrayIconPath()); tray.setToolTip(t("tray.tooltip")); // Restore focus tray.on("click", changeVisibility); @@ -295,9 +295,9 @@ function createTray() { if (!isMac) { // macOS uses template icons which work great on dark & light themes. - nativeTheme.on("updated", updateTrayMenu); + electron.nativeTheme.on("updated", updateTrayMenu); } - ipcMain.on("reload-tray", updateTrayMenu); + electron.ipcMain.on("reload-tray", updateTrayMenu); i18next.on("languageChanged", updateTrayMenu); } diff --git a/apps/server/src/services/window.ts b/apps/server/src/services/window.ts index 1c041be59..522d33ffc 100644 --- a/apps/server/src/services/window.ts +++ b/apps/server/src/services/window.ts @@ -7,9 +7,9 @@ import log from "./log.js"; import sqlInit from "./sql_init.js"; import cls from "./cls.js"; import keyboardActionsService from "./keyboard_actions.js"; -import * as remoteMain from "@electron/remote/main"; -import { BrowserWindow, shell, type App, type BrowserWindowConstructorOptions, type WebContents } from "electron"; -import { dialog, ipcMain } from "electron"; +import * as remoteMain from "@electron/remote/main/index.js"; +import electron from "electron"; +import type { App, BrowserWindowConstructorOptions, BrowserWindow, WebContents } from "electron"; import { formatDownloadTitle, isDev, isMac, isWindows } from "./utils.js"; import { fileURLToPath } from "url"; @@ -28,14 +28,14 @@ function trackWindowFocus(win: BrowserWindow) { allWindows = allWindows.filter(w => !w.isDestroyed() && w !== win); allWindows.push(win); if (!optionService.getOptionBool("disableTray")) { - ipcMain.emit("reload-tray"); + electron.ipcMain.emit("reload-tray"); } }); win.on("closed", () => { allWindows = allWindows.filter(w => !w.isDestroyed()); if (!optionService.getOptionBool("disableTray")) { - ipcMain.emit("reload-tray"); + electron.ipcMain.emit("reload-tray"); } }); } @@ -66,7 +66,7 @@ async function createExtraWindow(extraWindowHash: string) { trackWindowFocus(win); } -ipcMain.on("create-extra-window", (event, arg) => { +electron.ipcMain.on("create-extra-window", (event, arg) => { createExtraWindow(arg.extraWindowHash); }); @@ -76,13 +76,13 @@ interface ExportAsPdfOpts { pageSize: "A0" | "A1" | "A2" | "A3" | "A4" | "A5" | "A6" | "Legal" | "Letter" | "Tabloid" | "Ledger"; } -ipcMain.on("export-as-pdf", async (e, opts: ExportAsPdfOpts) => { - const browserWindow = BrowserWindow.fromWebContents(e.sender); +electron.ipcMain.on("export-as-pdf", async (e, opts: ExportAsPdfOpts) => { + const browserWindow = electron.BrowserWindow.fromWebContents(e.sender); if (!browserWindow) { return; } - const filePath = dialog.showSaveDialogSync(browserWindow, { + const filePath = electron.dialog.showSaveDialogSync(browserWindow, { defaultPath: formatDownloadTitle(opts.title, "file", "application/pdf"), filters: [ { @@ -111,18 +111,18 @@ ipcMain.on("export-as-pdf", async (e, opts: ExportAsPdfOpts) => { ` }); } catch (e) { - dialog.showErrorBox(t("pdf.unable-to-export-title"), t("pdf.unable-to-export-message")); + electron.dialog.showErrorBox(t("pdf.unable-to-export-title"), t("pdf.unable-to-export-message")); return; } try { await fs.writeFile(filePath, buffer); } catch (e) { - dialog.showErrorBox(t("pdf.unable-to-export-title"), t("pdf.unable-to-save-message")); + electron.dialog.showErrorBox(t("pdf.unable-to-export-title"), t("pdf.unable-to-save-message")); return; } - shell.openPath(filePath); + electron.shell.openPath(filePath); }); async function createMainWindow(app: App) { From 45c946352e014ac3ae4ede38cc819ed48b5633cd Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 17:31:40 +0300 Subject: [PATCH 13/78] refactor(express-partial-content): port to esbuild --- packages/express-partial-content/.swcrc | 22 ------------- packages/express-partial-content/package.json | 31 +++++++++++++------ 2 files changed, 22 insertions(+), 31 deletions(-) delete mode 100644 packages/express-partial-content/.swcrc diff --git a/packages/express-partial-content/.swcrc b/packages/express-partial-content/.swcrc deleted file mode 100644 index 73fa88b8d..000000000 --- a/packages/express-partial-content/.swcrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": ["jest.config.ts",".*\\.spec.tsx?$",".*\\.test.tsx?$","./src/jest-setup.ts$","./**/jest-setup.ts$",".*.js$"] -} diff --git a/packages/express-partial-content/package.json b/packages/express-partial-content/package.json index 96c49d63a..d4a78437b 100644 --- a/packages/express-partial-content/package.json +++ b/packages/express-partial-content/package.json @@ -5,16 +5,16 @@ "version": "1.1.0", "type": "module", "private": true, - "main": "./dist/index.js", - "module": "./dist/index.js", + "main": "./dist/main.js", + "module": "./dist/main.js", "types": "./dist/index.d.ts", "exports": { "./package.json": "./package.json", ".": { "development": "./src/index.ts", "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "default": "./dist/index.js" + "import": "./dist/main.js", + "default": "./dist/main.js" } }, "keywords": [ @@ -27,16 +27,29 @@ "name": "express-partial-content", "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/esbuild:esbuild", "outputs": [ "{options.outputPath}" ], + "defaultConfiguration": "production", "options": { - "outputPath": "packages/express-partial-content/dist", - "tsConfig": "packages/express-partial-content/tsconfig.lib.json", - "packageJson": "packages/express-partial-content/package.json", "main": "packages/express-partial-content/src/index.ts", - "stripLeadingPaths": true + "outputPath": "packages/express-partial-content/dist", + "outputFileName": "main.js", + "tsConfig": "packages/express-partial-content/tsconfig.lib.json", + "platform": "node", + "format": [ + "esm" + ], + "declarationRootDir": "packages/express-partial-content/src" + }, + "configurations": { + "development": { + "minify": false + }, + "production": { + "minify": true + } } } } From b59af770c2432c3c3ec498b35b0f29b11b82439c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 18:06:09 +0300 Subject: [PATCH 14/78] fix(server): server not starting due to dependency on electron remote --- apps/server/src/services/window.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/server/src/services/window.ts b/apps/server/src/services/window.ts index 522d33ffc..b62240be9 100644 --- a/apps/server/src/services/window.ts +++ b/apps/server/src/services/window.ts @@ -7,7 +7,6 @@ import log from "./log.js"; import sqlInit from "./sql_init.js"; import cls from "./cls.js"; import keyboardActionsService from "./keyboard_actions.js"; -import * as remoteMain from "@electron/remote/main/index.js"; import electron from "electron"; import type { App, BrowserWindowConstructorOptions, BrowserWindow, WebContents } from "electron"; import { formatDownloadTitle, isDev, isMac, isWindows } from "./utils.js"; @@ -226,7 +225,8 @@ function getWindowExtraOpts() { return extraOpts; } -function configureWebContents(webContents: WebContents, spellcheckEnabled: boolean) { +async function configureWebContents(webContents: WebContents, spellcheckEnabled: boolean) { + const remoteMain = (await import("@electron/remote/main/index.js")).default; remoteMain.enable(webContents); webContents.setWindowOpenHandler((details) => { From 4d8b9a6035eb09a202f2f04e2159a421e5c00ef8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 18:20:02 +0300 Subject: [PATCH 15/78] fix(server): copying of assets --- apps/server/package.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/server/package.json b/apps/server/package.json index 3139c40be..c676f0f1c 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -188,6 +188,13 @@ "outputFileName": "main.js", "tsConfig": "apps/server/tsconfig.app.json", "platform": "node", + "assets": [ + { + "glob": "**/*", + "input": "apps/server/src/assets", + "output": "assets" + } + ], "format": [ "esm" ], From 6c25471f91e593395d23c68e66a1121a13aaebc7 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 18:20:17 +0300 Subject: [PATCH 16/78] fix(server): resource dir for serve mode --- apps/server/.serve.env | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/server/.serve.env b/apps/server/.serve.env index 5006a3765..43591d92c 100644 --- a/apps/server/.serve.env +++ b/apps/server/.serve.env @@ -1,3 +1,4 @@ TRILIUM_ENV=dev TRILIUM_DATA_DIR=./apps/server/data +TRILIUM_RESOURCE_DIR=./apps/server/dist TRILIUM_PUBLIC_SERVER=http://localhost:4200 \ No newline at end of file From dc0409e5a886b561b7b16caf672ad2c47a5b34f4 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 18:20:25 +0300 Subject: [PATCH 17/78] chore(nx): sync tsconfig --- apps/edit-docs/tsconfig.app.json | 3 --- apps/edit-docs/tsconfig.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/apps/edit-docs/tsconfig.app.json b/apps/edit-docs/tsconfig.app.json index 2479661aa..a232431d0 100644 --- a/apps/edit-docs/tsconfig.app.json +++ b/apps/edit-docs/tsconfig.app.json @@ -18,9 +18,6 @@ "eslint.config.mjs" ], "references": [ - { - "path": "../server/tsconfig.app.json" - }, { "path": "../desktop/tsconfig.app.json" }, diff --git a/apps/edit-docs/tsconfig.json b/apps/edit-docs/tsconfig.json index de6607550..56baa3f4e 100644 --- a/apps/edit-docs/tsconfig.json +++ b/apps/edit-docs/tsconfig.json @@ -3,9 +3,6 @@ "files": [], "include": [], "references": [ - { - "path": "../server" - }, { "path": "../desktop" }, From 8cf4040ca0613b4dd61fa5a0f85c047813cc0c97 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 22:44:40 +0300 Subject: [PATCH 18/78] fix(server/esbuild): assets not copied in prod build --- .nxignore | 6 +++++- apps/server/package.json | 30 +++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.nxignore b/.nxignore index 7290b55e6..6c71a8758 100644 --- a/.nxignore +++ b/.nxignore @@ -1,2 +1,6 @@ _regroup -_regroup_monorepo \ No newline at end of file +_regroup_monorepo + +# Asset copying respects .gitignore / .nxignore for some reason. +# See https://github.com/nrwl/nx/issues/20309 +!dist \ No newline at end of file diff --git a/apps/server/package.json b/apps/server/package.json index c676f0f1c..90d2bdedc 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -188,13 +188,6 @@ "outputFileName": "main.js", "tsConfig": "apps/server/tsconfig.app.json", "platform": "node", - "assets": [ - { - "glob": "**/*", - "input": "apps/server/src/assets", - "output": "assets" - } - ], "format": [ "esm" ], @@ -202,10 +195,29 @@ }, "configurations": { "development": { - "minify": false + "minify": false, + "assets": [ + { + "glob": "**/*", + "input": "apps/server/src/assets", + "output": "assets" + } + ] }, "production": { - "minify": true + "minify": true, + "assets": [ + { + "glob": "**/*", + "input": "apps/server/src/assets", + "output": "assets" + }, + { + "glob": "**/*", + "input": "apps/client/dist", + "output": "public" + } + ] } } } From 9a18fea073e8878d5393196177185bf72446424c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 23:31:40 +0300 Subject: [PATCH 19/78] feat(server): add safeguard if public is missing --- apps/server/src/routes/assets.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index 67167eb3b..850847a11 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -5,6 +5,7 @@ import express from "express"; import { getResourceDir, isDev } from "../services/utils.js"; import type serveStatic from "serve-static"; import proxy from "express-http-proxy"; +import { existsSync } from "fs"; const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions>>) => { if (!isDev) { @@ -29,13 +30,18 @@ async function register(app: express.Application) { proxyReqPathResolver: (req) => "/" + assetUrlFragment + `/@fs` + req.url })); } else { - app.use(`/${assetUrlFragment}/src`, persistentCacheStatic(path.join(resourceDir, "public", "src"))); - app.use(`/${assetUrlFragment}/stylesheets`, persistentCacheStatic(path.join(resourceDir, "public", "stylesheets"))); - app.use(`/${assetUrlFragment}/libraries`, persistentCacheStatic(path.join(resourceDir, "public", "libraries"))); - app.use(`/${assetUrlFragment}/fonts`, persistentCacheStatic(path.join(resourceDir, "public", "fonts"))); - app.use(`/${assetUrlFragment}/translations/`, persistentCacheStatic(path.join(resourceDir, "public", "translations"))); + const publicDir = path.join(resourceDir, "public"); + if (!existsSync(publicDir)) { + throw new Error("Public directory is missing at: " + path.resolve(publicDir)); + } + + app.use(`/${assetUrlFragment}/src`, persistentCacheStatic(path.join(publicDir, "src"))); + app.use(`/${assetUrlFragment}/stylesheets`, persistentCacheStatic(path.join(publicDir, "stylesheets"))); + app.use(`/${assetUrlFragment}/libraries`, persistentCacheStatic(path.join(publicDir, "libraries"))); + app.use(`/${assetUrlFragment}/fonts`, persistentCacheStatic(path.join(publicDir, "fonts"))); + app.use(`/${assetUrlFragment}/translations/`, persistentCacheStatic(path.join(publicDir, "translations"))); app.use(`/${assetUrlFragment}/images`, persistentCacheStatic(path.join(resourceDir, "assets", "images"))); - app.use(`/node_modules/`, persistentCacheStatic(path.join(resourceDir, "public/node_modules"))); + app.use(`/node_modules/`, persistentCacheStatic(path.join(publicDir, "node_modules"))); } app.use(`/${assetUrlFragment}/doc_notes`, persistentCacheStatic(path.join(resourceDir, "assets", "doc_notes"))); app.use(`/assets/vX/fonts`, express.static(path.join(srcRoot, "public/fonts"))); From 2f208a8302b7df69ae05c695aff21664df82e840 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 21 May 2025 23:54:18 +0300 Subject: [PATCH 20/78] refactor(db-compare): type errors --- apps/db-compare/src/sql.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/db-compare/src/sql.ts b/apps/db-compare/src/sql.ts index 9e165ceab..adb03e4eb 100644 --- a/apps/db-compare/src/sql.ts +++ b/apps/db-compare/src/sql.ts @@ -51,8 +51,8 @@ async function getMap(db: Database, query: string, params: any[] = []) { return map; } -async function getFlattenedResults(db: Database, key: string, query: string, params: any[] = []) { - const list = []; +async function getFlattenedResults(db: Database, key: string, query: string, params: any[] = []) { + const list: T[] = []; const result = await getResults(db, query, params); for (const row of result) { From 5444e6b9cb804f32fb9b37c54a9948eef4752e65 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 11:54:29 +0300 Subject: [PATCH 21/78] refactor(server): separate build config for serve --- apps/server/package.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index 90d2bdedc..3597d8797 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -116,7 +116,7 @@ "executor": "@nx/js:node", "defaultConfiguration": "development", "dependsOn": [ - "build" + "build-without-client" ], "options": { "buildTarget": "server:build", @@ -124,7 +124,7 @@ }, "configurations": { "development": { - "buildTarget": "server:build:development" + "buildTarget": "server:build-without-client" }, "production": { "buildTarget": "server:build:production" @@ -176,7 +176,7 @@ } } }, - "build": { + "build-without-client": { "executor": "@nx/esbuild:esbuild", "outputs": [ "{options.outputPath}" @@ -220,6 +220,12 @@ ] } } + }, + "build": { + "dependsOn": [ + "client:build", + "build" + ] } } }, From 3b9683d763b4eedecf9c6419d88bef45a0a4cd23 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 15:37:34 +0300 Subject: [PATCH 22/78] fix(server): unable to depend on src --- apps/server/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/server/package.json b/apps/server/package.json index f2d7a03a5..ccdc5b0d8 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -231,6 +231,7 @@ }, "exports": { "./package.json": "./package.json", + "./src/*": "./src/*", ".": { "development": "./src/main.ts", "types": "./dist/main.d.ts", From f13ec550826dc177232ba5f5e5bd37b9679c298e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 16:53:27 +0300 Subject: [PATCH 23/78] fix(server): build not depending properly --- apps/server/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/package.json b/apps/server/package.json index ccdc5b0d8..db10545dc 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -224,7 +224,7 @@ "build": { "dependsOn": [ "client:build", - "build" + "build-without-client" ] } } From dac801b3697ae401fe2613880f4da189d00f787d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 16:54:19 +0300 Subject: [PATCH 24/78] fix(server/esbuild): node_modules not copied --- .nxignore | 3 ++- apps/server/package.json | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.nxignore b/.nxignore index 6c71a8758..bac1baa0e 100644 --- a/.nxignore +++ b/.nxignore @@ -3,4 +3,5 @@ _regroup_monorepo # Asset copying respects .gitignore / .nxignore for some reason. # See https://github.com/nrwl/nx/issues/20309 -!dist \ No newline at end of file +!dist +!node_modules \ No newline at end of file diff --git a/apps/server/package.json b/apps/server/package.json index db10545dc..cd7f87396 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -216,6 +216,21 @@ "glob": "**/*", "input": "apps/client/dist", "output": "public" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/better-sqlite3", + "output": "node_modules/better-sqlite3" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/bindings", + "output": "node_modules/bindings" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/file-uri-to-path", + "output": "node_modules/file-uri-to-path" } ] } From c38061c67d5be87ba9f78740be096dbd53d5c760 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 18:32:03 +0300 Subject: [PATCH 25/78] chore(server-e2e): adjust for server timeout --- apps/server-e2e/package.json | 2 +- apps/server-e2e/playwright.config.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/server-e2e/package.json b/apps/server-e2e/package.json index d2e8b9fe5..98a27b1e6 100644 --- a/apps/server-e2e/package.json +++ b/apps/server-e2e/package.json @@ -11,7 +11,7 @@ "targets": { "e2e": { "dependsOn": [ - "server:build" + "server:start-prod" ] } } diff --git a/apps/server-e2e/playwright.config.ts b/apps/server-e2e/playwright.config.ts index 43abab319..75de90147 100644 --- a/apps/server-e2e/playwright.config.ts +++ b/apps/server-e2e/playwright.config.ts @@ -26,7 +26,8 @@ export default defineConfig({ command: 'pnpm server:start-prod', url: baseURL, reuseExistingServer: !process.env.CI, - cwd: workspaceRoot + cwd: workspaceRoot, + timeout: 5 * 60 * 1000 } : undefined, projects: [ { From 867dd70c02648a810982e98c662d2cf359aa4c29 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 19:02:53 +0300 Subject: [PATCH 26/78] fix(docker): package.json missing for rebuild --- apps/server/Dockerfile | 2 +- apps/server/Dockerfile.alpine | 2 +- apps/server/docker/package.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 apps/server/docker/package.json diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile index db60b7f88..a0dec1073 100644 --- a/apps/server/Dockerfile +++ b/apps/server/Dockerfile @@ -3,7 +3,7 @@ FROM node:22.16.0-bullseye-slim AS builder # Install native dependencies since we might be building cross-platform. WORKDIR /usr/src/app/build - COPY ./dist/package.json ./dist/pnpm-lock.yaml ./docker/pnpm-workspace.yaml /usr/src/app/ + COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ # We have to use --no-frozen-lockfile due to CKEditor patches RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild diff --git a/apps/server/Dockerfile.alpine b/apps/server/Dockerfile.alpine index 91498bf48..42f69f520 100644 --- a/apps/server/Dockerfile.alpine +++ b/apps/server/Dockerfile.alpine @@ -3,7 +3,7 @@ FROM node:22.16.0-alpine AS builder # Install native dependencies since we might be building cross-platform. WORKDIR /usr/src/app - COPY ./dist/package.json ./dist/pnpm-lock.yaml ./docker/pnpm-workspace.yaml /usr/src/app/ + COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ # We have to use --no-frozen-lockfile due to CKEditor patches RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild diff --git a/apps/server/docker/package.json b/apps/server/docker/package.json new file mode 100644 index 000000000..bd414d937 --- /dev/null +++ b/apps/server/docker/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "better-sqlite3": "11.10.0" + } +} \ No newline at end of file From f8591142317ff96305b86a1f960d06cf5d6bb093 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 21:22:35 +0300 Subject: [PATCH 27/78] fix(server/esbuild): dependencies not bundled --- apps/server/package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/server/package.json b/apps/server/package.json index cd7f87396..013ee3d1d 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -188,6 +188,10 @@ "outputFileName": "main.js", "tsConfig": "apps/server/tsconfig.app.json", "platform": "node", + "external": [ + "electron", + "@electron/remote" + ], "format": [ "esm" ], @@ -206,6 +210,7 @@ }, "production": { "minify": true, + "thirdParty": true, "assets": [ { "glob": "**/*", From b792816d005914cbfb54ac659eacacc9337c5747 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 22:36:55 +0300 Subject: [PATCH 28/78] fix(server/esbuild): enable code splitting to help with electron imports --- apps/server/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/server/package.json b/apps/server/package.json index 013ee3d1d..b5797256f 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -211,6 +211,9 @@ "production": { "minify": true, "thirdParty": true, + "esbuildOptions": { + "splitting": true + }, "assets": [ { "glob": "**/*", From 5501733498e10e343562329aa57ee838dfe12464 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 23:06:04 +0300 Subject: [PATCH 29/78] refactor(server): unnecessary usage of fs-extra --- apps/server/src/services/anonymization.ts | 2 +- apps/server/src/services/backup.ts | 2 +- apps/server/src/services/migration.ts | 2 +- apps/server/src/services/sql.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/server/src/services/anonymization.ts b/apps/server/src/services/anonymization.ts index c7c191adc..bcc614c1f 100644 --- a/apps/server/src/services/anonymization.ts +++ b/apps/server/src/services/anonymization.ts @@ -1,5 +1,5 @@ import BUILTIN_ATTRIBUTES from "./builtin_attributes.js"; -import fs from "fs-extra"; +import fs from "fs"; import dataDir from "./data_dir.js"; import dateUtils from "./date_utils.js"; import Database from "better-sqlite3"; diff --git a/apps/server/src/services/backup.ts b/apps/server/src/services/backup.ts index 6c833c4ca..59f3b71cf 100644 --- a/apps/server/src/services/backup.ts +++ b/apps/server/src/services/backup.ts @@ -2,7 +2,7 @@ import dateUtils from "./date_utils.js"; import optionService from "./options.js"; -import fs from "fs-extra"; +import fs from "fs"; import dataDir from "./data_dir.js"; import log from "./log.js"; import syncMutexService from "./sync_mutex.js"; diff --git a/apps/server/src/services/migration.ts b/apps/server/src/services/migration.ts index 3b0d3dbfd..2271b5de4 100644 --- a/apps/server/src/services/migration.ts +++ b/apps/server/src/services/migration.ts @@ -1,6 +1,6 @@ import backupService from "./backup.js"; import sql from "./sql.js"; -import fs from "fs-extra"; +import fs from "fs"; import log from "./log.js"; import { crash } from "./utils.js"; import resourceDir from "./resource_dir.js"; diff --git a/apps/server/src/services/sql.ts b/apps/server/src/services/sql.ts index 0ea7cda9a..1bbfeb348 100644 --- a/apps/server/src/services/sql.ts +++ b/apps/server/src/services/sql.ts @@ -8,7 +8,7 @@ import log from "./log.js"; import type { Statement, Database as DatabaseType, RunResult } from "better-sqlite3"; import dataDir from "./data_dir.js"; import cls from "./cls.js"; -import fs from "fs-extra"; +import fs from "fs"; import Database from "better-sqlite3"; import ws from "./ws.js"; import becca_loader from "../becca/becca_loader.js"; From 9ff22714238d781c9e7ce9ca000010f0cd0b4c48 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 22 May 2025 23:14:44 +0300 Subject: [PATCH 30/78] chore(server): disable code splitting Not supported due to dynamic requires which are not supported by esbuild. --- apps/server/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/package.json b/apps/server/package.json index b5797256f..02282c719 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -212,7 +212,7 @@ "minify": true, "thirdParty": true, "esbuildOptions": { - "splitting": true + "splitting": false }, "assets": [ { From 1abf1d3f60d5b7706fe3f35674e8c19e5ab940ae Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 11:56:45 +0300 Subject: [PATCH 31/78] chore(server/esbuild): switch to cjs to embed deps --- apps/server/package.json | 20 ++++++-------------- apps/server/src/routes/assets.ts | 3 +-- apps/server/src/services/i18n.ts | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index 02282c719..3f2d5f9ac 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -114,21 +114,12 @@ "targets": { "serve": { "executor": "@nx/js:node", - "defaultConfiguration": "development", "dependsOn": [ "build-without-client" ], "options": { - "buildTarget": "server:build", + "buildTarget": "server:build-without-client:development", "runBuildTargetDependencies": false - }, - "configurations": { - "development": { - "buildTarget": "server:build-without-client" - }, - "production": { - "buildTarget": "server:build:production" - } } }, "package": { @@ -141,7 +132,7 @@ "dependsOn": [ "build" ], - "command": "node apps/server/dist/main.js" + "command": "node apps/server/dist/main.cjs" }, "docker-build": { "dependsOn": [ @@ -190,10 +181,12 @@ "platform": "node", "external": [ "electron", - "@electron/remote" + "@electron/remote", + "better-sqlite3", + "jsdom" ], "format": [ - "esm" + "cjs" ], "declarationRootDir": "apps/server/src" }, @@ -264,6 +257,5 @@ }, "types": "./dist/main.d.ts", "module": "./dist/main.js", - "type": "module", "main": "./dist/main.js" } diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index 850847a11..710feeb7a 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -1,6 +1,5 @@ import { assetUrlFragment } from "../services/asset_path.js"; import path from "path"; -import { fileURLToPath } from "url"; import express from "express"; import { getResourceDir, isDev } from "../services/utils.js"; import type serveStatic from "serve-static"; @@ -18,7 +17,7 @@ const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOp }; async function register(app: express.Application) { - const srcRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), ".."); + const srcRoot = path.join(__dirname, ".."); const resourceDir = getResourceDir(); if (isDev) { diff --git a/apps/server/src/services/i18n.ts b/apps/server/src/services/i18n.ts index 8e033bbf4..e4488ef06 100644 --- a/apps/server/src/services/i18n.ts +++ b/apps/server/src/services/i18n.ts @@ -16,7 +16,7 @@ let dayjsLocale: string; export async function initializeTranslations() { const resourceDir = getResourceDir(); - const Backend = (await import("i18next-fs-backend")).default; + const Backend = (await import("i18next-fs-backend/cjs")).default; const locale = getCurrentLanguage(); // Initialize translations From 1a49a25a7d8108549e0c1341d2a0b4766c2b443c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 13:29:51 +0300 Subject: [PATCH 32/78] fix(docker): extension in `start-docker.sh` --- apps/server/start-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/start-docker.sh b/apps/server/start-docker.sh index 448f4950d..0de162885 100644 --- a/apps/server/start-docker.sh +++ b/apps/server/start-docker.sh @@ -4,4 +4,4 @@ [ ! -z "${USER_GID}" ] && groupmod -og ${USER_GID} node || echo "No USER_GID specified, leaving 1000" chown -R node:node /home/node -exec su -c "node ./main" node \ No newline at end of file +exec su -c "node ./main.cjs" node \ No newline at end of file From 306d75e3f3fe6db3f9deb88be66f60916930d774 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 16:39:34 +0300 Subject: [PATCH 33/78] fix(server/esbuild): runtime error due to missing jsdom --- apps/server/package.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/server/package.json b/apps/server/package.json index 3f2d5f9ac..89e4ed5da 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -183,7 +183,7 @@ "electron", "@electron/remote", "better-sqlite3", - "jsdom" + "./xhr-sync-worker.js" ], "format": [ "cjs" @@ -232,6 +232,11 @@ "glob": "**/*", "input": "apps/server/node_modules/file-uri-to-path", "output": "node_modules/file-uri-to-path" + }, + { + "glob": "xhr-sync-worker.js", + "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", + "output": "" } ] } From 60af6f582643aa847cc552543cb61ced3bd9baf0 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 17:11:24 +0300 Subject: [PATCH 34/78] fix(server/esbuild): use separate config in order to solve dependency order issue --- apps/server/package.json | 111 +++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 50 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index 89e4ed5da..e3484d30c 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -172,19 +172,12 @@ "outputs": [ "{options.outputPath}" ], - "defaultConfiguration": "production", "options": { "main": "apps/server/src/main.ts", "outputPath": "apps/server/dist", "outputFileName": "main.js", "tsConfig": "apps/server/tsconfig.app.json", "platform": "node", - "external": [ - "electron", - "@electron/remote", - "better-sqlite3", - "./xhr-sync-worker.js" - ], "format": [ "cjs" ], @@ -200,53 +193,71 @@ "output": "assets" } ] - }, - "production": { - "minify": true, - "thirdParty": true, - "esbuildOptions": { - "splitting": false - }, - "assets": [ - { - "glob": "**/*", - "input": "apps/server/src/assets", - "output": "assets" - }, - { - "glob": "**/*", - "input": "apps/client/dist", - "output": "public" - }, - { - "glob": "**/*", - "input": "apps/server/node_modules/better-sqlite3", - "output": "node_modules/better-sqlite3" - }, - { - "glob": "**/*", - "input": "apps/server/node_modules/bindings", - "output": "node_modules/bindings" - }, - { - "glob": "**/*", - "input": "apps/server/node_modules/file-uri-to-path", - "output": "node_modules/file-uri-to-path" - }, - { - "glob": "xhr-sync-worker.js", - "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", - "output": "" - } - ] } } }, "build": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], "dependsOn": [ - "client:build", - "build-without-client" - ] + "client:build" + ], + "options": { + "main": "apps/server/src/main.ts", + "outputPath": "apps/server/dist", + "outputFileName": "main.js", + "tsConfig": "apps/server/tsconfig.app.json", + "platform": "node", + "external": [ + "electron", + "@electron/remote", + "better-sqlite3", + "./xhr-sync-worker.js" + ], + "format": [ + "cjs" + ], + "declarationRootDir": "apps/server/src", + "minify": true, + "thirdParty": true, + "esbuildOptions": { + "splitting": false + }, + "assets": [ + { + "glob": "**/*", + "input": "apps/server/src/assets", + "output": "assets" + }, + { + "glob": "**/*", + "input": "apps/client/dist", + "output": "public" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/better-sqlite3", + "output": "node_modules/better-sqlite3" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/bindings", + "output": "node_modules/bindings" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/file-uri-to-path", + "output": "node_modules/file-uri-to-path" + }, + { + "glob": "xhr-sync-worker.js", + "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", + "output": "" + } + ] + } } } }, @@ -263,4 +274,4 @@ "types": "./dist/main.d.ts", "module": "./dist/main.js", "main": "./dist/main.js" -} +} \ No newline at end of file From d7f8946c98f03a3cf25f2c59ec50eb319f99e259 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 17:22:15 +0300 Subject: [PATCH 35/78] fix(server/esbuild): missing build dependencies --- apps/server/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/server/package.json b/apps/server/package.json index e3484d30c..a9adea048 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -202,6 +202,7 @@ "{options.outputPath}" ], "dependsOn": [ + "^build", "client:build" ], "options": { From 6f8bf58456aec5d5bced175d21e7f84d7a9d3760 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 17:33:57 +0300 Subject: [PATCH 36/78] chore(desktop/esbuild): convert webpack config --- apps/desktop/package.json | 42 ++++++++++++++++++- apps/desktop/tsconfig.app.json | 10 +++-- ...pack.config.cjs => webpack.config.cjs.bak} | 0 3 files changed, 48 insertions(+), 4 deletions(-) rename apps/desktop/{webpack.config.cjs => webpack.config.cjs.bak} (100%) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 71b61fcce..f7011b20f 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -44,6 +44,46 @@ "nx": { "name": "desktop", "targets": { + "build": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], + "options": { + "main": "apps/desktop/src/electron-main.ts", + "outputPath": "apps/desktop/dist", + "outputFileName": "main.js", + "tsConfig": "apps/desktop/tsconfig.app.json", + "platform": "node", + "external": [ + "electron", + "@electron/remote", + "better-sqlite3", + "./xhr-sync-worker.js" + ], + "format": [ + "cjs" + ], + "assets": [ + { + "glob": "**/*", + "input": "apps/server/dist/node_modules", + "output": "node_modules" + }, + { + "glob": "**/*", + "input": "apps/server/dist/assets", + "output": "." + }, + { + "glob": "xhr-sync-worker.js", + "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", + "output": "" + } + ], + "declarationRootDir": "apps/desktop/src" + } + }, "rebuild-deps": { "executor": "nx:run-commands", "dependsOn": [ @@ -110,4 +150,4 @@ } } } -} +} \ No newline at end of file diff --git a/apps/desktop/tsconfig.app.json b/apps/desktop/tsconfig.app.json index 8a23da03c..1c37e3a04 100644 --- a/apps/desktop/tsconfig.app.json +++ b/apps/desktop/tsconfig.app.json @@ -1,17 +1,21 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "module": "ESNext", + "moduleResolution": "bundler", + "target": "ES2020", "outDir": "dist", + "strict": false, "types": [ "node", "express" ], "rootDir": "src", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "verbatimModuleSyntax": false + "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo" }, "include": [ - "src/**/*.ts" + "src/**/*.ts", + "../server/src/*.d.ts" ], "exclude": [ "eslint.config.js", diff --git a/apps/desktop/webpack.config.cjs b/apps/desktop/webpack.config.cjs.bak similarity index 100% rename from apps/desktop/webpack.config.cjs rename to apps/desktop/webpack.config.cjs.bak From 2da3d9b1edf67c4a94a9ffb23cb870e34ecf4ca1 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 17:50:09 +0300 Subject: [PATCH 37/78] fix(desktop/esbuild): rebuild not working due to lack of package.json --- scripts/electron-rebuild.mts | 69 ++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/scripts/electron-rebuild.mts b/scripts/electron-rebuild.mts index 7c061ff9e..848a86e5f 100644 --- a/scripts/electron-rebuild.mts +++ b/scripts/electron-rebuild.mts @@ -8,23 +8,47 @@ import { join, resolve } from "path"; import { rebuild } from "@electron/rebuild" -import { readFileSync } from "fs"; +import { readFileSync, rmSync, writeFileSync } from "fs"; -function getElectronVersion(distDir: string) { - if (process.argv[3]) { - return process.argv[3]; - } +const nativeDependencies = [ + "better-sqlite3" +]; - const packageJsonPath = join(distDir, "package.json"); +function parsePackageJson(distDir: string) { + const packageJsonPath = join(distDir, "../package.json"); const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8")); + let electronVersion: string; - const electronVersion = packageJson?.devDependencies?.electron ?? packageJson?.dependencies?.electron; - if (!electronVersion) { - console.error(`Unable to retrieve Electron version in '${resolve(packageJsonPath)}'.`); - process.exit(3); + if (process.argv[3]) { + electronVersion = process.argv[3]; + } else { + electronVersion = packageJson?.devDependencies?.electron ?? packageJson?.dependencies?.electron; + if (!electronVersion) { + console.error(`Unable to retrieve Electron version in '${resolve(packageJsonPath)}'.`); + process.exit(3); + } + } + + return { + electronVersion, + dependencies: packageJson?.dependencies ?? [] + }; +} + +function createFakePackageJson(distPath: string, dependencies: Record) { + const finalDependencies = {}; + for (const dep of nativeDependencies) { + finalDependencies[dep] = dependencies[dep]; } - return electronVersion; + const fakePackageJson = { + name: "trilium", + version: "1.0.0", + main: "index.js", + dependencies: finalDependencies, + devDependencies: {}, + }; + writeFileSync(distPath, JSON.stringify(fakePackageJson, null, 2), "utf-8"); } function main() { @@ -34,16 +58,23 @@ function main() { process.exit(1); } - const electronVersion = getElectronVersion(distDir); + const { electronVersion, dependencies } = parsePackageJson(distDir); + const packageJsonPath = join(distDir, "package.json"); + createFakePackageJson(packageJsonPath, dependencies); + console.log(`Rebuilding ${distDir} with version ${electronVersion}...`); - rebuild({ - // We force the project root path to avoid electron-rebuild from rebuilding the monorepo-level dependency and breaking the server. - projectRootPath: distDir, - buildPath: distDir, - force: true, - electronVersion, - }); + try { + rebuild({ + // We force the project root path to avoid electron-rebuild from rebuilding the monorepo-level dependency and breaking the server. + projectRootPath: distDir, + buildPath: distDir, + force: true, + electronVersion, + }); + } finally { + rmSync(packageJsonPath); + } } main(); From 64b48699395d924e4be69e7283362c38bc378a31 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 17:50:28 +0300 Subject: [PATCH 38/78] fix(desktop/esbuild): assets & launch options --- apps/desktop/package.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index f7011b20f..2be5e93d8 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "Build your personal knowledge base with TriliumNext Notes", "private": true, - "main": "main.js", + "main": "main.cjs", "dependencies": { "@electron/remote": "2.1.2", "better-sqlite3": "^11.9.1", @@ -73,7 +73,12 @@ { "glob": "**/*", "input": "apps/server/dist/assets", - "output": "." + "output": "assets" + }, + { + "glob": "**/*", + "input": "apps/server/dist/public", + "output": "public" }, { "glob": "xhr-sync-worker.js", @@ -108,11 +113,11 @@ "defaultConfiguration": "default", "configurations": { "default": { - "command": "electron .", + "command": "electron main.cjs", "cwd": "{projectRoot}/dist" }, "nixos": { - "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.js\"", + "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.cjs\"", "cwd": ".", "forwardAllArgs": false } @@ -126,11 +131,11 @@ "defaultConfiguration": "default", "configurations": { "default": { - "command": "electron .", + "command": "electron main.cjs", "cwd": "{projectRoot}/dist" }, "nixos": { - "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.js\"", + "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.cjs\"", "cwd": ".", "forwardAllArgs": false } From 43d9f77518bd81dc4980792729b8589ee7d90515 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 17:56:44 +0300 Subject: [PATCH 39/78] fix(desktop/esbuild): asset path not working at runtime --- apps/server/src/services/utils.ts | 4 +--- apps/server/src/services/window.ts | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/apps/server/src/services/utils.ts b/apps/server/src/services/utils.ts index 2ef921f35..89aad1bbb 100644 --- a/apps/server/src/services/utils.ts +++ b/apps/server/src/services/utils.ts @@ -9,8 +9,6 @@ import escape from "escape-html"; import sanitize from "sanitize-filename"; import mimeTypes from "mime-types"; import path from "path"; -import { fileURLToPath } from "url"; -import { dirname, join } from "path"; import type NoteMeta from "./meta/note_meta.js"; import log from "./log.js"; import { t } from "i18next"; @@ -299,7 +297,7 @@ export function getResourceDir() { return path.dirname(process.argv[1]); } - return join(dirname(fileURLToPath(import.meta.url)), ".."); + return path.join(__dirname, ".."); } // TODO: Deduplicate with src/public/app/services/utils.ts diff --git a/apps/server/src/services/window.ts b/apps/server/src/services/window.ts index b62240be9..a803e150d 100644 --- a/apps/server/src/services/window.ts +++ b/apps/server/src/services/window.ts @@ -10,10 +10,8 @@ import keyboardActionsService from "./keyboard_actions.js"; import electron from "electron"; import type { App, BrowserWindowConstructorOptions, BrowserWindow, WebContents } from "electron"; import { formatDownloadTitle, isDev, isMac, isWindows } from "./utils.js"; - -import { fileURLToPath } from "url"; -import { dirname } from "path"; import { t } from "i18next"; +import { RESOURCE_DIR } from "./resource_dir.js"; // Prevent the window being garbage collected let mainWindow: BrowserWindow | null; @@ -259,7 +257,7 @@ async function configureWebContents(webContents: WebContents, spellcheckEnabled: } function getIcon() { - return path.join(dirname(fileURLToPath(import.meta.url)), "../../images/app-icons/png/256x256" + (isDev ? "-dev" : "") + ".png"); + return path.join(RESOURCE_DIR, "images/app-icons/png/256x256" + (isDev ? "-dev" : "") + ".png"); } async function createSetupWindow() { From 9867d1ab9fbb222c127818a7bb9aa75017ef15ce Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 22:37:16 +0300 Subject: [PATCH 40/78] fix(docker): reintroduce docker healthcheck --- apps/server/Dockerfile | 2 +- apps/server/Dockerfile.alpine | 2 +- apps/server/package.json | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile index a0dec1073..1e357f6fe 100644 --- a/apps/server/Dockerfile +++ b/apps/server/Dockerfile @@ -25,4 +25,4 @@ FROM node:22.16.0-bullseye-slim # Configure container EXPOSE 8080 CMD [ "sh", "./start-docker.sh" ] - HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.js \ No newline at end of file + HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.cjs \ No newline at end of file diff --git a/apps/server/Dockerfile.alpine b/apps/server/Dockerfile.alpine index 42f69f520..24d0dcb12 100644 --- a/apps/server/Dockerfile.alpine +++ b/apps/server/Dockerfile.alpine @@ -23,4 +23,4 @@ FROM node:22.16.0-alpine # Configure container EXPOSE 8080 CMD [ "sh", "./start-docker.sh" ] - HEALTHCHECK --start-period=10s CMD exec su-exec node node /usr/src/app/docker_healthcheck.js \ No newline at end of file + HEALTHCHECK --start-period=10s CMD exec su-exec node node /usr/src/app/docker_healthcheck.cjs \ No newline at end of file diff --git a/apps/server/package.json b/apps/server/package.json index a9adea048..3e8054e8f 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -208,7 +208,6 @@ "options": { "main": "apps/server/src/main.ts", "outputPath": "apps/server/dist", - "outputFileName": "main.js", "tsConfig": "apps/server/tsconfig.app.json", "platform": "node", "external": [ @@ -226,6 +225,9 @@ "esbuildOptions": { "splitting": false }, + "additionalEntryPoints": [ + "apps/server/src/docker_healthcheck.ts" + ], "assets": [ { "glob": "**/*", From 56dd10bd158dd4c0b18b4c28dc19508cd7c0acd0 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 23:29:54 +0300 Subject: [PATCH 41/78] fix(desktop): path to forge config --- apps/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 2be5e93d8..7670e8801 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -29,7 +29,7 @@ "prebuild-install": "^7.1.1" }, "config": { - "forge": "../electron-forge/forge.config.cjs" + "forge": "./electron-forge/forge.config.cjs" }, "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977", "scripts": { From 6a6d68a11fdcc831550724899e4b4e7f40eccb53 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 24 May 2025 02:25:51 +0000 Subject: [PATCH 42/78] chore(deps): update nx monorepo to v21.1.2 --- package.json | 24 ++--- pnpm-lock.yaml | 272 ++++++++++++++++++++++++------------------------- 2 files changed, 148 insertions(+), 148 deletions(-) diff --git a/package.json b/package.json index bc277be09..678dee4a3 100644 --- a/package.json +++ b/package.json @@ -27,17 +27,17 @@ "private": true, "devDependencies": { "@electron/rebuild": "4.0.1", - "@nx/devkit": "21.1.1", - "@nx/esbuild": "21.1.1", - "@nx/eslint": "21.1.1", - "@nx/eslint-plugin": "21.1.1", - "@nx/express": "21.1.1", - "@nx/js": "21.1.1", - "@nx/node": "21.1.1", - "@nx/playwright": "21.1.1", - "@nx/vite": "21.1.1", - "@nx/web": "21.1.1", - "@nx/webpack": "21.1.1", + "@nx/devkit": "21.1.2", + "@nx/esbuild": "21.1.2", + "@nx/eslint": "21.1.2", + "@nx/eslint-plugin": "21.1.2", + "@nx/express": "21.1.2", + "@nx/js": "21.1.2", + "@nx/node": "21.1.2", + "@nx/playwright": "21.1.2", + "@nx/vite": "21.1.2", + "@nx/web": "21.1.2", + "@nx/webpack": "21.1.2", "@playwright/test": "^1.36.0", "@svgr/webpack": "^8.0.1", "@swc-node/register": "~1.10.0", @@ -59,7 +59,7 @@ "jiti": "2.4.2", "jsdom": "~26.1.0", "jsonc-eslint-parser": "^2.1.0", - "nx": "21.1.1", + "nx": "21.1.2", "react-refresh": "^0.17.0", "swc-loader": "0.2.6", "tslib": "^2.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f18e2fc1..9ced558f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,38 +33,38 @@ importers: specifier: 4.0.1 version: 4.0.1 '@nx/devkit': - specifier: 21.1.1 - version: 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + specifier: 21.1.2 + version: 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@nx/esbuild': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@nx/eslint': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@nx/eslint-plugin': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint-config-prettier@10.1.5(eslint@9.27.0(jiti@2.4.2)))(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint-config-prettier@10.1.5(eslint@9.27.0(jiti@2.4.2)))(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3) '@nx/express': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(express@4.21.2)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(express@4.21.2)(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3) '@nx/js': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@nx/node': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3) '@nx/playwright': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@playwright/test@1.52.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@playwright/test@1.52.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3) '@nx/vite': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(sugarss@4.0.1(postcss@8.5.3))(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))(vitest@3.1.4) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(sugarss@4.0.1(postcss@8.5.3))(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))(vitest@3.1.4) '@nx/web': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@nx/webpack': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(bufferutil@4.0.9)(esbuild@0.25.4)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) + specifier: 21.1.2 + version: 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(bufferutil@4.0.9)(esbuild@0.25.4)(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) '@playwright/test': specifier: ^1.36.0 version: 1.52.0 @@ -129,8 +129,8 @@ importers: specifier: ^2.1.0 version: 2.4.0 nx: - specifier: 21.1.1 - version: 21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)) + specifier: 21.1.2 + version: 21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)) react-refresh: specifier: ^0.17.0 version: 0.17.0 @@ -3758,21 +3758,21 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} deprecated: This functionality has been moved to @npmcli/fs - '@nx/devkit@21.1.1': - resolution: {integrity: sha512-f8LgdBSTrXzB6lRjyxejmNC+fj6LqsoE2BdaJ+wTeZ0t53pdkl+ku1x2xLHdExBJ8RCWgDd7VmSHymwiUs4l2g==} + '@nx/devkit@21.1.2': + resolution: {integrity: sha512-1dgjwSsNDdp/VXydZnSfzfVwySEB3C9yjzeIw6+3+nRvZfH16a7ggZE7MF5sJTq4d+01hAgIDz3KyvGa6Jf73g==} peerDependencies: - nx: 21.1.1 + nx: 21.1.2 - '@nx/esbuild@21.1.1': - resolution: {integrity: sha512-ocTcz4ZCHdm3KpJwsnxXrV6f4JdcoYPcEmgoNjoTqhMJZCInI+PxdahVXUjgLjLzqJ68xlA5veRC2AbG1JOYhQ==} + '@nx/esbuild@21.1.2': + resolution: {integrity: sha512-6h3f8mC/5e2JxFAJaE4kLALkaoAs0nVB3aFBV+nd3+0mwywbcnMQ+dibvGCrBz2EPYlWczo43upAFEvvqpdUag==} peerDependencies: esbuild: '>=0.19.2 <1.0.0' peerDependenciesMeta: esbuild: optional: true - '@nx/eslint-plugin@21.1.1': - resolution: {integrity: sha512-jAumlFkbKa2DfQmOm3mhuVFSLP0uIH5s+XP6lPMJsMfstaYVP5z3GtaIhBF89AzBzDi3ZuKkgZTeAQKm8z2NZQ==} + '@nx/eslint-plugin@21.1.2': + resolution: {integrity: sha512-kwhwe6e8dZ0pf5CYPq4OBck15NEJrfuivCEGRTIDZWu3WDYJIw7OvhfyCdGuoZLeHGoCVRjIU6xV5hOzkD9RSw==} peerDependencies: '@typescript-eslint/parser': ^6.13.2 || ^7.0.0 || ^8.0.0 eslint-config-prettier: ^10.0.0 @@ -3780,8 +3780,8 @@ packages: eslint-config-prettier: optional: true - '@nx/eslint@21.1.1': - resolution: {integrity: sha512-BLNVQ0KJUzqUykUFcX9BSD25kmHcYTUee2WtLcCbq0xTD074bFP60pJ/qBP3cORq9NY4NouVeaELHj8Y845sTw==} + '@nx/eslint@21.1.2': + resolution: {integrity: sha512-Mp8u0RlkhxYtZ47d2ou6t8XIpRy7N/n23OzikqMro4Wt/DK1irGyShSoNIqdGdwalAE5MG1OFXspttXB+y/wOQ==} peerDependencies: '@zkochan/js-yaml': 0.0.7 eslint: ^8.0.0 || ^9.0.0 @@ -3789,100 +3789,100 @@ packages: '@zkochan/js-yaml': optional: true - '@nx/express@21.1.1': - resolution: {integrity: sha512-i5d4iVwk+2+1alOLRafMPQLQG2Mf0knDnZWHVu+SiIwTi0i6XL5msSONZtzu3Sy9KVO6cZ1uLznaGkE668jQpA==} + '@nx/express@21.1.2': + resolution: {integrity: sha512-YYulIUJY9Hm2U4qWXJXgWFvIY2Hj39jdVs8p+Tsy/LuEV1NfDu1xAZxPdedQlevEvl3+KLCrt2SJ7JVohjvk7g==} peerDependencies: express: ^4.21.2 peerDependenciesMeta: express: optional: true - '@nx/jest@21.1.1': - resolution: {integrity: sha512-5l2CAUmm3zCIX1uVCvK2fZTGoHlIiMkEV9JzLp8MT1/97G1soUVORRDxq+hkTGKhCKdhRpv7TVY8sRIr9p6Y3w==} + '@nx/jest@21.1.2': + resolution: {integrity: sha512-y4VZita9LFb6XajulRIwjMcqHU6/f73C4SNSH6IM5BYmkN68ovICmzTGvoaL7wGTaYrA4Moh/WoKwEwQWKxRPQ==} - '@nx/js@21.1.1': - resolution: {integrity: sha512-rleiV+l2fergOXh+Z63jZ+njlBBVy5RlJ4mj6BflCfBnKHk6DEtFImfCcK8OWBMBvX1pjuyd4YZWWl5dEwKH8g==} + '@nx/js@21.1.2': + resolution: {integrity: sha512-ZF6Zf4Ys+RBvH0GoQHio94C/0N07Px/trAvseMuQ8PKc0tSkXycu/EBc1uAZQvgJThR5o3diAKtIQug77pPYMQ==} peerDependencies: verdaccio: ^6.0.5 peerDependenciesMeta: verdaccio: optional: true - '@nx/node@21.1.1': - resolution: {integrity: sha512-mBW7HDaArC6snfJn1eiZveN4lkJ43uC7xmBPWQVJmWsvf9yLPTNtHAwUqroV/mMrs7DgRi8Mto1JOmAL3Y5eXA==} + '@nx/node@21.1.2': + resolution: {integrity: sha512-BCKooOKT04MJDzLy6U4w3mFWhHCsuoMXqUjcd5g/3zf4bFXOK3ooklvVkxjHUQxRXVG/uPJ+ZcgTC1SE0vpS6g==} - '@nx/nx-darwin-arm64@21.1.1': - resolution: {integrity: sha512-RgdHtT+0oMLt/I1BMd4AuXHkg5E7kqubvhaMlcWFHW+QTpvqp34MJfAz7/agX24g4JIIs9NmIOjxWGhXWPtdZQ==} + '@nx/nx-darwin-arm64@21.1.2': + resolution: {integrity: sha512-9dO32jd+h7SrvQafJph6b7Bsmp2IotTE0w7dAGb4MGBQni3JWCXaxlMMpWUZXWW1pM5uIkFJO5AASW4UOI7w2w==} cpu: [arm64] os: [darwin] - '@nx/nx-darwin-x64@21.1.1': - resolution: {integrity: sha512-u9x0sKQAAE+sD9LBrENDw2I9ZVa4rS9JFdLaqs4/4xrJUSUhrbkjN0Z29HwsqBqg6BiRal8Yu5tPqVqynXf7Jw==} + '@nx/nx-darwin-x64@21.1.2': + resolution: {integrity: sha512-5sf+4PRVg9pDVgD53NE1hoPz4lC8Ni34UovQsOrZgDvwU5mqPbIhTzVYRDH86i/086AcCvjT5tEt7rEcuRwlKw==} cpu: [x64] os: [darwin] - '@nx/nx-freebsd-x64@21.1.1': - resolution: {integrity: sha512-8j5seOU1QNpshaEqfReqRHyykXZ7rE6nkf7DWnAE90VjG8aXzxFDekwmVpn5CZtsSJczU/zi01KoaUOLg2GWJg==} + '@nx/nx-freebsd-x64@21.1.2': + resolution: {integrity: sha512-E5HR44fimXlQuAgn/tP9esmvxbzt/92AIl0PBT6L3Juh/xYiXKWhda63H4+UNT8AcLRxVXwfZrGPuGCDs+7y/Q==} cpu: [x64] os: [freebsd] - '@nx/nx-linux-arm-gnueabihf@21.1.1': - resolution: {integrity: sha512-IzaoZpFLoI+yECK++bcTn+5LGX+7F1rLPgcLfYtlWvYAiwZjHiFSB+b3eBcDGSeoODH1MEl8D07smcbcsK402g==} + '@nx/nx-linux-arm-gnueabihf@21.1.2': + resolution: {integrity: sha512-V4n6DE+r12gwJHFjZs+e2GmWYZdhpgA2DYWbsYWRYb1XQCNUg4vPzt+YFzWZ+K2o91k93EBnlLfrag7CqxUslw==} cpu: [arm] os: [linux] - '@nx/nx-linux-arm64-gnu@21.1.1': - resolution: {integrity: sha512-EhZA7JOnPa3hxInC//GxBiDHL0wMrEgcomRk8pi3T8MCvdJJIy4cDztuR0jYtWy0+j2/pr/B8CQmp0pizImc4A==} + '@nx/nx-linux-arm64-gnu@21.1.2': + resolution: {integrity: sha512-NFhsp27O+mS3r7PWLmJgyZy42WQ72c2pTQSpYfhaBbZPTI5DqBHdANa0sEPmV+ON24qkl5CZKvsmhzjsNmyW6A==} cpu: [arm64] os: [linux] - '@nx/nx-linux-arm64-musl@21.1.1': - resolution: {integrity: sha512-z8KiR04aRR6ssinLmrk5K911WUe2VlcR2xskdlyUAuDFO432Z/Xm0xVJAwZvB5kSwc3U358IF6mWNYIoY8UHug==} + '@nx/nx-linux-arm64-musl@21.1.2': + resolution: {integrity: sha512-BgS9npARwcnw+hoaRsbas6vdBAJRBAj5qSeL57LO8Dva+e/6PYqoNyVJ0BgJ98xPXDpzM/NnpeRsndQGpLyhDw==} cpu: [arm64] os: [linux] - '@nx/nx-linux-x64-gnu@21.1.1': - resolution: {integrity: sha512-l0AJGPkBA1MjswtAw0MNVjv1S9MiGdE3KNRQfj0OodTGpTIiEXZhj/XqB8bPKIsjIEo1IPAHFMMU+6vKheS7Bw==} + '@nx/nx-linux-x64-gnu@21.1.2': + resolution: {integrity: sha512-tjBINbymQgxnIlNK/m6B0P5eiGRSHSYPNkFdh3+sra80AP/ymHGLRxxZy702Ga2xg8RVr9zEvuXYHI+QBa1YmA==} cpu: [x64] os: [linux] - '@nx/nx-linux-x64-musl@21.1.1': - resolution: {integrity: sha512-fy+4cj0vqgIuINGfvYqGQpT3TEZ0pV8Hf0YyN2poH5xrHgJuRv0se9oTzdRmA9LSNbvA8HxX1/Zbkjj9FIMeuA==} + '@nx/nx-linux-x64-musl@21.1.2': + resolution: {integrity: sha512-+0V0YAOWMh1wvpQZuayQ7y+sj2MhE3l7z0JMD9SX/4xv9zLOWGv+EiUmN/fGoU/mwsSkH2wTCo6G6quKF1E8jQ==} cpu: [x64] os: [linux] - '@nx/nx-win32-arm64-msvc@21.1.1': - resolution: {integrity: sha512-UsSDVD0Cjrb/FkEbGd2QsAljRiOvZ+t2lBkaPWZdCjEJoMFvkxHZgVptBWDQa9xgvseq9c80vSMiX0g89lVP6Q==} + '@nx/nx-win32-arm64-msvc@21.1.2': + resolution: {integrity: sha512-E+ECMQIMJ6R47BMW5YpDyOhTqczvFaL8k24umRkcvlRh3SraczyxBVPkYHDukDp7tCeIszc5EvdWc83C3W8U4w==} cpu: [arm64] os: [win32] - '@nx/nx-win32-x64-msvc@21.1.1': - resolution: {integrity: sha512-b8iQsPeDprGErA9wbRje1/9XIHcRze/jHdTVFmjQqrx9KumQAuwCRaNn4miP5xNljUU5h3g/TWnvx5qzQG24aQ==} + '@nx/nx-win32-x64-msvc@21.1.2': + resolution: {integrity: sha512-J9rNTBOS7Ld6CybU/cou1Fg52AHSYsiwpZISM2RNM0XIoVSDk3Jsvh4OJgS2rvV0Sp/cgDg3ieOMAreekH+TKw==} cpu: [x64] os: [win32] - '@nx/playwright@21.1.1': - resolution: {integrity: sha512-JDoqU66dMqohPw1qGlNo6V1hAj+5KndyHt4dfWE09eULzX8ZwAZFxBVDlrE4ajJ+BJSkLxA6zVmh2P0D4f4s4w==} + '@nx/playwright@21.1.2': + resolution: {integrity: sha512-XSfxoB+LeGFVpzzw59pjMjurOXmLEngGMqk+Z/4QT1A2lzBG4HccVrZQ8UiSxAGCbK+O7MFjy1r0k0z80EjYgg==} peerDependencies: '@playwright/test': ^1.36.0 peerDependenciesMeta: '@playwright/test': optional: true - '@nx/vite@21.1.1': - resolution: {integrity: sha512-cnhr+jBulm467ecRz8eD4xkRif1Q786VZSzXvwH3JSokko+F2BRkt0oVWctZo3OERQNMkoIo/v7MgiOrF5FyGQ==} + '@nx/vite@21.1.2': + resolution: {integrity: sha512-qKb3CTPtcs3MsDebNW7PUS10IDB1+w//iXKFobwmclH4uW/HFUMRcdUrIsdcQfdmQPjGNTTM2fwmbgWJC4qmAw==} peerDependencies: vite: ^5.0.0 || ^6.0.0 vitest: ^1.3.1 || ^2.0.0 || ^3.0.0 - '@nx/web@21.1.1': - resolution: {integrity: sha512-/xmNblNeE2Ilg+VGrLSSBfewIn09uT72PitftGbsSe3JrbOgcnMb3xbgZkY52A4tT+Q/zt5pb3q48Lid36IOwA==} + '@nx/web@21.1.2': + resolution: {integrity: sha512-ONw3bEO6rc9DqM9Jnt6Rc5xkSBMzruWA2KvHVlU4qaoUs1VKbnmJ28dM72lFMn8wbOOeq+RG7GC2nBpifBPLHw==} - '@nx/webpack@21.1.1': - resolution: {integrity: sha512-UL8oTqBq2uEhc8Acn2iyHAgFpy8uutIP5IFXYQGYtKOJd52RJHZuWJv1pmDVvAbRUG0RHgcSOcIpGxkyOD6ijQ==} + '@nx/webpack@21.1.2': + resolution: {integrity: sha512-MtTXjxT8HB47uaMi4Hw6VGnyycQ5gm7Trazk4Fq7mr4ReIrP0vp1BGnNgho2d1dFONY0eA6MeBf9j/5jOI+MBA==} - '@nx/workspace@21.1.1': - resolution: {integrity: sha512-tULklvFRA5BN/joehQ+bQ86zO714jeIuBKBfFH0+6cBK3p7yQXfxOshbk8fZSGI6nxTH7iwy35N+niIQ+DWZCw==} + '@nx/workspace@21.1.2': + resolution: {integrity: sha512-I4e/X/GN0Vx3FDZv/7bFYmXfOPmcMI3cDO/rg+TqudsuxVM7tJ7+8jtwdpU4I2IEpI6oU9FZ7Fu9R2uNqL5rrQ==} '@open-draft/deferred-promise@2.2.0': resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} @@ -10359,8 +10359,8 @@ packages: nwsapi@2.2.20: resolution: {integrity: sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==} - nx@21.1.1: - resolution: {integrity: sha512-+BFSEvLAuDLgtmuosvU3gelBFBE4szPfRlxsxxw34qXCweBysknpfwDItvFf1lThGJ5o4bCtNN1PH91uAn+qrw==} + nx@21.1.2: + resolution: {integrity: sha512-oczAEOOkQHElxCXs2g2jXDRabDRsmub/h5SAgqAUDSJ2CRnYGVVlgZX7l+o+A9kSqfONyLy5FlJ1pSWlvPuG4w==} hasBin: true peerDependencies: '@swc-node/register': ^1.8.0 @@ -17470,22 +17470,22 @@ snapshots: mkdirp: 1.0.4 rimraf: 3.0.2 - '@nx/devkit@21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': + '@nx/devkit@21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': dependencies: ejs: 3.1.10 enquirer: 2.3.6 ignore: 5.3.2 minimatch: 9.0.3 - nx: 21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)) + nx: 21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)) semver: 7.7.2 tmp: 0.2.3 tslib: 2.8.1 yargs-parser: 21.1.1 - '@nx/esbuild@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': + '@nx/esbuild@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) picocolors: 1.1.1 tinyglobby: 0.2.13 tsconfig-paths: 4.2.0 @@ -17501,10 +17501,10 @@ snapshots: - supports-color - verdaccio - '@nx/eslint-plugin@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint-config-prettier@10.1.5(eslint@9.27.0(jiti@2.4.2)))(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)': + '@nx/eslint-plugin@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint-config-prettier@10.1.5(eslint@9.27.0(jiti@2.4.2)))(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@typescript-eslint/parser': 8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) '@typescript-eslint/type-utils': 8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) '@typescript-eslint/utils': 8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -17527,10 +17527,10 @@ snapshots: - typescript - verdaccio - '@nx/eslint@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': + '@nx/eslint@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) eslint: 9.27.0(jiti@2.4.2) semver: 7.7.2 tslib: 2.8.1 @@ -17546,11 +17546,11 @@ snapshots: - supports-color - verdaccio - '@nx/express@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(express@4.21.2)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3)': + '@nx/express@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(express@4.21.2)(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3)': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/node': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/node': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3) tslib: 2.8.1 optionalDependencies: express: 4.21.2 @@ -17570,12 +17570,12 @@ snapshots: - typescript - verdaccio - '@nx/jest@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(babel-plugin-macros@3.1.0)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3)': + '@nx/jest@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(babel-plugin-macros@3.1.0)(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3)': dependencies: '@jest/reporters': 29.7.0 '@jest/test-result': 29.7.0 - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.8.3) identity-obj-proxy: 3.0.0 jest-config: 29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3)) @@ -17601,7 +17601,7 @@ snapshots: - typescript - verdaccio - '@nx/js@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': + '@nx/js@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': dependencies: '@babel/core': 7.26.10 '@babel/plugin-proposal-decorators': 7.25.9(@babel/core@7.26.10) @@ -17610,8 +17610,8 @@ snapshots: '@babel/preset-env': 7.26.9(@babel/core@7.26.10) '@babel/preset-typescript': 7.27.0(@babel/core@7.26.10) '@babel/runtime': 7.27.1 - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/workspace': 21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/workspace': 21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)) '@zkochan/js-yaml': 0.0.7 babel-plugin-const-enum: 1.2.0(@babel/core@7.26.10) babel-plugin-macros: 3.1.0 @@ -17640,12 +17640,12 @@ snapshots: - nx - supports-color - '@nx/node@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3)': + '@nx/node@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(@zkochan/js-yaml@0.0.7)(babel-plugin-macros@3.1.0)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3)': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/eslint': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/jest': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(babel-plugin-macros@3.1.0)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/eslint': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/jest': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(babel-plugin-macros@3.1.0)(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.8.3))(typescript@5.8.3) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) kill-port: 1.6.1 tcp-port-used: 1.0.2 tslib: 2.8.1 @@ -17665,41 +17665,41 @@ snapshots: - typescript - verdaccio - '@nx/nx-darwin-arm64@21.1.1': + '@nx/nx-darwin-arm64@21.1.2': optional: true - '@nx/nx-darwin-x64@21.1.1': + '@nx/nx-darwin-x64@21.1.2': optional: true - '@nx/nx-freebsd-x64@21.1.1': + '@nx/nx-freebsd-x64@21.1.2': optional: true - '@nx/nx-linux-arm-gnueabihf@21.1.1': + '@nx/nx-linux-arm-gnueabihf@21.1.2': optional: true - '@nx/nx-linux-arm64-gnu@21.1.1': + '@nx/nx-linux-arm64-gnu@21.1.2': optional: true - '@nx/nx-linux-arm64-musl@21.1.1': + '@nx/nx-linux-arm64-musl@21.1.2': optional: true - '@nx/nx-linux-x64-gnu@21.1.1': + '@nx/nx-linux-x64-gnu@21.1.2': optional: true - '@nx/nx-linux-x64-musl@21.1.1': + '@nx/nx-linux-x64-musl@21.1.2': optional: true - '@nx/nx-win32-arm64-msvc@21.1.1': + '@nx/nx-win32-arm64-msvc@21.1.2': optional: true - '@nx/nx-win32-x64-msvc@21.1.1': + '@nx/nx-win32-x64-msvc@21.1.2': optional: true - '@nx/playwright@21.1.1(@babel/traverse@7.27.0)(@playwright/test@1.52.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)': + '@nx/playwright@21.1.2(@babel/traverse@7.27.0)(@playwright/test@1.52.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/eslint': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/eslint': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(@zkochan/js-yaml@0.0.7)(eslint@9.27.0(jiti@2.4.2))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.8.3) minimatch: 9.0.3 tslib: 2.8.1 @@ -17717,10 +17717,10 @@ snapshots: - typescript - verdaccio - '@nx/vite@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(sugarss@4.0.1(postcss@8.5.3))(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))(vitest@3.1.4)': + '@nx/vite@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(sugarss@4.0.1(postcss@8.5.3))(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))(vitest@3.1.4)': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.8.3) '@swc/helpers': 0.5.17 ajv: 8.17.1 @@ -17740,10 +17740,10 @@ snapshots: - typescript - verdaccio - '@nx/web@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': + '@nx/web@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) detect-port: 1.6.1 http-server: 14.1.1 picocolors: 1.1.1 @@ -17757,11 +17757,11 @@ snapshots: - supports-color - verdaccio - '@nx/webpack@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(bufferutil@4.0.9)(esbuild@0.25.4)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)': + '@nx/webpack@21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(bufferutil@4.0.9)(esbuild@0.25.4)(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)': dependencies: '@babel/core': 7.26.10 - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/js': 21.1.2(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@phenomnomnominal/tsquery': 5.0.1(typescript@5.8.3) ajv: 8.17.1 autoprefixer: 10.4.21(postcss@8.5.3) @@ -17821,13 +17821,13 @@ snapshots: - vue-template-compiler - webpack-cli - '@nx/workspace@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))': + '@nx/workspace@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))': dependencies: - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) + '@nx/devkit': 21.1.2(nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) '@zkochan/js-yaml': 0.0.7 chalk: 4.1.2 enquirer: 2.3.6 - nx: 21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)) + nx: 21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)) picomatch: 4.0.2 tslib: 2.8.1 yargs-parser: 21.1.1 @@ -25559,7 +25559,7 @@ snapshots: nwsapi@2.2.20: {} - nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)): + nx@21.1.2(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)): dependencies: '@napi-rs/wasm-runtime': 0.2.4 '@yarnpkg/lockfile': 1.1.0 @@ -25597,16 +25597,16 @@ snapshots: yargs: 17.7.2 yargs-parser: 21.1.1 optionalDependencies: - '@nx/nx-darwin-arm64': 21.1.1 - '@nx/nx-darwin-x64': 21.1.1 - '@nx/nx-freebsd-x64': 21.1.1 - '@nx/nx-linux-arm-gnueabihf': 21.1.1 - '@nx/nx-linux-arm64-gnu': 21.1.1 - '@nx/nx-linux-arm64-musl': 21.1.1 - '@nx/nx-linux-x64-gnu': 21.1.1 - '@nx/nx-linux-x64-musl': 21.1.1 - '@nx/nx-win32-arm64-msvc': 21.1.1 - '@nx/nx-win32-x64-msvc': 21.1.1 + '@nx/nx-darwin-arm64': 21.1.2 + '@nx/nx-darwin-x64': 21.1.2 + '@nx/nx-freebsd-x64': 21.1.2 + '@nx/nx-linux-arm-gnueabihf': 21.1.2 + '@nx/nx-linux-arm64-gnu': 21.1.2 + '@nx/nx-linux-arm64-musl': 21.1.2 + '@nx/nx-linux-x64-gnu': 21.1.2 + '@nx/nx-linux-x64-musl': 21.1.2 + '@nx/nx-win32-arm64-msvc': 21.1.2 + '@nx/nx-win32-x64-msvc': 21.1.2 '@swc-node/register': 1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3) '@swc/core': 1.11.29(@swc/helpers@0.5.17) transitivePeerDependencies: From 978983eac27c0132577e80e0f8f4b6fc90b6bfab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 24 May 2025 02:26:49 +0000 Subject: [PATCH 43/78] fix(deps): update dependency diff to v8.0.2 --- apps/db-compare/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/db-compare/package.json b/apps/db-compare/package.json index c4d6620c4..370ae38a6 100644 --- a/apps/db-compare/package.json +++ b/apps/db-compare/package.json @@ -5,7 +5,7 @@ "description": "Tool to compare content of Trilium databases. Useful for debugging sync problems.", "dependencies": { "colors": "1.4.0", - "diff": "8.0.1", + "diff": "8.0.2", "sqlite": "5.1.1", "sqlite3": "5.1.7" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f18e2fc1..996328206 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -346,8 +346,8 @@ importers: specifier: 1.4.0 version: 1.4.0 diff: - specifier: 8.0.1 - version: 8.0.1 + specifier: 8.0.2 + version: 8.0.2 sqlite: specifier: 5.1.1 version: 5.1.1 @@ -7391,8 +7391,8 @@ packages: resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==} engines: {node: '>=0.3.1'} - diff@8.0.1: - resolution: {integrity: sha512-rEaM3KmVm78zE3dFZaop3aCQa2MTm+T4kcigUFLVU/KbOYdiY6JnL2g2puOYnct3QFw9pjZadaCbCZ1O8ArMlQ==} + diff@8.0.2: + resolution: {integrity: sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==} engines: {node: '>=0.3.1'} dir-compare@4.2.0: @@ -21785,7 +21785,7 @@ snapshots: diff@5.2.0: {} - diff@8.0.1: {} + diff@8.0.2: {} dir-compare@4.2.0: dependencies: From 1e55076228879702f7272b8b38eb80d12800ad12 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 24 May 2025 02:27:38 +0000 Subject: [PATCH 44/78] chore(deps): update dependency @anthropic-ai/sdk to v0.52.0 --- apps/server/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index e9c5d4703..94c894019 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -39,7 +39,7 @@ "@types/ws": "8.18.1", "@types/xml2js": "0.4.14", "express-http-proxy": "2.1.1", - "@anthropic-ai/sdk": "0.51.0", + "@anthropic-ai/sdk": "0.52.0", "@braintree/sanitize-url": "7.1.1", "@triliumnext/commons": "workspace:*", "@triliumnext/express-partial-content": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f18e2fc1..e6afd2a35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -479,8 +479,8 @@ importers: version: 11.10.0 devDependencies: '@anthropic-ai/sdk': - specifier: 0.51.0 - version: 0.51.0 + specifier: 0.52.0 + version: 0.52.0 '@braintree/sanitize-url': specifier: 7.1.1 version: 7.1.1 @@ -1323,8 +1323,8 @@ packages: '@antfu/utils@8.1.1': resolution: {integrity: sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==} - '@anthropic-ai/sdk@0.51.0': - resolution: {integrity: sha512-fAFC/uHhyzfw7rs65EPVV+scXDytGNm5BjttxHf6rP/YGvaBRKEvp2lwyuMigTwMI95neeG4bzrZigz7KCikjw==} + '@anthropic-ai/sdk@0.52.0': + resolution: {integrity: sha512-d4c+fg+xy9e46c8+YnrrgIQR45CZlAi7PwdzIfDXDM6ACxEZli1/fxhURsq30ZpMZy6LvSkr41jGq5aF5TD7rQ==} hasBin: true '@apidevtools/json-schema-ref-parser@9.1.2': @@ -14031,7 +14031,7 @@ snapshots: '@antfu/utils@8.1.1': {} - '@anthropic-ai/sdk@0.51.0': {} + '@anthropic-ai/sdk@0.52.0': {} '@apidevtools/json-schema-ref-parser@9.1.2': dependencies: From 81efea083b3d7f4dcf6b23ba5e589a0c6315c3ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 24 May 2025 02:29:08 +0000 Subject: [PATCH 45/78] chore(deps): update dependency openai to v4.103.0 --- apps/server/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index e9c5d4703..7b264ef8d 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -88,7 +88,7 @@ "multer": "2.0.0", "normalize-strings": "1.1.1", "ollama": "0.5.15", - "openai": "4.102.0", + "openai": "4.103.0", "rand-token": "1.0.1", "safe-compare": "1.1.4", "sanitize-filename": "1.6.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f18e2fc1..ba49dd8a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -725,8 +725,8 @@ importers: specifier: 0.5.15 version: 0.5.15 openai: - specifier: 4.102.0 - version: 4.102.0(encoding@0.1.13)(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5))(zod@3.24.4) + specifier: 4.103.0 + version: 4.103.0(encoding@0.1.13)(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5))(zod@3.24.4) rand-token: specifier: 1.0.1 version: 1.0.1 @@ -10449,8 +10449,8 @@ packages: resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} engines: {node: '>=12'} - openai@4.102.0: - resolution: {integrity: sha512-CWk15CMhPSHNZnjz+6rwVYV551xaC8CwOd7/zxImrC1btEo37dX/Ii5tBKWfqqxqyzpJ6p3Y4bICzzKhW03WhQ==} + openai@4.103.0: + resolution: {integrity: sha512-eWcz9kdurkGOFDtd5ySS5y251H2uBgq9+1a2lTBnjMMzlexJ40Am5t6Mu76SSE87VvitPa0dkIAp75F+dZVC0g==} hasBin: true peerDependencies: ws: ^8.18.0 @@ -25696,7 +25696,7 @@ snapshots: is-docker: 2.2.1 is-wsl: 2.2.0 - openai@4.102.0(encoding@0.1.13)(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5))(zod@3.24.4): + openai@4.103.0(encoding@0.1.13)(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5))(zod@3.24.4): dependencies: '@types/node': 18.16.9 '@types/node-fetch': 2.6.12 From 25f214d24ae3982bc22178ffc0efd675e821bad5 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 24 May 2025 12:26:22 +0300 Subject: [PATCH 46/78] fix(desktop): set proper path to main --- apps/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 7670e8801..634d586c3 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "Build your personal knowledge base with TriliumNext Notes", "private": true, - "main": "main.cjs", + "main": "dist/main.cjs", "dependencies": { "@electron/remote": "2.1.2", "better-sqlite3": "^11.9.1", From dfad73ee02da32745f1e4a2ef426f88f2dfccae9 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 24 May 2025 12:26:32 +0300 Subject: [PATCH 47/78] chore(desktop): disable electron forge rebuild --- apps/desktop/electron-forge/forge.config.cjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/electron-forge/forge.config.cjs b/apps/desktop/electron-forge/forge.config.cjs index 3f81bb477..b9fb0dd79 100644 --- a/apps/desktop/electron-forge/forge.config.cjs +++ b/apps/desktop/electron-forge/forge.config.cjs @@ -68,8 +68,8 @@ module.exports = { ] }, rebuildConfig: { - force: true, - extraModules: [ "better-sqlite3" ] + force: false, + onlyModules: [] }, makers: [ { From 63022c76d8a20c9a41daba40eeb7322411de1f2a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 24 May 2025 14:29:24 +0300 Subject: [PATCH 48/78] chore(desktop): avoid forge dependencies via custom package.JSON --- apps/desktop/package.json | 2 +- scripts/electron-rebuild.mts | 41 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 634d586c3..7670e8801 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "Build your personal knowledge base with TriliumNext Notes", "private": true, - "main": "dist/main.cjs", + "main": "main.cjs", "dependencies": { "@electron/remote": "2.1.2", "better-sqlite3": "^11.9.1", diff --git a/scripts/electron-rebuild.mts b/scripts/electron-rebuild.mts index 848a86e5f..6c67831a9 100644 --- a/scripts/electron-rebuild.mts +++ b/scripts/electron-rebuild.mts @@ -31,23 +31,28 @@ function parsePackageJson(distDir: string) { return { electronVersion, - dependencies: packageJson?.dependencies ?? [] + packageJson }; } -function createFakePackageJson(distPath: string, dependencies: Record) { +function createFakePackageJson(distPath: string, packageJson: any) { const finalDependencies = {}; for (const dep of nativeDependencies) { - finalDependencies[dep] = dependencies[dep]; + finalDependencies[dep] = packageJson.dependencies[dep]; } - const fakePackageJson = { + const fakePackageJson: any = { name: "trilium", - version: "1.0.0", - main: "index.js", + version: packageJson.version, + main: packageJson.main, dependencies: finalDependencies, - devDependencies: {}, + devDependencies: {} }; + if (packageJson?.config?.forge) { + fakePackageJson.config = { + forge: join("..", packageJson.config.forge) + }; + } writeFileSync(distPath, JSON.stringify(fakePackageJson, null, 2), "utf-8"); } @@ -58,23 +63,19 @@ function main() { process.exit(1); } - const { electronVersion, dependencies } = parsePackageJson(distDir); + const { electronVersion, packageJson } = parsePackageJson(distDir); const packageJsonPath = join(distDir, "package.json"); - createFakePackageJson(packageJsonPath, dependencies); + createFakePackageJson(packageJsonPath, packageJson); console.log(`Rebuilding ${distDir} with version ${electronVersion}...`); - try { - rebuild({ - // We force the project root path to avoid electron-rebuild from rebuilding the monorepo-level dependency and breaking the server. - projectRootPath: distDir, - buildPath: distDir, - force: true, - electronVersion, - }); - } finally { - rmSync(packageJsonPath); - } + rebuild({ + // We force the project root path to avoid electron-rebuild from rebuilding the monorepo-level dependency and breaking the server. + projectRootPath: distDir, + buildPath: distDir, + force: true, + electronVersion, + }); } main(); From 3bd2d865df15a8bbc1821cd91536b7404b86a40e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 24 May 2025 15:40:29 +0300 Subject: [PATCH 49/78] fix(desktop): path to main --- apps/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 7670e8801..634d586c3 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "Build your personal knowledge base with TriliumNext Notes", "private": true, - "main": "main.cjs", + "main": "dist/main.cjs", "dependencies": { "@electron/remote": "2.1.2", "better-sqlite3": "^11.9.1", From 37fd8a70951aa4c69b44864022cd981f177c3dc3 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 24 May 2025 16:55:30 +0300 Subject: [PATCH 50/78] style/mentions list: workaround to avoid some CSS property overrides --- apps/client/src/stylesheets/style.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css index bff0a333b..be1c8e717 100644 --- a/apps/client/src/stylesheets/style.css +++ b/apps/client/src/stylesheets/style.css @@ -1010,9 +1010,10 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href font-size: var(--detail-font-size) !important; } -.ck-mentions .ck-button.ck-on { - background-color: var(--active-item-background-color) !important; - color: var(--active-item-text-color) !important; +.ck-mentions { + --ck-color-list-button-on-background: var(--active-item-background-color); + --ck-color-list-button-on-background-focus: var(--ck-color-list-button-on-background); + --ck-color-list-button-on-text: var(--active-item-text-color); } .ck-mentions .ck-button b { From c47f050994d3c2542e1c1623fcf880cd0af05ccd Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 24 May 2025 16:58:52 +0300 Subject: [PATCH 51/78] style(next)/emoji dropdown: remove the background of the placeholder text --- apps/client/src/stylesheets/theme-next/notes/text.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/client/src/stylesheets/theme-next/notes/text.css b/apps/client/src/stylesheets/theme-next/notes/text.css index a159e2c87..f1019c624 100644 --- a/apps/client/src/stylesheets/theme-next/notes/text.css +++ b/apps/client/src/stylesheets/theme-next/notes/text.css @@ -373,6 +373,11 @@ background: var(--hover-item-background-color); } +/* "Keep on typing to see the emoji" placeholder */ +#mention-list-item-id\:__EMOJI_HINT { + background: transparent; +} + /* * EDITOR'S CONTENT */ From b258a8b60fa9b40a529d04ea9bb2ac6ed5028291 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 24 May 2025 18:00:46 +0300 Subject: [PATCH 52/78] style(next): update the colors of the mention list --- apps/client/src/stylesheets/theme-next/notes/text.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/client/src/stylesheets/theme-next/notes/text.css b/apps/client/src/stylesheets/theme-next/notes/text.css index f1019c624..5f711718b 100644 --- a/apps/client/src/stylesheets/theme-next/notes/text.css +++ b/apps/client/src/stylesheets/theme-next/notes/text.css @@ -373,6 +373,14 @@ background: var(--hover-item-background-color); } +/* Mention list (the autocompletion list for emojis, labels and relations) */ + +:root .ck-mentions { + --ck-color-list-button-on-background: var(--hover-item-background-color); + --ck-color-list-button-on-text: var(--hover-item-text-color); + --ck-color-list-button-hover-background: var(--ck-editor-toolbar-dropdown-button-open-background); +} + /* "Keep on typing to see the emoji" placeholder */ #mention-list-item-id\:__EMOJI_HINT { background: transparent; From d058bbc77689572e9fd0a985977e1e807563a674 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 24 May 2025 18:11:23 +0300 Subject: [PATCH 53/78] style(next): add a notice --- apps/client/src/stylesheets/theme-next-dark.css | 6 ++++++ apps/client/src/stylesheets/theme-next-light.css | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/apps/client/src/stylesheets/theme-next-dark.css b/apps/client/src/stylesheets/theme-next-dark.css index 9525231f5..031bdf465 100644 --- a/apps/client/src/stylesheets/theme-next-dark.css +++ b/apps/client/src/stylesheets/theme-next-dark.css @@ -5,6 +5,12 @@ * Color scheme */ :root { + + /* + * ⚠️ NOTICE: This theme is currently in the beta stage of development. + * The names and purposes of these CSS variables are subject to frequent changes. + */ + --theme-style: dark; --native-titlebar-background: #00000000; diff --git a/apps/client/src/stylesheets/theme-next-light.css b/apps/client/src/stylesheets/theme-next-light.css index a53ef1e97..ba994587f 100644 --- a/apps/client/src/stylesheets/theme-next-light.css +++ b/apps/client/src/stylesheets/theme-next-light.css @@ -5,6 +5,12 @@ * Color scheme */ :root { + + /* + * ⚠️ NOTICE: This theme is currently in the beta stage of development. + * The names and purposes of these CSS variables are subject to frequent changes. + */ + --theme-style: light; --native-titlebar-background: #ffffff00; From 6aa42a0749a1eb6c7c96f90c3c032eab3346240a Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 24 May 2025 18:17:54 +0300 Subject: [PATCH 54/78] style(next)/mentions list: remove the border of the focused items --- apps/client/src/stylesheets/theme-next/notes/text.css | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/client/src/stylesheets/theme-next/notes/text.css b/apps/client/src/stylesheets/theme-next/notes/text.css index 5f711718b..2d9127fd4 100644 --- a/apps/client/src/stylesheets/theme-next/notes/text.css +++ b/apps/client/src/stylesheets/theme-next/notes/text.css @@ -379,6 +379,7 @@ --ck-color-list-button-on-background: var(--hover-item-background-color); --ck-color-list-button-on-text: var(--hover-item-text-color); --ck-color-list-button-hover-background: var(--ck-editor-toolbar-dropdown-button-open-background); + --ck-focus-ring: 1px solid transparent; } /* "Keep on typing to see the emoji" placeholder */ From 04eb45f1e4101767aa76d085e44a41dde29ff6f7 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 24 May 2025 18:52:00 +0300 Subject: [PATCH 55/78] style(next)/tool buttons: improve selector specificity --- apps/client/src/stylesheets/theme-next/forms.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/client/src/stylesheets/theme-next/forms.css b/apps/client/src/stylesheets/theme-next/forms.css index f7aa04831..c83b70522 100644 --- a/apps/client/src/stylesheets/theme-next/forms.css +++ b/apps/client/src/stylesheets/theme-next/forms.css @@ -79,7 +79,7 @@ button.btn.btn-success kbd { */ :root .icon-action:not(.global-menu-button), -:root .tn-tool-button, +:root .btn.tn-tool-button, :root .btn-group .tn-tool-button:not(:last-child), :root .btn-group .tn-tool-button:last-child { width: var(--icon-button-size); From ddda222eee4f9c14df382bea6a07eb04db9b67da Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 24 May 2025 20:46:32 +0300 Subject: [PATCH 56/78] chore(nx): sync tsconfig --- apps/edit-docs/tsconfig.app.json | 3 +++ apps/edit-docs/tsconfig.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/apps/edit-docs/tsconfig.app.json b/apps/edit-docs/tsconfig.app.json index a232431d0..2479661aa 100644 --- a/apps/edit-docs/tsconfig.app.json +++ b/apps/edit-docs/tsconfig.app.json @@ -18,6 +18,9 @@ "eslint.config.mjs" ], "references": [ + { + "path": "../server/tsconfig.app.json" + }, { "path": "../desktop/tsconfig.app.json" }, diff --git a/apps/edit-docs/tsconfig.json b/apps/edit-docs/tsconfig.json index 56baa3f4e..de6607550 100644 --- a/apps/edit-docs/tsconfig.json +++ b/apps/edit-docs/tsconfig.json @@ -3,6 +3,9 @@ "files": [], "include": [], "references": [ + { + "path": "../server" + }, { "path": "../desktop" }, From 601e81fb1859290b4c7836952a9c7f4a141a93e0 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 24 May 2025 21:47:57 +0300 Subject: [PATCH 57/78] chore(desktop/forge): force presence of package.json --- apps/desktop/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 634d586c3..1831177fa 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -143,13 +143,15 @@ }, "electron-forge:make": { "dependsOn": [ - "build" + "build", + "rebuild-deps" ], "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge make dist" }, "electron-forge:package": { "dependsOn": [ - "build" + "build", + "rebuild-deps" ], "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge package dist" } From 72c1fb25a7b00b1c8ddcb7eeff329c682b75b51c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 24 May 2025 21:50:18 +0300 Subject: [PATCH 58/78] chore(desktop/forge): missing electron dependency --- scripts/electron-rebuild.mts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/electron-rebuild.mts b/scripts/electron-rebuild.mts index 6c67831a9..34ec412ea 100644 --- a/scripts/electron-rebuild.mts +++ b/scripts/electron-rebuild.mts @@ -46,7 +46,9 @@ function createFakePackageJson(distPath: string, packageJson: any) { version: packageJson.version, main: packageJson.main, dependencies: finalDependencies, - devDependencies: {} + devDependencies: { + "electron": packageJson.devDependencies?.electron || packageJson.dependencies?.electron, + } }; if (packageJson?.config?.forge) { fakePackageJson.config = { From 791a51dfe33a3e87a99a181d391e0ca7e7f5e7b3 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 24 May 2025 21:57:09 +0300 Subject: [PATCH 59/78] chore(desktop/forge): add missing fields --- apps/desktop/package.json | 2 +- scripts/electron-rebuild.mts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 1831177fa..3e0192bef 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "Build your personal knowledge base with TriliumNext Notes", "private": true, - "main": "dist/main.cjs", + "main": "main.cjs", "dependencies": { "@electron/remote": "2.1.2", "better-sqlite3": "^11.9.1", diff --git a/scripts/electron-rebuild.mts b/scripts/electron-rebuild.mts index 34ec412ea..46ef21986 100644 --- a/scripts/electron-rebuild.mts +++ b/scripts/electron-rebuild.mts @@ -4,6 +4,9 @@ * This script is used internally by the `rebuild-deps` target of the `desktop`. Normally we could use * `electron-rebuild` CLI directly, but it would rebuild the monorepo-level dependencies and breaks * the server build (and it doesn't expose a CLI option to override this). + * + * A side purpose is to generate a fake `package.json` file in the `dist` directory + * that contains only the native dependencies. This is used by `electron-forge`. */ import { join, resolve } from "path"; @@ -45,6 +48,9 @@ function createFakePackageJson(distPath: string, packageJson: any) { name: "trilium", version: packageJson.version, main: packageJson.main, + author: packageJson.author, + license: packageJson.license, + description: packageJson.description, dependencies: finalDependencies, devDependencies: { "electron": packageJson.devDependencies?.electron || packageJson.dependencies?.electron, From 501cb2bb05f1d2adc842f41c3f8175699d03b392 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 25 May 2025 02:46:00 +0000 Subject: [PATCH 60/78] chore(deps): update dependency @stylistic/eslint-plugin to v4.4.0 --- _regroup/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_regroup/package.json b/_regroup/package.json index 2db64c988..d45a40937 100644 --- a/_regroup/package.json +++ b/_regroup/package.json @@ -36,7 +36,7 @@ }, "devDependencies": { "@playwright/test": "1.52.0", - "@stylistic/eslint-plugin": "4.2.0", + "@stylistic/eslint-plugin": "4.4.0", "@types/express": "5.0.1", "@types/node": "22.15.21", "@types/yargs": "17.0.33", From 469c8a0a22782e962015224e4b9e48e66bc735d9 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 08:54:50 +0300 Subject: [PATCH 61/78] chore(server-e2e): mistakenly used continuous task --- apps/server-e2e/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server-e2e/package.json b/apps/server-e2e/package.json index 98a27b1e6..d2e8b9fe5 100644 --- a/apps/server-e2e/package.json +++ b/apps/server-e2e/package.json @@ -11,7 +11,7 @@ "targets": { "e2e": { "dependsOn": [ - "server:start-prod" + "server:build" ] } } From f9b0df30566d73cdfa137843e1c280066fab3909 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 10:12:09 +0300 Subject: [PATCH 62/78] chore(desktop): libraries not bundled --- apps/desktop/package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 3e0192bef..7274ff541 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -64,6 +64,11 @@ "format": [ "cjs" ], + "minify": true, + "thirdParty": true, + "esbuildOptions": { + "splitting": false + }, "assets": [ { "glob": "**/*", From 6bbf808cb49ffd7d1fc920e8bfda3de3480f7fde Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 11:00:01 +0300 Subject: [PATCH 63/78] fix(desktop): @electron/remote missing in package --- apps/desktop/package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 7274ff541..fff76d616 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -75,6 +75,11 @@ "input": "apps/server/dist/node_modules", "output": "node_modules" }, + { + "glob": "**/*", + "input": "apps/desktop/node_modules/@electron/remote", + "output": "node_modules/@electron/remote" + }, { "glob": "**/*", "input": "apps/server/dist/assets", From d70140c180cb625597049792bb3564ad74e7818c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 11:00:22 +0300 Subject: [PATCH 64/78] chore(desktop): add electron-forge:start --- apps/desktop/package.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index fff76d616..e43d6adbb 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -164,6 +164,13 @@ "rebuild-deps" ], "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge package dist" + }, + "electron-forge:start": { + "dependsOn": [ + "build", + "rebuild-deps" + ], + "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm TRILIUM_DATA_DIR=./data electron-forge start dist" } } } From be8749d84e40624faa6e60cfdcc586b62d99a470 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 11:47:03 +0300 Subject: [PATCH 65/78] chore(edit-docs): switch to esbuild --- apps/edit-docs/package.json | 75 ++++++++++++++++++++++-- apps/edit-docs/src/electron-docs-main.ts | 1 + apps/edit-docs/src/electron-edit-demo.ts | 2 +- apps/edit-docs/tsconfig.app.json | 13 ++-- apps/edit-docs/webpack.config.cjs | 53 ----------------- 5 files changed, 80 insertions(+), 64 deletions(-) delete mode 100644 apps/edit-docs/webpack.config.cjs diff --git a/apps/edit-docs/package.json b/apps/edit-docs/package.json index d38029b5f..ea13095e5 100644 --- a/apps/edit-docs/package.json +++ b/apps/edit-docs/package.json @@ -17,6 +17,51 @@ "server" ], "targets": { + "build": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], + "options": { + "main": "apps/edit-docs/src/electron-edit-demo.ts", + "outputPath": "apps/edit-docs/dist", + "outputFileName": "main.js", + "tsConfig": "apps/edit-docs/tsconfig.app.json", + "platform": "node", + "external": [ + "electron", + "@electron/remote", + "better-sqlite3", + "./xhr-sync-worker.js" + ], + "format": [ + "cjs" + ], + "assets": [ + { + "glob": "**/*", + "input": "apps/server/dist/node_modules", + "output": "node_modules" + }, + { + "glob": "**/*", + "input": "apps/server/dist/assets", + "output": "assets" + }, + { + "glob": "**/*", + "input": "apps/server/dist/public", + "output": "public" + }, + { + "glob": "xhr-sync-worker.js", + "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", + "output": "" + } + ], + "declarationRootDir": "apps/edit-docs/src" + } + }, "rebuild-deps": { "executor": "nx:run-commands", "dependsOn": [ @@ -41,13 +86,31 @@ "defaultConfiguration": "default", "configurations": { "default": { - "command": "electron .", - "cwd": "./apps/edit-docs/dist" + "command": "electron main.cjs", + "cwd": "{projectRoot}/dist" }, "nixos": { - "command": "nix-shell -p electron_35 --run \"electron .\"", - "forwardAllArgs": false, - "cwd": "./apps/edit-docs/dist" + "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.cjs\"", + "cwd": ".", + "forwardAllArgs": false + } + } + }, + "serve-nodir": { + "executor": "nx:run-commands", + "dependsOn": [ + "rebuild-deps" + ], + "defaultConfiguration": "default", + "configurations": { + "default": { + "command": "electron main.cjs", + "cwd": "{projectRoot}/dist" + }, + "nixos": { + "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.cjs\"", + "cwd": ".", + "forwardAllArgs": false } } } @@ -56,4 +119,4 @@ "dependencies": { "archiver": "7.0.1" } -} +} \ No newline at end of file diff --git a/apps/edit-docs/src/electron-docs-main.ts b/apps/edit-docs/src/electron-docs-main.ts index 52121df3a..ac1baa107 100644 --- a/apps/edit-docs/src/electron-docs-main.ts +++ b/apps/edit-docs/src/electron-docs-main.ts @@ -15,6 +15,7 @@ import { parseNoteMetaFile } from "@triliumnext/server/src/services/in_app_help. import { resolve } from "path"; import electron from "electron"; import { onReady } from "@triliumnext/desktop/src/electron-main.js"; +import type NoteMeta from "@triliumnext/server/src/services/meta/note_meta.js"; interface NoteMapping { rootNoteId: string; diff --git a/apps/edit-docs/src/electron-edit-demo.ts b/apps/edit-docs/src/electron-edit-demo.ts index 17fb59e57..204e9220a 100644 --- a/apps/edit-docs/src/electron-edit-demo.ts +++ b/apps/edit-docs/src/electron-edit-demo.ts @@ -40,4 +40,4 @@ async function exportData() { await exportToZipFile("root", "html", DEMO_ZIP_PATH); } -await main(); +main(); diff --git a/apps/edit-docs/tsconfig.app.json b/apps/edit-docs/tsconfig.app.json index 2479661aa..b9e17115a 100644 --- a/apps/edit-docs/tsconfig.app.json +++ b/apps/edit-docs/tsconfig.app.json @@ -1,16 +1,21 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "module": "ESNext", + "moduleResolution": "bundler", + "target": "ES2020", "outDir": "dist", + "strict": false, "types": [ - "node" + "node", + "express" ], "rootDir": "src", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "verbatimModuleSyntax": false + "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo" }, "include": [ - "src/**/*.ts" + "src/**/*.ts", + "../server/src/*.d.ts" ], "exclude": [ "eslint.config.js", diff --git a/apps/edit-docs/webpack.config.cjs b/apps/edit-docs/webpack.config.cjs deleted file mode 100644 index 1ae774de7..000000000 --- a/apps/edit-docs/webpack.config.cjs +++ /dev/null @@ -1,53 +0,0 @@ -const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin'); -const CopyPlugin = require('copy-webpack-plugin'); -const { join } = require('path'); - -const outputDir = join(__dirname, 'dist'); - -module.exports = { - output: { - path: join(__dirname, 'dist'), - }, - module: { - rules: [ - { - test: /\.css$/i, - type: "asset/source" - } - ] - }, - plugins: [ - new NxAppWebpackPlugin({ - target: 'node', - compiler: 'tsc', - main: './src/electron-docs-main.ts', - tsConfig: './tsconfig.app.json', - optimization: false, - outputHashing: 'none', - generatePackageJson: true, - externalDependencies: [ - "electron/main", - "@electron/remote/main", - "electron", - "@electron/remote", - "better-sqlite3" - ] - }), - new CopyPlugin({ - patterns: [ - { - from: "../desktop/dist/node_modules", - to: join(outputDir, "node_modules") - }, - { - from: "../desktop/dist/assets", - to: join(outputDir, "assets") - }, - { - from: "../desktop/dist/public", - to: join(outputDir, "public") - }, - ] - }) - ], -}; From 315224c046f254c9d291dc6ec3c683412f7ffd4c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 11:48:31 +0300 Subject: [PATCH 66/78] chore(desktop): remove unnecessary files --- apps/desktop/.swcrc | 8 ---- apps/desktop/webpack.config.cjs.bak | 67 ----------------------------- 2 files changed, 75 deletions(-) delete mode 100644 apps/desktop/.swcrc delete mode 100644 apps/desktop/webpack.config.cjs.bak diff --git a/apps/desktop/.swcrc b/apps/desktop/.swcrc deleted file mode 100644 index a2d5b04f4..000000000 --- a/apps/desktop/.swcrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "jsc": { - "parser": { - "syntax": "typescript" - }, - "target": "es2016" - } -} diff --git a/apps/desktop/webpack.config.cjs.bak b/apps/desktop/webpack.config.cjs.bak deleted file mode 100644 index edd32780a..000000000 --- a/apps/desktop/webpack.config.cjs.bak +++ /dev/null @@ -1,67 +0,0 @@ -const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin'); -const CopyPlugin = require('copy-webpack-plugin'); -const { join } = require('path'); - -const outputDir = join(__dirname, 'dist'); - -module.exports = { - output: { - path: outputDir, - }, - module: { - rules: [ - { - test: /\.css$/i, - type: "asset/source" - } - ] - }, - target: [ "node" ], - plugins: [ - new NxAppWebpackPlugin({ - target: 'node', - compiler: 'tsc', - main: './src/electron-main.ts', - tsConfig: './tsconfig.app.json', - assets: ["./src/assets"], - optimization: false, - outputHashing: 'none', - generatePackageJson: false, - externalDependencies: [ - "electron/main", - "@electron/remote/main", - "electron", - "@electron/remote", - "better-sqlite3" - ] - }), - new CopyPlugin({ - patterns: [ - { - from: "../client/dist", - to: join(outputDir, "public") - }, - { - from: "../server/dist/node_modules", - to: join(outputDir, "node_modules") - }, - { - from: "../server/dist/assets", - to: join(outputDir, "assets") - }, - { - from: "node_modules/@electron/remote", - to: join(outputDir, "node_modules/@electron/remote") - }, - { - from: "node_modules/prebuild-install", - to: join(outputDir, "node_modules/better-sqlite3/node_modules/prebuild-install") - }, - { - from: "package.json", - to: join(outputDir, "package.json") - } - ] - }) - ] -}; From f73daf5b95dd2c0a2604cd217c8cde742aa6d493 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 12:16:57 +0300 Subject: [PATCH 67/78] chore(edit-docs): fix rebuild and entrypoint --- apps/edit-docs/package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/edit-docs/package.json b/apps/edit-docs/package.json index ea13095e5..1c9d194c3 100644 --- a/apps/edit-docs/package.json +++ b/apps/edit-docs/package.json @@ -3,6 +3,10 @@ "version": "0.0.1", "private": true, "description": "Desktop version of Trilium which imports the demo database (presented to new users at start-up) or the user guide and other documentation and saves the modifications for committing.", + "dependencies": { + "archiver": "7.0.1", + "better-sqlite3": "^11.9.1" + }, "devDependencies": { "@triliumnext/client": "workspace:*", "@triliumnext/desktop": "workspace:*", @@ -23,7 +27,7 @@ "{options.outputPath}" ], "options": { - "main": "apps/edit-docs/src/electron-edit-demo.ts", + "main": "apps/edit-docs/src/electron-docs-main.ts", "outputPath": "apps/edit-docs/dist", "outputFileName": "main.js", "tsConfig": "apps/edit-docs/tsconfig.app.json", @@ -115,8 +119,5 @@ } } } - }, - "dependencies": { - "archiver": "7.0.1" - } + } } \ No newline at end of file From e07a7d291ba43a633e10d9c1fe56aeb395700914 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 12:24:01 +0300 Subject: [PATCH 68/78] chore(nx): remove dependency on webpack --- nx.json | 10 - package.json | 5 +- pnpm-lock.yaml | 1245 ++++-------------------------------------------- 3 files changed, 106 insertions(+), 1154 deletions(-) diff --git a/nx.json b/nx.json index ab2ff8fb3..b83107856 100644 --- a/nx.json +++ b/nx.json @@ -54,16 +54,6 @@ "watchDepsTargetName": "watch-deps" } }, - { - "plugin": "@nx/webpack/plugin", - "options": { - "buildTargetName": "build", - "serveTargetName": "serve", - "previewTargetName": "preview", - "buildDepsTargetName": "build-deps", - "watchDepsTargetName": "watch-deps" - } - }, { "plugin": "@nx/playwright/plugin", "options": { diff --git a/package.json b/package.json index bc277be09..07edb0c21 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,7 @@ "@nx/playwright": "21.1.1", "@nx/vite": "21.1.1", "@nx/web": "21.1.1", - "@nx/webpack": "21.1.1", "@playwright/test": "^1.36.0", - "@svgr/webpack": "^8.0.1", "@swc-node/register": "~1.10.0", "@swc/cli": "~0.7.0", "@swc/core": "~1.11.0", @@ -69,8 +67,7 @@ "upath": "2.0.1", "vite": "^6.0.0", "vite-plugin-dts": "~4.5.0", - "vitest": "^3.0.0", - "webpack-cli": "^6.0.0" + "vitest": "^3.0.0" }, "license": "AGPL-3.0-only", "author": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 18cd12cb0..d80787e8b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,15 +63,9 @@ importers: '@nx/web': specifier: 21.1.1 version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/webpack': - specifier: 21.1.1 - version: 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(bufferutil@4.0.9)(esbuild@0.25.4)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) '@playwright/test': specifier: ^1.36.0 version: 1.52.0 - '@svgr/webpack': - specifier: ^8.0.1 - version: 8.1.0(typescript@5.8.3) '@swc-node/register': specifier: ~1.10.0 version: 1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3) @@ -137,7 +131,7 @@ importers: version: 0.17.0 swc-loader: specifier: 0.2.6 - version: 0.2.6(@swc/core@1.11.29(@swc/helpers@0.5.17))(webpack@5.98.0) + version: 0.2.6(@swc/core@1.11.29(@swc/helpers@0.5.17))(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) tslib: specifier: ^2.3.0 version: 2.8.1 @@ -162,9 +156,6 @@ importers: vitest: specifier: ^3.0.0 version: 3.1.4(@types/debug@4.1.12)(@types/node@22.15.21)(@vitest/browser@3.1.4)(@vitest/ui@3.1.4)(happy-dom@17.4.7)(jiti@2.4.2)(jsdom@26.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(msw@2.7.5(@types/node@22.15.21)(typescript@5.8.3))(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(sugarss@4.0.1(postcss@8.5.3))(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1) - webpack-cli: - specifier: ^6.0.0 - version: 6.0.1(webpack@5.98.0) apps/client: dependencies: @@ -330,7 +321,7 @@ importers: version: 19.1.5(@types/react@19.1.5) copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + version: 13.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) happy-dom: specifier: 17.4.7 version: 17.4.7 @@ -412,7 +403,7 @@ importers: version: 1.0.2 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + version: 13.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) electron: specifier: 36.2.1 version: 36.2.1 @@ -453,6 +444,9 @@ importers: archiver: specifier: 7.0.1 version: 7.0.1 + better-sqlite3: + specifier: ^11.9.1 + version: 11.10.0 devDependencies: '@triliumnext/client': specifier: workspace:* @@ -465,7 +459,7 @@ importers: version: 11.0.4 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + version: 13.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) electron: specifier: 36.2.1 version: 36.2.1 @@ -824,7 +818,7 @@ importers: version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) + version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -884,7 +878,7 @@ importers: version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) + version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -944,7 +938,7 @@ importers: version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) + version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -1005,13 +999,13 @@ importers: version: 43.0.1(@swc/helpers@0.5.17)(tslib@2.8.1)(typescript@5.8.3) '@ckeditor/ckeditor5-dev-utils': specifier: 43.0.1 - version: 43.0.1(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + version: 43.0.1(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) '@ckeditor/ckeditor5-inspector': specifier: '>=4.1.0' version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) + version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -1078,7 +1072,7 @@ importers: version: 4.1.0 '@ckeditor/ckeditor5-package-tools': specifier: ^3.0.1 - version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1) + version: 3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5) '@typescript-eslint/eslint-plugin': specifier: ~8.32.0 version: 8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3) @@ -1828,36 +1822,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-react-constant-elements@7.25.9': - resolution: {integrity: sha512-Ncw2JFsJVuvfRsa2lSHiC55kETQVLSnsYGQ1JDDwkUeWGTL/8Tom8aLTnlqgoeuopWrbbGndrc9AlLYrIosrow==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-react-display-name@7.25.9': - resolution: {integrity: sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-react-jsx-development@7.25.9': - resolution: {integrity: sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-react-jsx@7.25.9': - resolution: {integrity: sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-react-pure-annotations@7.25.9': - resolution: {integrity: sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-regenerator@7.27.0': resolution: {integrity: sha512-LX/vCajUJQDqE7Aum/ELUMZAY19+cDpghxrnyt5I1tV6X5PyC86AOoWXWFYFeIvauyeSA6/ktn4tQVn/3ZifsA==} engines: {node: '>=6.9.0'} @@ -1953,12 +1917,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0 - '@babel/preset-react@7.26.3': - resolution: {integrity: sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@babel/preset-typescript@7.27.0': resolution: {integrity: sha512-vxaPFfJtHhgeOVXRKuHpHPAOgymmy8V8I65T1q53R7GCZlefKeCaTyDs3zOPHTTbmquvNlQYC5klEvWsBAtrBQ==} engines: {node: '>=6.9.0'} @@ -2332,10 +2290,6 @@ packages: peerDependencies: postcss-selector-parser: ^7.0.0 - '@discoveryjs/json-ext@0.6.3': - resolution: {integrity: sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==} - engines: {node: '>=14.17.0'} - '@dual-bundle/import-meta-resolve@4.1.0': resolution: {integrity: sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==} @@ -3873,9 +3827,6 @@ packages: '@nx/web@21.1.1': resolution: {integrity: sha512-/xmNblNeE2Ilg+VGrLSSBfewIn09uT72PitftGbsSe3JrbOgcnMb3xbgZkY52A4tT+Q/zt5pb3q48Lid36IOwA==} - '@nx/webpack@21.1.1': - resolution: {integrity: sha512-UL8oTqBq2uEhc8Acn2iyHAgFpy8uutIP5IFXYQGYtKOJd52RJHZuWJv1pmDVvAbRUG0RHgcSOcIpGxkyOD6ijQ==} - '@nx/workspace@21.1.1': resolution: {integrity: sha512-tULklvFRA5BN/joehQ+bQ86zO714jeIuBKBfFH0+6cBK3p7yQXfxOshbk8fZSGI6nxTH7iwy35N+niIQ+DWZCw==} @@ -4611,84 +4562,6 @@ packages: '@ssddanbrown/codemirror-lang-twig@1.0.0': resolution: {integrity: sha512-7WIMIh8Ssc54TooGCY57WU2rKEqZZrcV2tZSVRPtd0gKYsrDEKCSLWpQjUWEx7bdgh3NKHUjq1O4ugIzI/+dwQ==} - '@svgr/babel-plugin-add-jsx-attribute@8.0.0': - resolution: {integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/babel-plugin-remove-jsx-attribute@8.0.0': - resolution: {integrity: sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0': - resolution: {integrity: sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0': - resolution: {integrity: sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/babel-plugin-svg-dynamic-title@8.0.0': - resolution: {integrity: sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/babel-plugin-svg-em-dimensions@8.0.0': - resolution: {integrity: sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/babel-plugin-transform-react-native-svg@8.1.0': - resolution: {integrity: sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/babel-plugin-transform-svg-component@8.0.0': - resolution: {integrity: sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==} - engines: {node: '>=12'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/babel-preset@8.1.0': - resolution: {integrity: sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/core@8.1.0': - resolution: {integrity: sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==} - engines: {node: '>=14'} - - '@svgr/hast-util-to-babel-ast@8.0.0': - resolution: {integrity: sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==} - engines: {node: '>=14'} - - '@svgr/plugin-jsx@8.1.0': - resolution: {integrity: sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==} - engines: {node: '>=14'} - peerDependencies: - '@svgr/core': '*' - - '@svgr/plugin-svgo@8.1.0': - resolution: {integrity: sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==} - engines: {node: '>=14'} - peerDependencies: - '@svgr/core': '*' - - '@svgr/webpack@8.1.0': - resolution: {integrity: sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==} - engines: {node: '>=14'} - '@swc-node/core@1.13.3': resolution: {integrity: sha512-OGsvXIid2Go21kiNqeTIn79jcaX4l0G93X2rAnas4LFoDyA9wAwVK7xZdm+QsKoMn5Mus2yFLCc4OtX2dD/PWA==} engines: {node: '>= 10'} @@ -5554,31 +5427,6 @@ packages: '@webcomponents/webcomponentsjs@2.8.0': resolution: {integrity: sha512-loGD63sacRzOzSJgQnB9ZAhaQGkN7wl2Zuw7tsphI5Isa0irijrRo6EnJii/GgjGefIFO8AIO7UivzRhFaEk9w==} - '@webpack-cli/configtest@3.0.1': - resolution: {integrity: sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==} - engines: {node: '>=18.12.0'} - peerDependencies: - webpack: ^5.82.0 - webpack-cli: 6.x.x - - '@webpack-cli/info@3.0.1': - resolution: {integrity: sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==} - engines: {node: '>=18.12.0'} - peerDependencies: - webpack: ^5.82.0 - webpack-cli: 6.x.x - - '@webpack-cli/serve@3.0.1': - resolution: {integrity: sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==} - engines: {node: '>=18.12.0'} - peerDependencies: - webpack: ^5.82.0 - webpack-cli: 6.x.x - webpack-dev-server: '*' - peerDependenciesMeta: - webpack-dev-server: - optional: true - '@xhmikosr/archive-type@7.0.0': resolution: {integrity: sha512-sIm84ZneCOJuiy3PpWR5bxkx3HaNt1pqaN+vncUBZIlPZCq8ASZH+hBVdu5H8znR7qYC6sKwx+ie2Q7qztJTxA==} engines: {node: ^14.14.0 || >=16.0.0} @@ -5888,10 +5736,6 @@ packages: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - array-union@3.0.1: - resolution: {integrity: sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==} - engines: {node: '>=12'} - array.prototype.reduce@1.0.8: resolution: {integrity: sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==} engines: {node: '>= 0.4'} @@ -5946,13 +5790,6 @@ packages: autocomplete.js@0.38.1: resolution: {integrity: sha512-6pSJzuRMY3pqpozt+SXThl2DmJfma8Bi3SVFbZHS0PW/N72bOUv+Db0jAh2cWOhTsA4X+GNmKvIl8wExJTnN9w==} - autoprefixer@10.4.21: - resolution: {integrity: sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==} - engines: {node: ^10 || ^12 || >=14} - hasBin: true - peerDependencies: - postcss: ^8.1.0 - available-typed-arrays@1.0.7: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} @@ -5973,13 +5810,6 @@ packages: peerDependencies: '@babel/core': ^7.8.0 - babel-loader@9.2.1: - resolution: {integrity: sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==} - engines: {node: '>= 14.15.0'} - peerDependencies: - '@babel/core': ^7.12.0 - webpack: '>=5' - babel-plugin-const-enum@1.2.0: resolution: {integrity: sha512-o1m/6iyyFnp9MRsK1dHF3bneqyf3AlM2q3A/YbgQr2pCat6B6XJVDv2TXqzfY2RYUi4mak6WAksSBPlyYGx9dg==} peerDependencies: @@ -6446,10 +6276,6 @@ packages: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} - clone-deep@4.0.1: - resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==} - engines: {node: '>=6'} - clone-response@1.0.3: resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==} @@ -6569,9 +6395,6 @@ packages: resolution: {integrity: sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==} engines: {node: '>= 12.0.0'} - common-path-prefix@3.0.0: - resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} - commondir@1.0.1: resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} @@ -6655,12 +6478,6 @@ packages: copy-anything@2.0.6: resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==} - copy-webpack-plugin@10.2.4: - resolution: {integrity: sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==} - engines: {node: '>= 12.20.0'} - peerDependencies: - webpack: ^5.1.0 - copy-webpack-plugin@13.0.0: resolution: {integrity: sha512-FgR/h5a6hzJqATDGd9YG41SeDViH+0bkHn6WNXCi5zKAZkeESeSxLySSsFLHqLEVCh0E+rITmCf0dusXWYukeQ==} engines: {node: '>= 18.12.0'} @@ -6687,15 +6504,6 @@ packages: resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} engines: {node: '>=10'} - cosmiconfig@8.3.6: - resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} - engines: {node: '>=14'} - peerDependencies: - typescript: '>=4.9.5' - peerDependenciesMeta: - typescript: - optional: true - cosmiconfig@9.0.0: resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} engines: {node: '>=14'} @@ -6772,18 +6580,6 @@ packages: peerDependencies: webpack: ^4.27.0 || ^5.0.0 - css-loader@6.11.0: - resolution: {integrity: sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==} - engines: {node: '>= 12.13.0'} - peerDependencies: - '@rspack/core': 0.x || 1.x - webpack: ^5.0.0 - peerDependenciesMeta: - '@rspack/core': - optional: true - webpack: - optional: true - css-loader@7.1.2: resolution: {integrity: sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==} engines: {node: '>= 18.12.0'} @@ -6796,31 +6592,6 @@ packages: webpack: optional: true - css-minimizer-webpack-plugin@5.0.1: - resolution: {integrity: sha512-3caImjKFQkS+ws1TGcFn0V1HyDJFq1Euy589JlD6/3rV2kj+w7r5G9WDMgSHvpvXHNZ2calVypZWuEDQd9wfLg==} - engines: {node: '>= 14.15.0'} - peerDependencies: - '@parcel/css': '*' - '@swc/css': '*' - clean-css: '*' - csso: '*' - esbuild: '*' - lightningcss: '*' - webpack: ^5.0.0 - peerDependenciesMeta: - '@parcel/css': - optional: true - '@swc/css': - optional: true - clean-css: - optional: true - csso: - optional: true - esbuild: - optional: true - lightningcss: - optional: true - css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} @@ -7439,9 +7210,6 @@ packages: domutils@3.2.2: resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==} - dot-case@3.0.4: - resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} - dotenv-expand@11.0.7: resolution: {integrity: sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==} engines: {node: '>=12'} @@ -7615,11 +7383,6 @@ packages: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} - envinfo@7.14.0: - resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==} - engines: {node: '>=4'} - hasBin: true - environment@1.1.0: resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==} engines: {node: '>=18'} @@ -8059,10 +7822,6 @@ packages: resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==} engines: {node: '>=8'} - find-cache-dir@4.0.0: - resolution: {integrity: sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==} - engines: {node: '>=14.16'} - find-up@2.1.0: resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==} engines: {node: '>=4'} @@ -8079,10 +7838,6 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} - find-up@6.3.0: - resolution: {integrity: sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - find-versions@5.1.0: resolution: {integrity: sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==} engines: {node: '>=12'} @@ -8137,17 +7892,6 @@ packages: resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==} engines: {node: '>=14'} - fork-ts-checker-webpack-plugin@7.2.13: - resolution: {integrity: sha512-fR3WRkOb4bQdWB/y7ssDUlVdrclvwtyCUIHCfivAoYxq9dF7XfrDKbMdZIfwJ7hxIAqkYSGeU7lLJE6xrxIBdg==} - engines: {node: '>=12.13.0', yarn: '>=1.0.0'} - peerDependencies: - typescript: '>3.6.0' - vue-template-compiler: '*' - webpack: ^5.11.0 - peerDependenciesMeta: - vue-template-compiler: - optional: true - form-data-encoder@1.7.2: resolution: {integrity: sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==} @@ -8179,9 +7923,6 @@ packages: resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} engines: {node: '>= 0.6'} - fraction.js@4.3.7: - resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==} - fractional-indexing@3.2.0: resolution: {integrity: sha512-PcOxmqwYCW7O2ovKRU8OoQQj2yqTfEB/yeTYk4gPid6dN5ODRfU1hXd9tTVZzax/0NkO7AxpHykvZnT1aYp/BQ==} engines: {node: ^14.13.1 || >=16.0.0} @@ -8224,9 +7965,6 @@ packages: resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - fs-monkey@1.0.6: - resolution: {integrity: sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==} - fs-temp@1.2.1: resolution: {integrity: sha512-okTwLB7/Qsq82G6iN5zZJFsOfZtx2/pqrA7Hk/9fvy+c+eJS9CvgGXT2uNxwnI14BDY9L/jQPkaBgSvlKfSW9w==} @@ -8457,10 +8195,6 @@ packages: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} engines: {node: '>=10'} - globby@12.2.0: - resolution: {integrity: sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - globjoin@0.1.4: resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==} @@ -8789,11 +8523,6 @@ packages: resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==} engines: {node: '>=8'} - import-local@3.2.0: - resolution: {integrity: sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==} - engines: {node: '>=8'} - hasBin: true - import-meta-resolve@4.1.0: resolution: {integrity: sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==} @@ -9046,10 +8775,6 @@ packages: resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} engines: {node: '>=12'} - is-plain-object@2.0.4: - resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==} - engines: {node: '>=0.10.0'} - is-plain-object@5.0.0: resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==} engines: {node: '>=0.10.0'} @@ -9161,10 +8886,6 @@ packages: resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==} engines: {node: '>=16'} - isobject@3.0.1: - resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} - engines: {node: '>=0.10.0'} - istanbul-lib-coverage@3.2.2: resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==} engines: {node: '>=8'} @@ -9538,13 +9259,6 @@ packages: leaflet@1.9.4: resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==} - less-loader@11.1.0: - resolution: {integrity: sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==} - engines: {node: '>= 14.15.0'} - peerDependencies: - less: ^3.5.0 || ^4.0.0 - webpack: ^5.0.0 - less@4.1.3: resolution: {integrity: sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==} engines: {node: '>=6'} @@ -9558,14 +9272,6 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - license-webpack-plugin@4.0.2: - resolution: {integrity: sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==} - peerDependencies: - webpack: '*' - peerDependenciesMeta: - webpack: - optional: true - lie@3.3.0: resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==} @@ -9635,10 +9341,6 @@ packages: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} - locate-path@7.2.0: - resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - lodash-es@4.17.21: resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} @@ -9710,9 +9412,6 @@ packages: loupe@3.1.3: resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==} - lower-case@2.0.2: - resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} - lowercase-keys@2.0.0: resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==} engines: {node: '>=8'} @@ -9833,10 +9532,6 @@ packages: resolution: {integrity: sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==} engines: {node: '>=6'} - memfs@3.5.3: - resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==} - engines: {node: '>= 4.0.0'} - memfs@4.17.0: resolution: {integrity: sha512-4eirfZ7thblFmqFjywlTmuWVSvccHAJbn1r8qQLzmTO11qcqpohOjmY2mFce6x7x7WtskzRqApPD0hv+Oa74jg==} engines: {node: '>= 4.0.0'} @@ -10221,16 +9916,10 @@ packages: nice-try@1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} - no-case@3.0.4: - resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} - node-abi@4.8.0: resolution: {integrity: sha512-+P1Mf1XNURT+wN9UK8cjtHSwmmG02iAsX0JaYDDdXgMUe5eybde3AKpGGxOrkDmPkuonYJ6WjIRrNVQe0kjmFg==} engines: {node: '>=22.12.0'} - node-abort-controller@3.1.1: - resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==} - node-addon-api@7.1.1: resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} @@ -10310,10 +9999,6 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - normalize-range@0.1.2: - resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} - engines: {node: '>=0.10.0'} - normalize-strings@1.1.1: resolution: {integrity: sha512-fARPRdTwmrQDLYhmeh7j/eZwrCP6WzxD6uKOdK/hT/uKACAE9AG2Bc2dgqOZLkfmmctHpfcJ9w3AQnfLgg3GYg==} @@ -10518,10 +10203,6 @@ packages: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} - p-limit@4.0.0: - resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - p-locate@2.0.0: resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==} engines: {node: '>=4'} @@ -10538,10 +10219,6 @@ packages: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} - p-locate@6.0.0: - resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - p-map@3.0.0: resolution: {integrity: sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==} engines: {node: '>=8'} @@ -10641,9 +10318,6 @@ packages: parse5-parser-stream@7.1.2: resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==} - parse5@4.0.0: - resolution: {integrity: sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==} - parse5@6.0.1: resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==} @@ -10779,10 +10453,6 @@ packages: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} - pkg-dir@7.0.0: - resolution: {integrity: sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==} - engines: {node: '>=14.16'} - pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} @@ -10996,13 +10666,6 @@ packages: postcss: ^7.0.0 || ^8.0.1 webpack: ^4.0.0 || ^5.0.0 - postcss-loader@6.2.1: - resolution: {integrity: sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==} - engines: {node: '>= 12.13.0'} - peerDependencies: - postcss: ^7.0.0 || ^8.0.1 - webpack: ^5.0.0 - postcss-loader@8.1.1: resolution: {integrity: sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==} engines: {node: '>= 18.12.0'} @@ -11801,10 +11464,6 @@ packages: resolve-alpn@1.2.1: resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==} - resolve-cwd@3.0.0: - resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} - engines: {node: '>=8'} - resolve-from@4.0.0: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} @@ -12094,27 +11753,6 @@ packages: engines: {node: '>=16.0.0'} hasBin: true - sass-loader@16.0.5: - resolution: {integrity: sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==} - engines: {node: '>= 18.12.0'} - peerDependencies: - '@rspack/core': 0.x || 1.x - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 - sass: ^1.3.0 - sass-embedded: '*' - webpack: ^5.0.0 - peerDependenciesMeta: - '@rspack/core': - optional: true - node-sass: - optional: true - sass: - optional: true - sass-embedded: - optional: true - webpack: - optional: true - sass@1.51.0: resolution: {integrity: sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==} engines: {node: '>=12.0.0'} @@ -12255,10 +11893,6 @@ packages: setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} - shallow-clone@3.0.1: - resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} - engines: {node: '>=8'} - shebang-command@1.2.0: resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} engines: {node: '>=0.10.0'} @@ -12334,10 +11968,6 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - slash@4.0.0: - resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} - engines: {node: '>=12'} - slice-ansi@4.0.0: resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==} engines: {node: '>=10'} @@ -12360,9 +11990,6 @@ packages: smob@1.5.0: resolution: {integrity: sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==} - snake-case@3.0.4: - resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} - sockjs@0.3.24: resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} @@ -12397,12 +12024,6 @@ packages: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} - source-map-loader@5.0.0: - resolution: {integrity: sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA==} - engines: {node: '>= 18.12.0'} - peerDependencies: - webpack: ^5.72.1 - source-map-support@0.5.13: resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==} @@ -12646,12 +12267,6 @@ packages: peerDependencies: webpack: ^4.0.0 || ^5.0.0 - style-loader@3.3.4: - resolution: {integrity: sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==} - engines: {node: '>= 12.13.0'} - peerDependencies: - webpack: ^5.0.0 - style-loader@4.0.0: resolution: {integrity: sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==} engines: {node: '>= 18.12.0'} @@ -12707,13 +12322,6 @@ packages: stylis@4.3.6: resolution: {integrity: sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==} - stylus-loader@7.1.3: - resolution: {integrity: sha512-TY0SKwiY7D2kMd3UxaWKSf3xHF0FFN/FAfsSqfrhxRT/koXTwffq2cgEWDkLQz7VojMu7qEEHt5TlMjkPx9UDw==} - engines: {node: '>= 14.15.0'} - peerDependencies: - stylus: '>=0.52.4' - webpack: ^5.0.0 - stylus@0.64.0: resolution: {integrity: sha512-ZIdT8eUv8tegmqy1tTIdJv9We2DumkNZFdCF5mz/Kpq3OcTaxSuCAYZge6HKK2CmNC02G1eJig2RV7XTw5hQrA==} engines: {node: '>=16'} @@ -12768,9 +12376,6 @@ packages: svg-pan-zoom@3.6.2: resolution: {integrity: sha512-JwnvRWfVKw/Xzfe6jriFyfey/lWJLq4bUh2jwoR5ChWQuQoOH8FEh1l/bEp46iHHKHEJWIyFJETbazraxNWECg==} - svg-parser@2.0.4: - resolution: {integrity: sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==} - svg-tags@1.0.0: resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==} @@ -13063,10 +12668,6 @@ packages: '@swc/wasm': optional: true - tsconfig-paths-webpack-plugin@4.0.0: - resolution: {integrity: sha512-fw/7265mIWukrSHd0i+wSwx64kYUSAKPfxRDksjKIYTxSAp9W9/xcZVBF4Kl0eqQd5eBpAQ/oQrc5RyM/0c1GQ==} - engines: {node: '>=10.13.0'} - tsconfig-paths@4.2.0: resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} engines: {node: '>=6'} @@ -13159,9 +12760,6 @@ packages: resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==} engines: {node: '>= 0.4'} - typed-assert@1.0.9: - resolution: {integrity: sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==} - typedarray@0.0.6: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} @@ -13620,20 +13218,6 @@ packages: resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} engines: {node: '>=12'} - webpack-cli@6.0.1: - resolution: {integrity: sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==} - engines: {node: '>=18.12.0'} - hasBin: true - peerDependencies: - webpack: ^5.82.0 - webpack-bundle-analyzer: '*' - webpack-dev-server: '*' - peerDependenciesMeta: - webpack-bundle-analyzer: - optional: true - webpack-dev-server: - optional: true - webpack-dev-middleware@7.4.2: resolution: {integrity: sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==} engines: {node: '>= 18.12.0'} @@ -13656,14 +13240,6 @@ packages: webpack-cli: optional: true - webpack-merge@6.0.1: - resolution: {integrity: sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==} - engines: {node: '>=18.0.0'} - - webpack-node-externals@3.0.0: - resolution: {integrity: sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==} - engines: {node: '>=6'} - webpack-sources@1.4.3: resolution: {integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==} @@ -13675,26 +13251,6 @@ packages: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - webpack-subresource-integrity@5.1.0: - resolution: {integrity: sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==} - engines: {node: '>= 12'} - peerDependencies: - html-webpack-plugin: '>= 5.0.0-beta.1 < 6' - webpack: ^5.12.0 - peerDependenciesMeta: - html-webpack-plugin: - optional: true - - webpack@5.98.0: - resolution: {integrity: sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==} - engines: {node: '>=10.13.0'} - hasBin: true - peerDependencies: - webpack-cli: '*' - peerDependenciesMeta: - webpack-cli: - optional: true - webpack@5.99.9: resolution: {integrity: sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==} engines: {node: '>=10.13.0'} @@ -13799,9 +13355,6 @@ packages: wide-align@1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} - wildcard@2.0.1: - resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==} - word-wrap@1.2.5: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} @@ -13972,10 +13525,6 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - yocto-queue@1.2.1: - resolution: {integrity: sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==} - engines: {node: '>=12.20'} - yoctocolors-cjs@2.1.2: resolution: {integrity: sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==} engines: {node: '>=18'} @@ -14009,7 +13558,8 @@ packages: snapshots: - '@adobe/css-tools@4.3.3': {} + '@adobe/css-tools@4.3.3': + optional: true '@ampproject/remapping@2.3.0': dependencies: @@ -14614,40 +14164,6 @@ snapshots: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-react-constant-elements@7.25.9(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-transform-react-display-name@7.25.9(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-transform-react-jsx-development@7.25.9(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.10) - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-react-jsx@7.25.9(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.25.9 - '@babel/helper-module-imports': 7.25.9 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.10) - '@babel/types': 7.27.1 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-react-pure-annotations@7.25.9(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.25.9 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-regenerator@7.27.0(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -14821,18 +14337,6 @@ snapshots: '@babel/types': 7.27.1 esutils: 2.0.3 - '@babel/preset-react@7.26.3(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-validator-option': 7.25.9 - '@babel/plugin-transform-react-display-name': 7.25.9(@babel/core@7.26.10) - '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.10) - '@babel/plugin-transform-react-jsx-development': 7.25.9(@babel/core@7.26.10) - '@babel/plugin-transform-react-pure-annotations': 7.25.9(@babel/core@7.26.10) - transitivePeerDependencies: - - supports-color - '@babel/preset-typescript@7.27.0(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -14877,7 +14381,8 @@ snapshots: '@braintree/sanitize-url@7.1.1': {} - '@bufbuild/protobuf@2.2.5': {} + '@bufbuild/protobuf@2.2.5': + optional: true '@bundled-es-modules/cookie@2.0.1': dependencies: @@ -15071,11 +14576,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@ckeditor/ckeditor5-dev-translations@45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1))': + '@ckeditor/ckeditor5-dev-translations@45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4))': dependencies: '@babel/parser': 7.27.0 '@babel/traverse': 7.27.0 - '@ckeditor/ckeditor5-dev-utils': 45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + '@ckeditor/ckeditor5-dev-utils': 45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) chalk: 5.4.1 fs-extra: 11.3.0 glob: 10.4.5 @@ -15093,58 +14598,58 @@ snapshots: - uglify-js - webpack - '@ckeditor/ckeditor5-dev-utils@43.0.1(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1))': + '@ckeditor/ckeditor5-dev-utils@43.0.1(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4))': dependencies: '@ckeditor/ckeditor5-dev-translations': 43.0.1 chalk: 3.0.0 cli-cursor: 3.1.0 cli-spinners: 2.9.2 - css-loader: 5.2.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + css-loader: 5.2.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) cssnano: 6.1.2(postcss@8.5.3) del: 5.1.0 - esbuild-loader: 3.0.1(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + esbuild-loader: 3.0.1(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) fs-extra: 11.3.0 is-interactive: 1.0.0 javascript-stringify: 1.6.0 - mini-css-extract-plugin: 2.4.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + mini-css-extract-plugin: 2.4.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) mocha: 7.2.0 postcss: 8.5.3 postcss-import: 14.1.0(postcss@8.5.3) - postcss-loader: 4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + postcss-loader: 4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) postcss-mixins: 9.0.4(postcss@8.5.3) postcss-nesting: 13.0.1(postcss@8.5.3) - raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) shelljs: 0.8.5 - style-loader: 2.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) - terser-webpack-plugin: 4.2.3(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + style-loader: 2.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) + terser-webpack-plugin: 4.2.3(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) through2: 3.0.2 transitivePeerDependencies: - bluebird - supports-color - webpack - '@ckeditor/ckeditor5-dev-utils@45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1))': + '@ckeditor/ckeditor5-dev-utils@45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4))': dependencies: - '@ckeditor/ckeditor5-dev-translations': 45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + '@ckeditor/ckeditor5-dev-translations': 45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) chalk: 5.4.1 cli-cursor: 5.0.0 cli-spinners: 3.2.0 - css-loader: 7.1.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + css-loader: 7.1.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) cssnano: 7.0.6(postcss@8.5.3) - esbuild-loader: 4.3.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + esbuild-loader: 4.3.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) fs-extra: 11.3.0 is-interactive: 2.0.0 - mini-css-extract-plugin: 2.4.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + mini-css-extract-plugin: 2.4.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) mocha: 10.8.2 postcss: 8.5.3 postcss-import: 16.1.0(postcss@8.5.3) - postcss-loader: 8.1.1(postcss@8.5.3)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + postcss-loader: 8.1.1(postcss@8.5.3)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) postcss-mixins: 11.0.3(postcss@8.5.3) postcss-nesting: 13.0.1(postcss@8.5.3) - raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) shelljs: 0.8.5 - style-loader: 4.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) - terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + style-loader: 4.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) + terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) through2: 4.0.2 transitivePeerDependencies: - '@rspack/core' @@ -15425,29 +14930,29 @@ snapshots: '@ckeditor/ckeditor5-utils': 45.1.0 ckeditor5: 45.1.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) - '@ckeditor/ckeditor5-package-tools@3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)': + '@ckeditor/ckeditor5-package-tools@3.0.1(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(bufferutil@4.0.9)(esbuild@0.25.4)(utf-8-validate@6.0.5)': dependencies: - '@ckeditor/ckeditor5-dev-translations': 45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) - '@ckeditor/ckeditor5-dev-utils': 45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + '@ckeditor/ckeditor5-dev-translations': 45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) + '@ckeditor/ckeditor5-dev-utils': 45.0.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) buffer: 6.0.3 chalk: 5.4.1 - css-loader: 5.2.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + css-loader: 5.2.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) fs-extra: 11.3.0 glob: 7.2.3 minimist: 1.2.8 postcss: 8.5.3 - postcss-loader: 4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + postcss-loader: 4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) process: 0.11.10 - raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) - style-loader: 2.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + raw-loader: 4.0.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) + style-loader: 2.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) stylelint: 16.19.1(typescript@5.0.4) stylelint-config-ckeditor5: 2.0.1(stylelint@16.19.1(typescript@5.8.3)) - terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) - ts-loader: 9.5.2(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) + ts-loader: 9.5.2(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) ts-node: 10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.0.4) typescript: 5.0.4 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-dev-server: 5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) + webpack-dev-server: 5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) transitivePeerDependencies: - '@rspack/core' - '@swc/core' @@ -15786,8 +15291,6 @@ snapshots: dependencies: postcss-selector-parser: 7.1.0 - '@discoveryjs/json-ext@0.6.3': {} - '@dual-bundle/import-meta-resolve@4.1.0': {} '@electron-forge/cli@7.8.1(encoding@0.1.13)': @@ -17749,70 +17252,6 @@ snapshots: - supports-color - verdaccio - '@nx/webpack@21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(bufferutil@4.0.9)(esbuild@0.25.4)(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17)))(typescript@5.8.3)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)': - dependencies: - '@babel/core': 7.26.10 - '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@nx/js': 21.1.1(@babel/traverse@7.27.0)(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) - '@phenomnomnominal/tsquery': 5.0.1(typescript@5.8.3) - ajv: 8.17.1 - autoprefixer: 10.4.21(postcss@8.5.3) - babel-loader: 9.2.1(@babel/core@7.26.10)(webpack@5.98.0) - browserslist: 4.24.4 - copy-webpack-plugin: 10.2.4(webpack@5.98.0) - css-loader: 6.11.0(webpack@5.98.0) - css-minimizer-webpack-plugin: 5.0.1(esbuild@0.25.4)(webpack@5.98.0) - fork-ts-checker-webpack-plugin: 7.2.13(typescript@5.8.3)(webpack@5.98.0) - less: 4.1.3 - less-loader: 11.1.0(less@4.1.3)(webpack@5.98.0) - license-webpack-plugin: 4.0.2(webpack@5.98.0) - loader-utils: 2.0.4 - mini-css-extract-plugin: 2.4.7(webpack@5.98.0) - parse5: 4.0.0 - picocolors: 1.1.1 - postcss: 8.5.3 - postcss-import: 14.1.0(postcss@8.5.3) - postcss-loader: 6.2.1(postcss@8.5.3)(webpack@5.98.0) - rxjs: 7.8.2 - sass: 1.87.0 - sass-embedded: 1.87.0 - sass-loader: 16.0.5(sass-embedded@1.87.0)(sass@1.87.0)(webpack@5.98.0) - source-map-loader: 5.0.0(webpack@5.98.0) - style-loader: 3.3.4(webpack@5.98.0) - stylus: 0.64.0 - stylus-loader: 7.1.3(stylus@0.64.0)(webpack@5.98.0) - terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.98.0) - ts-loader: 9.5.2(typescript@5.8.3)(webpack@5.98.0) - tsconfig-paths-webpack-plugin: 4.0.0 - tslib: 2.8.1 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-dev-server: 5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)(webpack@5.98.0) - webpack-node-externals: 3.0.0 - webpack-subresource-integrity: 5.1.0(webpack@5.98.0) - transitivePeerDependencies: - - '@babel/traverse' - - '@parcel/css' - - '@rspack/core' - - '@swc-node/register' - - '@swc/core' - - '@swc/css' - - bufferutil - - clean-css - - csso - - debug - - esbuild - - html-webpack-plugin - - lightningcss - - node-sass - - nx - - supports-color - - typescript - - uglify-js - - utf-8-validate - - verdaccio - - vue-template-compiler - - webpack-cli - '@nx/workspace@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))': dependencies: '@nx/devkit': 21.1.1(nx@21.1.1(@swc-node/register@1.10.10(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.11.29(@swc/helpers@0.5.17))) @@ -18478,99 +17917,6 @@ snapshots: '@lezer/highlight': 1.2.1 '@lezer/lr': 1.4.2 - '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - - '@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - - '@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - - '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - - '@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - - '@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - - '@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - - '@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - - '@svgr/babel-preset@8.1.0(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.26.10) - '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.26.10) - '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.26.10) - '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.26.10) - '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.26.10) - '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.26.10) - '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.26.10) - '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.26.10) - - '@svgr/core@8.1.0(typescript@5.8.3)': - dependencies: - '@babel/core': 7.26.10 - '@svgr/babel-preset': 8.1.0(@babel/core@7.26.10) - camelcase: 6.3.0 - cosmiconfig: 8.3.6(typescript@5.8.3) - snake-case: 3.0.4 - transitivePeerDependencies: - - supports-color - - typescript - - '@svgr/hast-util-to-babel-ast@8.0.0': - dependencies: - '@babel/types': 7.27.1 - entities: 4.5.0 - - '@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.8.3))': - dependencies: - '@babel/core': 7.26.10 - '@svgr/babel-preset': 8.1.0(@babel/core@7.26.10) - '@svgr/core': 8.1.0(typescript@5.8.3) - '@svgr/hast-util-to-babel-ast': 8.0.0 - svg-parser: 2.0.4 - transitivePeerDependencies: - - supports-color - - '@svgr/plugin-svgo@8.1.0(@svgr/core@8.1.0(typescript@5.8.3))(typescript@5.8.3)': - dependencies: - '@svgr/core': 8.1.0(typescript@5.8.3) - cosmiconfig: 8.3.6(typescript@5.8.3) - deepmerge: 4.3.1 - svgo: 3.3.2 - transitivePeerDependencies: - - typescript - - '@svgr/webpack@8.1.0(typescript@5.8.3)': - dependencies: - '@babel/core': 7.26.10 - '@babel/plugin-transform-react-constant-elements': 7.25.9(@babel/core@7.26.10) - '@babel/preset-env': 7.26.9(@babel/core@7.26.10) - '@babel/preset-react': 7.26.3(@babel/core@7.26.10) - '@babel/preset-typescript': 7.27.0(@babel/core@7.26.10) - '@svgr/core': 8.1.0(typescript@5.8.3) - '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.8.3)) - '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0(typescript@5.8.3))(typescript@5.8.3) - transitivePeerDependencies: - - supports-color - - typescript - '@swc-node/core@1.13.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(@swc/types@0.1.21)': dependencies: '@swc/core': 1.11.29(@swc/helpers@0.5.17) @@ -19681,21 +19027,6 @@ snapshots: '@webcomponents/webcomponentsjs@2.8.0': {} - '@webpack-cli/configtest@3.0.1(webpack-cli@6.0.1)(webpack@5.98.0)': - dependencies: - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-cli: 6.0.1(webpack@5.98.0) - - '@webpack-cli/info@3.0.1(webpack-cli@6.0.1)(webpack@5.98.0)': - dependencies: - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-cli: 6.0.1(webpack@5.98.0) - - '@webpack-cli/serve@3.0.1(webpack-cli@6.0.1)(webpack@5.98.0)': - dependencies: - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-cli: 6.0.1(webpack@5.98.0) - '@xhmikosr/archive-type@7.0.0': dependencies: file-type: 19.6.0 @@ -20013,8 +19344,6 @@ snapshots: array-union@2.1.0: {} - array-union@3.0.1: {} - array.prototype.reduce@1.0.8: dependencies: call-bind: 1.0.8 @@ -20071,16 +19400,6 @@ snapshots: dependencies: immediate: 3.3.0 - autoprefixer@10.4.21(postcss@8.5.3): - dependencies: - browserslist: 4.24.4 - caniuse-lite: 1.0.30001715 - fraction.js: 4.3.7 - normalize-range: 0.1.2 - picocolors: 1.1.1 - postcss: 8.5.3 - postcss-value-parser: 4.2.0 - available-typed-arrays@1.0.7: dependencies: possible-typed-array-names: 1.1.0 @@ -20110,13 +19429,6 @@ snapshots: transitivePeerDependencies: - supports-color - babel-loader@9.2.1(@babel/core@7.26.10)(webpack@5.98.0): - dependencies: - '@babel/core': 7.26.10 - find-cache-dir: 4.0.0 - schema-utils: 4.3.2 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - babel-plugin-const-enum@1.2.0(@babel/core@7.26.10): dependencies: '@babel/core': 7.26.10 @@ -20373,7 +19685,8 @@ snapshots: buffer-alloc-unsafe: 1.1.0 buffer-fill: 1.0.0 - buffer-builder@0.2.0: {} + buffer-builder@0.2.0: + optional: true buffer-crc32@0.2.13: {} @@ -20786,12 +20099,6 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 - clone-deep@4.0.1: - dependencies: - is-plain-object: 2.0.4 - kind-of: 6.0.3 - shallow-clone: 3.0.1 - clone-response@1.0.3: dependencies: mimic-response: 1.0.1 @@ -20850,7 +20157,8 @@ snapshots: colorette@2.0.20: {} - colorjs.io@0.5.2: {} + colorjs.io@0.5.2: + optional: true colors@1.4.0: {} @@ -20885,8 +20193,6 @@ snapshots: comment-parser@1.4.0: {} - common-path-prefix@3.0.0: {} - commondir@1.0.1: {} compare-version@0.1.2: {} @@ -20965,25 +20271,16 @@ snapshots: copy-anything@2.0.6: dependencies: is-what: 3.14.1 + optional: true - copy-webpack-plugin@10.2.4(webpack@5.98.0): - dependencies: - fast-glob: 3.3.3 - glob-parent: 6.0.2 - globby: 12.2.0 - normalize-path: 3.0.0 - schema-utils: 4.3.2 - serialize-javascript: 6.0.2 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - copy-webpack-plugin@13.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + copy-webpack-plugin@13.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: glob-parent: 6.0.2 normalize-path: 3.0.0 schema-utils: 4.3.2 serialize-javascript: 6.0.2 tinyglobby: 0.2.13 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) core-js-compat@3.41.0: dependencies: @@ -21009,15 +20306,6 @@ snapshots: path-type: 4.0.0 yaml: 1.10.2 - cosmiconfig@8.3.6(typescript@5.8.3): - dependencies: - import-fresh: 3.3.1 - js-yaml: 4.1.0 - parse-json: 5.2.0 - path-type: 4.0.0 - optionalDependencies: - typescript: 5.8.3 - cosmiconfig@9.0.0(typescript@5.0.4): dependencies: env-paths: 2.2.1 @@ -21091,7 +20379,7 @@ snapshots: css-functions-list@3.2.3: {} - css-loader@5.2.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + css-loader@5.2.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: icss-utils: 5.1.0(postcss@8.5.3) loader-utils: 2.0.4 @@ -21103,9 +20391,9 @@ snapshots: postcss-value-parser: 4.2.0 schema-utils: 3.3.0 semver: 7.7.2 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) - css-loader@6.11.0(webpack@5.98.0): + css-loader@7.1.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: icss-utils: 5.1.0(postcss@8.5.3) postcss: 8.5.3 @@ -21116,32 +20404,7 @@ snapshots: postcss-value-parser: 4.2.0 semver: 7.7.2 optionalDependencies: - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - css-loader@7.1.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): - dependencies: - icss-utils: 5.1.0(postcss@8.5.3) - postcss: 8.5.3 - postcss-modules-extract-imports: 3.1.0(postcss@8.5.3) - postcss-modules-local-by-default: 4.2.0(postcss@8.5.3) - postcss-modules-scope: 3.2.1(postcss@8.5.3) - postcss-modules-values: 4.0.0(postcss@8.5.3) - postcss-value-parser: 4.2.0 - semver: 7.7.2 - optionalDependencies: - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - css-minimizer-webpack-plugin@5.0.1(esbuild@0.25.4)(webpack@5.98.0): - dependencies: - '@jridgewell/trace-mapping': 0.3.25 - cssnano: 6.1.2(postcss@8.5.3) - jest-worker: 29.7.0 - postcss: 8.5.3 - schema-utils: 4.3.2 - serialize-javascript: 6.0.2 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - optionalDependencies: - esbuild: 0.25.4 + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) css-select@4.3.0: dependencies: @@ -21835,11 +21098,6 @@ snapshots: domelementtype: 2.3.0 domhandler: 5.0.3 - dot-case@3.0.4: - dependencies: - no-case: 3.0.4 - tslib: 2.8.1 - dotenv-expand@11.0.7: dependencies: dotenv: 16.5.0 @@ -22068,8 +21326,6 @@ snapshots: env-paths@2.2.1: {} - envinfo@7.14.0: {} - environment@1.1.0: {} err-code@2.0.3: {} @@ -22171,20 +21427,20 @@ snapshots: es6-promise@4.2.8: {} - esbuild-loader@3.0.1(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + esbuild-loader@3.0.1(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: esbuild: 0.17.19 get-tsconfig: 4.10.0 loader-utils: 2.0.4 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) webpack-sources: 1.4.3 - esbuild-loader@4.3.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + esbuild-loader@4.3.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: esbuild: 0.25.3 get-tsconfig: 4.10.0 loader-utils: 2.0.4 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) webpack-sources: 1.4.3 esbuild@0.17.19: @@ -22718,11 +21974,6 @@ snapshots: make-dir: 3.1.0 pkg-dir: 4.2.0 - find-cache-dir@4.0.0: - dependencies: - common-path-prefix: 3.0.0 - pkg-dir: 7.0.0 - find-up@2.1.0: dependencies: locate-path: 2.0.0 @@ -22741,11 +21992,6 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 - find-up@6.3.0: - dependencies: - locate-path: 7.2.0 - path-exists: 5.0.0 - find-versions@5.1.0: dependencies: semver-regex: 4.0.5 @@ -22818,23 +22064,6 @@ snapshots: cross-spawn: 7.0.6 signal-exit: 4.1.0 - fork-ts-checker-webpack-plugin@7.2.13(typescript@5.8.3)(webpack@5.98.0): - dependencies: - '@babel/code-frame': 7.26.2 - chalk: 4.1.2 - chokidar: 3.6.0 - cosmiconfig: 7.1.0 - deepmerge: 4.3.1 - fs-extra: 10.1.0 - memfs: 3.5.3 - minimatch: 3.1.2 - node-abort-controller: 3.1.1 - schema-utils: 3.3.0 - semver: 7.7.2 - tapable: 2.2.1 - typescript: 5.8.3 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - form-data-encoder@1.7.2: {} form-data-encoder@2.1.4: {} @@ -22870,8 +22099,6 @@ snapshots: forwarded@0.2.0: {} - fraction.js@4.3.7: {} - fractional-indexing@3.2.0: {} fresh@0.5.2: {} @@ -22922,8 +22149,6 @@ snapshots: dependencies: minipass: 7.1.2 - fs-monkey@1.0.6: {} - fs-temp@1.2.1: dependencies: random-path: 0.1.2 @@ -23213,15 +22438,6 @@ snapshots: merge2: 1.4.1 slash: 3.0.0 - globby@12.2.0: - dependencies: - array-union: 3.0.1 - dir-glob: 3.0.1 - fast-glob: 3.3.3 - ignore: 5.3.2 - merge2: 1.4.1 - slash: 4.0.0 - globjoin@0.1.4: {} glur@1.1.2: {} @@ -23588,7 +22804,8 @@ snapshots: immutable@4.3.7: {} - immutable@5.1.1: {} + immutable@5.1.1: + optional: true import-fresh@3.3.1: dependencies: @@ -23597,11 +22814,6 @@ snapshots: import-lazy@4.0.0: {} - import-local@3.2.0: - dependencies: - pkg-dir: 4.2.0 - resolve-cwd: 3.0.0 - import-meta-resolve@4.1.0: {} imul@1.0.1: @@ -23803,10 +23015,6 @@ snapshots: is-plain-obj@4.1.0: {} - is-plain-object@2.0.4: - dependencies: - isobject: 3.0.1 - is-plain-object@5.0.0: {} is-potential-custom-element-name@1.0.1: {} @@ -23876,7 +23084,8 @@ snapshots: call-bound: 1.0.4 get-intrinsic: 1.3.0 - is-what@3.14.1: {} + is-what@3.14.1: + optional: true is-wsl@2.2.0: dependencies: @@ -23904,8 +23113,6 @@ snapshots: isexe@3.1.1: {} - isobject@3.0.1: {} - istanbul-lib-coverage@3.2.2: {} istanbul-lib-instrument@5.2.1: @@ -24512,12 +23719,6 @@ snapshots: leaflet@1.9.4: {} - less-loader@11.1.0(less@4.1.3)(webpack@5.98.0): - dependencies: - klona: 2.0.6 - less: 4.1.3 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - less@4.1.3: dependencies: copy-anything: 2.0.6 @@ -24531,6 +23732,7 @@ snapshots: mime: 1.6.0 needle: 3.3.1 source-map: 0.6.1 + optional: true leven@3.1.0: {} @@ -24539,12 +23741,6 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - license-webpack-plugin@4.0.2(webpack@5.98.0): - dependencies: - webpack-sources: 3.2.3 - optionalDependencies: - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - lie@3.3.0: dependencies: immediate: 3.0.6 @@ -24637,10 +23833,6 @@ snapshots: dependencies: p-locate: 5.0.0 - locate-path@7.2.0: - dependencies: - p-locate: 6.0.0 - lodash-es@4.17.21: {} lodash.clonedeep@4.5.0: {} @@ -24702,10 +23894,6 @@ snapshots: loupe@3.1.3: {} - lower-case@2.0.2: - dependencies: - tslib: 2.8.1 - lowercase-keys@2.0.0: {} lowercase-keys@3.0.0: {} @@ -24876,10 +24064,6 @@ snapshots: mimic-fn: 2.1.0 p-is-promise: 2.1.0 - memfs@3.5.3: - dependencies: - fs-monkey: 1.0.6 - memfs@4.17.0: dependencies: '@jsonjoy.com/json-pack': 1.2.0(tslib@2.8.1) @@ -25115,15 +24299,10 @@ snapshots: mind-elixir@4.5.2: {} - mini-css-extract-plugin@2.4.7(webpack@5.98.0): + mini-css-extract-plugin@2.4.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: schema-utils: 4.3.2 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - mini-css-extract-plugin@2.4.7(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): - dependencies: - schema-utils: 4.3.2 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) minimalistic-assert@1.0.1: {} @@ -25402,17 +24581,10 @@ snapshots: nice-try@1.0.5: {} - no-case@3.0.4: - dependencies: - lower-case: 2.0.2 - tslib: 2.8.1 - node-abi@4.8.0: dependencies: semver: 7.7.2 - node-abort-controller@3.1.1: {} - node-addon-api@7.1.1: {} node-api-version@0.2.1: @@ -25505,8 +24677,6 @@ snapshots: normalize-path@3.0.0: {} - normalize-range@0.1.2: {} - normalize-strings@1.1.1: {} normalize-url@6.1.0: {} @@ -25789,10 +24959,6 @@ snapshots: dependencies: yocto-queue: 0.1.0 - p-limit@4.0.0: - dependencies: - yocto-queue: 1.2.1 - p-locate@2.0.0: dependencies: p-limit: 1.3.0 @@ -25809,10 +24975,6 @@ snapshots: dependencies: p-limit: 3.1.0 - p-locate@6.0.0: - dependencies: - p-limit: 4.0.0 - p-map@3.0.0: dependencies: aggregate-error: 3.1.0 @@ -25909,7 +25071,8 @@ snapshots: json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 - parse-node-version@1.0.1: {} + parse-node-version@1.0.1: + optional: true parse-srcset@1.0.2: {} @@ -25926,8 +25089,6 @@ snapshots: dependencies: parse5: 7.3.0 - parse5@4.0.0: {} - parse5@6.0.1: {} parse5@7.3.0: @@ -26025,10 +25186,6 @@ snapshots: dependencies: find-up: 4.1.0 - pkg-dir@7.0.0: - dependencies: - find-up: 6.3.0 - pkg-types@1.3.1: dependencies: confbox: 0.1.8 @@ -26222,7 +25379,7 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.5.3 - postcss-loader@4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + postcss-loader@4.3.0(postcss@8.5.3)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: cosmiconfig: 7.1.0 klona: 2.0.6 @@ -26230,24 +25387,16 @@ snapshots: postcss: 8.5.3 schema-utils: 3.3.0 semver: 7.7.2 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) - postcss-loader@6.2.1(postcss@8.5.3)(webpack@5.98.0): - dependencies: - cosmiconfig: 7.1.0 - klona: 2.0.6 - postcss: 8.5.3 - semver: 7.7.2 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - postcss-loader@8.1.1(postcss@8.5.3)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + postcss-loader@8.1.1(postcss@8.5.3)(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: cosmiconfig: 9.0.0(typescript@5.0.4) jiti: 1.21.7 postcss: 8.5.3 semver: 7.7.2 optionalDependencies: - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) transitivePeerDependencies: - typescript @@ -26821,11 +25970,11 @@ snapshots: raw-loader@0.5.1: {} - raw-loader@4.0.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + raw-loader@4.0.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) rc@1.2.8: dependencies: @@ -27051,10 +26200,6 @@ snapshots: resolve-alpn@1.2.1: {} - resolve-cwd@3.0.0: - dependencies: - resolve-from: 5.0.0 - resolve-from@4.0.0: {} resolve-from@5.0.0: {} @@ -27213,6 +26358,7 @@ snapshots: rxjs@7.8.2: dependencies: tslib: 2.8.1 + optional: true sade@1.8.1: dependencies: @@ -27355,14 +26501,7 @@ snapshots: sass-embedded-win32-arm64: 1.87.0 sass-embedded-win32-ia32: 1.87.0 sass-embedded-win32-x64: 1.87.0 - - sass-loader@16.0.5(sass-embedded@1.87.0)(sass@1.87.0)(webpack@5.98.0): - dependencies: - neo-async: 2.6.2 - optionalDependencies: - sass: 1.87.0 - sass-embedded: 1.87.0 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + optional: true sass@1.51.0: dependencies: @@ -27377,6 +26516,7 @@ snapshots: source-map-js: 1.2.1 optionalDependencies: '@parcel/watcher': 2.5.1 + optional: true sax@1.4.1: {} @@ -27540,10 +26680,6 @@ snapshots: setprototypeof@1.2.0: {} - shallow-clone@3.0.1: - dependencies: - kind-of: 6.0.3 - shebang-command@1.2.0: dependencies: shebang-regex: 1.0.0 @@ -27620,8 +26756,6 @@ snapshots: slash@3.0.0: {} - slash@4.0.0: {} - slice-ansi@4.0.0: dependencies: ansi-styles: 4.3.0 @@ -27644,11 +26778,6 @@ snapshots: smob@1.5.0: {} - snake-case@3.0.4: - dependencies: - dot-case: 3.0.4 - tslib: 2.8.1 - sockjs@0.3.24: dependencies: faye-websocket: 0.11.4 @@ -27697,12 +26826,6 @@ snapshots: source-map-js@1.2.1: {} - source-map-loader@5.0.0(webpack@5.98.0): - dependencies: - iconv-lite: 0.6.3 - source-map-js: 1.2.1 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - source-map-support@0.5.13: dependencies: buffer-from: 1.1.2 @@ -27958,19 +27081,15 @@ snapshots: '@tokenizer/token': 0.3.0 peek-readable: 5.4.2 - style-loader@2.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + style-loader@2.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) - style-loader@3.3.4(webpack@5.98.0): + style-loader@4.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - style-loader@4.0.0(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): - dependencies: - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) style-mod@4.1.2: {} @@ -28101,13 +27220,6 @@ snapshots: stylis@4.3.6: {} - stylus-loader@7.1.3(stylus@0.64.0)(webpack@5.98.0): - dependencies: - fast-glob: 3.3.3 - normalize-path: 3.0.0 - stylus: 0.64.0 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - stylus@0.64.0: dependencies: '@adobe/css-tools': 4.3.3 @@ -28117,6 +27229,7 @@ snapshots: source-map: 0.7.4 transitivePeerDependencies: - supports-color + optional: true sudo-prompt@9.2.1: {} @@ -28176,8 +27289,6 @@ snapshots: svg-pan-zoom@3.6.2: {} - svg-parser@2.0.4: {} - svg-tags@1.0.0: {} svgo@2.8.0: @@ -28226,19 +27337,21 @@ snapshots: express: 4.21.2 swagger-ui-dist: 5.21.0 - swc-loader@0.2.6(@swc/core@1.11.29(@swc/helpers@0.5.17))(webpack@5.98.0): + swc-loader@0.2.6(@swc/core@1.11.29(@swc/helpers@0.5.17))(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: '@swc/core': 1.11.29(@swc/helpers@0.5.17) '@swc/counter': 0.1.3 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) symbol-tree@3.2.4: {} sync-child-process@1.0.2: dependencies: sync-message-port: 1.1.3 + optional: true - sync-message-port@1.1.3: {} + sync-message-port@1.1.3: + optional: true table@6.9.0: dependencies: @@ -28331,7 +27444,7 @@ snapshots: rimraf: 2.6.3 optional: true - terser-webpack-plugin@4.2.3(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + terser-webpack-plugin@4.2.3(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: cacache: 15.3.0 find-cache-dir: 3.3.2 @@ -28341,31 +27454,19 @@ snapshots: serialize-javascript: 5.0.1 source-map: 0.6.1 terser: 5.39.0 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) webpack-sources: 1.4.3 transitivePeerDependencies: - bluebird - terser-webpack-plugin@5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.98.0): + terser-webpack-plugin@5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.2 serialize-javascript: 6.0.2 terser: 5.39.0 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - optionalDependencies: - '@swc/core': 1.11.29(@swc/helpers@0.5.17) - esbuild: 0.25.4 - - terser-webpack-plugin@5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): - dependencies: - '@jridgewell/trace-mapping': 0.3.25 - jest-worker: 27.5.1 - schema-utils: 4.3.2 - serialize-javascript: 6.0.2 - terser: 5.39.0 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) optionalDependencies: '@swc/core': 1.11.29(@swc/helpers@0.5.17) esbuild: 0.25.4 @@ -28518,7 +27619,7 @@ snapshots: ts-dedent@2.2.0: {} - ts-loader@9.5.2(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): + ts-loader@9.5.2(typescript@5.0.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: chalk: 4.1.2 enhanced-resolve: 5.18.1 @@ -28526,17 +27627,7 @@ snapshots: semver: 7.7.2 source-map: 0.7.4 typescript: 5.0.4 - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - ts-loader@9.5.2(typescript@5.8.3)(webpack@5.98.0): - dependencies: - chalk: 4.1.2 - enhanced-resolve: 5.18.1 - micromatch: 4.0.8 - semver: 7.7.2 - source-map: 0.7.4 - typescript: 5.8.3 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) ts-node@10.9.2(@swc/core@1.11.29(@swc/helpers@0.5.17))(@types/node@22.15.21)(typescript@5.0.4): dependencies: @@ -28578,12 +27669,6 @@ snapshots: optionalDependencies: '@swc/core': 1.11.29(@swc/helpers@0.5.17) - tsconfig-paths-webpack-plugin@4.0.0: - dependencies: - chalk: 4.1.2 - enhanced-resolve: 5.18.1 - tsconfig-paths: 4.2.0 - tsconfig-paths@4.2.0: dependencies: json5: 2.2.3 @@ -28694,8 +27779,6 @@ snapshots: possible-typed-array-names: 1.1.0 reflect.getprototypeof: 1.0.10 - typed-assert@1.0.9: {} - typedarray@0.0.6: {} typescript-eslint@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3): @@ -28911,7 +27994,8 @@ snapshots: vanilla-js-wheel-zoom@9.0.4: {} - varint@6.0.0: {} + varint@6.0.0: + optional: true vary@1.1.2: {} @@ -29162,24 +28246,7 @@ snapshots: webidl-conversions@7.0.0: {} - webpack-cli@6.0.1(webpack@5.98.0): - dependencies: - '@discoveryjs/json-ext': 0.6.3 - '@webpack-cli/configtest': 3.0.1(webpack-cli@6.0.1)(webpack@5.98.0) - '@webpack-cli/info': 3.0.1(webpack-cli@6.0.1)(webpack@5.98.0) - '@webpack-cli/serve': 3.0.1(webpack-cli@6.0.1)(webpack@5.98.0) - colorette: 2.0.20 - commander: 12.1.0 - cross-spawn: 7.0.6 - envinfo: 7.14.0 - fastest-levenshtein: 1.0.16 - import-local: 3.2.0 - interpret: 3.1.1 - rechoir: 0.8.0 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-merge: 6.0.1 - - webpack-dev-middleware@7.4.2(webpack@5.98.0): + webpack-dev-middleware@7.4.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: colorette: 2.0.20 memfs: 4.17.0 @@ -29188,20 +28255,9 @@ snapshots: range-parser: 1.2.1 schema-utils: 4.3.2 optionalDependencies: - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) - webpack-dev-middleware@7.4.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): - dependencies: - colorette: 2.0.20 - memfs: 4.17.0 - mime-types: 2.1.35 - on-finished: 2.4.1 - range-parser: 1.2.1 - schema-utils: 4.3.2 - optionalDependencies: - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - webpack-dev-server@5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)(webpack@5.98.0): + webpack-dev-server@5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)): dependencies: '@types/bonjour': 3.5.13 '@types/connect-history-api-fallback': 1.5.4 @@ -29229,64 +28285,16 @@ snapshots: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack-dev-middleware: 7.4.2(webpack@5.98.0) + webpack-dev-middleware: 7.4.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5) optionalDependencies: - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-cli: 6.0.1(webpack@5.98.0) + webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4) transitivePeerDependencies: - bufferutil - debug - supports-color - utf-8-validate - webpack-dev-server@5.2.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)(webpack-cli@6.0.1)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)): - dependencies: - '@types/bonjour': 3.5.13 - '@types/connect-history-api-fallback': 1.5.4 - '@types/express': 4.17.22 - '@types/express-serve-static-core': 5.0.6 - '@types/serve-index': 1.9.4 - '@types/serve-static': 1.15.7 - '@types/sockjs': 0.3.36 - '@types/ws': 8.18.1 - ansi-html-community: 0.0.8 - bonjour-service: 1.3.0 - chokidar: 3.6.0 - colorette: 2.0.20 - compression: 1.8.0 - connect-history-api-fallback: 2.0.0 - express: 4.21.2 - graceful-fs: 4.2.11 - http-proxy-middleware: 2.0.9(@types/express@4.17.22) - ipaddr.js: 2.2.0 - launch-editor: 2.10.0 - open: 10.1.1 - p-retry: 6.2.1 - schema-utils: 4.3.2 - selfsigned: 2.4.1 - serve-index: 1.9.1 - sockjs: 0.3.24 - spdy: 4.0.2 - webpack-dev-middleware: 7.4.2(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) - ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5) - optionalDependencies: - webpack: 5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - webpack-cli: 6.0.1(webpack@5.98.0) - transitivePeerDependencies: - - bufferutil - - debug - - supports-color - - utf-8-validate - - webpack-merge@6.0.1: - dependencies: - clone-deep: 4.0.1 - flat: 5.0.2 - wildcard: 2.0.1 - - webpack-node-externals@3.0.0: {} - webpack-sources@1.4.3: dependencies: source-list-map: 2.0.1 @@ -29299,44 +28307,7 @@ snapshots: webpack-sources@3.2.3: {} - webpack-subresource-integrity@5.1.0(webpack@5.98.0): - dependencies: - typed-assert: 1.0.9 - webpack: 5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1) - - webpack@5.98.0(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1): - dependencies: - '@types/eslint-scope': 3.7.7 - '@types/estree': 1.0.7 - '@webassemblyjs/ast': 1.14.1 - '@webassemblyjs/wasm-edit': 1.14.1 - '@webassemblyjs/wasm-parser': 1.14.1 - acorn: 8.14.1 - browserslist: 4.24.4 - chrome-trace-event: 1.0.4 - enhanced-resolve: 5.18.1 - es-module-lexer: 1.7.0 - eslint-scope: 5.1.1 - events: 3.3.0 - glob-to-regexp: 0.4.1 - graceful-fs: 4.2.11 - json-parse-even-better-errors: 2.3.1 - loader-runner: 4.3.0 - mime-types: 2.1.35 - neo-async: 2.6.2 - schema-utils: 4.3.2 - tapable: 2.2.1 - terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.98.0) - watchpack: 2.4.2 - webpack-sources: 3.2.3 - optionalDependencies: - webpack-cli: 6.0.1(webpack@5.98.0) - transitivePeerDependencies: - - '@swc/core' - - esbuild - - uglify-js - - webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1): + webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -29359,11 +28330,9 @@ snapshots: neo-async: 2.6.2 schema-utils: 4.3.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack-cli@6.0.1)) + terser-webpack-plugin: 5.3.14(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)(webpack@5.99.9(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.25.4)) watchpack: 2.4.2 webpack-sources: 3.2.3 - optionalDependencies: - webpack-cli: 6.0.1(webpack@5.98.0) transitivePeerDependencies: - '@swc/core' - esbuild @@ -29486,8 +28455,6 @@ snapshots: string-width: 4.2.3 optional: true - wildcard@2.0.1: {} - word-wrap@1.2.5: {} workerpool@6.5.1: {} @@ -29654,8 +28621,6 @@ snapshots: yocto-queue@0.1.0: {} - yocto-queue@1.2.1: {} - yoctocolors-cjs@2.1.2: optional: true From fa9d0be651b96e235c9a1f082ee245a87107144b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 14:09:51 +0300 Subject: [PATCH 69/78] refactor(server): async import without side effects --- apps/server/src/services/i18n.ts | 34 +++++++++++++++++--------------- packages/commons/src/lib/i18n.ts | 9 +++++++-- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/apps/server/src/services/i18n.ts b/apps/server/src/services/i18n.ts index e4488ef06..c060f80fd 100644 --- a/apps/server/src/services/i18n.ts +++ b/apps/server/src/services/i18n.ts @@ -4,15 +4,22 @@ import sql_init from "./sql_init.js"; import { join } from "path"; import { getResourceDir } from "./utils.js"; import hidden_subtree from "./hidden_subtree.js"; -import { LOCALES, type Locale } from "@triliumnext/commons"; +import { LOCALES, type Locale, type LOCALE_IDS } from "@triliumnext/commons"; import dayjs, { Dayjs } from "dayjs"; -const DAYJS_LOCALE_MAP: Record = { - cn: "zh-cn", - tw: "zh-tw" -}; - -let dayjsLocale: string; +const DAYJS_LOADER: Record Promise> = { + "ar": () => import("dayjs/locale/ar.js"), + "cn": () => import("dayjs/locale/zh-cn.js"), + "de": () => import("dayjs/locale/de.js"), + "en": () => import("dayjs/locale/en.js"), + "es": () => import("dayjs/locale/es.js"), + "fa": () => import("dayjs/locale/fa.js"), + "fr": () => import("dayjs/locale/fr.js"), + "he": () => import("dayjs/locale/he.js"), + "ku": () => import("dayjs/locale/ku.js"), + "ro": () => import("dayjs/locale/ro.js"), + "tw": () => import("dayjs/locale/tw.js") +} export async function initializeTranslations() { const resourceDir = getResourceDir(); @@ -30,12 +37,7 @@ export async function initializeTranslations() { }); // Initialize dayjs locale. - dayjsLocale = DAYJS_LOCALE_MAP[locale] ?? locale; - try { - await import(`dayjs/locale/${dayjsLocale}.js`); - } catch (err) { - console.warn(`Could not load locale ${dayjsLocale}`, err); - } + const dayjsLocale = await DAYJS_LOADER[locale](); dayjs.locale(dayjsLocale); } @@ -48,8 +50,8 @@ export function getLocales(): Locale[] { return LOCALES; } -function getCurrentLanguage() { - let language; +function getCurrentLanguage(): LOCALE_IDS { + let language: string; if (sql_init.isDbInitialized()) { language = options.getOptionOrNull("locale"); } @@ -59,7 +61,7 @@ function getCurrentLanguage() { language = "en"; } - return language; + return language as LOCALE_IDS; } export async function changeLanguage(locale: string) { diff --git a/packages/commons/src/lib/i18n.ts b/packages/commons/src/lib/i18n.ts index 5967a1275..bfb5caac1 100644 --- a/packages/commons/src/lib/i18n.ts +++ b/packages/commons/src/lib/i18n.ts @@ -9,7 +9,7 @@ export interface Locale { electronLocale?: string; } -export const LOCALES: Locale[] = [ +const UNSORTED_LOCALES = [ { id: "en", name: "English", @@ -75,4 +75,9 @@ export const LOCALES: Locale[] = [ rtl: true, contentOnly: true } -].sort((a, b) => a.name.localeCompare(b.name)); +] as const; + +export const LOCALES: Locale[] = Array.from(UNSORTED_LOCALES) + .sort((a, b) => a.name.localeCompare(b.name)); + +export type LOCALE_IDS = typeof UNSORTED_LOCALES[number]["id"]; From adc8e8ad73f54b1d360cb68052eddb14f06ee687 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 14:15:12 +0300 Subject: [PATCH 70/78] fix(server): serving of images in dev mode --- apps/server/src/assets/views/login.ejs | 2 +- apps/server/src/routes/assets.ts | 2 +- apps/server/src/routes/login.ts | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/server/src/assets/views/login.ejs b/apps/server/src/assets/views/login.ejs index 01efc8720..1daf91a3d 100644 --- a/apps/server/src/assets/views/login.ejs +++ b/apps/server/src/assets/views/login.ejs @@ -21,7 +21,7 @@