Merge branch 'develop' into feat/add-llm-model-unit-tests

.github/workflows/main-docker.yml

@@ -53,7 +53,7 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Install Playwright Browsers
-        run: pnpx playwright install --with-deps
+        run: pnpm exec playwright install --with-deps
 
       - name: Run the TypeScript build
         run: pnpm run server:build
@@ -82,7 +82,7 @@ jobs:
           require-healthy: true
 
       - name: Run Playwright tests
-        run: TRILIUM_DOCKER=1 TRILIUM_PORT=8082 pnpx nx run server-e2e:e2e
+        run: TRILIUM_DOCKER=1 TRILIUM_PORT=8082 pnpm exec nx run server-e2e:e2e
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:

.github/workflows/playwright.yml

@@ -33,11 +33,11 @@ jobs:
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
-      - run: pnpx playwright install --with-deps
+      - run: pnpm exec playwright install --with-deps
       - uses: nrwl/nx-set-shas@v4
 
       # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
       # - run: npx nx-cloud record -- echo Hello World
       # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
       # When you enable task distribution, run the e2e-ci task instead of e2e
-      - run: pnpx nx affected -t e2e
+      - run: pnpm exec nx affected -t e2e

_regroup/package.json

@@ -35,10 +35,10 @@
     "chore:generate-openapi": "tsx bin/generate-openapi.js"
   },
   "devDependencies": {    
-    "@playwright/test": "1.52.0",
+    "@playwright/test": "1.53.0",
     "@stylistic/eslint-plugin": "4.4.1",        
     "@types/express": "5.0.3",    
-    "@types/node": "22.15.30",    
+    "@types/node": "22.15.31",    
     "@types/yargs": "17.0.33",
     "@vitest/coverage-v8": "3.2.3",
     "eslint": "9.28.0",

apps/client/package.json

@@ -67,11 +67,16 @@
     "@types/react": "19.1.7",
     "@types/react-dom": "19.1.6",
     "copy-webpack-plugin": "13.0.0",
-    "happy-dom": "17.6.3",
+    "happy-dom": "18.0.1",
     "script-loader": "0.7.2",
     "vite-plugin-static-copy": "3.0.0"
   },
   "nx": {
-    "name": "client"
+    "name": "client",
+    "targets": {
+      "serve": {
+        "dependsOn": ["^build"]
+      }
+    }
   }
 }

apps/client/vite.config.mts

@@ -44,6 +44,10 @@ export default defineConfig(() => ({
                 find: "@triliumnext/highlightjs",
                 replacement: resolve(__dirname, "node_modules/@triliumnext/highlightjs/dist")
             }
+        ],
+        dedupe: [
+            "react",
+            "react-dom"
         ]
     },
     // Uncomment this if you are using workers.

apps/server/package.json

@@ -88,13 +88,13 @@
     "multer": "2.0.1",
     "normalize-strings": "1.1.1",
     "ollama": "0.5.16",
-    "openai": "5.2.0",
+    "openai": "5.3.0",
     "rand-token": "1.0.1",
     "safe-compare": "1.1.4",
     "sanitize-filename": "1.6.3",
     "sanitize-html": "2.17.0",
     "sax": "1.4.1",
-    "serve-favicon": "2.5.0",
+    "serve-favicon": "2.5.1",
     "stream-throttle": "0.1.3",
     "strip-bom": "5.0.0",
     "striptags": "3.2.0",

package.json

@@ -40,7 +40,7 @@
     "@playwright/test": "^1.36.0",
     "@triliumnext/server": "workspace:*",
     "@types/express": "^5.0.0",
-    "@types/node": "22.15.30",
+    "@types/node": "22.15.31",
     "@vitest/coverage-v8": "^3.0.5",
     "@vitest/ui": "^3.0.0",
     "chalk": "5.4.1",
@@ -49,7 +49,7 @@
     "eslint": "^9.8.0",
     "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-playwright": "^2.0.0",
-    "happy-dom": "~17.6.0",
+    "happy-dom": "~18.0.0",
     "jiti": "2.4.2",
     "jsdom": "~26.1.0",
     "jsonc-eslint-parser": "^2.1.0",

packages/share-theme/package.json

@@ -23,12 +23,12 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@digitak/esrun": "^3.2.24",
-    "@types/swagger-ui": "^3.52.0",
+    "@types/swagger-ui": "^5.0.0",
     "@typescript-eslint/eslint-plugin": "^6.7.2",
     "@typescript-eslint/parser": "^6.7.2",
     "dotenv": "^16.3.1",
     "esbuild": "^0.25.0",
-    "eslint": "^8.49.0",
+    "eslint": "^9.0.0",
     "highlight.js": "^11.8.0",
     "typescript": "^5.2.2"
   },

packages/share-theme/scripts/build.ts

@@ -15,7 +15,7 @@ const rootDir = path.dirname(process.env.npm_package_json!);
 
 dotenv.config();
 
-const modules = ["scripts", "styles", "templates"];
+const modules = ["scripts", "styles"];
 const entryPoints: {in: string, out: string}[] = [];
 
 function makeEntry(mod: string) {
@@ -27,9 +27,6 @@ function makeEntry(mod: string) {
         case "scripts":
             entrypoint = "index.ts";
             break;
-        case "templates":
-            entrypoint = "page.ejs";
-            break;
         default:
             throw new Error(`Unknown module type ${mod}.`);
     }