feat(dev): merge main into feature branch

Resolved conflicts by:
- Combining imports from both branches in search.ts (added
hoistedNoteService and beccaService alongside existing ftsSearchService
and log imports)
- Integrating FTS5 search optimization from feature branch with flatText
attribute search logic from main in note_content_fulltext.ts
- Maintained backward compatibility by keeping fallback search
implementation for cases where FTS5 is not available or not suitable

.github/workflows/deploy-app.yml

@@ -1,65 +0,0 @@
-name: Deploy Standalone App
-
-on:
-  # Trigger on push to main branch
-  push:
-    branches:
-      - main
-    # Only run when docs files change
-    paths:
-      - 'apps/client/**'
-      - 'apps/client-standalone/**'
-      - 'packages/trilium-core/**'
-
-  # Allow manual triggering from Actions tab
-  workflow_dispatch:
-
-  # Run on pull requests for preview deployments
-  pull_request:
-    paths:
-      - 'apps/client/**'
-      - 'apps/client-standalone/**'
-      - 'packages/trilium-core/**'
-jobs:
-  build-and-deploy:
-    name: Build and Deploy App
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    # Required permissions for deployment
-    permissions:
-      contents: read
-      deployments: write
-      pull-requests: write # For PR preview comments
-      id-token: write # For OIDC authentication (if needed)
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v6
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: '24'
-          cache: 'pnpm'
-
-      - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Trigger build of app
-        run: pnpm --filter=client-standalone build
-
-      - name: Deploy
-        uses: ./.github/actions/deploy-to-cloudflare-pages
-        if: github.repository == vars.REPO_MAIN
-        with:
-          project_name: "trilium-app"
-          comment_body: "🖥️ App preview is ready"
-          production_url: "https://app.triliumnotes.org"
-          deploy_dir: "apps/client-standalone/dist"
-          cloudflare_api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          cloudflare_account_id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dev.yml

@@ -1,9 +1,9 @@
 name: Dev
 on:
   push:
-    branches: [ main, standalone ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, standalone ]
+    branches: [ main ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/release.yml

@@ -11,14 +11,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  sanity-check:
-    name: Sanity Check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Check version consistency
-        run: pnpm tsx ${{ github.workspace }}/scripts/check-version-consistency.ts ${{ github.ref_name }}
   make-electron:
     name: Make Electron
     strategy:

.gitignore

@@ -51,4 +51,3 @@ upload
 # docs
 site/
 apps/*/coverage
-scripts/translation/.language*.json

apps/build-docs/package.json

@@ -9,14 +9,14 @@
   "keywords": [],
   "author": "Elian Doran <contact@eliandoran.me>",
   "license": "AGPL-3.0-only",
-  "packageManager": "pnpm@10.28.0",
+  "packageManager": "pnpm@10.26.2",
   "devDependencies": {
-    "@redocly/cli": "2.14.4",
+    "@redocly/cli": "2.14.1",
     "archiver": "7.0.1",
     "fs-extra": "11.3.3",
     "react": "19.2.3",
     "react-dom": "19.2.3",
-    "typedoc": "0.28.16",
+    "typedoc": "0.28.15",
     "typedoc-plugin-missing-exports": "4.1.2"
   }
 }

apps/client-standalone/.env

@@ -1,4 +0,0 @@
-# The development license key for premium CKEditor features.
-# Note: This key must only be used for the Trilium Notes project.
-VITE_CKEDITOR_KEY=eyJhbGciOiJFUzI1NiJ9.eyJleHAiOjE3ODcyNzA0MDAsImp0aSI6IjkyMWE1MWNlLTliNDMtNGRlMC1iOTQwLTc5ZjM2MDBkYjg1NyIsImRpc3RyaWJ1dGlvbkNoYW5uZWwiOiJ0cmlsaXVtIiwiZmVhdHVyZXMiOlsiVFJJTElVTSJdLCJ2YyI6ImU4YzRhMjBkIn0.hny77p-U4-jTkoqbwPytrEar5ylGCWBN7Ez3SlB8i6_mJCBIeCSTOlVQk_JMiOEq3AGykUMHzWXzjdMFwgniOw
-VITE_CKEDITOR_ENABLE_INSPECTOR=false

apps/client-standalone/.env.production

@@ -1 +0,0 @@
-VITE_CKEDITOR_ENABLE_INSPECTOR=false

apps/client-standalone/package.json

@@ -1,86 +0,0 @@
-{
-  "name": "@triliumnext/client-standalone",
-  "version": "0.101.3",
-  "description": "Standalone client for TriliumNext with SQLite WASM backend",
-  "private": true,
-  "license": "AGPL-3.0-only",
-  "scripts": {
-    "build": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build",
-    "dev": "vite dev",
-    "test": "vitest",
-    "start-prod": "pnpm build && pnpm http-server dist -p 8888",
-    "coverage": "vitest --coverage"
-  },
-  "dependencies": {
-    "@excalidraw/excalidraw": "0.18.0",
-    "@fullcalendar/core": "6.1.20",
-    "@fullcalendar/daygrid": "6.1.20",
-    "@fullcalendar/interaction": "6.1.20",
-    "@fullcalendar/list": "6.1.20",
-    "@fullcalendar/multimonth": "6.1.20",
-    "@fullcalendar/timegrid": "6.1.20",
-    "@maplibre/maplibre-gl-leaflet": "0.1.3",
-    "@mermaid-js/layout-elk": "0.2.0",
-    "@mind-elixir/node-menu": "5.0.1",
-    "@popperjs/core": "2.11.8",
-    "@preact/signals": "2.5.1",
-    "@sqlite.org/sqlite-wasm": "3.51.1-build2",
-    "@triliumnext/ckeditor5": "workspace:*",
-    "@triliumnext/codemirror": "workspace:*",
-    "@triliumnext/commons": "workspace:*",
-    "@triliumnext/core": "workspace:*",
-    "@triliumnext/highlightjs": "workspace:*",
-    "@triliumnext/share-theme": "workspace:*",
-    "@triliumnext/split.js": "workspace:*",
-    "@zumer/snapdom": "2.0.1",
-    "autocomplete.js": "0.38.1",
-    "bootstrap": "5.3.8",
-    "boxicons": "2.1.4",
-    "clsx": "2.1.1",
-    "color": "5.0.3",
-    "debounce": "3.0.0",
-    "draggabilly": "3.0.0",
-    "force-graph": "1.51.0",
-    "globals": "17.0.0",
-    "i18next": "25.7.3",
-    "i18next-http-backend": "3.0.2",
-    "jquery": "3.7.1",
-    "jquery.fancytree": "2.38.5",
-    "js-sha1": "0.7.0",
-    "js-sha512": "0.9.0",
-    "jsplumb": "2.15.6",
-    "katex": "0.16.27",
-    "knockout": "3.5.1",
-    "leaflet": "1.9.4",
-    "leaflet-gpx": "2.2.0",
-    "mark.js": "8.11.1",
-    "marked": "17.0.1",
-    "mermaid": "11.12.2",
-    "mind-elixir": "5.4.0",
-    "normalize.css": "8.0.1",
-    "panzoom": "9.4.3",
-    "preact": "10.28.2",
-    "react-i18next": "16.5.1",
-    "react-window": "2.2.3",
-    "reveal.js": "5.2.1",
-    "svg-pan-zoom": "3.6.2",
-    "tabulator-tables": "6.3.1",
-    "vanilla-js-wheel-zoom": "9.0.4"
-  },
-  "devDependencies": {
-    "@ckeditor/ckeditor5-inspector": "5.0.0",
-    "@preact/preset-vite": "2.10.2",
-    "@types/bootstrap": "5.2.10",
-    "@types/jquery": "3.5.33",
-    "@types/leaflet": "1.9.21",
-    "@types/leaflet-gpx": "1.3.8",
-    "@types/mark.js": "8.11.12",
-    "@types/reveal.js": "5.2.2",
-    "@types/tabulator-tables": "6.3.1",
-    "copy-webpack-plugin": "13.0.1",
-    "cross-env": "7.0.3",
-    "happy-dom": "20.0.11",
-    "script-loader": "0.7.2",
-    "vite-plugin-static-copy": "3.1.4"
-  }
-}

apps/client-standalone/public/_headers

@@ -1,3 +0,0 @@
-/*
-  Cross-Origin-Opener-Policy: same-origin
-  Cross-Origin-Embedder-Policy: require-corp

apps/client-standalone/public/manifest.webmanifest

@@ -1,20 +0,0 @@
-{
-    "name": "Trilium Notes",
-    "short_name": "Trilium",
-    "description": "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.",
-    "theme_color": "#333333",
-    "background_color": "#1F1F1F",
-    "display": "standalone",
-    "scope": "/",
-    "start_url": "/",
-    "display_override": [
-        "window-controls-overlay"
-    ],
-    "icons": [
-        {
-            "src": "assets/icon.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ]
-}

apps/client-standalone/src/desktop.ts

@@ -1,2 +0,0 @@
-// Re-export desktop from client
-export * from "../../client/src/desktop";

apps/client-standalone/src/index.html

@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <link rel="shortcut icon" href="favicon.ico">
-        <meta name="mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover" />
-        <link rel="manifest" crossorigin="use-credentials" href="manifest.webmanifest">
-        <title>Trilium Notes</title>
-    </head>
-
-    <body id="trilium-app">
-        <noscript>Trilium requires JavaScript to be enabled.</noscript>
-
-        <script>
-            // hide body to reduce flickering on the startup. This is done through JS and not CSS to not hide <noscript>
-            document.getElementsByTagName("body")[0].style.display = "none";
-        </script>
-
-        <div class="dropdown-menu dropdown-menu-sm" id="context-menu-container" style="display: none"></div>
-
-        <!-- Required for match the PWA's top bar color with the theme -->
-        <!-- This works even when the user directly changes --root-background in CSS -->
-        <div id="background-color-tracker" style="position: absolute; visibility: hidden; color: var(--root-background); transition: color 1ms;"></div>
-
-        <!-- Bootstrap (request server for required information) -->
-        <script src="./main.ts" type="module"></script>
-
-        <!-- Required for correct loading of scripts in Electron -->
-        <script>
-            if (typeof module === 'object') {window.module = module; module = undefined;}
-        </script>
-    </body>
-</html>

apps/client-standalone/src/lightweight/browser_router.ts

@@ -1,254 +0,0 @@
-/**
- * Browser-compatible router that mimics Express routing patterns.
- * Supports path parameters (e.g., /api/notes/:noteId) and query strings.
- */
-
-import { getContext, routes } from "@triliumnext/core";
-
-export interface BrowserRequest {
-    method: string;
-    url: string;
-    path: string;
-    params: Record<string, string>;
-    query: Record<string, string | undefined>;
-    body?: unknown;
-}
-
-export interface BrowserResponse {
-    status: number;
-    headers: Record<string, string>;
-    body: ArrayBuffer | null;
-}
-
-export type RouteHandler = (req: BrowserRequest) => unknown | Promise<unknown>;
-
-interface Route {
-    method: string;
-    pattern: RegExp;
-    paramNames: string[];
-    handler: RouteHandler;
-}
-
-const encoder = new TextEncoder();
-
-/**
- * Convert an Express-style path pattern to a RegExp.
- * Supports :param syntax for path parameters.
- *
- * Examples:
- *   /api/notes/:noteId -> /^\/api\/notes\/([^\/]+)$/
- *   /api/notes/:noteId/revisions -> /^\/api\/notes\/([^\/]+)\/revisions$/
- */
-function pathToRegex(path: string): { pattern: RegExp; paramNames: string[] } {
-    const paramNames: string[] = [];
-
-    // Escape special regex characters except for :param patterns
-    const regexPattern = path
-        .replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // Escape special chars
-        .replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, paramName) => {
-            paramNames.push(paramName);
-            return '([^/]+)';
-        });
-
-    return {
-        pattern: new RegExp(`^${regexPattern}$`),
-        paramNames
-    };
-}
-
-/**
- * Parse query string into an object.
- */
-function parseQuery(search: string): Record<string, string | undefined> {
-    const query: Record<string, string | undefined> = {};
-    if (!search || search === '?') return query;
-
-    const params = new URLSearchParams(search);
-    for (const [key, value] of params) {
-        query[key] = value;
-    }
-    return query;
-}
-
-/**
- * Convert a result to a JSON response.
- */
-function jsonResponse(obj: unknown, status = 200, extraHeaders: Record<string, string> = {}): BrowserResponse {
-    const parsedObj = routes.convertEntitiesToPojo(obj);
-    const body = encoder.encode(JSON.stringify(parsedObj)).buffer as ArrayBuffer;
-    return {
-        status,
-        headers: { "content-type": "application/json; charset=utf-8", ...extraHeaders },
-        body
-    };
-}
-
-/**
- * Convert a string to a text response.
- */
-function textResponse(text: string, status = 200, extraHeaders: Record<string, string> = {}): BrowserResponse {
-    const body = encoder.encode(text).buffer as ArrayBuffer;
-    return {
-        status,
-        headers: { "content-type": "text/plain; charset=utf-8", ...extraHeaders },
-        body
-    };
-}
-
-/**
- * Browser router class that handles route registration and dispatching.
- */
-export class BrowserRouter {
-    private routes: Route[] = [];
-
-    /**
-     * Register a route handler.
-     */
-    register(method: string, path: string, handler: RouteHandler): void {
-        const { pattern, paramNames } = pathToRegex(path);
-        this.routes.push({
-            method: method.toUpperCase(),
-            pattern,
-            paramNames,
-            handler
-        });
-    }
-
-    /**
-     * Convenience methods for common HTTP methods.
-     */
-    get(path: string, handler: RouteHandler): void {
-        this.register('GET', path, handler);
-    }
-
-    post(path: string, handler: RouteHandler): void {
-        this.register('POST', path, handler);
-    }
-
-    put(path: string, handler: RouteHandler): void {
-        this.register('PUT', path, handler);
-    }
-
-    patch(path: string, handler: RouteHandler): void {
-        this.register('PATCH', path, handler);
-    }
-
-    delete(path: string, handler: RouteHandler): void {
-        this.register('DELETE', path, handler);
-    }
-
-    /**
-     * Dispatch a request to the appropriate handler.
-     */
-    async dispatch(method: string, urlString: string, body?: unknown, headers?: Record<string, string>): Promise<BrowserResponse> {
-        const url = new URL(urlString);
-        const path = url.pathname;
-        const query = parseQuery(url.search);
-        const upperMethod = method.toUpperCase();
-
-        // Parse JSON body if it's an ArrayBuffer and content-type suggests JSON
-        let parsedBody = body;
-        if (body instanceof ArrayBuffer && headers) {
-            const contentType = headers['content-type'] || headers['Content-Type'] || '';
-            if (contentType.includes('application/json')) {
-                try {
-                    const text = new TextDecoder().decode(body);
-                    if (text.trim()) {
-                        parsedBody = JSON.parse(text);
-                    }
-                } catch (e) {
-                    console.warn('[Router] Failed to parse JSON body:', e);
-                    // Keep original body if JSON parsing fails
-                    parsedBody = body;
-                }
-            }
-        }
-        // Find matching route
-        for (const route of this.routes) {
-            if (route.method !== upperMethod) continue;
-
-            const match = path.match(route.pattern);
-            if (!match) continue;
-
-            // Extract path parameters
-            const params: Record<string, string> = {};
-            for (let i = 0; i < route.paramNames.length; i++) {
-                params[route.paramNames[i]] = decodeURIComponent(match[i + 1]);
-            }
-
-            const request: BrowserRequest = {
-                method: upperMethod,
-                url: urlString,
-                path,
-                params,
-                query,
-                body: parsedBody
-            };
-
-            try {
-                const result = await getContext().init(async () => await route.handler(request));
-                return this.formatResult(result);
-            } catch (error) {
-                return this.formatError(error, `Error handling ${method} ${path}`);
-            }
-        }
-
-        // No route matched
-        return textResponse(`Not found: ${method} ${path}`, 404);
-    }
-
-    /**
-     * Format a handler result into a response.
-     * Follows the same patterns as the server's apiResultHandler.
-     */
-    private formatResult(result: unknown): BrowserResponse {
-        // Handle [statusCode, response] format
-        if (Array.isArray(result) && result.length > 0 && Number.isInteger(result[0])) {
-            const [statusCode, response] = result;
-            return jsonResponse(response, statusCode);
-        }
-
-        // Handle undefined (no content) - 204 should have no body
-        if (result === undefined) {
-            return {
-                status: 204,
-                headers: {},
-                body: null
-            };
-        }
-
-        // Default: JSON response with 200
-        return jsonResponse(result, 200);
-    }
-
-    /**
-     * Format an error into a response.
-     */
-    private formatError(error: unknown, context: string): BrowserResponse {
-        console.error('[Router] Handler error:', context, error);
-
-        // Check for known error types
-        if (error && typeof error === 'object') {
-            const err = error as { constructor?: { name?: string }; message?: string };
-
-            if (err.constructor?.name === 'NotFoundError') {
-                return jsonResponse({ message: err.message || 'Not found' }, 404);
-            }
-
-            if (err.constructor?.name === 'ValidationError') {
-                return jsonResponse({ message: err.message || 'Validation error' }, 400);
-            }
-        }
-
-        // Generic error
-        const message = error instanceof Error ? error.message : String(error);
-        return jsonResponse({ message }, 500);
-    }
-}
-
-/**
- * Create a new router instance.
- */
-export function createRouter(): BrowserRouter {
-    return new BrowserRouter();
-}

apps/client-standalone/src/lightweight/browser_routes.ts

@@ -1,98 +0,0 @@
-/**
- * Browser route definitions.
- * This integrates with the shared route builder from @triliumnext/core.
- */
-
-import { BootstrapDefinition } from '@triliumnext/commons';
-import { getSharedBootstrapItems, routes } from '@triliumnext/core';
-
-import packageJson from '../../package.json' with { type: 'json' };
-import { type BrowserRequest,BrowserRouter } from './browser_router';
-
-type HttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete';
-
-/**
- * Wraps a core route handler to work with the BrowserRouter.
- * Core handlers expect an Express-like request object with params, query, and body.
- */
-function wrapHandler(handler: (req: any) => unknown) {
-    return (req: BrowserRequest) => {
-        // Create an Express-like request object
-        const expressLikeReq = {
-            params: req.params,
-            query: req.query,
-            body: req.body
-        };
-        return handler(expressLikeReq);
-    };
-}
-
-/**
- * Creates an apiRoute function compatible with buildSharedApiRoutes.
- * This bridges the core's route registration to the BrowserRouter.
- */
-function createApiRoute(router: BrowserRouter) {
-    return (method: HttpMethod, path: string, handler: (req: any) => unknown) => {
-        router.register(method, path, wrapHandler(handler));
-    };
-}
-
-/**
- * Register all API routes on the browser router using the shared builder.
- *
- * @param router - The browser router instance
- */
-export function registerRoutes(router: BrowserRouter): void {
-    const apiRoute = createApiRoute(router);
-    routes.buildSharedApiRoutes(apiRoute);
-    apiRoute('get', '/bootstrap', bootstrapRoute);
-
-    // Dummy routes for compatibility.
-    apiRoute("get", "/api/script/widgets", () => []);
-    apiRoute("get", "/api/script/startup", () => []);
-    apiRoute("get", "/api/system-checks", () => ({ isCpuArchMismatch: false }));
-    apiRoute("get", "/api/search/:searchString", () => []);
-    apiRoute("get", "/api/search-templates", () => []);
-    apiRoute("get", "/api/autocomplete", () => []);
-}
-
-function bootstrapRoute() {
-
-    const assetPath = ".";
-
-    return {
-        ...getSharedBootstrapItems(assetPath),
-        appPath: assetPath,
-        device: false, // Let the client detect device type.
-        csrfToken: "dummy-csrf-token",
-        themeCssUrl: false,
-        themeUseNextAsBase: "next",
-        triliumVersion: packageJson.version,
-        baseApiUrl: "../api/",
-        headingStyle: "plain",
-        layoutOrientation: "vertical",
-        platform: "web",
-        isDev: import.meta.env.DEV,
-        isMainWindow: true,
-        isElectron: false,
-        isStandalone: true,
-        hasNativeTitleBar: false,
-        hasBackgroundEffects: true,
-
-        // TODO: Fill properly
-        currentLocale: { id: "en", name: "English", rtl: false },
-        isRtl: false,
-        instanceName: null,
-        appCssNoteIds: [],
-        TRILIUM_SAFE_MODE: false
-    } satisfies BootstrapDefinition;
-}
-
-/**
- * Create and configure a router with all routes registered.
- */
-export function createConfiguredRouter(): BrowserRouter {
-    const router = new BrowserRouter();
-    registerRoutes(router);
-    return router;
-}

apps/client-standalone/src/lightweight/cls_provider.ts

@@ -1,46 +0,0 @@
-import { ExecutionContext } from "@triliumnext/core";
-
-export default class BrowserExecutionContext implements ExecutionContext {
-    private store: Map<string, any> | null = null;
-
-    get<T = any>(key: string): T | undefined {
-        return this.store?.get(key);
-    }
-
-    set(key: string, value: any): void {
-        if (!this.store) {
-            throw new Error("ExecutionContext not initialized");
-        }
-        this.store.set(key, value);
-    }
-
-    reset(): void {
-        this.store = null;
-    }
-
-    init<T>(callback: () => T): T {
-        // Create a fresh context for this request
-        const prev = this.store;
-        this.store = new Map();
-
-        try {
-            const result = callback();
-            
-            // If the result is a Promise, we need to handle cleanup after it resolves
-            if (result && typeof result === 'object' && 'then' in result && 'catch' in result) {
-                const promise = result as unknown as Promise<any>;
-                return promise.finally(() => {
-                    this.store = prev;
-                }) as T;
-            } else {
-                // Synchronous result, clean up immediately
-                this.store = prev;
-                return result;
-            }
-        } catch (error) {
-            // Always clean up on error (for synchronous errors)
-            this.store = prev;
-            throw error;
-        }
-    }
-}

apps/client-standalone/src/lightweight/crypto_provider.ts

@@ -1,145 +0,0 @@
-import type { CryptoProvider } from "@triliumnext/core";
-import { sha1 } from "js-sha1";
-import { sha512 } from "js-sha512";
-
-interface Cipher {
-    update(data: Uint8Array): Uint8Array;
-    final(): Uint8Array;
-}
-
-const CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-/**
- * Crypto provider for browser environments using the Web Crypto API.
- */
-export default class BrowserCryptoProvider implements CryptoProvider {
-
-    createHash(algorithm: "sha1" | "sha512", content: string | Uint8Array): Uint8Array {
-        const data = typeof content === "string" ? content :
-                new TextDecoder().decode(content);
-
-        const hexHash = algorithm === "sha1" ? sha1(data) : sha512(data);
-
-        // Convert hex string to Uint8Array
-        const bytes = new Uint8Array(hexHash.length / 2);
-        for (let i = 0; i < hexHash.length; i += 2) {
-            bytes[i / 2] = parseInt(hexHash.substr(i, 2), 16);
-        }
-        return bytes;
-    }
-
-    createCipheriv(algorithm: "aes-128-cbc", key: Uint8Array, iv: Uint8Array): Cipher {
-        // Web Crypto API doesn't support streaming cipher like Node.js
-        // We need to implement a wrapper that collects data and encrypts on final()
-        return new WebCryptoCipher(algorithm, key, iv, "encrypt");
-    }
-
-    createDecipheriv(algorithm: "aes-128-cbc", key: Uint8Array, iv: Uint8Array): Cipher {
-        return new WebCryptoCipher(algorithm, key, iv, "decrypt");
-    }
-
-    randomBytes(size: number): Uint8Array {
-        const bytes = new Uint8Array(size);
-        crypto.getRandomValues(bytes);
-        return bytes;
-    }
-
-    randomString(length: number): string {
-        const bytes = this.randomBytes(length);
-        let result = "";
-        for (let i = 0; i < length; i++) {
-            result += CHARS[bytes[i] % CHARS.length];
-        }
-        return result;
-    }
-}
-
-/**
- * A cipher implementation that wraps Web Crypto API.
- * Note: This buffers all data until final() is called, which differs from
- * Node.js's streaming cipher behavior.
- */
-class WebCryptoCipher implements Cipher {
-    private chunks: Uint8Array[] = [];
-    private algorithm: string;
-    private key: Uint8Array;
-    private iv: Uint8Array;
-    private mode: "encrypt" | "decrypt";
-    private finalized = false;
-
-    constructor(
-        algorithm: "aes-128-cbc",
-        key: Uint8Array,
-        iv: Uint8Array,
-        mode: "encrypt" | "decrypt"
-    ) {
-        this.algorithm = algorithm;
-        this.key = key;
-        this.iv = iv;
-        this.mode = mode;
-    }
-
-    update(data: Uint8Array): Uint8Array {
-        if (this.finalized) {
-            throw new Error("Cipher has already been finalized");
-        }
-        // Buffer the data - Web Crypto doesn't support streaming
-        this.chunks.push(data);
-        // Return empty array since we process everything in final()
-        return new Uint8Array(0);
-    }
-
-    final(): Uint8Array {
-        if (this.finalized) {
-            throw new Error("Cipher has already been finalized");
-        }
-        this.finalized = true;
-
-        // Web Crypto API is async, but we need sync behavior
-        // This is a fundamental limitation that requires architectural changes
-        // For now, throw an error directing users to use async methods
-        throw new Error(
-            "Synchronous cipher finalization not available in browser. " +
-            "The Web Crypto API is async-only. Use finalizeAsync() instead."
-        );
-    }
-
-    /**
-     * Async version that actually performs the encryption/decryption.
-     */
-    async finalizeAsync(): Promise<Uint8Array> {
-        if (this.finalized) {
-            throw new Error("Cipher has already been finalized");
-        }
-        this.finalized = true;
-
-        // Concatenate all chunks
-        const totalLength = this.chunks.reduce((sum, chunk) => sum + chunk.length, 0);
-        const data = new Uint8Array(totalLength);
-        let offset = 0;
-        for (const chunk of this.chunks) {
-            data.set(chunk, offset);
-            offset += chunk.length;
-        }
-
-        // Copy key and iv to ensure they're plain ArrayBuffer-backed
-        const keyBuffer = new Uint8Array(this.key);
-        const ivBuffer = new Uint8Array(this.iv);
-
-        // Import the key
-        const cryptoKey = await crypto.subtle.importKey(
-            "raw",
-            keyBuffer,
-            { name: "AES-CBC" },
-            false,
-            [this.mode]
-        );
-
-        // Perform encryption/decryption
-        const result = this.mode === "encrypt"
-            ? await crypto.subtle.encrypt({ name: "AES-CBC", iv: ivBuffer }, cryptoKey, data)
-            : await crypto.subtle.decrypt({ name: "AES-CBC", iv: ivBuffer }, cryptoKey, data);
-
-        return new Uint8Array(result);
-    }
-}

apps/client-standalone/src/lightweight/messaging_provider.ts

@@ -1,90 +0,0 @@
-import type { WebSocketMessage } from "@triliumnext/commons";
-import type { MessagingProvider, MessageHandler } from "@triliumnext/core";
-
-/**
- * Messaging provider for browser Worker environments.
- *
- * This provider uses the Worker's postMessage API to communicate
- * with the main thread. It's designed to be used inside a Web Worker
- * that runs the core services.
- *
- * Message flow:
- * - Outbound (worker → main): Uses self.postMessage() with type: "WS_MESSAGE"
- * - Inbound (main → worker): Listens to onmessage for type: "WS_MESSAGE"
- */
-export default class WorkerMessagingProvider implements MessagingProvider {
-    private messageHandlers: MessageHandler[] = [];
-    private isDisposed = false;
-
-    constructor() {
-        // Listen for incoming messages from the main thread
-        self.addEventListener("message", this.handleIncomingMessage);
-    }
-
-    private handleIncomingMessage = (event: MessageEvent) => {
-        if (this.isDisposed) return;
-
-        const { type, message } = event.data || {};
-
-        if (type === "WS_MESSAGE" && message) {
-            // Dispatch to all registered handlers
-            for (const handler of this.messageHandlers) {
-                try {
-                    handler(message as WebSocketMessage);
-                } catch (e) {
-                    console.error("[WorkerMessagingProvider] Error in message handler:", e);
-                }
-            }
-        }
-    };
-
-    /**
-     * Send a message to all clients (in this case, the main thread).
-     * The main thread is responsible for further distribution if needed.
-     */
-    sendMessageToAllClients(message: WebSocketMessage): void {
-        if (this.isDisposed) {
-            console.warn("[WorkerMessagingProvider] Cannot send message - provider is disposed");
-            return;
-        }
-
-        try {
-            self.postMessage({
-                type: "WS_MESSAGE",
-                message
-            });
-        } catch (e) {
-            console.error("[WorkerMessagingProvider] Error sending message:", e);
-        }
-    }
-
-    /**
-     * Subscribe to incoming messages from the main thread.
-     */
-    onMessage(handler: MessageHandler): () => void {
-        this.messageHandlers.push(handler);
-
-        return () => {
-            this.messageHandlers = this.messageHandlers.filter(h => h !== handler);
-        };
-    }
-
-    /**
-     * Get the number of connected "clients".
-     * In worker context, there's always exactly 1 client (the main thread).
-     */
-    getClientCount(): number {
-        return this.isDisposed ? 0 : 1;
-    }
-
-    /**
-     * Clean up resources.
-     */
-    dispose(): void {
-        if (this.isDisposed) return;
-
-        this.isDisposed = true;
-        self.removeEventListener("message", this.handleIncomingMessage);
-        this.messageHandlers = [];
-    }
-}

apps/client-standalone/src/lightweight/sql_provider.ts

@@ -1,618 +0,0 @@
-import { type BindableValue, default as sqlite3InitModule } from "@sqlite.org/sqlite-wasm";
-import type { DatabaseProvider, RunResult, Statement, Transaction } from "@triliumnext/core";
-
-import demoDbSql from "./db.sql?raw";
-
-// Type definitions for SQLite WASM (the library doesn't export these directly)
-type Sqlite3Module = Awaited<ReturnType<typeof sqlite3InitModule>>;
-type Sqlite3Database = InstanceType<Sqlite3Module["oo1"]["DB"]>;
-type Sqlite3PreparedStatement = ReturnType<Sqlite3Database["prepare"]>;
-
-/**
- * Wraps an SQLite WASM PreparedStatement to match the Statement interface
- * expected by trilium-core.
- */
-class WasmStatement implements Statement {
-    private isRawMode = false;
-    private isPluckMode = false;
-    private isFinalized = false;
-
-    constructor(
-        private stmt: Sqlite3PreparedStatement,
-        private db: Sqlite3Database,
-        private sqlite3: Sqlite3Module
-    ) {}
-
-    run(...params: unknown[]): RunResult {
-        if (this.isFinalized) {
-            throw new Error("Cannot call run() on finalized statement");
-        }
-
-        this.bindParams(params);
-        try {
-            // Use step() and then reset instead of stepFinalize()
-            // This allows the statement to be reused
-            this.stmt.step();
-            const changes = this.db.changes();
-            // Get the last insert row ID using the C API
-            const lastInsertRowid = this.db.pointer ? this.sqlite3.capi.sqlite3_last_insert_rowid(this.db.pointer) : 0;
-            this.stmt.reset();
-            return {
-                changes,
-                lastInsertRowid: typeof lastInsertRowid === "bigint" ? Number(lastInsertRowid) : lastInsertRowid
-            };
-        } catch (e) {
-            // Reset on error to allow reuse
-            this.stmt.reset();
-            throw e;
-        }
-    }
-
-    get(params: unknown): unknown {
-        if (this.isFinalized) {
-            throw new Error("Cannot call get() on finalized statement");
-        }
-
-        this.bindParams(Array.isArray(params) ? params : params !== undefined ? [params] : []);
-        try {
-            if (this.stmt.step()) {
-                if (this.isPluckMode) {
-                    // In pluck mode, return only the first column value
-                    const row = this.stmt.get([]);
-                    return Array.isArray(row) && row.length > 0 ? row[0] : undefined;
-                }
-                return this.isRawMode ? this.stmt.get([]) : this.stmt.get({});
-            }
-            return undefined;
-        } finally {
-            this.stmt.reset();
-        }
-    }
-
-    all(...params: unknown[]): unknown[] {
-        if (this.isFinalized) {
-            throw new Error("Cannot call all() on finalized statement");
-        }
-
-        this.bindParams(params);
-        const results: unknown[] = [];
-        try {
-            while (this.stmt.step()) {
-                if (this.isPluckMode) {
-                    // In pluck mode, return only the first column value for each row
-                    const row = this.stmt.get([]);
-                    if (Array.isArray(row) && row.length > 0) {
-                        results.push(row[0]);
-                    }
-                } else {
-                    results.push(this.isRawMode ? this.stmt.get([]) : this.stmt.get({}));
-                }
-            }
-            return results;
-        } finally {
-            this.stmt.reset();
-        }
-    }
-
-    iterate(...params: unknown[]): IterableIterator<unknown> {
-        if (this.isFinalized) {
-            throw new Error("Cannot call iterate() on finalized statement");
-        }
-
-        this.bindParams(params);
-        const stmt = this.stmt;
-        const isRaw = this.isRawMode;
-        const isPluck = this.isPluckMode;
-
-        return {
-            [Symbol.iterator]() {
-                return this;
-            },
-            next(): IteratorResult<unknown> {
-                if (stmt.step()) {
-                    if (isPluck) {
-                        const row = stmt.get([]);
-                        const value = Array.isArray(row) && row.length > 0 ? row[0] : undefined;
-                        return { value, done: false };
-                    }
-                    return { value: isRaw ? stmt.get([]) : stmt.get({}), done: false };
-                }
-                stmt.reset();
-                return { value: undefined, done: true };
-            }
-        };
-    }
-
-    raw(toggleState?: boolean): this {
-        // In raw mode, rows are returned as arrays instead of objects
-        // If toggleState is undefined, enable raw mode (better-sqlite3 behavior)
-        this.isRawMode = toggleState !== undefined ? toggleState : true;
-        return this;
-    }
-
-    pluck(toggleState?: boolean): this {
-        // In pluck mode, only the first column of each row is returned
-        // If toggleState is undefined, enable pluck mode (better-sqlite3 behavior)
-        this.isPluckMode = toggleState !== undefined ? toggleState : true;
-        return this;
-    }
-
-    private bindParams(params: unknown[]): void {
-        this.stmt.clearBindings();
-        if (params.length === 0) {
-            return;
-        }
-
-        // Handle single object with named parameters
-        if (params.length === 1 && typeof params[0] === "object" && params[0] !== null && !Array.isArray(params[0])) {
-            const inputBindings = params[0] as { [paramName: string]: BindableValue };
-
-            // SQLite WASM expects parameter names to include the prefix (@ : or $)
-            // better-sqlite3 automatically maps unprefixed names to @name
-            // We need to add the @ prefix for compatibility
-            const bindings: { [paramName: string]: BindableValue } = {};
-            for (const [key, value] of Object.entries(inputBindings)) {
-                // If the key already has a prefix, use it as-is
-                if (key.startsWith('@') || key.startsWith(':') || key.startsWith('$')) {
-                    bindings[key] = value;
-                } else {
-                    // Add @ prefix to match better-sqlite3 behavior
-                    bindings[`@${key}`] = value;
-                }
-            }
-
-            this.stmt.bind(bindings);
-        } else {
-            // Handle positional parameters - flatten and cast to BindableValue[]
-            const flatParams = params.flat() as BindableValue[];
-            if (flatParams.length > 0) {
-                this.stmt.bind(flatParams);
-            }
-        }
-    }
-
-    finalize(): void {
-        if (!this.isFinalized) {
-            try {
-                this.stmt.finalize();
-            } catch (e) {
-                console.warn("Error finalizing SQLite statement:", e);
-            } finally {
-                this.isFinalized = true;
-            }
-        }
-    }
-}
-
-/**
- * SQLite database provider for browser environments using SQLite WASM.
- *
- * This provider wraps the official @sqlite.org/sqlite-wasm package to provide
- * a DatabaseProvider implementation compatible with trilium-core.
- *
- * @example
- * ```typescript
- * const provider = new BrowserSqlProvider();
- * await provider.initWasm(); // Initialize SQLite WASM module
- * provider.loadFromMemory(); // Open an in-memory database
- * // or
- * provider.loadFromBuffer(existingDbBuffer); // Load from existing data
- * ```
- */
-export default class BrowserSqlProvider implements DatabaseProvider {
-    private db?: Sqlite3Database;
-    private sqlite3?: Sqlite3Module;
-    private _inTransaction = false;
-    private initPromise?: Promise<void>;
-    private initError?: Error;
-    private statementCache: Map<string, WasmStatement> = new Map();
-
-    // OPFS state tracking
-    private opfsDbPath?: string;
-
-    /**
-     * Get the SQLite WASM module version info.
-     * Returns undefined if the module hasn't been initialized yet.
-     */
-    get version(): { libVersion: string; sourceId: string } | undefined {
-        return this.sqlite3?.version;
-    }
-
-    /**
-     * Initialize the SQLite WASM module.
-     * This must be called before using any database operations.
-     * Safe to call multiple times - subsequent calls return the same promise.
-     *
-     * @returns A promise that resolves when the module is initialized
-     * @throws Error if initialization fails
-     */
-    async initWasm(): Promise<void> {
-        // Return existing promise if already initializing/initialized
-        if (this.initPromise) {
-            return this.initPromise;
-        }
-
-        // Fail fast if we already tried and failed
-        if (this.initError) {
-            throw this.initError;
-        }
-
-        this.initPromise = this.doInitWasm();
-        return this.initPromise;
-    }
-
-    private async doInitWasm(): Promise<void> {
-        try {
-            console.log("[BrowserSqlProvider] Initializing SQLite WASM...");
-            const startTime = performance.now();
-
-            this.sqlite3 = await sqlite3InitModule({
-                print: console.log,
-                printErr: console.error,
-            });
-
-            const initTime = performance.now() - startTime;
-            console.log(
-                `[BrowserSqlProvider] SQLite WASM initialized in ${initTime.toFixed(2)}ms:`,
-                this.sqlite3.version.libVersion
-            );
-        } catch (e) {
-            this.initError = e instanceof Error ? e : new Error(String(e));
-            console.error("[BrowserSqlProvider] SQLite WASM initialization failed:", this.initError);
-            throw this.initError;
-        }
-    }
-
-    /**
-     * Check if the SQLite WASM module has been initialized.
-     */
-    get isInitialized(): boolean {
-        return this.sqlite3 !== undefined;
-    }
-
-    // ==================== OPFS Support ====================
-
-    /**
-     * Check if the OPFS VFS is available.
-     * This requires:
-     * - Running in a Worker context
-     * - Browser support for OPFS APIs
-     * - COOP/COEP headers sent by the server (for SharedArrayBuffer)
-     *
-     * @returns true if OPFS VFS is available for use
-     */
-    isOpfsAvailable(): boolean {
-        this.ensureSqlite3();
-        // SQLite WASM automatically installs the OPFS VFS if the environment supports it
-        // We can check for its presence via sqlite3_vfs_find or the OpfsDb class
-        return this.sqlite3!.oo1.OpfsDb !== undefined;
-    }
-
-    /**
-     * Load or create a database stored in OPFS for persistent storage.
-     * The database will persist across browser sessions.
-     *
-     * Requires COOP/COEP headers to be set by the server:
-     * - Cross-Origin-Opener-Policy: same-origin
-     * - Cross-Origin-Embedder-Policy: require-corp
-     *
-     * @param path - The path for the database file in OPFS (e.g., "/trilium.db")
-     *               Paths without a leading slash are treated as relative to OPFS root.
-     *               Leading directories are created automatically.
-     * @param options - Additional options
-     * @throws Error if OPFS VFS is not available
-     *
-     * @example
-     * ```typescript
-     * const provider = new BrowserSqlProvider();
-     * await provider.initWasm();
-     * if (provider.isOpfsAvailable()) {
-     *     provider.loadFromOpfs("/my-database.db");
-     * } else {
-     *     console.warn("OPFS not available, using in-memory database");
-     *     provider.loadFromMemory();
-     * }
-     * ```
-     */
-    loadFromOpfs(path: string, options: { createIfNotExists?: boolean } = {}): void {
-        this.ensureSqlite3();
-
-        if (!this.isOpfsAvailable()) {
-            throw new Error(
-                "OPFS VFS is not available. This requires:\n" +
-                "1. Running in a Worker context\n" +
-                "2. Browser support for OPFS (Chrome 102+, Firefox 111+, Safari 17+)\n" +
-                "3. COOP/COEP headers from the server:\n" +
-                "   Cross-Origin-Opener-Policy: same-origin\n" +
-                "   Cross-Origin-Embedder-Policy: require-corp"
-            );
-        }
-
-        console.log(`[BrowserSqlProvider] Loading database from OPFS: ${path}`);
-        const startTime = performance.now();
-
-        try {
-            // OpfsDb automatically creates directories in the path
-            // Mode 'c' = create if not exists
-            const mode = options.createIfNotExists !== false ? 'c' : '';
-            this.db = new this.sqlite3!.oo1.OpfsDb(path, mode);
-            this.opfsDbPath = path;
-
-            // Configure the database for OPFS
-            // Note: WAL mode requires exclusive locking in OPFS environment
-            this.db.exec("PRAGMA journal_mode = DELETE");
-            this.db.exec("PRAGMA synchronous = NORMAL");
-
-            const loadTime = performance.now() - startTime;
-            console.log(`[BrowserSqlProvider] OPFS database loaded in ${loadTime.toFixed(2)}ms`);
-        } catch (e) {
-            const error = e instanceof Error ? e : new Error(String(e));
-            console.error(`[BrowserSqlProvider] Failed to load OPFS database: ${error.message}`);
-            throw error;
-        }
-    }
-
-    /**
-     * Check if the currently open database is stored in OPFS.
-     */
-    get isUsingOpfs(): boolean {
-        return this.opfsDbPath !== undefined;
-    }
-
-    /**
-     * Get the OPFS path of the currently open database.
-     * Returns undefined if not using OPFS.
-     */
-    get currentOpfsPath(): string | undefined {
-        return this.opfsDbPath;
-    }
-
-    /**
-     * Check if the database has been initialized with a schema.
-     * This is a simple sanity check that looks for the existence of core tables.
-     *
-     * @returns true if the database appears to be initialized
-     */
-    isDbInitialized(): boolean {
-        this.ensureDb();
-
-        // Check if the 'notes' table exists (a core table that must exist in an initialized DB)
-        const tableExists = this.db!.selectValue(
-            "SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'notes'"
-        );
-
-        return tableExists !== undefined;
-    }
-
-    // ==================== End OPFS Support ====================
-
-    loadFromFile(_path: string, _isReadOnly: boolean): void {
-        // Browser environment doesn't have direct file system access.
-        // Use OPFS for persistent storage.
-        throw new Error(
-            "loadFromFile is not supported in browser environment. " +
-            "Use loadFromMemory() for temporary databases, loadFromBuffer() to load from data, " +
-            "or loadFromOpfs() for persistent storage."
-        );
-    }
-
-    /**
-     * Create an empty in-memory database.
-     * Data will be lost when the page is closed.
-     *
-     * For persistent storage, use loadFromOpfs() instead.
-     * To load demo data, call initializeDemoDatabase() after this.
-     */
-    loadFromMemory(): void {
-        this.ensureSqlite3();
-        console.log("[BrowserSqlProvider] Creating in-memory database...");
-        const startTime = performance.now();
-
-        this.db = new this.sqlite3!.oo1.DB(":memory:", "c");
-        this.opfsDbPath = undefined; // Not using OPFS
-        this.db.exec("PRAGMA journal_mode = WAL");
-
-        // Initialize with demo data for in-memory databases
-        // (since they won't persist anyway)
-        this.initializeDemoDatabase();
-
-        const loadTime = performance.now() - startTime;
-        console.log(`[BrowserSqlProvider] In-memory database created in ${loadTime.toFixed(2)}ms`);
-    }
-
-    /**
-     * Initialize the database with demo/starter data.
-     * This should only be called once when creating a new database.
-     *
-     * For OPFS databases, this is called automatically only if the database
-     * doesn't already exist.
-     */
-    initializeDemoDatabase(): void {
-        this.ensureDb();
-        console.log("[BrowserSqlProvider] Initializing database with demo data...");
-        const startTime = performance.now();
-
-        this.db!.exec(demoDbSql);
-
-        const loadTime = performance.now() - startTime;
-        console.log(`[BrowserSqlProvider] Demo data loaded in ${loadTime.toFixed(2)}ms`);
-    }
-
-    loadFromBuffer(buffer: Uint8Array): void {
-        this.ensureSqlite3();
-        // SQLite WASM can deserialize a database from a byte array
-        const p = this.sqlite3!.wasm.allocFromTypedArray(buffer);
-        try {
-            this.db = new this.sqlite3!.oo1.DB({ filename: ":memory:", flags: "c" });
-            this.opfsDbPath = undefined; // Not using OPFS
-
-            const rc = this.sqlite3!.capi.sqlite3_deserialize(
-                this.db.pointer!,
-                "main",
-                p,
-                buffer.byteLength,
-                buffer.byteLength,
-                this.sqlite3!.capi.SQLITE_DESERIALIZE_FREEONCLOSE |
-                this.sqlite3!.capi.SQLITE_DESERIALIZE_RESIZEABLE
-            );
-            if (rc !== 0) {
-                throw new Error(`Failed to deserialize database: ${rc}`);
-            }
-        } catch (e) {
-            this.sqlite3!.wasm.dealloc(p);
-            throw e;
-        }
-    }
-
-    backup(_destinationFile: string): void {
-        // In browser, we can serialize the database to a byte array
-        // For actual file backup, we'd need to use File System Access API or download
-        throw new Error(
-            "backup to file is not supported in browser environment. " +
-            "Use serialize() to get the database as a Uint8Array instead."
-        );
-    }
-
-    /**
-     * Serialize the database to a byte array.
-     * This can be used to save the database to IndexedDB, download it, etc.
-     */
-    serialize(): Uint8Array {
-        this.ensureDb();
-        // Use the convenience wrapper which handles all the memory management
-        return this.sqlite3!.capi.sqlite3_js_db_export(this.db!);
-    }
-
-    prepare(query: string): Statement {
-        this.ensureDb();
-
-        // Check if we already have this statement cached
-        if (this.statementCache.has(query)) {
-            return this.statementCache.get(query)!;
-        }
-
-        // Create new statement and cache it
-        const stmt = this.db!.prepare(query);
-        const wasmStatement = new WasmStatement(stmt, this.db!, this.sqlite3!);
-        this.statementCache.set(query, wasmStatement);
-        return wasmStatement;
-    }
-
-    transaction<T>(func: (statement: Statement) => T): Transaction {
-        this.ensureDb();
-
-        const self = this;
-        let savepointCounter = 0;
-
-        // Helper function to execute within a transaction
-        const executeTransaction = (beginStatement: string, ...args: unknown[]): T => {
-            // If we're already in a transaction, use SAVEPOINTs for nesting
-            // This mimics better-sqlite3's behavior
-            if (self._inTransaction) {
-                const savepointName = `sp_${++savepointCounter}_${Date.now()}`;
-                self.db!.exec(`SAVEPOINT ${savepointName}`);
-                try {
-                    const result = func.apply(null, args as [Statement]);
-                    self.db!.exec(`RELEASE SAVEPOINT ${savepointName}`);
-                    return result;
-                } catch (e) {
-                    self.db!.exec(`ROLLBACK TO SAVEPOINT ${savepointName}`);
-                    throw e;
-                }
-            }
-
-            // Not in a transaction, start a new one
-            self._inTransaction = true;
-            self.db!.exec(beginStatement);
-            try {
-                const result = func.apply(null, args as [Statement]);
-                self.db!.exec("COMMIT");
-                return result;
-            } catch (e) {
-                self.db!.exec("ROLLBACK");
-                throw e;
-            } finally {
-                self._inTransaction = false;
-            }
-        };
-
-        // Create the transaction function that acts like better-sqlite3's Transaction interface
-        // In better-sqlite3, the transaction function is callable and has .deferred(), .immediate(), etc.
-        const transactionWrapper = Object.assign(
-            // Default call executes with BEGIN (same as immediate)
-            (...args: unknown[]): T => executeTransaction("BEGIN", ...args),
-            {
-                // Deferred transaction - locks acquired on first data access
-                deferred: (...args: unknown[]): T => executeTransaction("BEGIN DEFERRED", ...args),
-                // Immediate transaction - acquires write lock immediately
-                immediate: (...args: unknown[]): T => executeTransaction("BEGIN IMMEDIATE", ...args),
-                // Exclusive transaction - exclusive lock
-                exclusive: (...args: unknown[]): T => executeTransaction("BEGIN EXCLUSIVE", ...args),
-                // Default is same as calling directly
-                default: (...args: unknown[]): T => executeTransaction("BEGIN", ...args)
-            }
-        );
-
-        return transactionWrapper as unknown as Transaction;
-    }
-
-    get inTransaction(): boolean {
-        return this._inTransaction;
-    }
-
-    exec(query: string): void {
-        this.ensureDb();
-        this.db!.exec(query);
-    }
-
-    close(): void {
-        // Clean up all cached statements first
-        for (const statement of this.statementCache.values()) {
-            try {
-                statement.finalize();
-            } catch (e) {
-                // Ignore errors during cleanup
-                console.warn("Error finalizing statement during cleanup:", e);
-            }
-        }
-        this.statementCache.clear();
-
-        if (this.db) {
-            this.db.close();
-            this.db = undefined;
-        }
-
-        // Reset OPFS state
-        this.opfsDbPath = undefined;
-    }
-
-    /**
-     * Get the number of rows changed by the last INSERT, UPDATE, or DELETE statement.
-     */
-    changes(): number {
-        this.ensureDb();
-        return this.db!.changes();
-    }
-
-    /**
-     * Check if the database is currently open.
-     */
-    isOpen(): boolean {
-        return this.db !== undefined && this.db.isOpen();
-    }
-
-    private ensureSqlite3(): void {
-        if (!this.sqlite3) {
-            throw new Error(
-                "SQLite WASM module not initialized. Call initialize() first with the sqlite3 module."
-            );
-        }
-    }
-
-    private ensureDb(): void {
-        this.ensureSqlite3();
-        if (!this.db) {
-            throw new Error("Database not opened. Call loadFromMemory(), loadFromBuffer(), or loadFromOpfs() first.");
-        }
-    }
-}

apps/client-standalone/src/lightweight/translation_provider.ts

@@ -1,16 +0,0 @@
-import { LOCALE_IDS } from "@triliumnext/commons";
-import i18next from "i18next";
-import I18NextHttpBackend from "i18next-http-backend";
-
-export default async function translationProvider(locale: LOCALE_IDS) {
-    await i18next.use(I18NextHttpBackend).init({
-        lng: locale,
-        fallbackLng: "en",
-        ns: "server",
-        backend: {
-            loadPath: "server-assets/translations/{{lng}}/{{ns}}.json"
-        },
-        returnEmptyString: false,
-        debug: true
-    });
-}

apps/client-standalone/src/local-bridge.ts

@@ -1,88 +0,0 @@
-let localWorker: Worker | null = null;
-const pending = new Map();
-
-export function startLocalServerWorker() {
-    if (localWorker) return localWorker;
-
-    localWorker = new Worker(new URL("./local-server-worker.js", import.meta.url), { type: "module" });
-
-    // Handle worker errors during initialization
-    localWorker.onerror = (event) => {
-        console.error("[LocalBridge] Worker error:", event);
-        // Reject all pending requests
-        for (const [, resolver] of pending) {
-            resolver.reject(new Error(`Worker error: ${event.message}`));
-        }
-        pending.clear();
-    };
-
-    localWorker.onmessage = (event) => {
-        const msg = event.data;
-
-        // Handle worker error reports
-        if (msg?.type === "WORKER_ERROR") {
-            console.error("[LocalBridge] Worker reported error:", msg.error);
-            // Reject all pending requests with the error
-            for (const [, resolver] of pending) {
-                resolver.reject(new Error(msg.error?.message || "Unknown worker error"));
-            }
-            pending.clear();
-            return;
-        }
-
-        if (!msg || msg.type !== "LOCAL_RESPONSE") return;
-
-        const { id, response, error } = msg;
-        const resolver = pending.get(id);
-        if (!resolver) return;
-        pending.delete(id);
-
-        if (error) resolver.reject(new Error(error));
-        else resolver.resolve(response);
-    };
-
-    return localWorker;
-}
-
-export function attachServiceWorkerBridge() {
-    navigator.serviceWorker.addEventListener("message", async (event) => {
-        const msg = event.data;
-        if (!msg || msg.type !== "LOCAL_FETCH") return;
-
-        const port = event.ports && event.ports[0];
-        if (!port) return;
-
-        try {
-            startLocalServerWorker();
-
-            const id = msg.id;
-            const req = msg.request;
-
-            const response = await new Promise((resolve, reject) => {
-                pending.set(id, { resolve, reject });
-                // Transfer body to worker for efficiency (if present)
-                localWorker.postMessage({
-                    type: "LOCAL_REQUEST",
-                    id,
-                    request: req
-                }, req.body ? [req.body] : []);
-            });
-
-            port.postMessage({
-                type: "LOCAL_FETCH_RESPONSE",
-                id,
-                response
-            }, response.body ? [response.body] : []);
-        } catch (e) {
-            port.postMessage({
-                type: "LOCAL_FETCH_RESPONSE",
-                id: msg.id,
-                response: {
-                    status: 500,
-                    headers: { "content-type": "text/plain; charset=utf-8" },
-                    body: new TextEncoder().encode(String(e?.message || e)).buffer
-                }
-            });
-        }
-    });
-}

apps/client-standalone/src/local-server-worker.ts

@@ -1,207 +0,0 @@
-import { BrowserRouter } from './lightweight/browser_router';
-import { createConfiguredRouter } from './lightweight/browser_routes';
-import BrowserExecutionContext from './lightweight/cls_provider';
-import BrowserCryptoProvider from './lightweight/crypto_provider';
-import WorkerMessagingProvider from './lightweight/messaging_provider';
-import BrowserSqlProvider from './lightweight/sql_provider';
-import translationProvider from './lightweight/translation_provider';
-
-// Global error handlers - MUST be set up before any async imports
-self.onerror = (message, source, lineno, colno, error) => {
-    console.error("[Worker] Uncaught error:", message, source, lineno, colno, error);
-    // Try to notify the main thread about the error
-    try {
-        self.postMessage({
-            type: "WORKER_ERROR",
-            error: {
-                message: String(message),
-                source,
-                lineno,
-                colno,
-                stack: error?.stack
-            }
-        });
-    } catch (e) {
-        // Can't even post message, just log
-        console.error("[Worker] Failed to report error:", e);
-    }
-    return false; // Don't suppress the error
-};
-
-self.onunhandledrejection = (event) => {
-    console.error("[Worker] Unhandled rejection:", event.reason);
-    try {
-        self.postMessage({
-            type: "WORKER_ERROR",
-            error: {
-                message: String(event.reason?.message || event.reason),
-                stack: event.reason?.stack
-            }
-        });
-    } catch (e) {
-        console.error("[Worker] Failed to report rejection:", e);
-    }
-};
-
-console.log("[Worker] Error handlers installed");
-
-// Shared SQL provider instance
-const sqlProvider = new BrowserSqlProvider();
-
-// Messaging provider for worker-to-main-thread communication
-const messagingProvider = new WorkerMessagingProvider();
-
-// Core module, router, and initialization state
-let coreModule: typeof import("@triliumnext/core") | null = null;
-let router: BrowserRouter | null = null;
-let initPromise: Promise<void> | null = null;
-let initError: Error | null = null;
-
-/**
- * Initialize SQLite WASM and load the core module.
- * This happens once at worker startup.
- */
-async function initialize(): Promise<void> {
-    if (initPromise) {
-        return initPromise; // Already initializing
-    }
-    if (initError) {
-        throw initError; // Failed before, don't retry
-    }
-
-    initPromise = (async () => {
-        try {
-            console.log("[Worker] Initializing SQLite WASM...");
-            await sqlProvider.initWasm();
-
-            // Try to use OPFS for persistent storage
-            if (sqlProvider.isOpfsAvailable()) {
-                console.log("[Worker] OPFS available, loading persistent database...");
-                sqlProvider.loadFromOpfs("/trilium.db");
-
-                // Check if database is initialized (schema exists)
-                if (!sqlProvider.isDbInitialized()) {
-                    console.log("[Worker] Database not initialized, loading demo data...");
-                    sqlProvider.initializeDemoDatabase();
-                    console.log("[Worker] Demo data loaded");
-                } else {
-                    console.log("[Worker] Existing initialized database loaded");
-                }
-            } else {
-                // Fall back to in-memory database (non-persistent)
-                console.warn("[Worker] OPFS not available, using in-memory database (data will not persist)");
-                console.warn("[Worker] To enable persistence, ensure COOP/COEP headers are set by the server");
-                sqlProvider.loadFromMemory();
-            }
-
-            console.log("[Worker] Database loaded");
-
-            console.log("[Worker] Loading @triliumnext/core...");
-            coreModule = await import("@triliumnext/core");
-            coreModule.initializeCore({
-                executionContext: new BrowserExecutionContext(),
-                crypto: new BrowserCryptoProvider(),
-                messaging: messagingProvider,
-                translations: translationProvider,
-                dbConfig: {
-                    provider: sqlProvider,
-                    isReadOnly: false,
-                    onTransactionCommit: () => {
-                        // No-op for now
-                    },
-                    onTransactionRollback: () => {
-                        // No-op for now
-                    }
-                }
-            });
-
-            console.log("[Worker] Supported routes", Object.keys(coreModule.routes));
-
-            // Create and configure the router
-            router = createConfiguredRouter();
-            console.log("[Worker] Router configured");
-
-            console.log("[Worker] Initializing becca...");
-            await coreModule.becca_loader.beccaLoaded;
-
-            console.log("[Worker] Initialization complete");
-        } catch (error) {
-            initError = error instanceof Error ? error : new Error(String(error));
-            console.error("[Worker] Initialization failed:", initError);
-            throw initError;
-        }
-    })();
-
-    return initPromise;
-}
-
-/**
- * Ensure the worker is initialized before processing requests.
- * Returns the router if initialization was successful.
- */
-async function ensureInitialized() {
-    await initialize();
-    if (!router) {
-        throw new Error("Router not initialized");
-    }
-    return router;
-}
-
-interface LocalRequest {
-    method: string;
-    url: string;
-    body?: unknown;
-    headers?: Record<string, string>;
-}
-
-// Main dispatch
-async function dispatch(request: LocalRequest) {
-    const url = new URL(request.url);
-
-    console.log("[Worker] Dispatch:", url.pathname);
-
-    // Ensure initialization is complete and get the router
-    const appRouter = await ensureInitialized();
-
-    // Dispatch to the router
-    return appRouter.dispatch(request.method, request.url, request.body, request.headers);
-}
-
-// Start initialization immediately when the worker loads
-console.log("[Worker] Starting initialization...");
-initialize().catch(err => {
-    console.error("[Worker] Initialization failed:", err);
-    // Post error to main thread
-    self.postMessage({
-        type: "WORKER_ERROR",
-        error: {
-            message: String(err?.message || err),
-            stack: err?.stack
-        }
-    });
-});
-
-self.onmessage = async (event) => {
-    const msg = event.data;
-    if (!msg || msg.type !== "LOCAL_REQUEST") return;
-
-    const { id, request } = msg;
-
-    try {
-        const response = await dispatch(request);
-
-        // Transfer body back (if any) - use options object for proper typing
-        (self as unknown as Worker).postMessage({
-            type: "LOCAL_RESPONSE",
-            id,
-            response
-        }, { transfer: response.body ? [response.body] : [] });
-    } catch (e) {
-        console.error("[Worker] Dispatch error:", e);
-        (self as unknown as Worker).postMessage({
-            type: "LOCAL_RESPONSE",
-            id,
-            error: String((e as Error)?.message || e)
-        });
-    }
-};

apps/client-standalone/src/main.ts

@@ -1,84 +0,0 @@
-import { attachServiceWorkerBridge, startLocalServerWorker } from "./local-bridge.js";
-
-async function waitForServiceWorkerControl(): Promise<void> {
-    if (!("serviceWorker" in navigator)) {
-        throw new Error("Service Worker not supported in this browser");
-    }
-
-    // If already controlling, we're good
-    if (navigator.serviceWorker.controller) {
-        console.log("[Bootstrap] Service worker already controlling");
-        return;
-    }
-
-    console.log("[Bootstrap] Waiting for service worker to take control...");
-
-    // Register service worker
-    await navigator.serviceWorker.register("./sw.js", { scope: "/" });
-
-    // Wait for it to be ready (installed + activated)
-    await navigator.serviceWorker.ready;
-
-    // Check if we're now controlling
-    if (navigator.serviceWorker.controller) {
-        console.log("[Bootstrap] Service worker now controlling");
-        return;
-    }
-
-    // If not controlling yet, we need to reload the page for SW to take control
-    // This is standard PWA behavior on first install
-    console.log("[Bootstrap] Service worker installed but not controlling yet - reloading page");
-
-    // Wait a tiny bit for SW to fully activate
-    await new Promise(resolve => setTimeout(resolve, 100));
-
-    // Reload to let SW take control
-    window.location.reload();
-
-    // Throw to stop execution (page will reload)
-    throw new Error("Reloading for service worker activation");
-}
-
-async function bootstrap() {
-    /* fixes https://github.com/webpack/webpack/issues/10035 */
-    window.global = globalThis;
-
-    try {
-        // 1) Start local worker ASAP (so /bootstrap is fast)
-        startLocalServerWorker();
-
-        // 2) Bridge SW -> local worker
-        attachServiceWorkerBridge();
-
-        // 3) Wait for service worker to control the page (may reload on first install)
-        await waitForServiceWorkerControl();
-
-        await loadScripts();
-    } catch (err) {
-        // If error is from reload, it will stop here (page reloads)
-        // Otherwise, show error to user
-        if (err instanceof Error && err.message.includes("Reloading")) {
-            // Page is reloading, do nothing
-            return;
-        }
-
-        console.error("[Bootstrap] Fatal error:", err);
-        document.body.innerHTML = `
-            <div style="padding: 40px; max-width: 600px; margin: 0 auto; font-family: system-ui, sans-serif;">
-                <h1 style="color: #d32f2f;">Failed to Initialize</h1>
-                <p>The application failed to start. Please check the browser console for details.</p>
-                <pre style="background: #f5f5f5; padding: 16px; border-radius: 4px; overflow: auto;">${err instanceof Error ? err.message : String(err)}</pre>
-                <button onclick="location.reload()" style="padding: 12px 24px; background: #1976d2; color: white; border: none; border-radius: 4px; cursor: pointer; font-size: 16px;">
-                    Reload Page
-                </button>
-            </div>
-        `;
-        document.body.style.display = "block";
-    }
-}
-
-async function loadScripts() {
-    await import("../../client/src/index.js");
-}
-
-bootstrap();

apps/client-standalone/src/sw.ts

@@ -1,185 +0,0 @@
-// public/sw.js
-const VERSION = "localserver-v1.4";
-const STATIC_CACHE = `static-${VERSION}`;
-
-// Check if running in dev mode (passed via URL parameter)
-const isDev = true;
-
-if (isDev) {
-    console.log('[Service Worker] Running in DEV mode - caching disabled');
-}
-
-// Adjust these to your routes:
-const LOCAL_FIRST_PREFIXES = [
-    "/bootstrap",
-    "/api/",
-    "/sync/",
-    "/search/"
-];
-
-// Optional: basic precache list (keep small; you can expand later)
-const PRECACHE_URLS = [
-    // "/",
-    // "/index.html",
-    // "/manifest.webmanifest",
-    // "/favicon.ico",
-];
-
-self.addEventListener("install", (event) => {
-    event.waitUntil((async () => {
-        // Skip precaching in dev mode
-        if (!isDev) {
-            const cache = await caches.open(STATIC_CACHE);
-            await cache.addAll(PRECACHE_URLS);
-        }
-        self.skipWaiting();
-    })());
-});
-
-self.addEventListener("activate", (event) => {
-    event.waitUntil((async () => {
-    // Cleanup old caches
-        const keys = await caches.keys();
-        await Promise.all(keys.map((k) => (k === STATIC_CACHE ? Promise.resolve() : caches.delete(k))));
-        await self.clients.claim();
-    })());
-});
-
-function isLocalFirst(url) {
-    return LOCAL_FIRST_PREFIXES.some((p) => url.pathname.startsWith(p));
-}
-
-async function cacheFirst(request) {
-    // In dev mode, always bypass cache
-    if (isDev) {
-        return fetch(request);
-    }
-
-    const cache = await caches.open(STATIC_CACHE);
-    const cached = await cache.match(request);
-    if (cached) return cached;
-
-    const fresh = await fetch(request);
-    // Cache only successful GETs
-    if (request.method === "GET" && fresh.ok) cache.put(request, fresh.clone());
-    return fresh;
-}
-
-async function networkFirst(request) {
-    // In dev mode, always bypass cache
-    if (isDev) {
-        return fetch(request);
-    }
-
-    const cache = await caches.open(STATIC_CACHE);
-    try {
-        const fresh = await fetch(request);
-        // Cache only successful GETs
-        if (request.method === "GET" && fresh.ok) cache.put(request, fresh.clone());
-        return fresh;
-    } catch (error) {
-        // Fallback to cache if network fails
-        const cached = await cache.match(request);
-        if (cached) return cached;
-        throw error;
-    }
-}
-
-async function forwardToClientLocalServer(request, clientId) {
-    // Find a client to handle the request (prefer the initiating client if available)
-    let client = clientId ? await self.clients.get(clientId) : null;
-
-    if (!client) {
-        const all = await self.clients.matchAll({ type: "window", includeUncontrolled: true });
-        client = all[0] || null;
-    }
-
-    // If no page is available, fall back to network
-    if (!client) return fetch(request);
-
-    const reqUrl = request.url;
-    const headersObj = {};
-    for (const [k, v] of request.headers.entries()) headersObj[k] = v;
-
-    const body = (request.method === "GET" || request.method === "HEAD")
-        ? null
-        : await request.arrayBuffer();
-
-    const id = crypto.randomUUID();
-    const channel = new MessageChannel();
-
-    const responsePromise = new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-            reject(new Error("Local server timeout"));
-        }, 30_000);
-
-        channel.port1.onmessage = (event) => {
-            clearTimeout(timeout);
-            resolve(event.data);
-        };
-        channel.port1.onmessageerror = () => {
-            clearTimeout(timeout);
-            reject(new Error("Local server message error"));
-        };
-    });
-
-    // Send to the client with a reply port
-    client.postMessage({
-        type: "LOCAL_FETCH",
-        id,
-        request: {
-            url: reqUrl,
-            method: request.method,
-            headers: headersObj,
-            body // ArrayBuffer or null
-        }
-    }, [channel.port2]);
-
-    const localResp = await responsePromise;
-
-    if (!localResp || localResp.type !== "LOCAL_FETCH_RESPONSE" || localResp.id !== id) {
-    // Protocol mismatch; fall back
-        return fetch(request);
-    }
-
-    // localResp.response: { status, headers, body }
-    const { status, headers, body: respBody } = localResp.response;
-
-    const respHeaders = new Headers();
-    if (headers) {
-        for (const [k, v] of Object.entries(headers)) respHeaders.set(k, String(v));
-    }
-
-    return new Response(respBody ? respBody : null, {
-        status: status || 200,
-        headers: respHeaders
-    });
-}
-
-self.addEventListener("fetch", (event) => {
-    const url = new URL(event.request.url);
-
-    // Only handle same-origin
-    if (url.origin !== self.location.origin) return;
-
-    // HTML files: network-first to ensure updates are reflected immediately
-    if (event.request.mode === "navigate" || url.pathname.endsWith(".html")) {
-        event.respondWith(networkFirst(event.request));
-        return;
-    }
-
-    // Static assets: cache-first for performance
-    if (event.request.method === "GET" && !isLocalFirst(url)) {
-        event.respondWith(cacheFirst(event.request));
-        return;
-    }
-
-    // API-ish: local-first via bridge
-    if (isLocalFirst(url)) {
-        event.respondWith(forwardToClientLocalServer(event.request, event.clientId));
-        return;
-    }
-
-    // Default
-    event.respondWith(fetch(event.request));
-});

apps/client-standalone/src/vite-env.d.ts

@@ -1,31 +0,0 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TITLE: string
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv
-}
-
-interface Window {
-  glob: {
-    assetPath: string;
-    themeCssUrl?: string;
-    themeUseNextAsBase?: string;
-    iconPackCss: string;
-    device: string;
-    headingStyle: string;
-    layoutOrientation: string;
-    platform: string;
-    isElectron: boolean;
-    hasNativeTitleBar: boolean;
-    hasBackgroundEffects: boolean;
-    currentLocale: {
-      id: string;
-      rtl: boolean;
-    };
-    activeDialog: any;
-  };
-  global: typeof globalThis;
-}

apps/client-standalone/tsconfig.app.json

@@ -1,26 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": [
-      "ES2022",
-      "dom",
-      "dom.iterable"
-    ],
-    "skipLibCheck": true,
-    "types": [
-      "vite/client"
-    ],
-    "jsx": "react-jsx",
-    "jsxImportSource": "preact"
-  },
-  "include": [
-    "src/**/*",
-    "../client/src/**/*"
-  ],
-  "exclude": [
-    "src/**/*.spec.ts",
-    "src/**/*.test.ts",
-    "../client/src/**/*.spec.ts",
-    "../client/src/**/*.test.ts"
-  ]
-}

apps/client-standalone/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "references": [
-    { "path": "./tsconfig.app.json" },
-    { "path": "./tsconfig.spec.json" }
-  ]
-}

apps/client-standalone/tsconfig.spec.json

@@ -1,18 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": [
-      "ES2022",
-      "dom",
-      "dom.iterable"
-    ],
-    "types": [
-      "vitest/globals",
-      "happy-dom"
-    ]
-  },
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.test.ts"
-  ]
-}

apps/client-standalone/vite.config.mts

@@ -1,189 +0,0 @@
-import prefresh from '@prefresh/vite';
-import { join } from 'path';
-import { defineConfig } from 'vite';
-import { viteStaticCopy } from 'vite-plugin-static-copy';
-
-const clientAssets = ["assets", "stylesheets", "fonts", "translations"];
-
-const isDev = process.env.NODE_ENV === "development";
-
-// Watch client files and trigger reload in development
-const clientWatchPlugin = () => ({
-    name: 'client-watch',
-    configureServer(server: any) {
-        if (isDev) {
-            // Watch client source files (adjusted for new root)
-            server.watcher.add('../../client/src/**/*');
-            server.watcher.on('change', (file: string) => {
-                if (file.includes('../../client/src/')) {
-                    server.ws.send({
-                        type: 'full-reload'
-                    });
-                }
-            });
-        }
-    }
-});
-
-// Always copy SQLite WASM files so they're available to the module
-const sqliteWasmPlugin = viteStaticCopy({
-    targets: [
-        {
-            src: "../../../node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.wasm",
-            dest: "assets"
-        },
-        {
-            src: "../../../node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3-opfs-async-proxy.js",
-            dest: "assets"
-        }
-    ]
-});
-
-let plugins: any = [
-    sqliteWasmPlugin,  // Always include SQLite WASM files
-    viteStaticCopy({
-        targets: clientAssets.map((asset) => ({
-            src: `../../client/src/${asset}/*`,
-            dest: asset
-        })),
-        // Enable watching in development
-        ...(isDev && {
-            watch: {
-                reloadPageOnChange: true
-            }
-        })
-    }),
-    viteStaticCopy({
-        targets: [
-            {
-                src: "../../server/src/assets/*",
-                dest: "server-assets"
-            }
-        ]
-    }),
-    // Watch client files for changes in development
-    ...(isDev ? [
-        prefresh(),
-        clientWatchPlugin()
-    ] : [])
-];
-
-if (!isDev) {
-    plugins = [
-        ...plugins,
-        viteStaticCopy({
-            structured: true,
-            targets: [
-                {
-                    src: "../../../node_modules/@excalidraw/excalidraw/dist/prod/fonts/*",
-                    dest: "",
-                }
-            ]
-        })
-    ]
-}
-
-export default defineConfig(() => ({
-    root: join(__dirname, 'src'),  // Set src as root so index.html is served from /
-    envDir: __dirname,  // Load .env files from client-standalone directory, not src/
-    cacheDir: '../../../node_modules/.vite/apps/client-standalone',
-    base: "",
-    plugins,
-    esbuild: {
-        jsx: 'automatic',
-        jsxImportSource: 'preact',
-        jsxDev: isDev
-    },
-    css: {
-        transformer: 'lightningcss',
-        devSourcemap: isDev
-    },
-    publicDir: join(__dirname, 'public'),
-    resolve: {
-        alias: [
-            {
-                find: "react",
-                replacement: "preact/compat"
-            },
-            {
-                find: "react-dom",
-                replacement: "preact/compat"
-            },
-            {
-                find: "@client",
-                replacement: join(__dirname, "../client/src")
-            }
-        ],
-        dedupe: [
-            "react",
-            "react-dom",
-            "preact",
-            "preact/compat",
-            "preact/hooks"
-        ]
-    },
-    server: {
-        watch: {
-            // Watch workspace packages
-            ignored: ['!**/node_modules/@triliumnext/**'],
-            // Also watch client assets for live reload
-            usePolling: false,
-            interval: 100,
-            binaryInterval: 300
-        },
-        // Watch additional directories for changes
-        fs: {
-            allow: [
-                // Allow access to workspace root
-                '../../../',
-                // Explicitly allow client directory
-                '../../client/src/'
-            ]
-        },
-        headers: {
-            // Required for SharedArrayBuffer which is needed by SQLite WASM OPFS VFS
-            // See: https://sqlite.org/wasm/doc/trunk/persistence.md#coop-coep
-            "Cross-Origin-Opener-Policy": "same-origin",
-            "Cross-Origin-Embedder-Policy": "require-corp"
-        }
-    },
-    optimizeDeps: {
-        exclude: ['@sqlite.org/sqlite-wasm', '@triliumnext/core']
-    },
-    worker: {
-        format: "es" as const
-    },
-    commonjsOptions: {
-        transformMixedEsModules: true,
-    },
-    build: {
-        target: "esnext",
-        outDir: join(__dirname, 'dist'),
-        emptyOutDir: true,
-        rollupOptions: {
-            input: {
-                main: join(__dirname, 'src', 'index.html'),
-                sw: join(__dirname, 'src', 'sw.ts'),
-                'local-bridge': join(__dirname, 'src', 'local-bridge.ts'),
-                'local-server-worker': join(__dirname, 'src', 'local-server-worker.ts')
-            },
-            output: {
-                entryFileNames: (chunkInfo) => {
-                    // Service worker and other workers should be at root level
-                    if (chunkInfo.name === 'sw' || chunkInfo.name === 'local-server-worker') {
-                        return '[name].js';
-                    }
-                    return 'src/[name].js';
-                },
-                chunkFileNames: "src/[name].js",
-                assetFileNames: "src/[name].[ext]"
-            }
-        }
-    },
-    test: {
-        environment: "happy-dom"
-    },
-    define: {
-        "process.env.IS_PREACT": JSON.stringify("true"),
-    }
-}));

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triliumnext/client",
-  "version": "0.101.3",
+  "version": "0.101.1",
   "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
   "private": true,
   "license": "AGPL-3.0-only",
@@ -43,7 +43,7 @@
     "debounce": "3.0.0",
     "draggabilly": "3.0.0",
     "force-graph": "1.51.0",
-    "globals": "17.0.0",
+    "globals": "16.5.0",
     "i18next": "25.7.3",
     "i18next-http-backend": "3.0.2",
     "jquery": "3.7.1",
@@ -56,12 +56,11 @@
     "mark.js": "8.11.1",
     "marked": "17.0.1",
     "mermaid": "11.12.2",
-    "mind-elixir": "5.5.0",
+    "mind-elixir": "5.3.8",
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
-    "preact": "10.28.2",
-    "react-i18next": "16.5.1",
-    "react-window": "2.2.5",
+    "preact": "10.28.1",
+    "react-i18next": "16.5.0",
     "reveal.js": "5.2.1",
     "svg-pan-zoom": "3.6.2",
     "tabulator-tables": "6.3.1",
@@ -69,7 +68,7 @@
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-inspector": "5.0.0",
-    "@prefresh/vite": "2.4.11",
+    "@preact/preset-vite": "2.10.2",
     "@types/bootstrap": "5.2.10",
     "@types/jquery": "3.5.33",
     "@types/leaflet": "1.9.21",
@@ -79,7 +78,6 @@
     "@types/tabulator-tables": "6.3.1",
     "copy-webpack-plugin": "13.0.1",
     "happy-dom": "20.0.11",
-    "lightningcss": "1.30.2",
     "script-loader": "0.7.2",
     "vite-plugin-static-copy": "3.1.4"
   }

apps/client/src/components/app_context.ts

@@ -6,7 +6,7 @@ import { ColumnComponent } from "tabulator-tables";
 
 import type { Attribute } from "../services/attribute_parser.js";
 import froca from "../services/froca.js";
-import { initLocale, t } from "../services/i18n.js";
+import { initLocale,t } from "../services/i18n.js";
 import keyboardActionsService from "../services/keyboard_actions.js";
 import linkService, { type ViewScope } from "../services/link.js";
 import type LoadResults from "../services/load_results.js";
@@ -154,7 +154,6 @@ export type CommandMappings = {
     };
     openInTab: ContextMenuCommandData;
     openNoteInSplit: ContextMenuCommandData;
-    openNoteInWindow: ContextMenuCommandData;
     openNoteInPopup: ContextMenuCommandData;
     toggleNoteHoisting: ContextMenuCommandData;
     insertNoteAfter: ContextMenuCommandData;
@@ -383,8 +382,7 @@ export type CommandMappings = {
     reloadTextEditor: CommandData;
     chooseNoteType: CommandData & {
         callback: ChooseNoteTypeCallback
-    };
-    customDownload: CommandData;
+    }
 };
 
 type EventMappings = {
@@ -475,11 +473,6 @@ type EventMappings = {
     noteContextRemoved: {
         ntxIds: string[];
     };
-    contextDataChanged: {
-        noteContext: NoteContext;
-        key: string;
-        value: unknown;
-    };
     exportSvg: { ntxId: string | null | undefined; };
     exportPng: { ntxId: string | null | undefined; };
     geoMapCreateChildNote: {

apps/client/src/components/component.ts

@@ -57,18 +57,6 @@ export class TypedComponent<ChildT extends TypedComponent<ChildT>> {
         return this;
     }
 
-    /**
-     * Removes a child component from this component's children array.
-     * This is used for cleanup when a widget is unmounted to prevent event listener accumulation.
-     */
-    removeChild(component: ChildT) {
-        const index = this.children.indexOf(component);
-        if (index !== -1) {
-            this.children.splice(index, 1);
-            component.parent = undefined;
-        }
-    }
-
     handleEvent<T extends EventNames>(name: T, data: EventData<T>): Promise<unknown[] | unknown> | null | undefined {
         try {
             const callMethodPromise = this.initialized ? this.initialized.then(() => this.callMethod((this as any)[`${name}Event`], data)) : this.callMethod((this as any)[`${name}Event`], data);

apps/client/src/components/note_context.ts

@@ -12,7 +12,6 @@ import server from "../services/server.js";
 import treeService from "../services/tree.js";
 import utils from "../services/utils.js";
 import { ReactWrappedWidget } from "../widgets/basic_widget.js";
-import type { HeadingContext } from "../widgets/sidebar/TableOfContents.js";
 import appContext, { type EventData, type EventListener } from "./app_context.js";
 import Component from "./component.js";
 
@@ -23,31 +22,6 @@ export interface SetNoteOpts {
 
 export type GetTextEditorCallback = (editor: CKTextEditor) => void;
 
-export type SaveState = "saved" | "saving" | "unsaved" | "error";
-
-export interface NoteContextDataMap {
-    toc: HeadingContext;
-    pdfPages: {
-        totalPages: number;
-        currentPage: number;
-        scrollToPage(page: number): void;
-        requestThumbnail(page: number): void;
-    };
-    pdfAttachments: {
-        attachments: PdfAttachment[];
-        downloadAttachment(filename: string): void;
-    };
-    pdfLayers: {
-        layers: PdfLayer[];
-        toggleLayer(layerId: string, visible: boolean): void;
-    };
-    saveState: {
-        state: SaveState;
-    };
-}
-
-type ContextDataKey = keyof NoteContextDataMap;
-
 class NoteContext extends Component implements EventListener<"entitiesReloaded"> {
     ntxId: string | null;
     hoistedNoteId: string;
@@ -58,13 +32,6 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
     parentNoteId?: string | null;
     viewScope?: ViewScope;
 
-    /**
-     * Metadata storage for UI components (e.g., table of contents, PDF page list, code outline).
-     * This allows type widgets to publish data that sidebar/toolbar components can consume.
-     * Data is automatically cleared when navigating to a different note.
-     */
-    private contextData: Map<string, unknown> = new Map();
-
     constructor(ntxId: string | null = null, hoistedNoteId: string = "root", mainNtxId: string | null = null) {
         super();
 
@@ -124,22 +91,6 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
         this.viewScope = opts.viewScope;
         ({ noteId: this.noteId, parentNoteId: this.parentNoteId } = treeService.getNoteIdAndParentIdFromUrl(resolvedNotePath));
 
-        // Clear context data when switching notes and notify subscribers
-        const oldKeys = Array.from(this.contextData.keys());
-        this.contextData.clear();
-        if (oldKeys.length > 0) {
-            // Notify subscribers asynchronously to avoid blocking navigation
-            window.setTimeout(() => {
-                for (const key of oldKeys) {
-                    this.triggerEvent("contextDataChanged", {
-                        noteContext: this,
-                        key,
-                        value: undefined
-                    });
-                }
-            }, 0);
-        }
-
         this.saveToRecentNotes(resolvedNotePath);
 
         protectedSessionHolder.touchProtectedSessionIfNecessary(this.note);
@@ -492,52 +443,6 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
 
         return title;
     }
-
-    /**
-     * Set metadata for this note context (e.g., table of contents, PDF pages, code outline).
-     * This data can be consumed by sidebar/toolbar components.
-     *
-     * @param key - Unique identifier for the data type (e.g., "toc", "pdfPages", "codeOutline")
-     * @param value - The data to store (will be cleared when switching notes)
-     */
-    setContextData<K extends ContextDataKey>(key: K, value: NoteContextDataMap[K]): void {
-        this.contextData.set(key, value);
-        // Trigger event so subscribers can react
-        this.triggerEvent("contextDataChanged", {
-            noteContext: this,
-            key,
-            value
-        });
-    }
-
-    /**
-     * Get metadata for this note context.
-     *
-     * @param key - The data key to retrieve
-     * @returns The stored data, or undefined if not found
-     */
-    getContextData<K extends ContextDataKey>(key: K): NoteContextDataMap[K] | undefined {
-        return this.contextData.get(key) as NoteContextDataMap[K] | undefined;
-    }
-
-    /**
-     * Check if context data exists for a given key.
-     */
-    hasContextData(key: ContextDataKey): boolean {
-        return this.contextData.has(key);
-    }
-
-    /**
-     * Clear specific context data.
-     */
-    clearContextData(key: ContextDataKey): void {
-        this.contextData.delete(key);
-        this.triggerEvent("contextDataChanged", {
-            noteContext: this,
-            key,
-            value: undefined
-        });
-    }
 }
 
 export function openInCurrentNoteContext(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent | React.PointerEvent<HTMLCanvasElement> | null, notePath: string, viewScope?: ViewScope) {

apps/client/src/desktop.ts

@@ -1,18 +1,17 @@
-import "autocomplete.js/index_jquery.js";
-
-import type ElectronRemote from "@electron/remote";
-import type Electron from "electron";
-
 import appContext from "./components/app_context.js";
-import electronContextMenu from "./menus/electron_context_menu.js";
+import utils from "./services/utils.js";
+import noteTooltipService from "./services/note_tooltip.js";
 import bundleService from "./services/bundle.js";
+import toastService from "./services/toast.js";
+import noteAutocompleteService from "./services/note_autocomplete.js";
+import electronContextMenu from "./menus/electron_context_menu.js";
 import glob from "./services/glob.js";
 import { t } from "./services/i18n.js";
-import noteAutocompleteService from "./services/note_autocomplete.js";
-import noteTooltipService from "./services/note_tooltip.js";
 import options from "./services/options.js";
-import toastService from "./services/toast.js";
-import utils from "./services/utils.js";
+import type ElectronRemote from "@electron/remote";
+import type Electron from "electron";
+import "boxicons/css/boxicons.min.css";
+import "autocomplete.js/index_jquery.js";
 
 await appContext.earlyInit();
 

apps/client/src/entities/fnote.ts

@@ -8,7 +8,7 @@ import search from "../services/search.js";
 import server from "../services/server.js";
 import utils from "../services/utils.js";
 import type FAttachment from "./fattachment.js";
-import type { AttributeType, default as FAttribute } from "./fattribute.js";
+import type { AttributeType,default as FAttribute } from "./fattribute.js";
 
 const LABEL = "label";
 const RELATION = "relation";
@@ -582,10 +582,6 @@ export default class FNote {
     }
 
     getIcon() {
-        return `tn-icon ${this.#getIconInternal()}`;
-    }
-
-    #getIconInternal() {
         const iconClassLabels = this.getLabels("iconClass");
         const workspaceIconClass = this.getWorkspaceIconClass();
 
@@ -616,9 +612,7 @@ export default class FNote {
     }
 
     isFolder() {
-        if (this.isLabelTruthy("subtreeHidden")) return false;
-        if (this.type === "search") return true;
-        return this.getFilteredChildBranches().length > 0;
+        return this.type === "search" || this.getFilteredChildBranches().length > 0;
     }
 
     getFilteredChildBranches() {

apps/client/src/index.html

@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <link rel="shortcut icon" href="favicon.ico">
-        <meta name="mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover, interactive-widget=resizes-content" />
-        <link rel="manifest" crossorigin="use-credentials" href="manifest.webmanifest">
-        <title>Trilium Notes</title>
-    </head>
-
-    <body id="trilium-app">
-        <noscript>Trilium requires JavaScript to be enabled.</noscript>
-
-        <div class="dropdown-menu dropdown-menu-sm" id="context-menu-container" style="display: none"></div>
-
-        <!-- Required to match the PWA's top bar color with the theme -->
-        <!-- This works even when the user directly changes --root-background in CSS -->
-        <div id="background-color-tracker" style="position: absolute; visibility: hidden; color: var(--root-background); transition: color 1ms;"></div>
-
-        <script src="./index.ts" type="module"></script>
-
-        <!-- Required for correct loading of scripts in Electron -->
-        <script>
-            if (typeof module === 'object') {window.module = module; module = undefined;}
-        </script>
-    </body>
-</html>

apps/client/src/index.ts

@@ -1,143 +0,0 @@
-async function bootstrap() {
-    showSplash();
-    await setupGlob();
-    await Promise.all([
-        initJQuery(),
-        loadBootstrapCss()
-    ]);
-    loadStylesheets();
-    loadIcons();
-    setBodyAttributes();
-    await loadScripts();
-    hideSplash();
-}
-
-async function initJQuery() {
-    const $ = (await import("jquery")).default;
-    window.$ = $;
-    window.jQuery = $;
-}
-
-async function setupGlob() {
-    const response = await fetch(`/bootstrap${window.location.search}`);
-    const json = await response.json();
-
-    window.global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
-    window.glob = {
-        ...json,
-        activeDialog: null,
-        device: json.device || getDevice()
-    };
-}
-
-function getDevice() {
-    // Respect user's manual override via URL.
-    const urlParams = new URLSearchParams(window.location.search);
-    if (urlParams.has("print")) {
-        return "print";
-    } else if (urlParams.has("desktop")) {
-        return "desktop";
-    } else if (urlParams.has("mobile")) {
-        return "mobile";
-    }
-
-    const deviceCookie = document.cookie.split("; ").find(row => row.startsWith("trilium-device="))?.split("=")[1];
-    if (deviceCookie === "desktop" || deviceCookie === "mobile") return deviceCookie;
-    return isMobile() ? "mobile" : "desktop";
-}
-
-// https://stackoverflow.com/a/73731646/944162
-function isMobile() {
-    const mQ = matchMedia?.("(pointer:coarse)");
-    if (mQ?.media === "(pointer:coarse)") return !!mQ.matches;
-
-    if ("orientation" in window) return true;
-    const userAgentsRegEx = /\b(Android|iPhone|iPad|iPod|Windows Phone|BlackBerry|webOS|IEMobile)\b/i;
-    return userAgentsRegEx.test(navigator.userAgent);
-}
-
-async function loadBootstrapCss() {
-    // We have to selectively import Bootstrap CSS based on text direction.
-    if (glob.isRtl) {
-        await import("bootstrap/dist/css/bootstrap.rtl.min.css");
-    } else {
-        await import("bootstrap/dist/css/bootstrap.min.css");
-    }
-}
-
-function loadStylesheets() {
-    const { assetPath, themeCssUrl, themeUseNextAsBase } = window.glob;
-    const cssToLoad: string[] = [];
-    cssToLoad.push(`${assetPath}/stylesheets/ckeditor-theme.css`);
-    cssToLoad.push(`api/fonts`);
-    cssToLoad.push(`${assetPath}/stylesheets/theme-light.css`);
-    if (themeCssUrl) {
-        cssToLoad.push(themeCssUrl);
-    }
-    if (themeUseNextAsBase === "next") {
-        cssToLoad.push(`${assetPath}/stylesheets/theme-next.css`);
-    } else if (themeUseNextAsBase === "next-dark") {
-        cssToLoad.push(`${assetPath}/stylesheets/theme-next-dark.css`);
-    } else if (themeUseNextAsBase === "next-light") {
-        cssToLoad.push(`${assetPath}/stylesheets/theme-next-light.css`);
-    }
-    cssToLoad.push(`${assetPath}/stylesheets/style.css`);
-
-    for (const href of cssToLoad) {
-        const linkEl = document.createElement("link");
-        linkEl.href = href;
-        linkEl.rel = "stylesheet";
-        document.head.appendChild(linkEl);
-    }
-}
-
-function loadIcons() {
-    const styleEl = document.createElement("style");
-    styleEl.innerText = window.glob.iconPackCss;
-    document.head.appendChild(styleEl);
-}
-
-function setBodyAttributes() {
-    const { device, headingStyle, layoutOrientation, platform, isElectron, hasNativeTitleBar, hasBackgroundEffects, currentLocale } = window.glob;
-    const classesToSet = [
-        device,
-        `heading-style-${headingStyle}`,
-        `layout-${layoutOrientation}`,
-        `platform-${platform}`,
-        isElectron && "electron",
-        hasNativeTitleBar && "native-titlebar",
-        hasBackgroundEffects && "background-effects"
-    ].filter(Boolean) as string[];
-
-    for (const classToSet of classesToSet) {
-        document.body.classList.add(classToSet);
-    }
-
-    document.body.lang = currentLocale.id;
-    document.body.dir = currentLocale.rtl ? "rtl" : "ltr";
-}
-
-async function loadScripts() {
-    switch (glob.device) {
-        case "mobile":
-            await import("./mobile.js");
-            break;
-        case "print":
-            await import("./print.js");
-            break;
-        case "desktop":
-        default:
-            await import("./desktop.js");
-    }
-}
-
-function showSplash() {
-    // hide body to reduce flickering on the startup. This is done through JS and not CSS to not hide <noscript>
-    document.body.style.display = "none";
-}
-
-function hideSplash() {
-    document.body.style.display = "block";
-}
-
-bootstrap();

apps/client/src/layouts/mobile_layout.tsx

@@ -1,35 +1,35 @@
-import type AppContext from "../components/app_context.js";
-import GlobalMenuWidget from "../widgets/buttons/global_menu.js";
-import CloseZenModeButton from "../widgets/close_zen_button.js";
-import NoteList from "../widgets/collections/NoteList.jsx";
-import ContentHeader from "../widgets/containers/content_header.js";
-import FlexContainer from "../widgets/containers/flex_container.js";
-import RootContainer from "../widgets/containers/root_container.js";
-import ScrollingContainer from "../widgets/containers/scrolling_container.js";
-import SplitNoteContainer from "../widgets/containers/split_note_container.js";
-import FloatingButtons from "../widgets/FloatingButtons.jsx";
+import { applyModals } from "./layout_commons.js";
 import { MOBILE_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.jsx";
-import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
+import { useNoteContext } from "../widgets/react/hooks.jsx";
+import CloseZenModeButton from "../widgets/close_zen_button.js";
+import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.jsx";
+import FlexContainer from "../widgets/containers/flex_container.js";
+import FloatingButtons from "../widgets/FloatingButtons.jsx";
+import GlobalMenuWidget from "../widgets/buttons/global_menu.js";
 import MobileDetailMenu from "../widgets/mobile_widgets/mobile_detail_menu.js";
-import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
-import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js";
-import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
+import NoteList from "../widgets/collections/NoteList.jsx";
 import NoteTitleWidget from "../widgets/note_title.js";
+import ContentHeader from "../widgets/containers/content_header.js";
 import NoteTreeWidget from "../widgets/note_tree.js";
 import NoteWrapperWidget from "../widgets/note_wrapper.js";
-import NoteDetail from "../widgets/NoteDetail.jsx";
-import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
 import QuickSearchWidget from "../widgets/quick_search.js";
-import { useNoteContext } from "../widgets/react/hooks.jsx";
 import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
-import StandaloneRibbonAdapter from "../widgets/ribbon/components/StandaloneRibbonAdapter.jsx";
-import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.jsx";
+import RootContainer from "../widgets/containers/root_container.js";
+import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
+import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import SearchDefinitionTab from "../widgets/ribbon/SearchDefinitionTab.jsx";
 import SearchResult from "../widgets/search_result.jsx";
 import SharedInfoWidget from "../widgets/shared_info.js";
+import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js";
+import StandaloneRibbonAdapter from "../widgets/ribbon/components/StandaloneRibbonAdapter.jsx";
 import TabRowWidget from "../widgets/tab_row.js";
+import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
+import type AppContext from "../components/app_context.js";
+import NoteDetail from "../widgets/NoteDetail.jsx";
 import MobileEditorToolbar from "../widgets/type_widgets/text/mobile_editor_toolbar.jsx";
-import { applyModals } from "./layout_commons.js";
+import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
+import SplitNoteContainer from "../widgets/containers/split_note_container.js";
+import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
 
 const MOBILE_CSS = `
 <style>
@@ -194,11 +194,11 @@ export default class MobileLayout {
 }
 
 function FilePropertiesWrapper() {
-    const { note, ntxId } = useNoteContext();
+    const { note } = useNoteContext();
 
     return (
         <div>
-            {note?.type === "file" && <FilePropertiesTab note={note} ntxId={ntxId} />}
+            {note?.type === "file" && <FilePropertiesTab note={note} />}
         </div>
     );
 }

apps/client/src/menus/tree_context_menu.ts

@@ -1,21 +1,21 @@
-import appContext, { type ContextMenuCommandData, type FilteredCommandNames } from "../components/app_context.js";
-import type { SelectMenuItemEventListener } from "../components/events.js";
-import type FAttachment from "../entities/fattachment.js";
-import attributes from "../services/attributes.js";
-import { executeBulkActions } from "../services/bulk_action.js";
-import clipboard from "../services/clipboard.js";
-import dialogService from "../services/dialog.js";
+import NoteColorPicker from "./custom-items/NoteColorPicker.jsx";
+import treeService from "../services/tree.js";
 import froca from "../services/froca.js";
-import { t } from "../services/i18n.js";
+import clipboard from "../services/clipboard.js";
 import noteCreateService from "../services/note_create.js";
+import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
+import appContext, { type ContextMenuCommandData, type FilteredCommandNames } from "../components/app_context.js";
 import noteTypesService from "../services/note_types.js";
 import server from "../services/server.js";
 import toastService from "../services/toast.js";
-import treeService from "../services/tree.js";
-import utils from "../services/utils.js";
+import dialogService from "../services/dialog.js";
+import { t } from "../services/i18n.js";
 import type NoteTreeWidget from "../widgets/note_tree.js";
-import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
-import NoteColorPicker from "./custom-items/NoteColorPicker.jsx";
+import type FAttachment from "../entities/fattachment.js";
+import type { SelectMenuItemEventListener } from "../components/events.js";
+import utils from "../services/utils.js";
+import attributes from "../services/attributes.js";
+import { executeBulkActions } from "../services/bulk_action.js";
 
 // TODO: Deduplicate once client/server is well split.
 interface ConvertToAttachmentResponse {
@@ -72,8 +72,6 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
         const noSelectedNotes = selNodes.length === 0 || (selNodes.length === 1 && selNodes[0] === this.node);
 
         const notSearch = note?.type !== "search";
-        const hasSubtreeHidden = note?.isLabelTruthy("subtreeHidden") ?? false;
-        const isSpotlighted = this.node.extraClasses.includes("spotlighted-node");
         const notOptionsOrHelp = !note?.noteId.startsWith("_options") && !note?.noteId.startsWith("_help");
         const parentNotSearch = !parentNote || parentNote.type !== "search";
         const insertNoteAfterEnabled = isNotRoot && !isHoisted && parentNotSearch;
@@ -81,18 +79,17 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
         const items: (MenuItem<TreeCommandNames> | null)[] = [
             { title: t("tree-context-menu.open-in-a-new-tab"), command: "openInTab", shortcut: "Ctrl+Click", uiIcon: "bx bx-link-external", enabled: noSelectedNotes },
             { title: t("tree-context-menu.open-in-a-new-split"), command: "openNoteInSplit", uiIcon: "bx bx-dock-right", enabled: noSelectedNotes },
-            { title: t("tree-context-menu.open-in-a-new-window"), command: "openNoteInWindow", uiIcon: "bx bx-window-open", enabled: noSelectedNotes },
             { title: t("tree-context-menu.open-in-popup"), command: "openNoteInPopup", uiIcon: "bx bx-edit", enabled: noSelectedNotes },
 
             isHoisted
                 ? null
                 : {
-                    title: `${t("tree-context-menu.hoist-note")}`,
-                    command: "toggleNoteHoisting",
-                    keyboardShortcut: "toggleNoteHoisting",
-                    uiIcon: "bx bxs-chevrons-up",
-                    enabled: noSelectedNotes && notSearch
-                },
+                      title: `${t("tree-context-menu.hoist-note")}`,
+                      command: "toggleNoteHoisting",
+                      keyboardShortcut: "toggleNoteHoisting",
+                      uiIcon: "bx bxs-chevrons-up",
+                      enabled: noSelectedNotes && notSearch
+                  },
             !isHoisted || !isNotRoot
                 ? null
                 : { title: t("tree-context-menu.unhoist-note"), command: "toggleNoteHoisting", keyboardShortcut: "toggleNoteHoisting", uiIcon: "bx bx-door-open" },
@@ -115,7 +112,7 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
                 keyboardShortcut: "createNoteInto",
                 uiIcon: "bx bx-plus",
                 items: notSearch ? await noteTypesService.getNoteTypeItems("insertChildNote") : null,
-                enabled: notSearch && noSelectedNotes && notOptionsOrHelp && !hasSubtreeHidden && !isSpotlighted,
+                enabled: notSearch && noSelectedNotes && notOptionsOrHelp,
                 columns: 2
             },
 
@@ -153,17 +150,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
 
                     { kind: "separator" },
 
-                    !hasSubtreeHidden && { title: t("tree-context-menu.expand-subtree"), command: "expandSubtree", keyboardShortcut: "expandSubtree", uiIcon: "bx bx-expand", enabled: noSelectedNotes },
-                    !hasSubtreeHidden && { title: t("tree-context-menu.collapse-subtree"), command: "collapseSubtree", keyboardShortcut: "collapseSubtree", uiIcon: "bx bx-collapse", enabled: noSelectedNotes },
-                    {
-                        title: hasSubtreeHidden ? t("tree-context-menu.show-subtree") : t("tree-context-menu.hide-subtree"),
-                        uiIcon: "bx bx-show",
-                        handler: async () => {
-                            const note = await froca.getNote(this.node.data.noteId);
-                            if (!note) return;
-                            attributes.setBooleanWithInheritance(note, "subtreeHidden", !hasSubtreeHidden);
-                        }
-                    },
+                    { title: t("tree-context-menu.expand-subtree"), command: "expandSubtree", keyboardShortcut: "expandSubtree", uiIcon: "bx bx-expand", enabled: noSelectedNotes },
+                    { title: t("tree-context-menu.collapse-subtree"), command: "collapseSubtree", keyboardShortcut: "collapseSubtree", uiIcon: "bx bx-collapse", enabled: noSelectedNotes },
                     {
                         title: t("tree-context-menu.sort-by"),
                         command: "sortChildNotes",
@@ -176,7 +164,7 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
 
                     { title: t("tree-context-menu.copy-note-path-to-clipboard"), command: "copyNotePathToClipboard", uiIcon: "bx bx-directions", enabled: true },
                     { title: t("tree-context-menu.recent-changes-in-subtree"), command: "recentChangesInSubtree", uiIcon: "bx bx-history", enabled: noSelectedNotes && notOptionsOrHelp }
-                ].filter(Boolean) as MenuItem<TreeCommandNames>[]
+                ]
             },
 
             { kind: "separator" },
@@ -304,30 +292,25 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
             noteCreateService.createNote(parentNotePath, {
                 target: "after",
                 targetBranchId: this.node.data.branchId,
-                type,
-                isProtected,
-                templateNoteId
+                type: type,
+                isProtected: isProtected,
+                templateNoteId: templateNoteId
             });
         } else if (command === "insertChildNote") {
             const parentNotePath = treeService.getNotePath(this.node);
 
             noteCreateService.createNote(parentNotePath, {
-                type,
+                type: type,
                 isProtected: this.node.data.isProtected,
-                templateNoteId
+                templateNoteId: templateNoteId
             });
         } else if (command === "openNoteInSplit") {
             const subContexts = appContext.tabManager.getActiveContext()?.getSubContexts();
             const { ntxId } = subContexts?.[subContexts.length - 1] ?? {};
 
             this.treeWidget.triggerCommand("openNewNoteSplit", { ntxId, notePath });
-        } else if (command === "openNoteInWindow") {
-            appContext.triggerCommand("openInWindow", {
-                notePath,
-                hoistedNoteId: appContext.tabManager.getActiveContext()?.hoistedNoteId
-            });
         } else if (command === "openNoteInPopup") {
-            appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath });
+            appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath })
         } else if (command === "convertNoteToAttachment") {
             if (!(await dialogService.confirm(t("tree-context-menu.convert-to-attachment-confirm")))) {
                 return;
@@ -349,11 +332,11 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
 
             toastService.showMessage(t("tree-context-menu.converted-to-attachments", { count: converted }));
         } else if (command === "copyNotePathToClipboard") {
-            navigator.clipboard.writeText(`#${  notePath}`);
+            navigator.clipboard.writeText("#" + notePath);
         } else if (command) {
             this.treeWidget.triggerCommand<TreeCommandNames>(command, {
                 node: this.node,
-                notePath,
+                notePath: notePath,
                 noteId: this.node.data.noteId,
                 selectedOrActiveBranchIds: this.treeWidget.getSelectedOrActiveBranchIds(this.node),
                 selectedOrActiveNoteIds: this.treeWidget.getSelectedOrActiveNoteIds(this.node)

apps/client/src/mobile.ts

@@ -1,8 +1,8 @@
-import "autocomplete.js/index_jquery.js";
-
 import appContext from "./components/app_context.js";
-import glob from "./services/glob.js";
 import noteAutocompleteService from "./services/note_autocomplete.js";
+import glob from "./services/glob.js";
+import "boxicons/css/boxicons.min.css";
+import "autocomplete.js/index_jquery.js";
 
 glob.setupGlobs();
 

apps/client/src/services/attributes.spec.ts

@@ -1,139 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import { buildNote } from "../test/easy-froca";
-import { setBooleanWithInheritance } from "./attributes";
-import froca from "./froca";
-import server from "./server.js";
-
-// Spy on server methods to track calls
-// @ts-expect-error the generic typing is causing issues here
-server.put = vi.fn(async <T> (url: string, data?: T) => ({} as T));
-// @ts-expect-error the generic typing is causing issues here
-server.remove = vi.fn(async <T> (url: string) => ({} as T));
-
-describe("Set boolean with inheritance", () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it("doesn't call server if value matches directly", async () => {
-        const noteWithLabel = buildNote({
-            title: "New note",
-            "#foo": ""
-        });
-        const noteWithoutLabel = buildNote({
-            title: "New note"
-        });
-
-        await setBooleanWithInheritance(noteWithLabel, "foo", true);
-        await setBooleanWithInheritance(noteWithoutLabel, "foo", false);
-        expect(server.put).not.toHaveBeenCalled();
-        expect(server.remove).not.toHaveBeenCalled();
-    });
-
-    it("sets boolean normally without inheritance", async () => {
-        const standaloneNote = buildNote({
-            title: "New note"
-        });
-
-        await setBooleanWithInheritance(standaloneNote, "foo", true);
-        expect(server.put).toHaveBeenCalledWith(`notes/${standaloneNote.noteId}/set-attribute`, {
-            type: "label",
-            name: "foo",
-            value: "",
-            isInheritable: false
-        });
-    });
-
-    it("removes boolean normally without inheritance", async () => {
-        const standaloneNote = buildNote({
-            title: "New note",
-            "#foo": ""
-        });
-
-        const attributeId = standaloneNote.getLabel("foo")!.attributeId;
-        await setBooleanWithInheritance(standaloneNote, "foo", false);
-        expect(server.remove).toHaveBeenCalledWith(`notes/${standaloneNote.noteId}/attributes/${attributeId}`);
-    });
-
-    it("doesn't call server if value matches inherited", async () => {
-        const parentNote = buildNote({
-            title: "Parent note",
-            "#foo(inheritable)": "",
-            "children": [
-                {
-                    title: "Child note"
-                }
-            ]
-        });
-        const childNote = froca.getNoteFromCache(parentNote.children[0])!;
-        expect(childNote.isLabelTruthy("foo")).toBe(true);
-        await setBooleanWithInheritance(childNote, "foo", true);
-        expect(server.put).not.toHaveBeenCalled();
-        expect(server.remove).not.toHaveBeenCalled();
-    });
-
-    it("overrides boolean with inheritance", async () => {
-        const parentNote = buildNote({
-            title: "Parent note",
-            "#foo(inheritable)": "",
-            "children": [
-                {
-                    title: "Child note"
-                }
-            ]
-        });
-        const childNote = froca.getNoteFromCache(parentNote.children[0])!;
-        expect(childNote.isLabelTruthy("foo")).toBe(true);
-        await setBooleanWithInheritance(childNote, "foo", false);
-        expect(server.put).toHaveBeenCalledWith(`notes/${childNote.noteId}/set-attribute`, {
-            type: "label",
-            name: "foo",
-            value: "false",
-            isInheritable: false
-        });
-    });
-
-    it("overrides boolean with inherited false", async () => {
-        const parentNote = buildNote({
-            title: "Parent note",
-            "#foo(inheritable)": "false",
-            "children": [
-                {
-                    title: "Child note"
-                }
-            ]
-        });
-        const childNote = froca.getNoteFromCache(parentNote.children[0])!;
-        expect(childNote.isLabelTruthy("foo")).toBe(false);
-        await setBooleanWithInheritance(childNote, "foo", true);
-        expect(server.put).toHaveBeenCalledWith(`notes/${childNote.noteId}/set-attribute`, {
-            type: "label",
-            name: "foo",
-            value: "",
-            isInheritable: false
-        });
-    });
-
-    it("deletes override boolean with inherited false with already existing value", async () => {
-        const parentNote = buildNote({
-            title: "Parent note",
-            "#foo(inheritable)": "false",
-            "children": [
-                {
-                    title: "Child note",
-                    "#foo": "false",
-                }
-            ]
-        });
-        const childNote = froca.getNoteFromCache(parentNote.children[0])!;
-        expect(childNote.isLabelTruthy("foo")).toBe(false);
-        await setBooleanWithInheritance(childNote, "foo", true);
-        expect(server.put).toBeCalledWith(`notes/${childNote.noteId}/set-attribute`, {
-            type: "label",
-            name: "foo",
-            value: "",
-            isInheritable: false
-        });
-    });
-});

apps/client/src/services/attributes.ts

@@ -1,15 +1,14 @@
-import { AttributeType } from "@triliumnext/commons";
-
-import type FNote from "../entities/fnote.js";
-import froca from "./froca.js";
-import type { AttributeRow } from "./load_results.js";
 import server from "./server.js";
+import froca from "./froca.js";
+import type FNote from "../entities/fnote.js";
+import type { AttributeRow } from "./load_results.js";
+import { AttributeType } from "@triliumnext/commons";
 
 async function addLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/attribute`, {
         type: "label",
-        name,
-        value,
+        name: name,
+        value: value,
         isInheritable
     });
 }
@@ -17,8 +16,8 @@ async function addLabel(noteId: string, name: string, value: string = "", isInhe
 export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/set-attribute`, {
         type: "label",
-        name,
-        value,
+        name: name,
+        value: value,
         isInheritable
     });
 }
@@ -26,42 +25,12 @@ export async function setLabel(noteId: string, name: string, value: string = "",
 export async function setRelation(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/set-attribute`, {
         type: "relation",
-        name,
-        value,
+        name: name,
+        value: value,
         isInheritable
     });
 }
 
-/**
- * Sets a boolean label on the given note, taking inheritance into account. If the desired value matches the inherited
- * value, any owned label will be removed to allow the inherited value to take effect. If the desired value differs
- * from the inherited value, an owned label will be created or updated to reflect the desired value.
- *
- * When checking if the boolean value is set, don't use `note.hasLabel`; instead use `note.isLabelTruthy`.
- *
- * @param note the note on which to set the boolean label.
- * @param labelName the name of the label to set.
- * @param value the boolean value to set for the label.
- */
-export async function setBooleanWithInheritance(note: FNote, labelName: string, value: boolean) {
-    const actualValue = note.isLabelTruthy(labelName);
-    if (actualValue === value) return;
-    const hasInheritedValue = !note.hasOwnedLabel(labelName) && note.hasLabel(labelName);
-
-    if (hasInheritedValue) {
-        if (value) {
-            setLabel(note.noteId, labelName, "");
-        } else {
-            // Label is inherited - override to false.
-            setLabel(note.noteId, labelName, "false");
-        }
-    } else if (value) {
-        setLabel(note.noteId, labelName, "");
-    } else {
-        removeOwnedLabelByName(note, labelName);
-    }
-}
-
 async function removeAttributeById(noteId: string, attributeId: string) {
     await server.remove(`notes/${noteId}/attributes/${attributeId}`);
 }
@@ -173,7 +142,6 @@ export default {
     setLabel,
     setRelation,
     setAttribute,
-    setBooleanWithInheritance,
     removeAttributeById,
     removeOwnedLabelByName,
     removeOwnedRelationByName,

apps/client/src/services/branches.ts

@@ -1,12 +1,12 @@
-import appContext from "../components/app_context.js";
-import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
-import froca from "./froca.js";
-import hoistedNoteService from "./hoisted_note.js";
-import { t } from "./i18n.js";
+import utils from "./utils.js";
 import server from "./server.js";
 import toastService, { type ToastOptionsWithRequiredId } from "./toast.js";
-import utils from "./utils.js";
+import froca from "./froca.js";
+import hoistedNoteService from "./hoisted_note.js";
 import ws from "./ws.js";
+import appContext from "../components/app_context.js";
+import { t } from "./i18n.js";
+import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
 
 // TODO: Deduplicate type with server
 interface Response {
@@ -66,7 +66,7 @@ async function moveAfterBranch(branchIdsToMove: string[], afterBranchId: string)
     }
 }
 
-async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: string, componentId?: string) {
+async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: string) {
     const newParentBranch = froca.getBranch(newParentBranchId);
     if (!newParentBranch) {
         return;
@@ -86,7 +86,7 @@ async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: st
             continue;
         }
 
-        const resp = await server.put<Response>(`branches/${branchIdToMove}/move-to/${newParentBranchId}`, undefined, componentId);
+        const resp = await server.put<Response>(`branches/${branchIdToMove}/move-to/${newParentBranchId}`);
 
         if (!resp.success) {
             toastService.showError(resp.message);

apps/client/src/services/content_renderer.ts

@@ -1,19 +1,18 @@
-import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons";
-import WheelZoom from 'vanilla-js-wheel-zoom';
-
-import FAttachment from "../entities/fattachment.js";
-import FNote from "../entities/fnote.js";
-import imageContextMenuService from "../menus/image_context_menu.js";
-import { t } from "../services/i18n.js";
-import renderText from "./content_renderer_text.js";
-import renderDoc from "./doc_renderer.js";
-import { loadElkIfNeeded, postprocessMermaidSvg } from "./mermaid.js";
-import openService from "./open.js";
+import renderService from "./render.js";
 import protectedSessionService from "./protected_session.js";
 import protectedSessionHolder from "./protected_session_holder.js";
-import renderService from "./render.js";
-import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.js";
+import openService from "./open.js";
 import utils from "./utils.js";
+import FNote from "../entities/fnote.js";
+import FAttachment from "../entities/fattachment.js";
+import imageContextMenuService from "../menus/image_context_menu.js";
+import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.js";
+import { loadElkIfNeeded, postprocessMermaidSvg } from "./mermaid.js";
+import renderDoc from "./doc_renderer.js";
+import { t } from "../services/i18n.js";
+import WheelZoom from 'vanilla-js-wheel-zoom';
+import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons";
+import renderText from "./content_renderer_text.js";
 
 let idCounter = 1;
 
@@ -23,12 +22,6 @@ export interface RenderOptions {
     imageHasZoom?: boolean;
     /** If enabled, it will prevent the default behavior in which an empty note would display a list of children. */
     noChildrenList?: boolean;
-    /** If enabled, it will prevent rendering of included notes. */
-    noIncludedNotes?: boolean;
-    /** If enabled, it will include archived notes when rendering children list. */
-    includeArchivedNotes?: boolean;
-    /** Set of note IDs that have already been seen during rendering to prevent infinite recursion. */
-    seenNoteIds?: Set<string>;
 }
 
 const CODE_MIME_TYPES = new Set(["application/json"]);
@@ -159,7 +152,7 @@ function renderImage(entity: FNote | FAttachment, $renderedContent: JQuery<HTMLE
 
     const $img = $("<img>")
         .attr("src", url || "")
-        .attr("id", `attachment-image-${idCounter++}`)
+        .attr("id", "attachment-image-" + idCounter++)
         .css("max-width", "100%");
 
     $renderedContent.append($img);
@@ -200,7 +193,7 @@ function renderFile(entity: FNote | FAttachment, type: string, $renderedContent:
 
     if (type === "pdf") {
         const $pdfPreview = $('<iframe class="pdf-preview" style="width: 100%; flex-grow: 100;"></iframe>');
-        $pdfPreview.attr("src", openService.getUrlForDownload(`pdfjs/web/viewer.html?file=../../api/${entityType}/${entityId}/open`));
+        $pdfPreview.attr("src", openService.getUrlForDownload(`api/${entityType}/${entityId}/open`));
 
         $content.append($pdfPreview);
     } else if (type === "audio") {
@@ -224,28 +217,28 @@ function renderFile(entity: FNote | FAttachment, type: string, $renderedContent:
         //       in attachment list
         const $downloadButton = $(`
             <button class="file-download btn btn-primary" type="button">
-                <span class="tn-icon bx bx-download"></span>
+                <span class="bx bx-download"></span>
                 ${t("file_properties.download")}
             </button>
         `);
 
         const $openButton = $(`
             <button class="file-open btn btn-primary" type="button">
-                <span class="tn-icon bx bx-link-external"></span>
+                <span class="bx bx-link-external"></span>
                 ${t("file_properties.open")}
             </button>
         `);
 
         $downloadButton.on("click", (e) => {
             e.stopPropagation();
-            openService.downloadFileNote(entity, null, null);
+            openService.downloadFileNote(entity.noteId)
         });
         $openButton.on("click", async (e) => {
             const iconEl = $openButton.find("> .bx");
             iconEl.removeClass("bx bx-link-external");
             iconEl.addClass("bx bx-loader spin");
             e.stopPropagation();
-            await openService.openNoteExternally(entity.noteId, entity.mime);
+            await openService.openNoteExternally(entity.noteId, entity.mime)
             iconEl.removeClass("bx bx-loader spin");
             iconEl.addClass("bx bx-link-external");
         });
@@ -273,7 +266,7 @@ async function renderMermaid(note: FNote | FAttachment, $renderedContent: JQuery
 
     try {
         await loadElkIfNeeded(mermaid, content);
-        const { svg } = await mermaid.mermaidAPI.render(`in-mermaid-graph-${idCounter++}`, content);
+        const { svg } = await mermaid.mermaidAPI.render("in-mermaid-graph-" + idCounter++, content);
 
         $renderedContent.append($(postprocessMermaidSvg(svg)));
     } catch (e) {

apps/client/src/services/content_renderer_text.spec.ts

@@ -1,132 +0,0 @@
-import { trimIndentation } from "@triliumnext/commons";
-import { describe, expect, it } from "vitest";
-
-import { buildNote } from "../test/easy-froca";
-import renderText from "./content_renderer_text";
-
-describe("Text content renderer", () => {
-    it("renders included note", async () => {
-        const contentEl = document.createElement("div");
-        const includedNote = buildNote({
-            title: "Included note",
-            content: "<p>This is the included note.</p>"
-        });
-        const note = buildNote({
-            title: "New note",
-            content: trimIndentation`
-                <p>
-                    Hi there
-                </p>
-                <section class="include-note" data-note-id="${includedNote.noteId}" data-box-size="medium">
-                    &nbsp;
-                </section>
-            `
-        });
-        await renderText(note, $(contentEl));
-        expect(contentEl.querySelectorAll("section.include-note").length).toBe(1);
-        expect(contentEl.querySelectorAll("section.include-note p").length).toBe(1);
-    });
-
-    it("skips rendering included note", async () => {
-        const contentEl = document.createElement("div");
-        const includedNote = buildNote({
-            title: "Included note",
-            content: "<p>This is the included note.</p>"
-        });
-        const note = buildNote({
-            title: "New note",
-            content: trimIndentation`
-                <p>
-                    Hi there
-                </p>
-                <section class="include-note" data-note-id="${includedNote.noteId}" data-box-size="medium">
-                    &nbsp;
-                </section>
-            `
-        });
-        await renderText(note, $(contentEl), { noIncludedNotes: true });
-        expect(contentEl.querySelectorAll("section.include-note").length).toBe(0);
-    });
-
-    it("doesn't enter infinite loop on direct recursion", async () => {
-        const contentEl = document.createElement("div");
-        const note = buildNote({
-            title: "New note",
-            id: "Y7mBwmRjQyb4",
-            content: trimIndentation`
-                <p>
-                    Hi there
-                </p>
-                <section class="include-note" data-note-id="Y7mBwmRjQyb4" data-box-size="medium">
-                    &nbsp;
-                </section>
-                <section class="include-note" data-note-id="Y7mBwmRjQyb4" data-box-size="medium">
-                    &nbsp;
-                </section>
-            `
-        });
-        await renderText(note, $(contentEl));
-        expect(contentEl.querySelectorAll("section.include-note").length).toBe(0);
-    });
-
-    it("doesn't enter infinite loop on indirect recursion", async () => {
-        const contentEl = document.createElement("div");
-        buildNote({
-            id: "first",
-            title: "Included note",
-            content: trimIndentation`\
-                <p>This is the included note.</p>
-                <section class="include-note" data-note-id="second" data-box-size="medium">
-                    &nbsp;
-                </section>
-            `
-        });
-        const note = buildNote({
-            id: "second",
-            title: "New note",
-            content: trimIndentation`
-                <p>
-                    Hi there
-                </p>
-                <section class="include-note" data-note-id="first" data-box-size="medium">
-                    &nbsp;
-                </section>
-            `
-        });
-        await renderText(note, $(contentEl));
-        expect(contentEl.querySelectorAll("section.include-note").length).toBe(1);
-    });
-
-    it("renders children list when note is empty", async () => {
-        const contentEl = document.createElement("div");
-        const parentNote = buildNote({
-            title: "Parent note",
-            children: [
-                { title: "Child note 1" },
-                { title: "Child note 2" }
-            ]
-        });
-        await renderText(parentNote, $(contentEl));
-        const items = contentEl.querySelectorAll("a");
-        expect(items.length).toBe(2);
-        expect(items[0].textContent).toBe("Child note 1");
-        expect(items[1].textContent).toBe("Child note 2");
-    });
-
-    it("skips archived notes in children list", async () => {
-        const contentEl = document.createElement("div");
-        const parentNote = buildNote({
-            title: "Parent note",
-            children: [
-                { title: "Child note 1" },
-                { title: "Child note 2", "#archived": "" },
-                { title: "Child note 3" }
-            ]
-        });
-        await renderText(parentNote, $(contentEl));
-        const items = contentEl.querySelectorAll("a");
-        expect(items.length).toBe(2);
-        expect(items[0].textContent).toBe("Child note 1");
-        expect(items[1].textContent).toBe("Child note 3");
-    });
-});

apps/client/src/services/content_renderer_text.ts

@@ -15,14 +15,7 @@ export default async function renderText(note: FNote | FAttachment, $renderedCon
 
     if (blob && !isHtmlEmpty(blob.content)) {
         $renderedContent.append($('<div class="ck-content">').html(blob.content));
-
-        const seenNoteIds = options.seenNoteIds ?? new Set<string>();
-        seenNoteIds.add("noteId" in note ? note.noteId : note.attachmentId);
-        if (!options.noIncludedNotes) {
-            await renderIncludedNotes($renderedContent[0], seenNoteIds);
-        } else {
-            $renderedContent.find("section.include-note").remove();
-        }
+        await renderIncludedNotes($renderedContent[0]);
 
         if ($renderedContent.find("span.math-tex").length > 0) {
             renderMathInElement($renderedContent[0], { trust: true });
@@ -42,11 +35,11 @@ export default async function renderText(note: FNote | FAttachment, $renderedCon
         await rewriteMermaidDiagramsInContainer($renderedContent[0] as HTMLDivElement);
         await formatCodeBlocks($renderedContent);
     } else if (note instanceof FNote && !options.noChildrenList) {
-        await renderChildrenList($renderedContent, note, options.includeArchivedNotes ?? false);
+        await renderChildrenList($renderedContent, note);
     }
 }
 
-async function renderIncludedNotes(contentEl: HTMLElement, seenNoteIds: Set<string>) {
+async function renderIncludedNotes(contentEl: HTMLElement) {
     // TODO: Consider duplicating with server's share/content_renderer.ts.
     const includeNoteEls = contentEl.querySelectorAll("section.include-note");
 
@@ -73,15 +66,7 @@ async function renderIncludedNotes(contentEl: HTMLElement, seenNoteIds: Set<stri
             continue;
         }
 
-        if (seenNoteIds.has(noteId)) {
-            console.warn(`Skipping inclusion of ${noteId} to avoid circular reference.`);
-            includeNoteEl.remove();
-            continue;
-        }
-
-        const renderedContent = (await content_renderer.getRenderedContent(note, {
-            seenNoteIds
-        })).$renderedContent;
+        const renderedContent = (await content_renderer.getRenderedContent(note)).$renderedContent;
         includeNoteEl.replaceChildren(...renderedContent);
     }
 }
@@ -113,7 +98,7 @@ export async function applyInlineMermaid(container: HTMLDivElement) {
     }
 }
 
-async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: FNote, includeArchivedNotes: boolean) {
+async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: FNote) {
     let childNoteIds = note.getChildNoteIds();
 
     if (!childNoteIds.length) {
@@ -123,16 +108,14 @@ async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: F
     $renderedContent.css("padding", "10px");
     $renderedContent.addClass("text-with-ellipsis");
 
-    // just load the first 10 child notes
     if (childNoteIds.length > 10) {
         childNoteIds = childNoteIds.slice(0, 10);
     }
 
+    // just load the first 10 child notes
     const childNotes = await froca.getNotes(childNoteIds);
 
     for (const childNote of childNotes) {
-        if (childNote.isArchived && !includeArchivedNotes) continue;
-
         $renderedContent.append(
             await link.createLink(`${note.noteId}/${childNote.noteId}`, {
                 showTooltip: false,

apps/client/src/services/css_class_manager.spec.ts

@@ -1,14 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { getReadableTextColor } from "./css_class_manager";
-
-describe("getReadableTextColor", () => {
-    it("doesn't crash for invalid color", () => {
-        expect(getReadableTextColor("RandomColor")).toBe("#000");
-    });
-
-    it("tolerates different casing", () => {
-        expect(getReadableTextColor("Blue"))
-            .toBe(getReadableTextColor("blue"));
-    });
-});

apps/client/src/services/css_class_manager.ts

@@ -1,7 +1,6 @@
 import clsx from "clsx";
-import Color, { ColorInstance } from "color";
-
 import {readCssVar} from "../utils/css-var";
+import Color, { ColorInstance } from "color";
 
 const registeredClasses = new Set<string>();
 const colorsWithHue = new Set<string>();
@@ -9,14 +8,14 @@ const colorsWithHue = new Set<string>();
 // Read the color lightness limits defined in the theme as CSS variables
 
 const lightThemeColorMaxLightness = readCssVar(
-    document.documentElement,
-    "tree-item-light-theme-max-color-lightness"
-).asNumber(70);
+                                        document.documentElement,
+                                        "tree-item-light-theme-max-color-lightness"
+                                    ).asNumber(70);
 
 const darkThemeColorMinLightness = readCssVar(
-    document.documentElement,
-    "tree-item-dark-theme-min-color-lightness"
-).asNumber(50);
+                                        document.documentElement,
+                                        "tree-item-dark-theme-min-color-lightness"
+                                    ).asNumber(50);
 
 function createClassForColor(colorString: string | null) {
     if (!colorString?.trim()) return "";
@@ -28,7 +27,7 @@ function createClassForColor(colorString: string | null) {
 
     if (!registeredClasses.has(className)) {
         const adjustedColor = adjustColorLightness(color, lightThemeColorMaxLightness!,
-            darkThemeColorMinLightness!);
+                                                   darkThemeColorMinLightness!);
         const hue = getHue(color);
 
         $("head").append(`<style>
@@ -51,7 +50,7 @@ function createClassForColor(colorString: string | null) {
 
 function parseColor(color: string) {
     try {
-        return Color(color.toLowerCase());
+        return Color(color);
     } catch (ex) {
         console.error(ex);
     }
@@ -85,8 +84,8 @@ function getHue(color: ColorInstance) {
 }
 
 export function getReadableTextColor(bgColor: string) {
-    const colorInstance = parseColor(bgColor);
-    return !colorInstance || colorInstance?.isLight() ? "#000" : "#fff";
+    const colorInstance = Color(bgColor);
+    return colorInstance.isLight() ? "#000" : "#fff";
 }
 
 export default {

apps/client/src/services/doc_renderer.ts

@@ -5,7 +5,7 @@ import { formatCodeBlocks } from "./syntax_highlight.js";
 
 export default function renderDoc(note: FNote) {
     return new Promise<JQuery<HTMLElement>>((resolve) => {
-        const docName = note.getLabelValue("docName");
+        let docName = note.getLabelValue("docName");
         const $content = $("<div>");
 
         if (docName) {
@@ -16,7 +16,7 @@ export default function renderDoc(note: FNote) {
                 if (status === "error") {
                     const fallbackUrl = getUrl(docName, "en");
                     $content.load(fallbackUrl, async () => {
-                        await processContent(fallbackUrl, $content);
+                        await processContent(fallbackUrl, $content)
                         resolve($content);
                     });
                     return;
@@ -37,9 +37,9 @@ async function processContent(url: string, $content: JQuery<HTMLElement>) {
     const dir = url.substring(0, url.lastIndexOf("/"));
 
     // Images are relative to the docnote but that will not work when rendered in the application since the path breaks.
-    $content.find("img").each((_i, el) => {
+    $content.find("img").each((i, el) => {
         const $img = $(el);
-        $img.attr("src", `${dir}/${$img.attr("src")}`);
+        $img.attr("src", dir + "/" + $img.attr("src"));
     });
 
     formatCodeBlocks($content);
@@ -51,17 +51,7 @@ async function processContent(url: string, $content: JQuery<HTMLElement>) {
 function getUrl(docNameValue: string, language: string) {
     // Cannot have spaces in the URL due to how JQuery.load works.
     docNameValue = docNameValue.replaceAll(" ", "%20");
-    // The user guide is available only in English, so make sure we are requesting correctly since 404s in standalone client are treated differently.
-    if (docNameValue.includes("User%20Guide")) language = "en";
-    return `${getBasePath()}/doc_notes/${language}/${docNameValue}.html`;
-}
 
-function getBasePath() {
-    if (window.glob.isStandalone) {
-        return `server-assets`;
-    }
-    if (window.glob.isDev) {
-        return `${window.glob.assetPath  }/..`;
-    }
-    return window.glob.assetPath;
+    const basePath = window.glob.isDev ? window.glob.assetPath + "/.." : window.glob.assetPath;
+    return `${basePath}/doc_notes/${language}/${docNameValue}.html`;
 }

apps/client/src/services/load_results.ts

@@ -1,5 +1,4 @@
 import type { AttachmentRow, EtapiTokenRow, NoteType, OptionNames } from "@triliumnext/commons";
-
 import type { AttributeType } from "../entities/fattribute.js";
 import type { EntityChange } from "../server_types.js";
 
@@ -136,14 +135,7 @@ export default class LoadResults {
     }
 
     getBranchRows() {
-        return this.branchRows.map((row) => {
-            const branch = this.getEntityRow("branches", row.branchId);
-            if (branch) {
-                // Merge the componentId from the tracked row with the entity data
-                return { ...branch, componentId: row.componentId };
-            }
-            return null;
-        }).filter((branch) => !!branch) as BranchRow[];
+        return this.branchRows.map((row) => this.getEntityRow("branches", row.branchId)).filter((branch) => !!branch);
     }
 
     addNoteReordering(parentNoteId: string, componentId: string) {
@@ -161,14 +153,7 @@ export default class LoadResults {
     getAttributeRows(componentId = "none"): AttributeRow[] {
         return this.attributeRows
             .filter((row) => row.componentId !== componentId)
-            .map((row) => {
-                const attr = this.getEntityRow("attributes", row.attributeId);
-                if (attr) {
-                    // Merge the componentId from the tracked row with the entity data
-                    return { ...attr, componentId: row.componentId };
-                }
-                return null;
-            })
+            .map((row) => this.getEntityRow("attributes", row.attributeId))
             .filter((attr) => !!attr) as AttributeRow[];
     }
 

apps/client/src/services/note_autocomplete.ts

@@ -12,7 +12,7 @@ const SELECTED_NOTE_PATH_KEY = "data-note-path";
 const SELECTED_EXTERNAL_LINK_KEY = "data-external-link";
 
 // To prevent search lag when there are a large number of notes, set a delay based on the number of notes to avoid jitter.
-const notesCount = 10000; // TODO: Replace with dynamic count from becca once available.
+const notesCount = await server.get<number>(`autocomplete/notesCount`);
 let debounceTimeoutId: ReturnType<typeof setTimeout>;
 
 function getSearchDelay(notesCount: number): number {

apps/client/src/services/open.ts

@@ -1,8 +1,6 @@
-import Component from "../components/component.js";
-import FNote from "../entities/fnote.js";
+import utils from "./utils.js";
 import options from "./options.js";
 import server from "./server.js";
-import utils from "./utils.js";
 
 type ExecFunction = (command: string, cb: (err: string, stdout: string, stderror: string) => void) => void;
 
@@ -38,14 +36,9 @@ function download(url: string) {
     }
 }
 
-export function downloadFileNote(note: FNote, parentComponent: Component | null, ntxId: string | null | undefined) {
-    if (note.type === "file" && note.mime === "application/pdf" && parentComponent) {
-        // Special handling, manages its own downloading process.
-        parentComponent.triggerEvent("customDownload", { ntxId });
-        return;
-    }
+export function downloadFileNote(noteId: string) {
+    const url = `${getFileUrl("notes", noteId)}?${Date.now()}`; // don't use cache
 
-    const url = `${getFileUrl("notes", note.noteId)}?${Date.now()}`; // don't use cache
     download(url);
 }
 
@@ -104,7 +97,7 @@ async function openCustom(type: string, entityId: string, mime: string) {
             // Note that the path separator must be \ instead of /
             filePath = filePath.replace(/\//g, "\\");
         }
-        const command = `rundll32.exe shell32.dll,OpenAs_RunDLL ${filePath}`;
+        const command = `rundll32.exe shell32.dll,OpenAs_RunDLL ` + filePath;
         exec(command, (err, stdout, stderr) => {
             if (err) {
                 console.error("Open Note custom: ", err);
@@ -138,10 +131,10 @@ export function getUrlForDownload(url: string) {
     if (utils.isElectron()) {
         // electron needs absolute URL, so we extract current host, port, protocol
         return `${getHost()}/${url}`;
+    } else {
+        // web server can be deployed on subdomain, so we need to use a relative path
+        return url;
     }
-    // web server can be deployed on subdomain, so we need to use a relative path
-    return url;
-
 }
 
 function canOpenInBrowser(mime: string) {

apps/client/src/services/promoted_attribute_definition_parser.ts

@@ -1,4 +1,14 @@
-import { DefinitionObject, LabelType, Multiplicity } from "@triliumnext/commons";
+export type LabelType = "text" | "number" | "boolean" | "date" | "datetime" | "time" | "url" | "color";
+type Multiplicity = "single" | "multi";
+
+export interface DefinitionObject {
+    isPromoted?: boolean;
+    labelType?: LabelType;
+    multiplicity?: Multiplicity;
+    numberPrecision?: number;
+    promotedAlias?: string;
+    inverseRelation?: string;
+}
 
 function parse(value: string) {
     const tokens = value.split(",").map((t) => t.trim());

apps/client/src/services/server.ts

@@ -85,15 +85,13 @@ async function remove<T>(url: string, componentId?: string) {
     return await call<T>("DELETE", url, componentId);
 }
 
-async function upload(url: string, fileToUpload: File, componentId?: string) {
+async function upload(url: string, fileToUpload: File) {
     const formData = new FormData();
     formData.append("upload", fileToUpload);
 
     return await $.ajax({
         url: window.glob.baseApiUrl + url,
-        headers: await getHeaders(componentId ? {
-            "trilium-component-id": componentId
-        } : undefined),
+        headers: await getHeaders(),
         data: formData,
         type: "PUT",
         timeout: 60 * 60 * 1000,

apps/client/src/services/spaced_update.ts

@@ -1,30 +1,22 @@
-import type { SaveState } from "../components/note_context";
-import { getErrorMessage } from "./utils";
-
 type Callback = () => Promise<void> | void;
 
-export type StateCallback = (state: SaveState) => void;
-
 export default class SpacedUpdate {
     private updater: Callback;
     private lastUpdated: number;
     private changed: boolean;
     private updateInterval: number;
     private changeForbidden?: boolean;
-    private stateCallback?: StateCallback;
 
-    constructor(updater: Callback, updateInterval = 1000, stateCallback?: StateCallback) {
+    constructor(updater: Callback, updateInterval = 1000) {
         this.updater = updater;
         this.lastUpdated = Date.now();
         this.changed = false;
         this.updateInterval = updateInterval;
-        this.stateCallback = stateCallback;
     }
 
     scheduleUpdate() {
         if (!this.changeForbidden) {
             this.changed = true;
-            this.stateCallback?.("unsaved");
             setTimeout(() => this.triggerUpdate());
         }
     }
@@ -34,13 +26,10 @@ export default class SpacedUpdate {
             this.changed = false; // optimistic...
 
             try {
-                this.stateCallback?.("saving");
                 await this.updater();
-                this.stateCallback?.("saved");
             } catch (e) {
                 this.changed = true;
-                this.stateCallback?.("error");
-                logError(getErrorMessage(e));
+
                 throw e;
             }
         }
@@ -70,22 +59,15 @@ export default class SpacedUpdate {
         this.updateInterval = interval;
     }
 
-    async triggerUpdate() {
+    triggerUpdate() {
         if (!this.changed) {
             return;
         }
 
         if (Date.now() - this.lastUpdated > this.updateInterval) {
-            this.stateCallback?.("saving");
-            try {
-                await this.updater();
-                this.stateCallback?.("saved");
-                this.changed = false;
-            } catch (e) {
-                this.stateCallback?.("error");
-                logError(getErrorMessage(e));
-            }
+            this.updater();
             this.lastUpdated = Date.now();
+            this.changed = false;
         } else {
             // update isn't triggered but changes are still pending, so we need to schedule another check
             this.scheduleUpdate();

apps/client/src/services/utils.ts

@@ -133,8 +133,6 @@ export function isElectron() {
     return !!(window && window.process && window.process.type);
 }
 
-export const isStandalone = window.glob.isStandalone;
-
 /**
  * Returns `true` if the client is running as a PWA, otherwise `false`.
  */
@@ -189,15 +187,13 @@ export function formatSize(size: number | null | undefined) {
         return "";
     }
 
-    if (size === 0) {
-        return "0 B";
+    size = Math.max(Math.round(size / 1024), 1);
+
+    if (size < 1024) {
+        return `${size} KiB`;
     }
+    return `${Math.round(size / 102.4) / 10} MiB`;
 
-    const k = 1024;
-    const sizes = ["B", "KiB", "MiB", "GiB"];
-    const i = Math.floor(Math.log(size) / Math.log(k));
-
-    return `${Math.round((size / Math.pow(k, i)) * 100) / 100} ${sizes[i]}`;
 }
 
 function toObject<T, R>(array: T[], fn: (arg0: T) => [key: string, value: R]) {
@@ -816,7 +812,7 @@ function compareVersions(v1: string, v2: string): number {
 /**
  * Compares two semantic version strings and returns `true` if the latest version is greater than the current version.
  */
-export function isUpdateAvailable(latestVersion: string | null | undefined, currentVersion: string): boolean {
+function isUpdateAvailable(latestVersion: string | null | undefined, currentVersion: string): boolean {
     if (!latestVersion) {
         return false;
     }

apps/client/src/services/ws.ts

@@ -304,7 +304,7 @@ async function sendPing() {
 }
 
 setTimeout(() => {
-    if (glob.device === "print" || glob.isStandalone) return;
+    if (glob.device === "print") return;
 
     ws = connectWebSocket();
 

apps/client/src/stylesheets/boxicons-compat.css

@@ -1,498 +0,0 @@
-.bx-ul
-{
-    margin-left: 2em;
-    padding-left: 0;
-
-    list-style: none;
-}
-.bx-ul > li
-{
-    position: relative;
-}
-.bx-ul .bx
-{
-    font-size: inherit;
-    line-height: inherit;
-
-    position: absolute;
-    left: -2em;
-
-    width: 2em;
-
-    text-align: center;
-}
-@-webkit-keyframes spin
-{
-    0%
-    {
-        -webkit-transform: rotate(0);
-                transform: rotate(0);
-    }
-    100%
-    {
-        -webkit-transform: rotate(359deg);
-                transform: rotate(359deg);
-    }
-}
-@keyframes spin
-{
-    0%
-    {
-        -webkit-transform: rotate(0);
-                transform: rotate(0);
-    }
-    100%
-    {
-        -webkit-transform: rotate(359deg);
-                transform: rotate(359deg);
-    }
-}
-@-webkit-keyframes burst
-{
-    0%
-    {
-        -webkit-transform: scale(1);
-                transform: scale(1);
-
-        opacity: 1;
-    }
-    90%
-    {
-        -webkit-transform: scale(1.5);
-                transform: scale(1.5);
-
-        opacity: 0;
-    }
-}
-@keyframes burst
-{
-    0%
-    {
-        -webkit-transform: scale(1);
-                transform: scale(1);
-
-        opacity: 1;
-    }
-    90%
-    {
-        -webkit-transform: scale(1.5);
-                transform: scale(1.5);
-
-        opacity: 0;
-    }
-}
-@-webkit-keyframes flashing
-{
-    0%
-    {
-        opacity: 1;
-    }
-    45%
-    {
-        opacity: 0;
-    }
-    90%
-    {
-        opacity: 1;
-    }
-}
-@keyframes flashing
-{
-    0%
-    {
-        opacity: 1;
-    }
-    45%
-    {
-        opacity: 0;
-    }
-    90%
-    {
-        opacity: 1;
-    }
-}
-@-webkit-keyframes fade-left
-{
-    0%
-    {
-        -webkit-transform: translateX(0);
-                transform: translateX(0);
-
-        opacity: 1;
-    }
-    75%
-    {
-        -webkit-transform: translateX(-20px);
-                transform: translateX(-20px);
-
-        opacity: 0;
-    }
-}
-@keyframes fade-left
-{
-    0%
-    {
-        -webkit-transform: translateX(0);
-                transform: translateX(0);
-
-        opacity: 1;
-    }
-    75%
-    {
-        -webkit-transform: translateX(-20px);
-                transform: translateX(-20px);
-
-        opacity: 0;
-    }
-}
-@-webkit-keyframes fade-right
-{
-    0%
-    {
-        -webkit-transform: translateX(0);
-                transform: translateX(0);
-
-        opacity: 1;
-    }
-    75%
-    {
-        -webkit-transform: translateX(20px);
-                transform: translateX(20px);
-
-        opacity: 0;
-    }
-}
-@keyframes fade-right
-{
-    0%
-    {
-        -webkit-transform: translateX(0);
-                transform: translateX(0);
-
-        opacity: 1;
-    }
-    75%
-    {
-        -webkit-transform: translateX(20px);
-                transform: translateX(20px);
-
-        opacity: 0;
-    }
-}
-@-webkit-keyframes fade-up
-{
-    0%
-    {
-        -webkit-transform: translateY(0);
-                transform: translateY(0);
-
-        opacity: 1;
-    }
-    75%
-    {
-        -webkit-transform: translateY(-20px);
-                transform: translateY(-20px);
-
-        opacity: 0;
-    }
-}
-@keyframes fade-up
-{
-    0%
-    {
-        -webkit-transform: translateY(0);
-                transform: translateY(0);
-
-        opacity: 1;
-    }
-    75%
-    {
-        -webkit-transform: translateY(-20px);
-                transform: translateY(-20px);
-
-        opacity: 0;
-    }
-}
-@-webkit-keyframes fade-down
-{
-    0%
-    {
-        -webkit-transform: translateY(0);
-                transform: translateY(0);
-
-        opacity: 1;
-    }
-    75%
-    {
-        -webkit-transform: translateY(20px);
-                transform: translateY(20px);
-
-        opacity: 0;
-    }
-}
-@keyframes fade-down
-{
-    0%
-    {
-        -webkit-transform: translateY(0);
-                transform: translateY(0);
-
-        opacity: 1;
-    }
-    75%
-    {
-        -webkit-transform: translateY(20px);
-                transform: translateY(20px);
-
-        opacity: 0;
-    }
-}
-@-webkit-keyframes tada
-{
-    from
-    {
-        -webkit-transform: scale3d(1, 1, 1);
-                transform: scale3d(1, 1, 1);
-    }
-
-    10%,
-    20%
-    {
-        -webkit-transform: scale3d(.95, .95, .95) rotate3d(0, 0, 1, -10deg);
-                transform: scale3d(.95, .95, .95) rotate3d(0, 0, 1, -10deg);
-    }
-
-    30%,
-    50%,
-    70%,
-    90%
-    {
-        -webkit-transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, 10deg);
-                transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, 10deg);
-    }
-
-    40%,
-    60%,
-    80%
-    {
-        -webkit-transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, -10deg);
-                transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, -10deg);
-    }
-
-    to
-    {
-        -webkit-transform: scale3d(1, 1, 1);
-                transform: scale3d(1, 1, 1);
-    }
-}
-
-@keyframes tada
-{
-    from
-    {
-        -webkit-transform: scale3d(1, 1, 1);
-                transform: scale3d(1, 1, 1);
-    }
-
-    10%,
-    20%
-    {
-        -webkit-transform: scale3d(.95, .95, .95) rotate3d(0, 0, 1, -10deg);
-                transform: scale3d(.95, .95, .95) rotate3d(0, 0, 1, -10deg);
-    }
-
-    30%,
-    50%,
-    70%,
-    90%
-    {
-        -webkit-transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, 10deg);
-                transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, 10deg);
-    }
-
-    40%,
-    60%,
-    80%
-    {
-        -webkit-transform: rotate3d(0, 0, 1, -10deg);
-                transform: rotate3d(0, 0, 1, -10deg);
-    }
-
-    to
-    {
-        -webkit-transform: scale3d(1, 1, 1);
-                transform: scale3d(1, 1, 1);
-    }
-}
-.bx-spin
-{
-    -webkit-animation: spin 2s linear infinite;
-            animation: spin 2s linear infinite;
-}
-.bx-spin-hover:hover
-{
-    -webkit-animation: spin 2s linear infinite;
-            animation: spin 2s linear infinite;
-}
-
-.bx-tada
-{
-    -webkit-animation: tada 1.5s ease infinite;
-            animation: tada 1.5s ease infinite;
-}
-.bx-tada-hover:hover
-{
-    -webkit-animation: tada 1.5s ease infinite;
-            animation: tada 1.5s ease infinite;
-}
-
-.bx-flashing
-{
-    -webkit-animation: flashing 1.5s infinite linear;
-            animation: flashing 1.5s infinite linear;
-}
-.bx-flashing-hover:hover
-{
-    -webkit-animation: flashing 1.5s infinite linear;
-            animation: flashing 1.5s infinite linear;
-}
-
-.bx-burst
-{
-    -webkit-animation: burst 1.5s infinite linear;
-            animation: burst 1.5s infinite linear;
-}
-.bx-burst-hover:hover
-{
-    -webkit-animation: burst 1.5s infinite linear;
-            animation: burst 1.5s infinite linear;
-}
-.bx-fade-up
-{
-    -webkit-animation: fade-up 1.5s infinite linear;
-            animation: fade-up 1.5s infinite linear;
-}
-.bx-fade-up-hover:hover
-{
-    -webkit-animation: fade-up 1.5s infinite linear;
-            animation: fade-up 1.5s infinite linear;
-}
-.bx-fade-down
-{
-    -webkit-animation: fade-down 1.5s infinite linear;
-            animation: fade-down 1.5s infinite linear;
-}
-.bx-fade-down-hover:hover
-{
-    -webkit-animation: fade-down 1.5s infinite linear;
-            animation: fade-down 1.5s infinite linear;
-}
-.bx-fade-left
-{
-    -webkit-animation: fade-left 1.5s infinite linear;
-            animation: fade-left 1.5s infinite linear;
-}
-.bx-fade-left-hover:hover
-{
-    -webkit-animation: fade-left 1.5s infinite linear;
-            animation: fade-left 1.5s infinite linear;
-}
-.bx-fade-right
-{
-    -webkit-animation: fade-right 1.5s infinite linear;
-            animation: fade-right 1.5s infinite linear;
-}
-.bx-fade-right-hover:hover
-{
-    -webkit-animation: fade-right 1.5s infinite linear;
-            animation: fade-right 1.5s infinite linear;
-}
-.bx-xs
-{
-    font-size: 1rem!important;
-}
-.bx-sm
-{
-    font-size: 1.55rem!important;
-}
-.bx-md
-{
-    font-size: 2.25rem!important;
-}
-.bx-lg
-{
-    font-size: 3.0rem!important;
-}
-.bx-fw
-{
-    font-size: 1.2857142857em;
-    line-height: .8em;
-
-    width: 1.2857142857em;
-    height: .8em;
-    margin-top: -.2em!important;
-
-    vertical-align: middle;
-}
-.bx-pull-left
-{
-    float: left;
-
-    margin-right: .3em!important;
-}
-.bx-pull-right
-{
-    float: right;
-
-    margin-left: .3em!important;
-}
-.bx-rotate-90
-{
-    transform: rotate(90deg);
-
-    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=1)';
-}
-.bx-rotate-180
-{
-    transform: rotate(180deg);
-
-    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=2)';
-}
-.bx-rotate-270
-{
-    transform: rotate(270deg);
-
-    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=3)';
-}
-.bx-flip-horizontal
-{
-    transform: scaleX(-1);
-
-    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)';
-}
-.bx-flip-vertical
-{
-    transform: scaleY(-1);
-
-    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)';
-}
-.bx-border
-{
-    padding: .25em;
-
-    border: .07em solid rgba(0,0,0,.1);
-    border-radius: .25em;
-}
-.bx-border-circle
-{
-    padding: .25em;
-
-    border: .07em solid rgba(0,0,0,.1);
-    border-radius: 50%;
-}
-
-/** Custom icon **/
-.bx-empty {
-    width: 1em;
-    display: inline-block;
-}

apps/client/src/stylesheets/style.css

@@ -1,5 +1,3 @@
-@import "./boxicons-compat.css";
-
 @font-face {
     font-family: Montserrat;
     src: url(../fonts/Montserrat-Light.ttf);
@@ -1130,6 +1128,11 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
     border-color: var(--main-border-color) !important;
 }
 
+.bx-empty {
+    width: 1em;
+    display: inline-block;
+}
+
 .modal-header {
     padding: 0.5rem 1rem 0.5rem 1rem !important; /* make modal header padding slightly smaller */
 }
@@ -1796,7 +1799,7 @@ button.close:hover {
     display: none;
 }
 
-.reference-link .tn-icon {
+.reference-link .bx {
     position: relative;
     top: 1px;
     margin-inline-end: 3px;
@@ -2415,7 +2418,7 @@ footer.webview-footer button {
     gap: 5px;
 }
 
-.right-pane-tab .tab-title .tn-icon {
+.right-pane-tab .tab-title .bx {
     font-size: 1.1em;
 }
 
@@ -2543,11 +2546,18 @@ footer.webview-footer button {
     inset-inline-end: 10px;
 }
 
-.content-floating-buttons button.tn-icon {
+.content-floating-buttons button.bx {
     font-size: 130%;
     padding: 1px 10px 1px 10px;
 }
 
+/* Customized icons */
+
+.bx-tn-toc::before {
+    content: "\ec24";
+    transform: rotate(180deg);
+}
+
 /* CK Editor */
 
 /* Insert text snippet: limit the width of the listed items to avoid overly long names */

apps/client/src/stylesheets/theme-next/base.css

@@ -17,8 +17,6 @@
  */
 
 :root {
-    color-scheme: var(--theme-style);
-
     --main-font-family: "Inter", sans-serif;
 
     --main-font-size: normal;
@@ -136,7 +134,7 @@ body.backdrop-effects-disabled {
     white-space-collapse: discard;
 }
 
-.dropdown-menu.tn-dropdown-menu .dropdown-item .tn-icon {
+.dropdown-menu.tn-dropdown-menu .bx {
     margin-inline-end: 6px;
 }
 
@@ -251,7 +249,7 @@ html body .dropdown-item[disabled] {
 }
 
 /* Menu item icon */
-.dropdown-item .tn-icon {
+.dropdown-item .bx {
     translate: 0 var(--menu-item-icon-vert-offset);
     color: var(--menu-item-icon-color) !important;
     font-size: 1.1em;
@@ -498,7 +496,7 @@ li.dropdown-item a.dropdown-item-button {
     border: unset;
 }
 
-li.dropdown-item a.dropdown-item-button.tn-icon {
+li.dropdown-item a.dropdown-item-button.bx {
     color: var(--menu-text-color) !important;
 }
 
@@ -559,13 +557,13 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     padding-top: 0;
 }
 
-#toast-container .toast:not(.no-title) .tn-icon {
+#toast-container .toast:not(.no-title) .bx {
     margin-inline-end: 0.5em;
     font-size: 1.1em;
     opacity: 0.85;
 }
 
-#toast-container .toast.no-title .tn-icon {
+#toast-container .toast.no-title .bx {
     margin-inline-end: 0;
     font-size: 1.3em;
 }
@@ -756,7 +754,7 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     margin-bottom: 0;
 }
 
-.note-list-wrapper .note-book-card .tn-icon {
+.note-list-wrapper .note-book-card .bx {
     color: var(--left-pane-icon-color) !important;
 }
 

apps/client/src/stylesheets/theme-next/dialogs.css

@@ -423,6 +423,6 @@ div.tn-tool-dialog {
     font-size: unset;
 }
 
-.note-type-chooser-dialog div.note-type-dropdown .dropdown-item span.tn-icon {
+.note-type-chooser-dialog div.note-type-dropdown .dropdown-item span.bx {
     margin-inline-end: .25em;
-}
+}

apps/client/src/stylesheets/theme-next/forms.css

@@ -62,10 +62,10 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .c
 }
 
 /* Button's icon */
-button.btn.btn-primary span.tn-icon,
-button.btn.btn-secondary span.tn-icon,
-button.btn.btn-sm span.tn-icon,
-button.btn.btn-success span.tn-icon {
+button.btn.btn-primary span.bx,
+button.btn.btn-secondary span.bx,
+button.btn.btn-sm span.bx,
+button.btn.btn-success span.bx {
     color: var(--cmd-button-icon-color);
     padding-inline-end: 0.35em;
     font-size: 1.2em;

apps/client/src/stylesheets/theme-next/pages.css

@@ -151,11 +151,6 @@
     --options-title-font-size: .75rem;
     --options-title-offset: 13px;
 }
-
-.note-split.options {
-    --preferred-max-content-width: var(--options-card-max-width);
-}
-
 /* Create a gap at the top of the option pages */
 .note-detail-content-widget-content.options>*:first-child {
     margin-top: var(--options-first-item-top-margin, 1em);
@@ -190,6 +185,10 @@ body.experimental-feature-new-layout .note-detail-content-widget-content.options
     padding: var(--options-card-padding);
 }
 
+body.prefers-centered-content .options-section:not(.tn-no-card) {
+    margin-inline: auto;
+}
+
 body.desktop .options-section:not(.tn-no-card) {
     min-width: var(--options-card-min-width);
     max-width: var(--options-card-max-width);

apps/client/src/stylesheets/theme-next/shell.css

@@ -497,7 +497,7 @@ div.bookmark-folder-widget .note-link:hover a {
 }
 
 /* The item's icon */
-div.bookmark-folder-widget .note-link .tn-icon {
+div.bookmark-folder-widget .note-link .bx {
     color: var(--menu-item-icon-color);
     font-size: 1.2em;
 }
@@ -767,7 +767,7 @@ body.mobile .fancytree-node > span {
     background: var(--left-pane-item-hover-background);
 }
 
-#left-pane .note-indicator-icon.shared-indicator {
+#left-pane span.fancytree-node.shared .fancytree-title::after {
     opacity: 0.5;
 }
 
@@ -1259,16 +1259,8 @@ body.layout-horizontal #rest-pane > .classic-toolbar-widget {
 #center-pane .note-split {
     padding-top: 2px;
     background-color: var(--note-split-background-color, var(--main-background-color));
-    transition: border-color 250ms ease-in;
-    border: 2px solid transparent;
 }
 
-/* The active split in a multi-split view */
-#center-pane > .split-note-container-widget:has(> .note-split.visible ~ .note-split.visible) > .note-split.active {
-    border-color: var(--link-selection-outline-color);
-}
-
-
 body:not(.background-effects) #center-pane .note-split {
     animation: note-entrance 100ms linear;
 }

apps/client/src/stylesheets/tree.css

@@ -148,28 +148,29 @@ span.fancytree-node.protected > span.fancytree-custom-icon {
     filter: drop-shadow(2px 2px 2px var(--main-text-color));
 }
 
-/* Note indicator icons (clone, shared) - real DOM elements for tooltip support */
-.note-indicator-icon {
+span.fancytree-node.multiple-parents.shared .fancytree-title::after {
     font-family: "boxicons" !important;
     font-size: smaller;
-    margin-inline-start: 4px;
-    opacity: 0.8;
-    cursor: help;
+    content: " \eb3d \ec03";
 }
 
-.note-indicator-icon.clone-indicator::before {
-    content: "\eb3d"; /* bx-link-alt */
+span.fancytree-node.multiple-parents .fancytree-title::after {
+    font-family: "boxicons" !important;
+    font-size: smaller;
+    content: " \eb3d"; /* lookup code for "link-alt" in boxicons.css */
 }
 
-.note-indicator-icon.shared-indicator::before {
-    content: "\ec03"; /* bx-share-alt */
-}
-
-body.experimental-feature-new-layout .note-indicator-icon.clone-indicator::before {
-    content: "\ed82";
+body.experimental-feature-new-layout span.fancytree-node.multiple-parents .fancytree-title::after {
+    content: " \ed82";
     opacity: 0.5;
 }
 
+span.fancytree-node.shared .fancytree-title::after {
+    font-family: "boxicons" !important;
+    font-size: smaller;
+    content: " \ec03"; /* lookup code for "share-alt" in boxicons.css */
+}
+
 span.fancytree-node.fancytree-active-clone:not(.fancytree-active) .fancytree-title {
     font-weight: bold;
 }
@@ -228,11 +229,11 @@ span.fancytree-node.archived {
     opacity: 0.6;
 }
 
-.fancytree-node:hover .tn-icon.tree-item-button {
+.fancytree-node:hover .bx.tree-item-button {
     display: inline-block;
 }
 
-.tn-icon.tree-item-button {
+.bx.tree-item-button {
     display: none;
     font-size: 120%;
     cursor: pointer;
@@ -242,7 +243,7 @@ span.fancytree-node.archived {
     border-radius: 5px;
 }
 
-.unhoist-button.tn-icon.tree-item-button {
+.unhoist-button.bx.tree-item-button {
     margin-inline-start: 0; /* unhoist button is on the left and doesn't need more margin */
     display: block; /* keep always visible */
 }

apps/client/src/test/easy-froca.ts

@@ -69,6 +69,24 @@ export function buildNote(noteDef: NoteDefinition) {
     });
     note.getBlob = async () => blob;
 
+    // Manage children.
+    if (noteDef.children) {
+        for (const childDef of noteDef.children) {
+            const childNote = buildNote(childDef);
+            const branchId = `${note.noteId}_${childNote.noteId}`;
+            const branch = new FBranch(froca, {
+                branchId,
+                noteId: childNote.noteId,
+                parentNoteId: note.noteId,
+                notePosition: childNotePosition,
+                fromSearchNote: false
+            });
+            froca.branches[branchId] = branch;
+            note.addChild(childNote.noteId, branchId, false);
+            childNotePosition += 10;
+        }
+    }
+
     let position = 0;
     for (const [ key, value ] of Object.entries(noteDef)) {
         const attributeId = utils.randomString(12);
@@ -118,25 +136,5 @@ export function buildNote(noteDef: NoteDefinition) {
         }
         noteAttributeCache.attributes[note.noteId].push(attribute);
     }
-
-    // Manage children.
-    if (noteDef.children) {
-        for (const childDef of noteDef.children) {
-            const childNote = buildNote(childDef);
-            const branchId = `${note.noteId}_${childNote.noteId}`;
-            const branch = new FBranch(froca, {
-                branchId,
-                noteId: childNote.noteId,
-                parentNoteId: note.noteId,
-                notePosition: childNotePosition,
-                fromSearchNote: false
-            });
-            froca.branches[branchId] = branch;
-            note.addChild(childNote.noteId, branchId, false);
-            childNote.addParent(note.noteId, branchId, false);
-            childNotePosition += 10;
-        }
-    }
-
     return note;
 }

apps/client/src/translations/ar/translation.json

@@ -223,6 +223,7 @@
     "backlink_other": ""
   },
   "note_icon": {
+    "category": "الفئة:",
     "search": "بحث:",
     "change_note_icon": "تغيير ايقونة الملاحظة",
     "reset-default": "اعادة تعيين الى الايقونة الافتراضية"
@@ -484,6 +485,7 @@
     "delete_button": "حذف",
     "download_button": "تنزيل",
     "restore_button": "أستعادة",
+    "preview": "معاينة:",
     "note_revisions": "مراجعات الملاحظة",
     "diff_on": "عرض الفروقات",
     "diff_off": "عرض المحتوى",

apps/client/src/translations/ca/translation.json

@@ -64,7 +64,8 @@
     "restore_button": "Restaura",
     "delete_button": "Suprimeix",
     "download_button": "Descarrega",
-    "mime": "MIME: "
+    "mime": "MIME: ",
+    "preview": "Vista prèvia:"
   },
   "sort_child_notes": {
     "title": "títol",
@@ -145,6 +146,7 @@
     "relation": "relació"
   },
   "note_icon": {
+    "category": "Categoria:",
     "search": "Cerca:"
   },
   "basic_properties": {

apps/client/src/translations/cn/translation.json

@@ -290,6 +290,7 @@
     "download_button": "下载",
     "mime": "MIME 类型： ",
     "file_size": "文件大小：",
+    "preview": "预览：",
     "preview_not_available": "无法预览此类型的笔记。",
     "diff_on": "显示差异",
     "diff_off": "显示内容",
@@ -763,15 +764,9 @@
   },
   "note_icon": {
     "change_note_icon": "更改笔记图标",
+    "category": "类别:",
     "search": "搜索:",
-    "reset-default": "重置为默认图标",
-    "search_placeholder_other": "在 {{count}} 个图标包中搜索 {{number}} 个图标",
-    "search_placeholder_filtered": "在 {{name}} 中搜索 {{number}} 个图标",
-    "filter": "筛选",
-    "filter-none": "所有图标",
-    "filter-default": "默认图标",
-    "icon_tooltip": "{{name}}\n图标包：{{iconPack}}",
-    "no_results": "没有找到图标。"
+    "reset-default": "重置为默认图标"
   },
   "basic_properties": {
     "note_type": "笔记类型",
@@ -798,8 +793,7 @@
     "expand_tooltip": "展开此集合的直接子代（单层深度）。点击右方箭头以查看更多选项。",
     "expand_first_level": "展开直接子代",
     "expand_nth_level": "展开 {{depth}} 层",
-    "expand_all_levels": "展开所有层级",
-    "hide_child_notes": "隐藏树中的子笔记"
+    "expand_all_levels": "展开所有层级"
   },
   "edited_notes": {
     "no_edited_notes_found": "今天还没有编辑过的笔记...",
@@ -1452,7 +1446,7 @@
     "will_be_deleted_in": "此附件将在 {{time}} 后自动删除",
     "will_be_deleted_soon": "该附件在不久后将被自动删除",
     "deletion_reason": "，因为该附件未链接在笔记的内容中。为防止被删除，请将附件链接重新添加到内容中或将附件转换为笔记。",
-    "role_and_size": "角色：{{role}}，大小：{{size}}，文件类型：{{- mimeType}}",
+    "role_and_size": "角色：{{role}}，大小：{{size}}",
     "link_copied": "附件链接已复制到剪贴板。",
     "unrecognized_role": "无法识别的附件角色 '{{role}}'。"
   },
@@ -1506,10 +1500,7 @@
     "duplicate": "复制",
     "open-in-popup": "快速编辑",
     "archive": "归档",
-    "unarchive": "解压",
-    "open-in-a-new-window": "在新窗口中打开",
-    "hide-subtree": "隐藏子树",
-    "show-subtree": "显示子树"
+    "unarchive": "解压"
   },
   "shared_info": {
     "help_link": "访问 <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a> 获取帮助。",
@@ -1598,13 +1589,7 @@
     "create-child-note": "创建子笔记",
     "unhoist": "取消聚焦",
     "toggle-sidebar": "切换侧边栏",
-    "dropping-not-allowed": "不允许移动笔记到此处。",
-    "shared-indicator-tooltip": "此笔记已公开分享",
-    "shared-indicator-tooltip-with-url": "此笔记已公开分享至：{{- url}}",
-    "clone-indicator-tooltip": "此笔记有 {{- count}} 个父级： {{- parents}}",
-    "clone-indicator-tooltip-single": "此笔记已克隆（1 个额外的父级：{{- parent}}）",
-    "subtree-hidden-tooltip_other": "从树中隐藏的 {{count}} 篇子笔记",
-    "subtree-hidden-moved-title": "已添加到 {{title}}"
+    "dropping-not-allowed": "不允许移动笔记到此处。"
   },
   "title_bar_buttons": {
     "window-on-top": "保持此窗口置顶"
@@ -2202,14 +2187,7 @@
     "execute_sql_description": "这是一篇 SQL 笔记。点击即可执行 SQL 查询。",
     "shared_copy_to_clipboard": "复制链接到剪贴板",
     "shared_open_in_browser": "在浏览器中打开链接",
-    "shared_unshare": "取消共享",
-    "save_status_saved": "已保存",
-    "save_status_saving": "保存中...",
-    "save_status_unsaved": "未保存",
-    "save_status_error": "保存失败",
-    "save_status_unsaved_tooltip": "还有一些更改尚未保存。它们将稍后自动保存。",
-    "save_status_error_tooltip": "保存笔记时出错。如果可以，请尝试将笔记内容复制到其他位置并重新加载应用程序。",
-    "save_status_saving_tooltip": "更改正在保存。"
+    "shared_unshare": "取消共享"
   },
   "status_bar": {
     "language_title": "更改内容语言",
@@ -2240,12 +2218,5 @@
   },
   "attributes_panel": {
     "title": "笔记属性"
-  },
-  "pdf": {
-    "attachments_other": "{{count}} 个附件",
-    "pages_other": "共{{count}}页",
-    "pages_alt": "第{{pageNumber}}页",
-    "pages_loading": "加载中...",
-    "layers_other": "{{count}} 层"
   }
 }

apps/client/src/translations/de/translation.json

@@ -21,12 +21,8 @@
     },
     "bundle-error": {
       "title": "Benutzerdefiniertes Skript konnte nicht geladen werden",
-      "message": "Skript konnte nicht ausgeführt werden wegen:\n\n{{message}}"
-    },
-    "widget-list-error": {
-      "title": "Abruf der Liste von Widgets vom Server ist fehlgeschlagen"
-    },
-    "open-script-note": "Script-Notiz öffnen"
+      "message": "Skript aus der Notiz \"{{title}}\" mit der ID \"{{id}}\", konnte nicht ausgeführt werden wegen:\n\n{{message}}"
+    }
   },
   "add_link": {
     "add_link": "Link hinzufügen",
@@ -209,8 +205,7 @@
   "info": {
     "modalTitle": "Infonachricht",
     "closeButton": "Schließen",
-    "okButton": "OK",
-    "copy_to_clipboard": "In die Zwischenablage kopieren"
+    "okButton": "OK"
   },
   "jump_to_note": {
     "search_button": "Suche im Volltext",
@@ -283,6 +278,7 @@
     "download_button": "Herunterladen",
     "mime": "MIME: ",
     "file_size": "Dateigröße:",
+    "preview": "Vorschau:",
     "preview_not_available": "Für diesen Notiztyp ist keine Vorschau verfügbar.",
     "restore_button": "Wiederherstellen",
     "delete_button": "Löschen",
@@ -693,13 +689,7 @@
     "convert_into_attachment_successful": "Notiz '{{title}}' wurde als Anhang konvertiert.",
     "convert_into_attachment_prompt": "Bist du dir sicher, dass du die Notiz '{{title}}' in ein Anhang der übergeordneten Notiz konvertieren möchtest?",
     "print_pdf": "Export als PDF...",
-    "open_note_on_server": "Öffne Notiz auf dem Server",
-    "export_as_image": "Als Bild exportieren",
-    "export_as_image_png": "PNG (Raster)",
-    "export_as_image_svg": "SVG (Vektor)",
-    "note_map": "Notizen Karte",
-    "view_revisions": "Notizrevisionen",
-    "advanced": "Erweitert"
+    "open_note_on_server": "Öffne Notiz auf dem Server"
   },
   "onclick_button": {
     "no_click_handler": "Das Schaltflächen-Widget „{{componentId}}“ hat keinen definierten Klick-Handler"
@@ -756,16 +746,9 @@
   },
   "note_icon": {
     "change_note_icon": "Notiz-Icon ändern",
+    "category": "Kategorie:",
     "search": "Suche:",
-    "reset-default": "Standard wiederherstellen",
-    "search_placeholder_one": "Suche {{number}} Icons über {{count}} Pakete",
-    "search_placeholder_other": "Suche {{number}} Icons über {{count}} Pakete",
-    "search_placeholder_filtered": "Suche {{number}} Icons in {{name}}",
-    "filter": "Filter",
-    "filter-none": "Alle Icons",
-    "filter-default": "Standard Icons",
-    "icon_tooltip": "{{name}}\nIcon Paket: {{iconPack}}",
-    "no_results": "Keine Icons gefunden."
+    "reset-default": "Standard wiederherstellen"
   },
   "basic_properties": {
     "note_type": "Notiztyp",
@@ -825,8 +808,7 @@
   },
   "inherited_attribute_list": {
     "title": "Geerbte Attribute",
-    "no_inherited_attributes": "Keine geerbten Attribute.",
-    "none": "Keine"
+    "no_inherited_attributes": "Keine geerbten Attribute."
   },
   "note_info_widget": {
     "note_id": "Notiz-ID",
@@ -837,9 +819,7 @@
     "note_size_info": "Die Notizgröße bietet eine grobe Schätzung des Speicherbedarfs für diese Notiz. Es berücksichtigt den Inhalt der Notiz und den Inhalt ihrer Notizrevisionen.",
     "calculate": "berechnen",
     "subtree_size": "(Teilbaumgröße: {{size}} in {{count}} Notizen)",
-    "title": "Notizinfo",
-    "mime": "MIME Typ",
-    "show_similar_notes": "Zeige ähnliche Notizen"
+    "title": "Notizinfo"
   },
   "note_map": {
     "open_full": "Vollständig erweitern",
@@ -902,8 +882,7 @@
     "search_parameters": "Suchparameter",
     "unknown_search_option": "Unbekannte Suchoption {{searchOptionName}}",
     "search_note_saved": "Suchnotiz wurde in {{-notePathTitle}} gespeichert",
-    "actions_executed": "Aktionen wurden ausgeführt.",
-    "view_options": "Anzeigeoptionen:"
+    "actions_executed": "Aktionen wurden ausgeführt."
   },
   "similar_notes": {
     "title": "Ähnliche Notizen",
@@ -1007,12 +986,7 @@
   "editable_text": {
     "placeholder": "Gebe hier den Inhalt deiner Notiz ein...",
     "auto-detect-language": "Automatisch erkannt",
-    "keeps-crashing": "Die Bearbeitungskomponente stürzt immer wieder ab. Bitte starten Sie Trilium neu. Wenn das Problem weiterhin besteht, erstellen Sie einen Fehlerbericht.",
-    "editor_crashed_title": "Der Text Editor ist abgestürzt",
-    "editor_crashed_content": "Ihr Inhalt wurde erfolgreich wiederhergestellt, aber einzelne Ihrer letzten Änderungen waren möglicherweise noch nicht gespeichert.",
-    "editor_crashed_details_button": "Zeige mehr Details…",
-    "editor_crashed_details_intro": "Falls Sie diesen Fehler mehrmals sehen, melden Sie dies auf GitHub mit den folgenden Informationen.",
-    "editor_crashed_details_title": "Technische Informationen"
+    "keeps-crashing": "Die Bearbeitungskomponente stürzt immer wieder ab. Bitte starten Sie Trilium neu. Wenn das Problem weiterhin besteht, erstellen Sie einen Fehlerbericht."
   },
   "empty": {
     "open_note_instruction": "Öffne eine Notiz, indem du den Titel der Notiz in die Eingabe unten eingibst oder eine Notiz in der Baumstruktur auswählst.",
@@ -1527,12 +1501,7 @@
   },
   "highlights_list_2": {
     "title": "Hervorhebungs-Liste",
-    "options": "Optionen",
-    "title_with_count_one": "{{count}} Highlight",
-    "title_with_count_other": "{{count}} Highlights",
-    "modal_title": "Highlight Liste konfigurieren",
-    "menu_configure": "Highlight Liste konfigurieren…",
-    "no_highlights": "Keine Highlights gefunden."
+    "options": "Optionen"
   },
   "quick-search": {
     "placeholder": "Schnellsuche",
@@ -1564,21 +1533,10 @@
   "note_detail": {
     "could_not_find_typewidget": "Konnte typeWidget für Typ ‚{{type}}‘ nicht finden",
     "printing": "Druckvorgang läuft…",
-    "printing_pdf": "PDF-Export läuft…",
-    "print_report_title": "Druckreport",
-    "print_report_collection_details_button": "Details anzeigen",
-    "print_report_collection_details_ignored_notes": "Ignorierte Notizen"
+    "printing_pdf": "PDF-Export läuft…"
   },
   "note_title": {
-    "placeholder": "Titel der Notiz hier eingeben…",
-    "created_on": "Erstellt am <Value />",
-    "last_modified": "Bearbeitet am <Value />",
-    "note_type_switcher_label": "Ändere von {{type}} zu:",
-    "note_type_switcher_others": "Andere Notizart",
-    "note_type_switcher_templates": "Template",
-    "note_type_switcher_collection": "Sammlung",
-    "edited_notes": "Notizen, bearbeitet an diesem Tag",
-    "promoted_attributes": "Hervorgehobene Attribute"
+    "placeholder": "Titel der Notiz hier eingeben…"
   },
   "search_result": {
     "no_notes_found": "Es wurden keine Notizen mit den angegebenen Suchparametern gefunden.",
@@ -1607,8 +1565,7 @@
   },
   "toc": {
     "table_of_contents": "Inhaltsverzeichnis",
-    "options": "Optionen",
-    "no_headings": "Keine Überschriften."
+    "options": "Optionen"
   },
   "watched_file_update_status": {
     "file_last_modified": "Datei <code class=\"file-path\"></code> wurde zuletzt geändert am <span class=\"file-last-modified\"></span>.",
@@ -2147,10 +2104,5 @@
   },
   "popup-editor": {
     "maximize": "Wechsele zum vollständigen Editor"
-  },
-  "experimental_features": {
-    "title": "Experimentelle Optionen",
-    "disclaimer": "Diese Optionen sind experimentell und können Instabilitäten verursachen. Achtsam zu verwenden.",
-    "new_layout_name": "Neues Layout"
   }
 }

apps/client/src/translations/en/translation.json

@@ -295,6 +295,7 @@
     "download_button": "Download",
     "mime": "MIME: ",
     "file_size": "File size:",
+    "preview": "Preview:",
     "preview_not_available": "Preview isn't available for this note type."
   },
   "sort_child_notes": {
@@ -764,16 +765,9 @@
   },
   "note_icon": {
     "change_note_icon": "Change note icon",
+    "category": "Category:",
     "search": "Search:",
-    "search_placeholder_one": "Search {{number}} icons across {{count}} packs",
-    "search_placeholder_other": "Search {{number}} icons across {{count}} packs",
-    "search_placeholder_filtered": "Search {{number}} icons in {{name}}",
-    "reset-default": "Reset to default icon",
-    "filter": "Filter",
-    "filter-none": "All icons",
-    "filter-default": "Default icons",
-    "icon_tooltip": "{{name}}\nIcon pack: {{iconPack}}",
-    "no_results": "No icons found."
+    "reset-default": "Reset to default icon"
   },
   "basic_properties": {
     "note_type": "Note type",
@@ -800,8 +794,7 @@
     "geo-map": "Geo Map",
     "board": "Board",
     "presentation": "Presentation",
-    "include_archived_notes": "Show archived notes",
-    "hide_child_notes": "Hide child notes in tree"
+    "include_archived_notes": "Show archived notes"
   },
   "edited_notes": {
     "no_edited_notes_found": "No edited notes on this day yet...",
@@ -1620,7 +1613,7 @@
     "will_be_deleted_in": "This attachment will be automatically deleted in {{time}}",
     "will_be_deleted_soon": "This attachment will be automatically deleted soon",
     "deletion_reason": ", because the attachment is not linked in the note's content. To prevent deletion, add the attachment link back into the content or convert the attachment into note.",
-    "role_and_size": "Role: {{role}}, size: {{size}}, MIME: {{- mimeType}}",
+    "role_and_size": "Role: {{role}}, Size: {{size}}",
     "link_copied": "Attachment link copied to clipboard.",
     "unrecognized_role": "Unrecognized attachment role '{{role}}'."
   },
@@ -1644,7 +1637,6 @@
   "tree-context-menu": {
     "open-in-a-new-tab": "Open in a new tab",
     "open-in-a-new-split": "Open in a new split",
-    "open-in-a-new-window": "Open in a new window",
     "insert-note-after": "Insert note after",
     "insert-child-note": "Insert child note",
     "archive": "Archive",
@@ -1657,8 +1649,6 @@
     "advanced": "Advanced",
     "expand-subtree": "Expand subtree",
     "collapse-subtree": "Collapse subtree",
-    "hide-subtree": "Hide subtree",
-    "show-subtree": "Show subtree",
     "sort-by": "Sort by...",
     "recent-changes-in-subtree": "Recent changes in subtree",
     "convert-to-attachment": "Convert to attachment",
@@ -1772,16 +1762,7 @@
     "create-child-note": "Create child note",
     "unhoist": "Unhoist",
     "toggle-sidebar": "Toggle sidebar",
-    "dropping-not-allowed": "Dropping notes into this location is not allowed.",
-    "clone-indicator-tooltip": "This note has {{- count}} parents: {{- parents}}",
-    "clone-indicator-tooltip-single": "This note is cloned (1 additional parent: {{- parent}})",
-    "shared-indicator-tooltip": "This note is shared publicly",
-    "shared-indicator-tooltip-with-url": "This note is shared publicly at: {{- url}}",
-    "subtree-hidden-tooltip_one": "{{count}} child note that is hidden from the tree",
-    "subtree-hidden-tooltip_other": "{{count}} child notes that are hidden from the tree",
-    "subtree-hidden-moved-title": "Added to {{title}}",
-    "subtree-hidden-moved-description-collection": "This collection hides its child notes in the tree.",
-    "subtree-hidden-moved-description-other": "Child notes are hidden in the tree for this note."
+    "dropping-not-allowed": "Dropping notes into this location is not allowed."
   },
   "title_bar_buttons": {
     "window-on-top": "Keep Window on Top"
@@ -2217,14 +2198,7 @@
     "execute_script": "Run script",
     "execute_script_description": "This note is a script note. Click to execute the script.",
     "execute_sql": "Run SQL",
-    "execute_sql_description": "This note is a SQL note. Click to execute the SQL query.",
-    "save_status_saved": "Saved",
-    "save_status_saving": "Saving...",
-    "save_status_unsaved": "Unsaved",
-    "save_status_error": "Save failed",
-    "save_status_saving_tooltip": "Changes are being saved.",
-    "save_status_unsaved_tooltip": "There are unsaved changes. They will be saved automatically in a moment.",
-    "save_status_error_tooltip": "An error occurred while saving the note. If possible, try copying the note content elsewhere and reloading the application."
+    "execute_sql_description": "This note is a SQL note. Click to execute the SQL query."
   },
   "status_bar": {
     "language_title": "Change content language",
@@ -2253,15 +2227,5 @@
     "empty_button": "Hide the panel",
     "toggle": "Toggle right panel",
     "custom_widget_go_to_source": "Go to source code"
-  },
-  "pdf": {
-    "attachments_one": "{{count}} attachment",
-    "attachments_other": "{{count}} attachments",
-    "layers_one": "{{count}} layer",
-    "layers_other": "{{count}} layers",
-    "pages_one": "{{count}} page",
-    "pages_other": "{{count}} pages",
-    "pages_alt": "Page {{pageNumber}}",
-    "pages_loading": "Loading..."
   }
 }

apps/client/src/translations/es/translation.json

@@ -21,13 +21,7 @@
     },
     "bundle-error": {
       "title": "Hubo un fallo al cargar un script personalizado",
-      "message": "El script no pudo ser ejecutado debido a:\n\n{{message}}"
-    },
-    "widget-list-error": {
-      "title": "Hubo un fallo al obtener la lista de widgets del servidor"
-    },
-    "widget-render-error": {
-      "title": "Hubo un fallo al renderizar un widget personalizado de React"
+      "message": "El script de la nota con ID \"{{id}}\", titulado \"{{title}}\" no pudo ser ejecutado debido a:\n\n{{message}}"
     }
   },
   "add_link": {
@@ -168,8 +162,7 @@
     "other": "Otro",
     "quickSearch": "centrarse en la entrada de búsqueda rápida",
     "inPageSearch": "búsqueda en la página",
-    "title": "Hoja de ayuda",
-    "editShortcuts": "Editar atajos de teclado"
+    "title": "Hoja de ayuda"
   },
   "import": {
     "importIntoNote": "Importar a nota",
@@ -286,6 +279,7 @@
     "download_button": "Descargar",
     "mime": "MIME: ",
     "file_size": "Tamaño del archivo:",
+    "preview": "Vista previa:",
     "preview_not_available": "La vista previa no está disponible para este tipo de notas.",
     "diff_off": "Mostrar contenido",
     "diff_on": "Mostrar diferencia",
@@ -697,7 +691,7 @@
     "convert_into_attachment_successful": "La nota '{{title}}' ha sido convertida a un archivo adjunto.",
     "convert_into_attachment_prompt": "¿Está seguro que desea convertir la nota '{{title}}' en un archivo adjunto de la nota padre?",
     "print_pdf": "Exportar como PDF...",
-    "open_note_on_server": "Abrir nota en servidor"
+    "open_note_on_server": "Abrir nota en el servidor"
   },
   "onclick_button": {
     "no_click_handler": "El widget de botón '{{componentId}}' no tiene un controlador de clics definido"
@@ -743,7 +737,7 @@
   "zpetne_odkazy": {
     "relation": "relación",
     "backlink_one": "{{count}} Vínculo de retroceso",
-    "backlink_many": "{{count}} Vínculos de retroceso",
+    "backlink_many": "",
     "backlink_other": "{{count}} vínculos de retroceso"
   },
   "mobile_detail_menu": {
@@ -755,11 +749,9 @@
   },
   "note_icon": {
     "change_note_icon": "Cambiar icono de nota",
+    "category": "Categoría:",
     "search": "Búsqueda:",
-    "reset-default": "Restablecer a icono por defecto",
-    "search_placeholder_one": "Buscar {{number}} icono a través de {{count}} paquetes",
-    "search_placeholder_many": "Buscar {{number}} iconos a través de {{count}} paquetes",
-    "search_placeholder_other": "Buscar {{number}} iconos a través de {{count}} paquetes"
+    "reset-default": "Restablecer a icono por defecto"
   },
   "basic_properties": {
     "note_type": "Tipo de nota",
@@ -799,7 +791,7 @@
     "file_type": "Tipo de archivo",
     "file_size": "Tamaño del archivo",
     "download": "Descargar",
-    "open": "Abrir externamente",
+    "open": "Abrir",
     "upload_new_revision": "Subir nueva revisión",
     "upload_success": "Se ha subido una nueva revisión de archivo.",
     "upload_failed": "Error al cargar una nueva revisión de archivo.",
@@ -1312,11 +1304,11 @@
   "code_mime_types": {
     "title": "Tipos MIME disponibles en el menú desplegable",
     "tooltip_syntax_highlighting": "Resaltado de sintaxis",
-    "tooltip_code_block_syntax": "Bloques de Código en notas de Texto",
-    "tooltip_code_note_syntax": "Notas de Código"
+    "tooltip_code_block_syntax": "Bloques de código en notas de texto",
+    "tooltip_code_note_syntax": "Notas de código"
   },
   "vim_key_bindings": {
-    "use_vim_keybindings_in_code_notes": "Combinaciones de teclas Vim",
+    "use_vim_keybindings_in_code_notes": "Atajos de teclas de Vim",
     "enable_vim_keybindings": "Habilitar los atajos de teclas de Vim en la notas de código (no es modo ex)"
   },
   "wrap_lines": {
@@ -1581,7 +1573,7 @@
     "will_be_deleted_in": "Este archivo adjunto se eliminará automáticamente en {{time}}",
     "will_be_deleted_soon": "Este archivo adjunto se eliminará automáticamente pronto",
     "deletion_reason": ", porque el archivo adjunto no está vinculado en el contenido de la nota. Para evitar la eliminación, vuelva a agregar el enlace del archivo adjunto al contenido o convierta el archivo adjunto en una nota.",
-    "role_and_size": "Rol: {{role}}, tamaño: {{size}}, MIME: {{- mimeType}}",
+    "role_and_size": "Rol: {{role}}, Tamaño: {{size}}",
     "link_copied": "Enlace del archivo adjunto copiado al portapapeles.",
     "unrecognized_role": "Rol de archivo adjunto no reconocido '{{role}}'."
   },
@@ -1632,7 +1624,7 @@
     "import-into-note": "Importar a nota",
     "apply-bulk-actions": "Aplicar acciones en lote",
     "converted-to-attachments": "{{count}} notas han sido convertidas en archivos adjuntos.",
-    "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres? Esta operación solo aplica a notas de Imagen, otras notas serán omitidas.",
+    "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres?",
     "open-in-popup": "Edición rápida",
     "archive": "Archivar",
     "unarchive": "Desarchivar"
@@ -1727,10 +1719,7 @@
   "note_detail": {
     "could_not_find_typewidget": "No se pudo encontrar typeWidget para el tipo '{{type}}'",
     "printing": "Impresión en curso...",
-    "printing_pdf": "Exportando a PDF en curso..",
-    "print_report_collection_content_one": "{{count}} nota en la colección no se puede imprimir porque no son compatibles o está protegida.",
-    "print_report_collection_content_many": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
-    "print_report_collection_content_other": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas."
+    "printing_pdf": "Exportando a PDF en curso.."
   },
   "note_title": {
     "placeholder": "escriba el título de la nota aquí..."
@@ -1942,7 +1931,7 @@
     "unknown_widget": "Widget desconocido para \"{{id}}\"."
   },
   "note_language": {
-    "not_set": "Idioma no establecido",
+    "not_set": "No establecido",
     "configure-languages": "Configurar idiomas..."
   },
   "content_language": {
@@ -1981,7 +1970,7 @@
     "hide-weekends": "Ocultar fines de semana",
     "show-scale": "Mostrar escala",
     "display-week-numbers": "Mostrar números de semana",
-    "map-style": "Estilo de mapa",
+    "map-style": "Estilo de mapa:",
     "max-nesting-depth": "Máxima profundidad de anidamiento:",
     "vector_light": "Vector (claro)",
     "vector_dark": "Vector (oscuro)",
@@ -2110,36 +2099,5 @@
     "clear-color": "Borrar color de nota",
     "set-color": "Asignar color de nota",
     "set-custom-color": "Asignar color de nota personalizado"
-  },
-  "status_bar": {
-    "backlinks_one": "{{count}} vínculo de retroceso",
-    "backlinks_many": "{{count}} vínculos de retroceso",
-    "backlinks_other": "{{count}} vínculos de retroceso",
-    "backlinks_title_one": "Ver vínculo de retroceso",
-    "backlinks_title_many": "Ver vínculos de retroceso",
-    "backlinks_title_other": "Ver vínculos de retroceso",
-    "attachments_one": "{{count}} adjunto",
-    "attachments_many": "{{count}} adjuntos",
-    "attachments_other": "{{count}} adjuntos",
-    "attachments_title_one": "Ver adjunto en una nueva pestaña",
-    "attachments_title_many": "Ver adjuntos en una nueva pestaña",
-    "attachments_title_other": "Ver adjuntos en una nueva pestaña",
-    "attributes_one": "{{count}} atributo",
-    "attributes_many": "{{count}} atributos",
-    "attributes_other": "{{count}} atributos",
-    "note_paths_one": "{{count}} ruta",
-    "note_paths_many": "{{count}} rutas",
-    "note_paths_other": "{{count}} rutas"
-  },
-  "pdf": {
-    "attachments_one": "{{count}} adjunto",
-    "attachments_many": "{{count}} adjuntos",
-    "attachments_other": "{{count}} adjuntos",
-    "layers_one": "{{count}} capa",
-    "layers_many": "{{count}} capas",
-    "layers_other": "{{count}} capas",
-    "pages_one": "{{count}} página",
-    "pages_many": "{{count}} páginas",
-    "pages_other": "{{count}} páginas"
   }
 }

apps/client/src/translations/fr/translation.json

@@ -21,13 +21,7 @@
     },
     "bundle-error": {
       "title": "Echec du chargement d'un script personnalisé",
-      "message": "Le script n'a pas pu être exécuté à cause de\n\n{{message}}"
-    },
-    "widget-list-error": {
-      "title": "Impossible d'obtenir la liste des widgets depuis le serveur"
-    },
-    "widget-render-error": {
-      "title": "Rendu impossible d'un widget React custom"
+      "message": "Le script de la note avec l'ID \"{{id}}\", intitulé \"{{title}}\" n'a pas pu être exécuté à cause de\n\n{{message}}"
     }
   },
   "add_link": {
@@ -285,6 +279,7 @@
     "download_button": "Télécharger",
     "mime": "MIME : ",
     "file_size": "Taille du fichier :",
+    "preview": "Aperçu :",
     "preview_not_available": "L'aperçu n'est pas disponible pour ce type de note.",
     "restore_button": "Restaurer",
     "delete_button": "Supprimer",
@@ -761,12 +756,9 @@
   },
   "note_icon": {
     "change_note_icon": "Changer l'icône de note",
+    "category": "Catégorie :",
     "search": "Recherche :",
-    "reset-default": "Réinitialiser l'icône par défaut",
-    "filter": "Filtre",
-    "filter-none": "Toutes les icônes",
-    "filter-default": "Icônes par défaut",
-    "icon_tooltip": "{{name}}\nPack d'icônes : {{iconPack}}"
+    "reset-default": "Réinitialiser l'icône par défaut"
   },
   "basic_properties": {
     "note_type": "Type de note",
@@ -1550,8 +1542,7 @@
     "refresh-saved-search-results": "Rafraîchir les résultats de recherche enregistrée",
     "create-child-note": "Créer une note enfant",
     "unhoist": "Désactiver le focus",
-    "toggle-sidebar": "Basculer la barre latérale",
-    "dropping-not-allowed": "Lâcher des notes à cet endroit n'est pas autorisé"
+    "toggle-sidebar": "Basculer la barre latérale"
   },
   "title_bar_buttons": {
     "window-on-top": "Épingler cette fenêtre au premier plan"
@@ -1559,19 +1550,10 @@
   "note_detail": {
     "could_not_find_typewidget": "Impossible de trouver typeWidget pour le type '{{type}}'",
     "printing": "Impression en cours...",
-    "printing_pdf": "Export au format PDF en cours...",
-    "print_report_title": "Imprimer le rapport",
-    "print_report_collection_details_button": "Consulter les détails",
-    "print_report_collection_details_ignored_notes": "Notes ignorées"
+    "printing_pdf": "Export au format PDF en cours..."
   },
   "note_title": {
-    "placeholder": "saisir le titre de la note ici...",
-    "created_on": "Créé le <Value />",
-    "last_modified": "Modifié le <Value />",
-    "note_type_switcher_label": "Basculer de {{type}} à :",
-    "note_type_switcher_others": "Autre type de note",
-    "note_type_switcher_templates": "Modèle",
-    "note_type_switcher_collection": "Collection"
+    "placeholder": "saisir le titre de la note ici..."
   },
   "search_result": {
     "no_notes_found": "Aucune note n'a été trouvée pour les paramètres de recherche donnés.",
@@ -1600,8 +1582,7 @@
   },
   "toc": {
     "table_of_contents": "Table des matières",
-    "options": "Options",
-    "no_headings": "Pas d'en-tête."
+    "options": "Options"
   },
   "watched_file_update_status": {
     "file_last_modified": "Le fichier <code class=\"file-path\"></code> a été modifié pour la dernière fois le <span class=\"file-last-modified\"></span>.",
@@ -1702,8 +1683,7 @@
     "copy-link": "Copier le lien",
     "paste": "Coller",
     "paste-as-plain-text": "Coller comme texte brut",
-    "search_online": "Rechercher «{{term}}» avec {{searchEngine}}",
-    "search_in_trilium": "Rechercher \"{{term}}\" dans Trilium"
+    "search_online": "Rechercher «{{term}}» avec {{searchEngine}}"
   },
   "image_context_menu": {
     "copy_reference_to_clipboard": "Copier la référence dans le presse-papiers",
@@ -2012,8 +1992,7 @@
     "add-column": "Ajouter une colonne",
     "add-column-placeholder": "Entrez le nom de la colonne...",
     "edit-note-title": "Cliquez pour modifier le titre de la note",
-    "edit-column-title": "Cliquez pour modifier le titre de la colonne",
-    "column-already-exists": "Cette colonne existe déjà dans le tableau."
+    "edit-column-title": "Cliquez pour modifier le titre de la colonne"
   },
   "presentation_view": {
     "edit-slide": "Modifier cette diapositive",
@@ -2097,8 +2076,7 @@
     "button_title": "Exporter le diagramme au format PNG"
   },
   "svg": {
-    "export_to_png": "Le diagramme n'a pas pu être exporté au format PNG.",
-    "export_to_svg": "Le diagramme n'a pas pu être exporté en SVG."
+    "export_to_png": "Le diagramme n'a pas pu être exporté au format PNG."
   },
   "code_theme": {
     "title": "Apparence",
@@ -2131,10 +2109,6 @@
   },
   "read-only-info": {
     "read-only-note": "Vous consultez actuellement une note en lecture seule.",
-    "auto-read-only-note": "Cette note s'affiche en mode lecture seule pour un chargement plus rapide.",
-    "edit-note": "Editer la note"
-  },
-  "calendar_view": {
-    "delete_note": "Effacer la note..."
+    "auto-read-only-note": "Cette note s'affiche en mode lecture seule pour un chargement plus rapide."
   }
 }

apps/client/src/translations/hi/translation.json

@@ -1,50 +1,5 @@
 {
   "about": {
-    "title": "ट्रिलियम नोट्स के बारें में",
-    "build_date": "निर्माण की तारीख:",
-    "app_version": "ऐप वर्ज़न:",
-    "db_version": "DB वर्ज़न:",
-    "build_revision": "बिल्ड रिविज़न:"
-  },
-  "toast": {
-    "widget-error": {
-      "title": "एक विजेट को इनिशियलाइज़ करने में विफल रहा"
-    },
-    "bundle-error": {
-      "title": "एक कस्टम स्क्रिप्ट लोड करने में विफल रहा"
-    },
-    "widget-list-error": {
-      "title": "सर्वर से विजेट्स की सूची प्राप्त करने में विफल"
-    },
-    "open-script-note": "स्क्रिप्ट नोट खोलें"
-  },
-  "update_available": {
-    "update_available": "उपलब्ध अद्यतन"
-  },
-  "code_buttons": {
-    "execute_button_title": "स्क्रिप्ट एक्सीक्यूट करें",
-    "trilium_api_docs_button_title": "ट्रिलियम एपीआई डॉक्स खोलें",
-    "save_to_note_button_title": "नोट में सेव करें"
-  },
-  "hide_floating_buttons_button": {
-    "button_title": "बटन छुपाएं"
-  },
-  "show_floating_buttons_button": {
-    "button_title": "बटन दिखाएं"
-  },
-  "add_link": {
-    "note": "नोट"
-  },
-  "bulk_actions": {
-    "other": "अन्य"
-  },
-  "clone_to": {
-    "search_for_note_by_its_name": "नोट क नाम से नोट खोजें"
-  },
-  "confirm": {
-    "also_delete_note": "नोट भी डिलीट करें"
-  },
-  "delete_notes": {
-    "delete_notes_preview": "नोट्स प्रिव्यू डिलीट करें"
+    "title": "ट्रिलियम नोट्स के बारें में"
   }
 }

apps/client/src/translations/hu/translation.json

@@ -21,13 +21,7 @@
     },
     "bundle-error": {
       "title": "Nem sikerült betölteni az egyéni szkriptet",
-      "message": "A skript nem hajtható végre a következő ok miatt:\n\n{{message}}"
-    },
-    "widget-list-error": {
-      "title": "A Widget-ek letöltése sikertelen volt"
-    },
-    "widget-render-error": {
-      "title": "Nem sikerült renderelni a React widget-et"
+      "message": "A(z) \"{{id}}\" azonosítójú, \"{{title}}\" című jegyzetből származó szkript nem hajtható végre a következő ok miatt:\n\n{{message}}"
     }
   },
   "add_link": {

apps/client/src/translations/it/translation.json

@@ -16,22 +16,13 @@
     },
     "bundle-error": {
       "title": "Non si è riusciti a caricare uno script personalizzato",
-      "message": "Impossibile eseguire lo script a causa di:\n\n{{message}}"
+      "message": "Lo script della nota con ID \"{{id}}\", dal titolo \"{{title}}\" non è stato inizializzato a causa di:\n\n{{message}}"
     },
     "widget-error": {
       "title": "Impossibile inizializzare un widget",
       "message-custom": "Il widget personalizzato dalla nota con ID “{{id}}”, intitolato “{{title}}”, non è stato possibile inizializzare a causa di:\n\n{{message}}",
       "message-unknown": "Un widget sconosciuto non è stato inizializzato a causa di:\n\n{{message}}"
-    },
-    "widget-list-error": {
-      "title": "Impossibile ottenere l'elenco dei widget dal server"
-    },
-    "widget-render-error": {
-      "title": "Impossibile eseguire il rendering di un widget React personalizzato"
-    },
-    "widget-missing-parent": "Il widget personalizzato non ha la proprietà obbligatoria '{{property}}' definita.\n\nSe questo script deve essere eseguito senza un elemento dell'interfaccia utente, utilizzare invece '#run=frontendStartup'.",
-    "open-script-note": "Apri script note",
-    "scripting-error": "Errore script personalizzato: {{title}}"
+    }
   },
   "add_link": {
     "add_link": "Aggiungi un collegamento",
@@ -902,6 +893,7 @@
     "download_button": "Scarica",
     "mime": "MIME: ",
     "file_size": "Dimensione del file:",
+    "preview": "Anteprima:",
     "preview_not_available": "L'anteprima non è disponibile per questo tipo di nota."
   },
   "sort_child_notes": {
@@ -1341,17 +1333,9 @@
   },
   "note_icon": {
     "change_note_icon": "Cambia icona nota",
+    "category": "Categoria:",
     "search": "Ricerca:",
-    "reset-default": "Ripristina l'icona predefinita",
-    "search_placeholder_one": "Cerca {{number}} icona in {{count}} pacchetto",
-    "search_placeholder_many": "Cerca {{number}} icone in {{count}} pacchetti",
-    "search_placeholder_other": "Cerca {{number}} icone in {{count}} pacchetti",
-    "search_placeholder_filtered": "Cerca {{number}} icone in {{name}}",
-    "filter": "Filtro",
-    "filter-none": "Tutte le icone",
-    "filter-default": "Icone predefinite",
-    "icon_tooltip": "{{name}}\nPacchetto icone: {{iconPack}}",
-    "no_results": "Nessuna icona trovata."
+    "reset-default": "Ripristina l'icona predefinita"
   },
   "basic_properties": {
     "note_type": "Tipo di nota",
@@ -1809,7 +1793,7 @@
     "will_be_deleted_in": "Questo allegato verrà eliminato automaticamente tra {{time}}",
     "will_be_deleted_soon": "Questo allegato verrà eliminato automaticamente a breve",
     "deletion_reason": ", perché l'allegato non è collegato al contenuto della nota. Per impedirne l'eliminazione, aggiungi nuovamente il collegamento all'allegato nel contenuto o converti l'allegato in nota.",
-    "role_and_size": "Ruolo: {{role}}, dimensione: {{size}}, MIME: {{- mimeType}}",
+    "role_and_size": "Ruolo: {{role}}, Dimensione: {{size}}",
     "link_copied": "Link all'allegato copiato negli appunti.",
     "unrecognized_role": "Ruolo di allegato non riconosciuto '{{role}}'."
   },
@@ -1895,11 +1879,7 @@
     "create-child-note": "Crea nota figlio",
     "unhoist": "Sganciare",
     "toggle-sidebar": "Attiva/disattiva la barra laterale",
-    "dropping-not-allowed": "Non è consentito lasciare appunti in questa posizione.",
-    "clone-indicator-tooltip": "Questa nota ha {{- count}} genitori: {{- parents}}",
-    "clone-indicator-tooltip-single": "Questa nota è stata clonata (1 genitore aggiuntivo: {{- parent}})",
-    "shared-indicator-tooltip": "Questa nota è condivisa pubblicamente",
-    "shared-indicator-tooltip-with-url": "Questa nota è condivisa pubblicamente all'indirizzo: {{- url}}"
+    "dropping-not-allowed": "Non è consentito lasciare appunti in questa posizione."
   },
   "title_bar_buttons": {
     "window-on-top": "Mantieni la finestra in primo piano"
@@ -1907,13 +1887,7 @@
   "note_detail": {
     "could_not_find_typewidget": "Impossibile trovare typeWidget per il tipo '{{type}}'",
     "printing": "Stampa in corso...",
-    "printing_pdf": "Esportazione in PDF in corso...",
-    "print_report_title": "Stampa rapporto",
-    "print_report_collection_content_one": "{{count}} la note nella raccolta non può essere stampata perché non è supportata o è protetta.",
-    "print_report_collection_content_many": "{{count}} le note nella raccolta non possono essere stampate perché non sono supportate o sono protette.",
-    "print_report_collection_content_other": "{{count}} le note nella raccolta non possono essere stampate perché non sono supportate o sono protette.",
-    "print_report_collection_details_button": "Vedi dettagli",
-    "print_report_collection_details_ignored_notes": "Note ignorate"
+    "printing_pdf": "Esportazione in PDF in corso..."
   },
   "note_title": {
     "placeholder": "scrivi qui il titolo della nota...",
@@ -1923,8 +1897,7 @@
     "note_type_switcher_others": "Altro tipo di nota",
     "note_type_switcher_templates": "Modello",
     "note_type_switcher_collection": "Collezione",
-    "edited_notes": "Note modificate in questo giorno",
-    "promoted_attributes": "Attributi promossi"
+    "edited_notes": "Note modificate"
   },
   "search_result": {
     "no_notes_found": "Non sono state trovate note per i parametri di ricerca specificati.",
@@ -2204,14 +2177,7 @@
     "execute_sql_description": "Questa nota è una nota SQL. Clicca per eseguire la query SQL.",
     "shared_copy_to_clipboard": "Copia link negli appunti",
     "shared_open_in_browser": "Apri il link nel browser",
-    "shared_unshare": "Rimuovi condivisione",
-    "save_status_saved": "Salvato",
-    "save_status_saving": "Salvataggio in corso...",
-    "save_status_unsaved": "Non salvato",
-    "save_status_error": "Salvataggio non riuscito",
-    "save_status_saving_tooltip": "Le modifiche sono state salvate.",
-    "save_status_unsaved_tooltip": "Ci sono modifiche non salvate. Verranno salvate automaticamente tra un attimo.",
-    "save_status_error_tooltip": "Si è verificato un errore durante il salvataggio della nota. Se possibile, prova a copiare il contenuto della nota altrove e a ricaricare l'applicazione."
+    "shared_unshare": "Rimuovi condivisione"
   },
   "breadcrumb": {
     "workspace_badge": "Area di lavoro",
@@ -2254,18 +2220,5 @@
     "empty_button": "Nascondi il pannello",
     "toggle": "Attiva/disattiva pannello destro",
     "custom_widget_go_to_source": "Vai al codice sorgente"
-  },
-  "pdf": {
-    "attachments_one": "{{count}} allegato",
-    "attachments_many": "{{count}} allegati",
-    "attachments_other": "{{count}} allegati",
-    "layers_one": "{{count}} livello",
-    "layers_many": "{{count}} livelli",
-    "layers_other": "{{count}} livelli",
-    "pages_one": "{{count}} pagina",
-    "pages_many": "{{count}} pagine",
-    "pages_other": "{{count}} pagine",
-    "pages_alt": "Pagina {{pageNumber}}",
-    "pages_loading": "Caricamento in corso..."
   }
 }

apps/client/src/translations/ja/translation.json

@@ -152,22 +152,16 @@
   },
   "note_icon": {
     "change_note_icon": "ノートアイコンの変更",
+    "category": "カテゴリー:",
     "search": "検索:",
-    "reset-default": "アイコンをデフォルトに戻す",
-    "search_placeholder_other": "{{count}} 個のパックから {{number}} 個のアイコンを検索",
-    "search_placeholder_filtered": "{{name}} で {{number}} 個のアイコンを検索",
-    "filter": "フィルター",
-    "filter-none": "すべてのアイコン",
-    "filter-default": "デフォルトアイコン",
-    "icon_tooltip": "{{name}}\nアイコンパック: {{iconPack}}",
-    "no_results": "アイコンが見つかりません。"
+    "reset-default": "アイコンをデフォルトに戻す"
   },
   "basic_properties": {
     "note_type": "ノートタイプ",
     "editable": "編集可能",
     "basic_properties": "基本プロパティ",
     "language": "言語",
-    "configure_code_notes": "コードノートを設定..."
+    "configure_code_notes": "コードノートを設定しています..."
   },
   "i18n": {
     "title": "ローカライゼーション",
@@ -443,10 +437,7 @@
     "unhoist-note": "ノートのホイストを解除",
     "edit-branch-prefix": "ブランチの接頭辞を編集",
     "archive": "アーカイブ",
-    "unarchive": "アーカイブ解除",
-    "open-in-a-new-window": "新しいウィンドウで開く",
-    "hide-subtree": "サブツリーを非表示",
-    "show-subtree": "サブツリーを表示"
+    "unarchive": "アーカイブ解除"
   },
   "zen_mode": {
     "button_exit": "禅モードを退出"
@@ -571,8 +562,7 @@
     "expand_tooltip": "このコレクションの直下の子（1階層下）を展開します。その他のオプションについては、右側の矢印を押してください。",
     "expand_first_level": "直下の子を展開",
     "expand_nth_level": "{{depth}} 階層下まで展開",
-    "expand_all_levels": "すべての階層を展開",
-    "hide_child_notes": "ツリー内の子ノートを非表示"
+    "expand_all_levels": "すべての階層を展開"
   },
   "note_types": {
     "geo-map": "ジオマップ",
@@ -658,6 +648,7 @@
     "revision_deleted": "ノートの変更履歴は削除されました。",
     "settings": "ノートの変更履歴の設定",
     "file_size": "ファイルサイズ:",
+    "preview": "プレビュー:",
     "preview_not_available": "このノートタイプではプレビューは利用できません。",
     "diff_on": "差分を表示",
     "diff_off": "内容を表示",
@@ -1248,15 +1239,7 @@
     "saved-search-note-refreshed": "保存した検索ノートが更新されました。",
     "refresh-saved-search-results": "保存した検索結果を更新",
     "toggle-sidebar": "サイドバーを切り替え",
-    "dropping-not-allowed": "この場所にノートをドロップすることはできません。",
-    "clone-indicator-tooltip": "このノートには {{- count}} 個の親があります: {{- parents}}",
-    "clone-indicator-tooltip-single": "このノートは複製されています (親が 1 件追加: {{- parent}})",
-    "shared-indicator-tooltip": "このノートは公開されています",
-    "shared-indicator-tooltip-with-url": "このノートは以下で公開されています: {{- url}}",
-    "subtree-hidden-tooltip_other": "{{count}} 個の子ノートがツリーで非表示になっています",
-    "subtree-hidden-moved-title": "{{title}} に追加されました",
-    "subtree-hidden-moved-description-collection": "このコレクションはツリー内の子ノートを非表示にします。",
-    "subtree-hidden-moved-description-other": "このノートのツリーでは子ノートは非表示になっています。"
+    "dropping-not-allowed": "この場所にノートをドロップすることはできません。"
   },
   "bulk_actions": {
     "bulk_actions": "一括操作",
@@ -2147,7 +2130,7 @@
     "will_be_deleted_in": "この添付ファイルは {{time}} 後に自動的に削除されます",
     "will_be_deleted_soon": "この添付ファイルはすぐに自動的に削除されます",
     "deletion_reason": "、添付ファイルがノートのコンテンツにリンクされていないためです。削除されないようにするには、添付ファイルのリンクをコンテンツに再度追加するか、添付ファイルをノートに変換してください。",
-    "role_and_size": "ロール: {{role}},サイズ: {{size}}, MIME: {{- mimeType}}",
+    "role_and_size": "ロール: {{role}},サイズ: {{size}}",
     "link_copied": "添付ファイルのリンクをクリップボードにコピーしました。",
     "unrecognized_role": "添付ファイルのロール「{{role}}」は認識されません。"
   },
@@ -2204,14 +2187,7 @@
     "execute_sql_description": "このノートは SQL ノートです。クリックすると SQL クエリが実行されます。",
     "shared_copy_to_clipboard": "リンクをクリップボードにコピー",
     "shared_open_in_browser": "ブラウザでリンクを開く",
-    "shared_unshare": "共有を削除",
-    "save_status_saved": "保存されました",
-    "save_status_saving": "保存中...",
-    "save_status_unsaved": "未保存",
-    "save_status_error": "保存に失敗しました",
-    "save_status_saving_tooltip": "変更を保存しています。",
-    "save_status_unsaved_tooltip": "未保存の変更があります。すぐに自動的に保存されます。",
-    "save_status_error_tooltip": "ノートの保存中にエラーが発生しました。可能であれば、ノートの内容を別の場所にコピーして、アプリケーションを再読み込みしてください。"
+    "shared_unshare": "共有を削除"
   },
   "status_bar": {
     "language_title": "コンテンツの言語を変更",
@@ -2242,12 +2218,5 @@
   },
   "attributes_panel": {
     "title": "ノート属性"
-  },
-  "pdf": {
-    "attachments_other": "{{count}} 添付ファイル",
-    "layers_other": "{{count}} 層",
-    "pages_other": "{{count}} ページ",
-    "pages_alt": "ページ {{pageNumber}}",
-    "pages_loading": "読み込み中..."
   }
 }

apps/client/src/translations/nb-NO/translation.json

@@ -1,64 +1 @@
-{
-  "about": {
-    "title": "Om Trilium Notes",
-    "app_version": "App versjon:",
-    "db_version": "DB versjon:",
-    "sync_version": "Synk versjon:",
-    "build_date": "Byggdato:",
-    "build_revision": "Bygg versjon:",
-    "data_directory": "Datamappe:",
-    "homepage": "Hjemmeside:"
-  },
-  "experimental_features": {
-    "new_layout_description": "Prøv det nye grensesnittet for et mer moderne utseende og forbedret brukervenlighet. Det må påregnes betydelige endringer i kommende versjoner."
-  },
-  "cpu_arch_warning": {
-    "recommendation": "For den beste brukeropplevelsen, vennligst last ned den tilpassede ARM64-versjonen av TriliumNext fra siden for utgivelser."
-  },
-  "zpetne_odkazy": {
-    "backlink_one": "{{count}} Tilbakelenke",
-    "backlink_other": "{{count}} Tilbakelenker"
-  },
-  "add_link": {
-    "note": "Notat"
-  },
-  "branch_prefix": {
-    "prefix": "Prefiks : ",
-    "save": "Lagre"
-  },
-  "bulk_actions": {
-    "labels": "Etiketter",
-    "relations": "Relasjoner",
-    "notes": "Notater",
-    "other": "Andre"
-  },
-  "confirm": {
-    "confirmation": "Bekreftelse",
-    "cancel": "Avbryt",
-    "ok": "OK"
-  },
-  "delete_notes": {
-    "close": "Lukk",
-    "cancel": "Avbryt",
-    "ok": "OK"
-  },
-  "export": {
-    "close": "Lukk",
-    "export": "Eksporter"
-  },
-  "note_type_chooser": {
-    "templates": "Maler"
-  },
-  "help": {
-    "title": "Hurtigveiledning",
-    "troubleshooting": "Feilsøking",
-    "other": "Andre"
-  },
-  "import": {
-    "options": "Alternativer",
-    "import": "Importer"
-  },
-  "include_note": {
-    "label_note": "Notat"
-  }
-}
+{}

apps/client/src/translations/nl/translation.json

@@ -12,7 +12,7 @@
   "toast": {
     "critical-error": {
       "title": "Kritische Error",
-      "message": "Een kritieke fout heeft plaatsgevonden waardoor de applicatie niet kon opstarten:\n\n{{message}}\n\nDit is waarschijnlijk veroorzaakt door een onverwachte fout in een script. Probeer de applicatie op te starten in veilige modus en het probleem op te lossen."
+      "message": "Een kritieke fout heeft plaatsgevonden waardoor de cliënt zich aanmeldt vanaf het begin:\n\n84X\n\nDit is waarschijnlijk veroorzaakt door een script dat op een onverwachte manier faalt. Probeer de sollicitatie in veilige modus te starten en de kwestie aan te spreken."
     },
     "widget-error": {
       "title": "Starten widget mislukt",
@@ -22,16 +22,7 @@
     "bundle-error": {
       "title": "Custom script laden mislukt",
       "message": "Script van notitie met ID \"{{id}}\", getiteld \"{{title}}\" kon niet worden uitgevoerd vanwege:\n\n{{message}}"
-    },
-    "scripting-error": "Error met script: {{title}}",
-    "widget-list-error": {
-      "title": "Kon geen lijst met widgets ophalen van de server"
-    },
-    "widget-render-error": {
-      "title": "React-widget kon niet geladen worden"
-    },
-    "widget-missing-parent": "Widget heeft niet het verplichte '{{property}}'-veld gedefinieerd.\n\nAls dit script is bedoeld om zonder interface te draaien, gebruik dan in plaats daarvan '#run=frontendStartup'.",
-    "open-script-note": "Open scriptnotitie"
+    }
   },
   "add_link": {
     "add_link": "Voeg link toe",
@@ -50,8 +41,7 @@
     "help_on_tree_prefix": "Help bij boomvoorvoegsel",
     "prefix": "Voorvoegsel: ",
     "edit_branch_prefix_multiple": "Bewerk zijtakvoorvoegsel voor {{count}} zijtakken",
-    "branch_prefix_saved_multiple": "Vertakkingsvoorvoegsel opgeslagen voor {{count}} vertakkingen.",
-    "affected_branches": "Aangetaste takken ({{count}}):"
+    "branch_prefix_saved_multiple": "Vertakkingsvoorvoegsel opgeslagen voor {{count}} vertakkingen."
   },
   "bulk_actions": {
     "bulk_actions": "Bulk acties",
@@ -64,8 +54,7 @@
     "labels": "Labels",
     "relations": "Relaties",
     "notes": "Notities",
-    "other": "Andere",
-    "include_descendants": "Tel afstammelingen van de geselecteerde notities mee"
+    "other": "Andere"
   },
   "calendar": {
     "april": "April",
@@ -89,35 +78,5 @@
   },
   "show_toc_widget_button": {
     "show_toc": "Laat Inhoudsopgave zien"
-  },
-  "status_bar": {
-    "note_paths_one": "{{count}} pad",
-    "note_paths_other": "{{count}} paden",
-    "note_paths_title": "Notitiepaden",
-    "code_note_switcher": "Verander de taalmodus"
-  },
-  "attributes_panel": {
-    "title": "Notitie-attributen"
-  },
-  "right_pane": {
-    "empty_message": "Geen informatie voor deze notitie",
-    "empty_button": "Verberg dit paneel",
-    "toggle": "Schakel rechterpaneel in/uit",
-    "custom_widget_go_to_source": "Go naar de broncode"
-  },
-  "pdf": {
-    "attachments_one": "{{count}} bijlage",
-    "attachments_other": "{{count}} bijlagen",
-    "layers_one": "{{count}} laag",
-    "layers_other": "{{count}} lagen",
-    "pages_one": "{{count}} pagina",
-    "pages_other": "{{count}} pagina's",
-    "pages_alt": "Pagina {{pageNumber}}",
-    "pages_loading": "Laden..."
-  },
-  "clone_to": {
-    "clone_notes_to": "Kloon de notities naar...",
-    "help_on_links": "Hulp op links",
-    "notes_to_clone": "Notities om te klonen"
   }
 }

apps/client/src/translations/pl/translation.json

@@ -959,6 +959,7 @@
     "download_button": "Pobierz",
     "mime": "MIME: ",
     "file_size": "Rozmiar pliku:",
+    "preview": "Podgląd:",
     "preview_not_available": "Podgląd nie jest dostępny dla tego typu notatki."
   },
   "sort_child_notes": {
@@ -1285,6 +1286,7 @@
   },
   "note_icon": {
     "change_note_icon": "Zmień ikonę notatki",
+    "category": "Kategoria:",
     "search": "Szukaj:",
     "reset-default": "Przywróć domyślną ikonę"
   },

apps/client/src/translations/pt/translation.json

@@ -22,16 +22,7 @@
     "bundle-error": {
       "title": "Falha para carregar o script customizado",
       "message": "O script da nota com ID \"{{id}}\", intitulada \"{{title}}\", não pôde ser executado devido a:\n\n{{message}}"
-    },
-    "widget-list-error": {
-      "title": "Falha ao obter a lista de widgets do servidor"
-    },
-    "scripting-error": "Erro do script específicado: {{title}}",
-    "open-script-note": "Abrir script da nota",
-    "widget-render-error": {
-      "title": "Falha do renderizar um widget React personalizado"
-    },
-    "widget-missing-parent": "Widget adaptado não tem a propriedade '{{property}}' mandatória definida.\n\nSe este script é para ser executado sem um element de UI, usar '#run=frontendStartup'."
+    }
   },
   "add_link": {
     "add_link": "Adicionar ligação",
@@ -48,10 +39,7 @@
     "help_on_tree_prefix": "Ajuda sobre o prefixo da árvore de notas",
     "prefix": "Prefixo: ",
     "save": "Gravar",
-    "branch_prefix_saved": "O prefixo de ramificação foi gravado.",
-    "edit_branch_prefix_multiple": "Editar prefixo para {{count}} branches",
-    "branch_prefix_saved_multiple": "Prefixo dos branches foi editado para {{count}} branches.",
-    "affected_branches": "Alterados ({{count}}) branches:"
+    "branch_prefix_saved": "O prefixo de ramificação foi gravado."
   },
   "bulk_actions": {
     "bulk_actions": "Ações em massa",
@@ -116,8 +104,7 @@
     "export_status": "Estado da exportação",
     "export_in_progress": "Exportação em andamento: {{progressCount}}",
     "export_finished_successfully": "Exportação concluída com sucesso.",
-    "format_pdf": "PDF – para impressão ou compartilhamento.",
-    "share-format": "HTML para publicação web - usa o mesmo tema que é usado para notas partilhadas, mas pode ser publicado como um site estatico."
+    "format_pdf": "PDF – para impressão ou compartilhamento."
   },
   "help": {
     "title": "Folha de Dicas",
@@ -171,8 +158,7 @@
     "showSQLConsole": "mostrar console SQL",
     "other": "Outros",
     "quickSearch": "focar no campo de pesquisa rápida",
-    "inPageSearch": "pesquisa na página",
-    "editShortcuts": "Editar atalhos do teclado"
+    "inPageSearch": "pesquisa na página"
   },
   "import": {
     "importIntoNote": "Importar para a nota",
@@ -198,8 +184,7 @@
     },
     "import-status": "Estado da importação",
     "in-progress": "Importação em andamento: {{progress}}",
-    "successful": "Importação concluída com sucesso.",
-    "importZipRecommendation": "Quando a importar ficheiro ZIP, a hierarquia de notas vai reflectir a estrutura da sub directoria dentro do ficheiro."
+    "successful": "Importação concluída com sucesso."
   },
   "include_note": {
     "dialog_title": "Incluir nota",
@@ -214,8 +199,7 @@
   "info": {
     "modalTitle": "Mensagem informativa",
     "closeButton": "Fechar",
-    "okButton": "OK",
-    "copy_to_clipboard": "Copiar para a área de transferência"
+    "okButton": "OK"
   },
   "jump_to_note": {
     "search_placeholder": "Pesquise uma nota pelo nome ou digite > para comandos...",
@@ -290,12 +274,8 @@
     "download_button": "Descarregar",
     "mime": "MIME: ",
     "file_size": "Tamanho do ficheiro:",
-    "preview_not_available": "A visualização não está disponível para este tipo de nota.",
-    "diff_on": "Mostrar diferenças",
-    "diff_off": "Mostrar conteúdos",
-    "diff_on_hint": "Carregar para mostrar diferenças da fonte da nota",
-    "diff_off_hint": "Carregar para mostrar conteúdos da nota",
-    "diff_not_available": "Diferenças não disponível."
+    "preview": "Visualizar:",
+    "preview_not_available": "A visualização não está disponível para este tipo de nota."
   },
   "sort_child_notes": {
     "sort_children_by": "Ordenar notas filhas por...",
@@ -606,18 +586,7 @@
     "september": "Setembro",
     "october": "Outubro",
     "november": "Novembro",
-    "december": "Dezembro",
-    "week": "Semana",
-    "week_previous": "Semana anterior",
-    "week_next": "Próxima semana",
-    "month": "Mês",
-    "month_previous": "Mês anterior",
-    "month_next": "Próximo mês",
-    "year": "Ano",
-    "year_previous": "Ano anterior",
-    "year_next": "Próximo ano",
-    "list": "Lista",
-    "today": "Hoje"
+    "december": "Dezembro"
   },
   "close_pane_button": {
     "close_this_pane": "Fechar este painel"
@@ -660,9 +629,7 @@
     "about": "Sobre o Trilium Notes",
     "logout": "Sair",
     "show-cheatsheet": "Exibir Cheatsheet",
-    "toggle-zen-mode": "Modo Zen",
-    "new-version-available": "Nova actualização disponível",
-    "download-update": "Obter versão {{latestVersion}}"
+    "toggle-zen-mode": "Modo Zen"
   },
   "zen_mode": {
     "button_exit": "Sair do Modo Zen"
@@ -700,14 +667,7 @@
     "convert_into_attachment_failed": "A conversão da nota '{{title}}' falhou.",
     "convert_into_attachment_successful": "A nota '{{title}}' foi convertida para anexo.",
     "convert_into_attachment_prompt": "Tem certeza que quer converter a nota '{{title}}' num anexo da nota pai?",
-    "print_pdf": "Exportar como PDF…",
-    "open_note_on_server": "Abrir nota no servidor",
-    "export_as_image": "Exportar como imagem",
-    "note_map": "Mapa de notas",
-    "advanced": "Avançadas",
-    "view_revisions": "Revisões da nota...",
-    "export_as_image_svg": "SVG (vectorial)",
-    "export_as_image_png": "PNG (matricial)"
+    "print_pdf": "Exportar como PDF…"
   },
   "onclick_button": {
     "no_click_handler": "Componente de botão '{{componentId}}' não possui manipulador de clique definido"
@@ -753,26 +713,20 @@
   "zpetne_odkazy": {
     "relation": "relação",
     "backlink_one": "{{count}} Ligação Reversa",
-    "backlink_many": "{{count}} Ligações Reversas",
+    "backlink_many": "",
     "backlink_other": "{{count}} Ligações Reversas"
   },
   "mobile_detail_menu": {
     "insert_child_note": "Inserir nota filha",
     "delete_this_note": "Apagar esta nota",
     "error_cannot_get_branch_id": "Não foi possível obter o branchId para o notePath '{{notePath}} '",
-    "error_unrecognized_command": "Comando não reconhecido {{command}}",
-    "note_revisions": "Revisões da nota"
+    "error_unrecognized_command": "Comando não reconhecido {{command}}"
   },
   "note_icon": {
     "change_note_icon": "Alterar ícone da nota",
+    "category": "Categoria:",
     "search": "Pesquisa:",
-    "reset-default": "Redefinir para o ícone padrão",
-    "filter": "Filtrar",
-    "filter-none": "Todos os icons",
-    "filter-default": "Icons default",
-    "no_results": "Não foram encontrados icons.",
-    "search_placeholder_filtered": "Procurar {{number}} icons no {{name}}",
-    "icon_tooltip": "{{name}}\nPacote de icons: {{iconPack}}"
+    "reset-default": "Redefinir para o ícone padrão"
   },
   "basic_properties": {
     "note_type": "Tipo da nota",
@@ -793,13 +747,7 @@
     "calendar": "Calendário",
     "table": "Tabela",
     "geo-map": "Mapa geográfico",
-    "board": "Quadro",
-    "expand_first_level": "Expandir descendentes directos",
-    "presentation": "Apresentação",
-    "expand_nth_level": "Expandir {{depth}} níveis",
-    "expand_all_levels": "Expandir todos os níveis",
-    "include_archived_notes": "Mostrar notas arquivadas",
-    "expand_tooltip": "Expande a direcção dos descendentes desta colecção (um nível). Para mais opções, carregar na seta à direita."
+    "board": "Quadro"
   },
   "edited_notes": {
     "no_edited_notes_found": "Ainda não há nenhuma nota editada neste dia…",
@@ -832,8 +780,7 @@
   },
   "inherited_attribute_list": {
     "title": "Atributos Herdados",
-    "no_inherited_attributes": "Nenhum atributo herdado.",
-    "none": "Nenhum"
+    "no_inherited_attributes": "Nenhum atributo herdado."
   },
   "note_info_widget": {
     "note_id": "ID da Nota",
@@ -844,9 +791,7 @@
     "note_size_info": "O tamanho da nota fornece uma estimativa aproximada dos requisitos de armazenamento para esta nota. Leva em conta o conteúdo e o conteúdo das suas revisões de nota.",
     "calculate": "calcular",
     "subtree_size": "(tamanho da subárvore: {{size}} em {{count}} notas)",
-    "title": "Informações da nota",
-    "mime": "Tipo MIME",
-    "show_similar_notes": "Mostrar notas semelhantes"
+    "title": "Informações da nota"
   },
   "note_map": {
     "open_full": "Expandir completamente",
@@ -909,8 +854,7 @@
     "search_parameters": "Parâmetros de Pesquisa",
     "unknown_search_option": "Opção de pesquisa desconhecida {{searchOptionName}}",
     "search_note_saved": "Nota de pesquisa foi gravada em {{- notePathTitle}}",
-    "actions_executed": "As ações foram executadas.",
-    "view_options": "Ver opções:"
+    "actions_executed": "As ações foram executadas."
   },
   "similar_notes": {
     "title": "Notas Similares",
@@ -1004,20 +948,14 @@
     "no_attachments": "Esta nota não possuí anexos."
   },
   "book": {
-    "no_children_help": "Esta coleção não possui nenhum nota filha, então não há nada para exibir. Veja <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> para pormenores.",
-    "drag_locked_title": "Bloqueado para edição",
-    "drag_locked_message": "Arrastar não permitida pois a coleção está bloqueada para edição."
+    "no_children_help": "Esta coleção não possui nenhum nota filha, então não há nada para exibir. Veja <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> para pormenores."
   },
   "editable_code": {
     "placeholder": "Digite o conteúdo da sua nota de código aqui…"
   },
   "editable_text": {
     "placeholder": "Digite o conteúdo da sua nota aqui…",
-    "auto-detect-language": "Detetado automaticamente",
-    "editor_crashed_title": "O editor de texto quebrou",
-    "editor_crashed_details_button": "Ver mais detalhes...",
-    "editor_crashed_details_title": "Informação técnica",
-    "editor_crashed_details_intro": "Se teve este erro várias vezes, considerer reportar no GitHub disponibilizando a informação abaixo."
+    "auto-detect-language": "Detetado automaticamente"
   },
   "empty": {
     "open_note_instruction": "Abra uma nota a digitar o título da nota no campo abaixo ou escolha uma nota na árvore.",

apps/client/src/translations/pt_br/translation.json

@@ -439,6 +439,7 @@
     "download_button": "Download",
     "mime": "MIME: ",
     "file_size": "Tamanho do arquivo:",
+    "preview": "Visualizar:",
     "preview_not_available": "A visualização não está disponível para este tipo de nota.",
     "diff_on": "Exibir diferença",
     "diff_off": "Exibir conteúdo",
@@ -1007,6 +1008,7 @@
   },
   "note_icon": {
     "change_note_icon": "Alterar ícone da nota",
+    "category": "Categoria:",
     "search": "Busca:",
     "reset-default": "Redefinir para o ícone padrão"
   },

apps/client/src/translations/ro/translation.json

@@ -1103,6 +1103,7 @@
     "mime": "MIME: ",
     "no_revisions": "Nu există încă nicio revizie pentru această notiță...",
     "note_revisions": "Revizii ale notiței",
+    "preview": "Previzualizare:",
     "preview_not_available": "Nu este disponibilă o previzualizare pentru acest tip de notiță.",
     "restore_button": "Restaurează",
     "revision_deleted": "Revizia notiței a fost ștearsă.",
@@ -1482,6 +1483,7 @@
   },
   "note_icon": {
     "change_note_icon": "Schimbă iconița notiței",
+    "category": "Categorie:",
     "reset-default": "Resetează la iconița implicită",
     "search": "Căutare:"
   },

apps/client/src/translations/ru/translation.json

@@ -387,6 +387,7 @@
     "revision_deleted": "Версия заметки была удалена.",
     "download_button": "Скачать",
     "file_size": "Размер файла:",
+    "preview": "Предпросмотр:",
     "preview_not_available": "Предпосмотр недоступен для заметки этого типа.",
     "mime": "MIME: ",
     "settings": "Настройка версионирования заметок",
@@ -1009,18 +1010,10 @@
     "backlink_many": "{{count}} обратных ссылок"
   },
   "note_icon": {
+    "category": "Категория:",
     "search": "Поиск:",
     "change_note_icon": "Изменить иконку заметки",
-    "reset-default": "Сбросить к значку по умолчанию",
-    "no_results": "Иконки не найдены.",
-    "icon_tooltip": "{{name}}\nНабор иконок: {{iconPack}}",
-    "filter-default": "Иконки по-умолчанию",
-    "filter-none": "Все иконки",
-    "filter": "Фильтр",
-    "search_placeholder_filtered": "Поиск {{number}} иконок в {{name}}",
-    "search_placeholder_one": "Поиск {{number}} иконки среди {{count}} наборов",
-    "search_placeholder_few": "Поиск {{number}} иконок среди {{count}} наборов",
-    "search_placeholder_many": "Поиск {{number}} иконок среди {{count}} наборов"
+    "reset-default": "Сбросить к значку по умолчанию"
   },
   "basic_properties": {
     "editable": "Изменяемое",
@@ -2033,7 +2026,7 @@
     "lost-websocket-connection-message": "Проверьте конфигурацию обратного прокси (например, nginx или Apache), чтобы убедиться, что соединения WebSocket должным образом разрешены и не заблокированы."
   },
   "attachment_detail_2": {
-    "role_and_size": "Роль: {{role}}, размер: {{size}}, MIME: {{- mimeType}}",
+    "role_and_size": "Роль: {{role}}, Размер: {{size}}",
     "unrecognized_role": "Нераспознанная роль вложения '{{role}}'.",
     "link_copied": "Ссылка на вложение скопирована в буфер обмена.",
     "will_be_deleted_soon": "Это вложение скоро будет автоматически удалено",

apps/client/src/translations/sr/translation.json

@@ -271,6 +271,7 @@
     "download_button": "Preuzmi",
     "mime": "MIME: ",
     "file_size": "Veličina datoteke:",
+    "preview": "Pregled:",
     "preview_not_available": "Pregled nije dostupan za ovaj tip beleške."
   },
   "sort_child_notes": {

apps/client/src/translations/tw/translation.json

@@ -21,7 +21,7 @@
     },
     "bundle-error": {
       "title": "載入自訂腳本失敗",
-      "message": "腳本因以下原因無法執行：\n\n{{message}}"
+      "message": "來自 ID 為 \"{{id}}\"、標題為 \"{{title}}\" 的筆記的腳本因以下原因無法執行：\n\n{{message}}"
     },
     "widget-list-error": {
       "title": "無法從伺服器取得元件清單"
@@ -29,9 +29,8 @@
     "widget-render-error": {
       "title": "無法渲染自訂 React 元件"
     },
-    "widget-missing-parent": "自訂元件未定義強制性的 \"{{property}}\" 屬性。\n\n若此腳本需在無 UI 的情況下執行，請改用 \"#run=frontendStartup\"。",
-    "open-script-note": "打開腳本筆記",
-    "scripting-error": "自訂腳本錯誤：{{title}}"
+    "widget-missing-parent": "自訂元件未定義強制性的 \"{{property}}\" 屬性。",
+    "open-script-note": "打開腳本筆記"
   },
   "add_link": {
     "add_link": "新增連結",
@@ -288,6 +287,7 @@
     "download_button": "下載",
     "mime": "MIME類型： ",
     "file_size": "檔案大小：",
+    "preview": "預覽：",
     "preview_not_available": "無法預覽此類型的筆記。",
     "restore_button": "還原",
     "delete_button": "刪除",
@@ -761,16 +761,9 @@
   },
   "note_icon": {
     "change_note_icon": "更改筆記圖標",
+    "category": "類別：",
     "search": "搜尋：",
-    "reset-default": "重置為預設圖標",
-    "search_placeholder_one": "在 {{count}} 個圖示包中搜尋 {{number}} 個圖示",
-    "search_placeholder_other": "",
-    "search_placeholder_filtered": "在 {{name}} 中搜尋 {{number}} 個圖示",
-    "filter": "篩選",
-    "filter-none": "所有圖示",
-    "filter-default": "預設圖示",
-    "icon_tooltip": "{{name}}\n圖示包：{{iconPack}}",
-    "no_results": "找不到圖示。"
+    "reset-default": "重置為預設圖標"
   },
   "basic_properties": {
     "note_type": "筆記類型",
@@ -797,8 +790,7 @@
     "expand_tooltip": "展開此集合的直接子級（單層深度）。按下右側箭頭以查看更多選項。",
     "expand_first_level": "展開直接子級",
     "expand_nth_level": "展開 {{depth}} 層",
-    "expand_all_levels": "展開所有層級",
-    "hide_child_notes": "隱藏樹中的子筆記"
+    "expand_all_levels": "展開所有層級"
   },
   "edited_notes": {
     "no_edited_notes_found": "今天還沒有編輯過的筆記...",
@@ -1413,7 +1405,7 @@
     "will_be_deleted_in": "此附件將在 {{time}} 後自動刪除",
     "will_be_deleted_soon": "該附件即將被自動刪除",
     "deletion_reason": "，因為該附件未連結在筆記的內容中。為防止被刪除，請將附件連結重新新增至內容中或將附件轉換為筆記。",
-    "role_and_size": "角色：{{role}}，大小：{{size}}，MIME：{{- mimeType}}",
+    "role_and_size": "角色：{{role}}，大小：{{size}}",
     "link_copied": "已複製附件連結到剪貼簿。",
     "unrecognized_role": "無法識別的附件角色 '{{role}}'。"
   },
@@ -1467,10 +1459,7 @@
     "duplicate": "複製副本",
     "open-in-popup": "快速編輯",
     "archive": "封存",
-    "unarchive": "解除封存",
-    "open-in-a-new-window": "在新視窗打開",
-    "hide-subtree": "隱藏子階層",
-    "show-subtree": "顯示子階層"
+    "unarchive": "解除封存"
   },
   "shared_info": {
     "help_link": "如需幫助，請訪問 <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a>。",
@@ -1560,15 +1549,7 @@
     "create-child-note": "建立子筆記",
     "unhoist": "取消聚焦",
     "toggle-sidebar": "切換側邊欄",
-    "dropping-not-allowed": "不允許移動筆記至此處。",
-    "clone-indicator-tooltip": "此筆記有 {{- count}} 個父級：{{- parents}}",
-    "clone-indicator-tooltip-single": "此筆記已克隆（新增 1 個父級：{{- parent}}）",
-    "shared-indicator-tooltip": "此筆記已公開分享",
-    "shared-indicator-tooltip-with-url": "此筆記已公開分享至：{{- url}}",
-    "subtree-hidden-tooltip_one": "從樹中隱藏的 {{count}} 篇子筆記",
-    "subtree-hidden-moved-title": "已新增至 {{title}}",
-    "subtree-hidden-moved-description-collection": "此集合隱藏其樹中的子筆記。",
-    "subtree-hidden-moved-description-other": "子筆記隱藏於此筆記的樹中。"
+    "dropping-not-allowed": "不允許移動筆記至此處。"
   },
   "title_bar_buttons": {
     "window-on-top": "保持此視窗置頂"
@@ -1576,12 +1557,7 @@
   "note_detail": {
     "could_not_find_typewidget": "找不到類型為 '{{type}}' 的 typeWidget",
     "printing": "正在列印…",
-    "printing_pdf": "正在匯出為 PDF…",
-    "print_report_title": "列印報告",
-    "print_report_collection_content_one": "集合中的 {{count}} 篇筆記無法列印，因為它們不被支援或受到保護。",
-    "print_report_collection_content_other": "",
-    "print_report_collection_details_button": "查看詳情",
-    "print_report_collection_details_ignored_notes": "忽略的筆記"
+    "printing_pdf": "正在匯出為 PDF…"
   },
   "note_title": {
     "placeholder": "請輸入筆記標題...",
@@ -1591,8 +1567,7 @@
     "note_type_switcher_others": "其他筆記類型",
     "note_type_switcher_templates": "模板",
     "note_type_switcher_collection": "集合",
-    "edited_notes": "今天編輯過的筆記",
-    "promoted_attributes": "升級屬性"
+    "edited_notes": "編輯過的筆記"
   },
   "search_result": {
     "no_notes_found": "沒有找到符合搜尋條件的筆記。",
@@ -2208,14 +2183,7 @@
     "read_only_temporarily_disabled_description": "此筆記目前可編輯，但通常為唯讀狀態。當您切換至其他筆記時，本筆記將立即恢復為唯讀模式。\n\n點擊此處重新啟用唯讀模式。",
     "clipped_note_description": "本筆記原始來源為 {{url}}。\n\n點擊此處前往原網頁。",
     "execute_script_description": "此筆記為腳本筆記。點擊以執行腳本。",
-    "execute_sql_description": "此筆記為 SQL 筆記。點擊以執行 SQL 查詢。",
-    "save_status_saved": "已儲存",
-    "save_status_saving": "正在儲存…",
-    "save_status_unsaved": "未儲存",
-    "save_status_error": "儲存失敗",
-    "save_status_saving_tooltip": "正在儲存更動。",
-    "save_status_unsaved_tooltip": "仍有更動尚未儲存。它們將在稍後自動儲存。",
-    "save_status_error_tooltip": "在儲存筆記時發生錯誤。如果可以，請嘗試將筆記內容複製至他處並重新載入應用程式。"
+    "execute_sql_description": "此筆記為 SQL 筆記。點擊以執行 SQL 查詢。"
   },
   "breadcrumb": {
     "hoisted_badge": "聚焦",
@@ -2252,15 +2220,5 @@
   },
   "attributes_panel": {
     "title": "筆記屬性"
-  },
-  "pdf": {
-    "attachments_one": "{{count}} 個附件",
-    "attachments_other": "",
-    "layers_one": "{{count}} 層",
-    "layers_other": "",
-    "pages_one": "共 {{count}} 頁",
-    "pages_other": "",
-    "pages_alt": "第 {{pageNumber}} 頁",
-    "pages_loading": "正在載入…"
   }
 }

apps/client/src/translations/uk/translation.json

@@ -321,6 +321,7 @@
     "download_button": "Завантажити",
     "mime": "МІМЕ: ",
     "file_size": "Розмір файлу:",
+    "preview": "Попередній перегляд:",
     "preview_not_available": "Попередній перегляд недоступний для цього типу нотатки.",
     "diff_on": "Показати різницю",
     "diff_off": "Показати вміст",
@@ -848,6 +849,7 @@
   },
   "note_icon": {
     "change_note_icon": "Змінити значок нотатки",
+    "category": "Категорія:",
     "search": "Пошук:",
     "reset-default": "Скинути значок до стандартного значення"
   },

apps/client/src/types-assets.d.ts

@@ -17,3 +17,5 @@ declare module "*?raw" {
     var content: string;
     export default content;
 }
+
+declare module "boxicons/css/boxicons.min.css" { }

apps/client/src/types-fancytree.d.ts

@@ -69,7 +69,7 @@ declare namespace Fancytree {
         debug(msg: any): void;
 
         /** Expand (or collapse) all parent nodes. */
-        expandAll(flag?: boolean, options?: object): void;
+        expandAll(flag?: boolean, options?: Object): void;
 
         /** [ext-filter] Dimm or hide whole branches.
          * @returns {integer} count
@@ -221,7 +221,6 @@ declare namespace Fancytree {
         branchId: string;
         isProtected: boolean;
         noteType: NoteType;
-        subtreeHidden: boolean;
     }
 
     interface FancytreeNewNode extends FancytreeNodeData {
@@ -370,7 +369,7 @@ declare namespace Fancytree {
          * @param mode 'before', 'after', or 'child' (default='child')
          * @param init NodeData (or simple title string)
          */
-        editCreateNode(mode?: string, init?: object): void;
+        editCreateNode(mode?: string, init?: Object): void;
 
         /** [ext-edit] Stop inline editing.
          *
@@ -527,7 +526,7 @@ declare namespace Fancytree {
          *
          * @param opts passed to `setExpanded()`. Defaults to {noAnimation: false, noEvents: false, scrollIntoView: true}
          */
-        makeVisible(opts?: object): JQueryPromise<any>;
+        makeVisible(opts?: Object): JQueryPromise<any>;
 
         /** Move this node to targetNode.
          *
@@ -590,25 +589,25 @@ declare namespace Fancytree {
          * @param effects animation options.
          * @param options {topNode: null, effects: ..., parent: ...} this node will remain visible in any case, even if `this` is outside the scroll pane.
          */
-        scrollIntoView(effects?: boolean, options?: object): JQueryPromise<any>;
+        scrollIntoView(effects?: boolean, options?: Object): JQueryPromise<any>;
 
         /**
          * @param effects animation options.
          * @param options {topNode: null, effects: ..., parent: ...} this node will remain visible in any case, even if `this` is outside the scroll pane.
          */
-        scrollIntoView(effects?: object, options?: object): JQueryPromise<any>;
+        scrollIntoView(effects?: Object, options?: Object): JQueryPromise<any>;
 
         /**
          * @param flag pass false to deactivate
          * @param opts additional options. Defaults to {noEvents: false}
          */
-        setActive(flag?: boolean, opts?: object): JQueryPromise<any>;
+        setActive(flag?: boolean, opts?: Object): JQueryPromise<any>;
 
         /**
          * @param flag pass false to collapse.
          * @param opts additional options. Defaults to {noAnimation:false, noEvents:false}
          */
-        setExpanded(flag?: boolean, opts?: object): JQueryPromise<any>;
+        setExpanded(flag?: boolean, opts?: Object): JQueryPromise<any>;
 
         /**
          * Set keyboard focus to this node.
@@ -1110,7 +1109,7 @@ declare namespace Fancytree {
         /** class names added to the node markup (separate with space) */
         extraClasses?: string | undefined;
         /** all properties from will be copied to `node.data` */
-        data?: object | undefined;
+        data?: Object | undefined;
 
         /** Will be added as title attribute of the node's icon span,thus enabling a tooltip. */
         iconTooltip?: string | undefined;
@@ -1161,7 +1160,7 @@ declare namespace Fancytree {
 
         escapeHtml(s: string): string;
 
-        getEventTarget(event: Event): object;
+        getEventTarget(event: Event): Object;
 
         getEventTargetType(event: Event): string;
 
@@ -1180,7 +1179,7 @@ declare namespace Fancytree {
         parseHtml($ul: JQuery): NodeData[];
 
         /** Add Fancytree extension definition to the list of globally available extensions. */
-        registerExtension(definition: object): void;
+        registerExtension(definition: Object): void;
 
         unescapeHtml(s: string): string;
 

apps/client/src/types-pdfjs.d.ts

@@ -1,121 +0,0 @@
-type HistoryData = {
-    files: {
-        fingerprint: string;
-        page: number;
-        zoom: string;
-        scrollLeft: number;
-        scrollTop: number;
-        rotation: number;
-        sidebarView: number;
-    }[];
-};
-
-interface Window {
-    /**
-     * By default, pdf.js will try to store information about the opened PDFs such as zoom and scroll position in local storage.
-     * The Trilium alternative is to use attachments stored at note level.
-     * This variable represents the direct content used by the pdf.js viewer in its local storage key, but in plain JS object format.
-     * The variable must be set early at startup, before pdf.js fully initializes.
-     */
-    TRILIUM_VIEW_HISTORY_STORE?: HistoryData;
-
-    /**
-     * If set to true, hides the pdf.js viewer default sidebar containing the outline, page navigation, etc.
-     * This needs to be set early in the main method.
-     */
-    TRILIUM_HIDE_SIDEBAR?: boolean;
-
-    TRILIUM_NOTE_ID: string;
-
-    TRILIUM_NTX_ID: string | null | undefined;
-}
-
-interface PdfOutlineItem {
-    title: string;
-    level: number;
-    dest: unknown;
-    id: string;
-    items: PdfOutlineItem[];
-}
-
-interface WithContext {
-    ntxId: string;
-    noteId: string | null | undefined;
-}
-
-interface PdfDocumentModifiedMessage extends WithContext {
-    type: "pdfjs-viewer-document-modified";
-}
-
-interface PdfDocumentBlobResultMessage extends WithContext {
-    type: "pdfjs-viewer-blob";
-    data: Uint8Array<ArrayBufferLike>;
-}
-
-interface PdfSaveViewHistoryMessage extends WithContext {
-    type: "pdfjs-viewer-save-view-history";
-    data: string;
-}
-
-interface PdfViewerTocMessage {
-    type: "pdfjs-viewer-toc";
-    data: PdfOutlineItem[];
-}
-
-interface PdfViewerActiveHeadingMessage {
-    type: "pdfjs-viewer-active-heading";
-    headingId: string;
-}
-
-interface PdfViewerPageInfoMessage {
-    type: "pdfjs-viewer-page-info";
-    totalPages: number;
-    currentPage: number;
-}
-
-interface PdfViewerCurrentPageMessage {
-    type: "pdfjs-viewer-current-page";
-    currentPage: number;
-}
-
-interface PdfViewerThumbnailMessage {
-    type: "pdfjs-viewer-thumbnail";
-    pageNumber: number;
-    dataUrl: string;
-}
-
-interface PdfAttachment {
-    filename: string;
-    size: number;
-}
-
-interface PdfViewerAttachmentsMessage {
-    type: "pdfjs-viewer-attachments";
-    attachments: PdfAttachment[];
-    downloadAttachment?: (fileName: string) => void;
-}
-
-interface PdfLayer {
-    id: string;
-    name: string;
-    visible: boolean;
-}
-
-interface PdfViewerLayersMessage {
-    type: "pdfjs-viewer-layers";
-    layers: PdfLayer[];
-    toggleLayer?: (layerId: string, visible: boolean) => void;
-}
-
-type PdfMessageEvent = MessageEvent<
-    PdfDocumentModifiedMessage
-    | PdfSaveViewHistoryMessage
-    | PdfViewerTocMessage
-    | PdfViewerActiveHeadingMessage
-    | PdfViewerPageInfoMessage
-    | PdfViewerCurrentPageMessage
-    | PdfViewerThumbnailMessage
-    | PdfViewerAttachmentsMessage
-    | PdfViewerLayersMessage
-    | PdfDocumentBlobResultMessage
->;

apps/client/src/types.d.ts

@@ -1,5 +1,3 @@
-import { BootstrapDefinition } from "@triliumnext/commons";
-
 import appContext, { AppContext } from "./components/app_context";
 import type FNote from "./entities/fnote";
 import type { PrintReport } from "./print";
@@ -15,9 +13,10 @@ interface ElectronProcess {
     platform: string;
 }
 
-interface CustomGlobals extends BootstrapDefinition {
+interface CustomGlobals {
     isDesktop: typeof utils.isDesktop;
     isMobile: typeof utils.isMobile;
+    device: "mobile" | "desktop" | "print";
     getComponentByEl: typeof appContext.getComponentByEl;
     getHeaders: typeof server.getHeaders;
     getReferenceLinkTitle: (href: string) => Promise<string>;
@@ -30,16 +29,29 @@ interface CustomGlobals extends BootstrapDefinition {
     SEARCH_HELP_TEXT: string;
     activeDialog: JQuery<HTMLElement> | null;
     componentId: string;
+    csrfToken: string;
+    baseApiUrl: string;
+    isProtectedSessionAvailable: boolean;
+    isDev: boolean;
+    isMainWindow: boolean;
+    maxEntityChangeIdAtLoad: number;
+    maxEntityChangeSyncIdAtLoad: number;
+    assetPath: string;
+    appPath: string;
+    instanceName: string;
+    appCssNoteIds: string[];
+    triliumVersion: string;
+    TRILIUM_SAFE_MODE: boolean;
+    platform?: typeof process.platform;
     linter: typeof lint;
+    hasNativeTitleBar: boolean;
+    isRtl: boolean;
 }
 
 type RequireMethod = (moduleName: string) => any;
 
 declare global {
     interface Window {
-        $: JQueryStatic;
-        jQuery: JQueryStatic;
-
         logError(message: string);
         logInfo(message: string);
 

apps/client/src/widgets/FloatingButtonsDefinitions.tsx

@@ -142,7 +142,7 @@ function ShowTocWidgetButton({ note, noteContext, isDefaultViewMode }: FloatingB
 
     return isEnabled && <FloatingButton
         text={t("show_toc_widget_button.show_toc")}
-        icon="bx bx-spreadsheet bx-rotate-180"
+        icon="bx bx-tn-toc"
         onClick={() => {
             if (noteContext?.viewScope && noteContext.noteId) {
                 noteContext.viewScope.tocTemporarilyHidden = false;

apps/client/src/widgets/NoteDetail.tsx

@@ -215,7 +215,7 @@ export default function NoteDetail() {
     return (
         <div
             ref={containerRef}
-            class={`component note-detail ${isFullHeight ? "full-height" : ""}`}
+            class={`note-detail ${isFullHeight ? "full-height" : ""}`}
         >
             {Object.entries(noteTypesToRender).map(([ itemType, Element ]) => {
                 return <NoteDetailWrapper

apps/client/src/widgets/attribute_widgets/UserAttributesList.tsx

@@ -1,16 +1,14 @@
-import "./UserAttributesList.css";
-
-import type { DefinitionObject } from "@triliumnext/commons";
-import { ComponentChildren, CSSProperties } from "preact";
 import { useState } from "preact/hooks";
-
 import FNote from "../../entities/fnote";
-import attributes from "../../services/attributes";
-import { getReadableTextColor } from "../../services/css_class_manager";
-import { formatDateTime } from "../../utils/formatters";
+import "./UserAttributesList.css";
 import { useTriliumEvent } from "../react/hooks";
+import attributes from "../../services/attributes";
+import { DefinitionObject } from "../../services/promoted_attribute_definition_parser";
+import { formatDateTime } from "../../utils/formatters";
+import { ComponentChildren, CSSProperties } from "preact";
 import Icon from "../react/Icon";
 import NoteLink from "../react/NoteLink";
+import { getReadableTextColor } from "../../services/css_class_manager";
 
 interface UserAttributesListProps {
     note: FNote;
@@ -31,7 +29,7 @@ export default function UserAttributesDisplay({ note, ignoredAttributes }: UserA
         <div className="user-attributes">
             {userAttributes?.map(attr => buildUserAttribute(attr))}
         </div>
-    );
+    )
 
 }
 
@@ -48,13 +46,13 @@ function useNoteAttributesWithDefinitions(note: FNote, attributesToIgnore:  stri
 }
 
 function UserAttribute({ attr, children, style }: { attr: AttributeWithDefinitions, children: ComponentChildren, style?: CSSProperties }) {
-    const className = attr.type === "label" ? `label ${attr.def.labelType}` : "relation";
+    const className = `${attr.type === "label" ? "label" + " " + attr.def.labelType : "relation"}`;
 
     return (
         <span key={attr.friendlyName} className={`user-attribute type-${className}`} style={style}>
             {children}
         </span>
-    );
+    )
 }
 
 function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
@@ -63,7 +61,7 @@ function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
     let style: CSSProperties | undefined;
 
     if (attr.type === "label") {
-        const value = attr.value;
+        let value = attr.value;
         switch (attr.def.labelType) {
             case "number":
                 let formattedValue = value;
@@ -104,7 +102,7 @@ function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
         content = <>{defaultLabel}<NoteLink notePath={attr.value} showNoteIcon /></>;
     }
 
-    return <UserAttribute attr={attr} style={style}>{content}</UserAttribute>;
+    return <UserAttribute attr={attr} style={style}>{content}</UserAttribute>
 }
 
 function getAttributesWithDefinitions(note: FNote, attributesToIgnore: string[] = []): AttributeWithDefinitions[] {

apps/client/src/widgets/buttons/global_menu.tsx

@@ -8,7 +8,7 @@ import { CommandNames } from "../../components/app_context";
 import Component from "../../components/component";
 import { ExperimentalFeature, ExperimentalFeatureId, experimentalFeatures, isExperimentalFeatureEnabled, toggleExperimentalFeature } from "../../services/experimental_features";
 import { t } from "../../services/i18n";
-import utils, { dynamicRequire, isElectron, isMobile, isStandalone, reloadFrontendApp } from "../../services/utils";
+import utils, { dynamicRequire, isElectron, isMobile, reloadFrontendApp } from "../../services/utils";
 import Dropdown from "../react/Dropdown";
 import { FormDropdownDivider, FormDropdownSubmenu, FormListHeader, FormListItem } from "../react/FormList";
 import { useStaticTooltip, useStaticTooltipWithKeyboardShortcut, useTriliumOption, useTriliumOptionBool, useTriliumOptionInt } from "../react/hooks";
@@ -249,7 +249,7 @@ function ToggleWindowOnTop() {
 function useTriliumUpdateStatus() {
     const [ latestVersion, setLatestVersion ] = useState<string>();
     const [ checkForUpdates ] = useTriliumOptionBool("checkForUpdates");
-    const isUpdateAvailable = utils.isUpdateAvailable(latestVersion, window.glob.triliumVersion);
+    const isUpdateAvailable = utils.isUpdateAvailable(latestVersion, glob.triliumVersion);
 
     async function updateVersionStatus() {
         const RELEASES_API_URL = "https://api.github.com/repos/TriliumNext/Trilium/releases/latest";
@@ -267,7 +267,7 @@ function useTriliumUpdateStatus() {
     }
 
     useEffect(() => {
-        if (!checkForUpdates || !isStandalone) {
+        if (!checkForUpdates) {
             setLatestVersion(undefined);
             return;
         }

apps/client/src/widgets/buttons/right_pane_toggle.tsx

@@ -1,17 +1,11 @@
 import clsx from "clsx";
 
 import { t } from "../../services/i18n";
-import options from "../../services/options";
 import ActionButton from "../react/ActionButton";
-import { useState, useCallback } from "preact/hooks";
-import { useTriliumEvent } from "../react/hooks";
+import { useTriliumOptionBool } from "../react/hooks";
 
 export default function RightPaneToggle() {
-    const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
-
-    useTriliumEvent("toggleRightPane", useCallback(() => {
-        setRightPaneVisible(current => !current);
-    }, []));
+    const [ rightPaneVisible, setRightPaneVisible ] = useTriliumOptionBool("rightPaneVisible");
 
     return (
         <ActionButton
@@ -21,7 +15,7 @@ export default function RightPaneToggle() {
             )}
             text={t("right_pane.toggle")}
             icon="bx bx-sidebar"
-            triggerCommand="toggleRightPane"
+            onClick={() => setRightPaneVisible(!rightPaneVisible)}
         />
     );
 }

apps/client/src/widgets/collections/NoteList.css

@@ -12,7 +12,7 @@ body.prefers-centered-content .note-list-widget:not(.full-height) {
 }
 
 .note-list-widget .note-list {
-    padding-block: 10px;
+    padding: 10px;
 }
 
 .note-list-widget.full-height,

apps/client/src/widgets/collections/NoteList.tsx

@@ -11,8 +11,7 @@ import froca from "../../services/froca";
 import { subscribeToMessages, unsubscribeToMessage as unsubscribeFromMessage } from "../../services/ws";
 import { useNoteContext, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useTriliumEvent } from "../react/hooks";
 import { allViewTypes, ViewModeMedia, ViewModeProps, ViewTypeOptions } from "./interface";
-import ViewModeStorage, { type ViewModeStorageType } from "./view_mode_storage";
-
+import ViewModeStorage from "./view_mode_storage";
 interface NoteListProps {
     note: FNote | null | undefined;
     notePath: string | null | undefined;
@@ -216,7 +215,7 @@ export function useNoteIds(note: FNote | null | undefined, viewType: ViewTypeOpt
     return noteIds;
 }
 
-export function useViewModeConfig<T extends object>(note: FNote | null | undefined, viewType: ViewModeStorageType | undefined) {
+export function useViewModeConfig<T extends object>(note: FNote | null | undefined, viewType: ViewTypeOptions | undefined) {
     const [ viewConfig, setViewConfig ] = useState<{
         config: T | undefined;
         storeFn: (data: T) => void;