From e18613148b0a653e036f4e3cc00aaaae13d3e143 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Mon, 28 Apr 2025 22:58:00 +0300 Subject: [PATCH] chore(nx/server): set up e2e --- _regroup/package.json | 2 +- _regroup/playwright.config.ts | 3 --- apps/client-e2e/src/example.spec.ts | 8 ------ apps/desktop-e2e/.spec.swcrc | 22 ---------------- apps/desktop-e2e/eslint.config.mjs | 5 ---- apps/desktop-e2e/jest.config.ts | 24 ------------------ apps/desktop-e2e/package.json | 25 ------------------- apps/desktop-e2e/src/desktop/desktop.spec.ts | 10 -------- apps/desktop-e2e/src/support/global-setup.ts | 11 -------- .../src/support/global-teardown.ts | 7 ------ apps/desktop-e2e/src/support/test-setup.ts | 9 ------- apps/desktop-e2e/tsconfig.json | 14 ----------- apps/server-e2e/.env | 3 +++ .../eslint.config.mjs | 0 apps/{client-e2e => server-e2e}/package.json | 5 ++-- .../playwright.config.ts | 25 ++++++++++--------- .../e2e => apps/server-e2e/src}/help.spec.ts | 0 .../e2e => apps/server-e2e/src}/i18n.spec.ts | 0 .../server-e2e/src}/layout/tab_bar.spec.ts | 0 .../server-e2e/src}/note_types/code.spec.ts | 0 .../src}/note_types/mermaid.spec.ts | 0 .../src}/note_types/mindmap.spec.ts | 0 .../src}/note_types/note_map.spec.ts | 0 .../server-e2e/src}/note_types/text.spec.ts | 0 .../server-e2e/src}/shared_notes.spec.ts | 0 .../server-e2e/src}/support/app.ts | 0 apps/{client-e2e => server-e2e}/tsconfig.json | 0 apps/server/.start-prod.env | 2 ++ apps/server/package.json | 4 +++ apps/server/src/services/llm/index_service.ts | 2 +- package.json | 2 +- pnpm-lock.yaml | 24 ++++++++---------- tsconfig.json | 5 +--- 33 files changed, 40 insertions(+), 172 deletions(-) delete mode 100644 apps/client-e2e/src/example.spec.ts delete mode 100644 apps/desktop-e2e/.spec.swcrc delete mode 100644 apps/desktop-e2e/eslint.config.mjs delete mode 100644 apps/desktop-e2e/jest.config.ts delete mode 100644 apps/desktop-e2e/package.json delete mode 100644 apps/desktop-e2e/src/desktop/desktop.spec.ts delete mode 100644 apps/desktop-e2e/src/support/global-setup.ts delete mode 100644 apps/desktop-e2e/src/support/global-teardown.ts delete mode 100644 apps/desktop-e2e/src/support/test-setup.ts delete mode 100644 apps/desktop-e2e/tsconfig.json create mode 100644 apps/server-e2e/.env rename apps/{client-e2e => server-e2e}/eslint.config.mjs (100%) rename apps/{client-e2e => server-e2e}/package.json (50%) rename apps/{client-e2e => server-e2e}/playwright.config.ts (80%) rename {_regroup/e2e => apps/server-e2e/src}/help.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/i18n.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/layout/tab_bar.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/note_types/code.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/note_types/mermaid.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/note_types/mindmap.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/note_types/note_map.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/note_types/text.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/shared_notes.spec.ts (100%) rename {_regroup/e2e => apps/server-e2e/src}/support/app.ts (100%) rename apps/{client-e2e => server-e2e}/tsconfig.json (100%) create mode 100644 apps/server/.start-prod.env diff --git a/_regroup/package.json b/_regroup/package.json index f7ffc2fa6..43e6cea17 100644 --- a/_regroup/package.json +++ b/_regroup/package.json @@ -24,7 +24,7 @@ "client:coverage": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest --root src/public/app --coverage", "test:playwright": "playwright test --workers 1", "test:integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", - "test:integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", + "test:integration-mem-db": "cross-env nodemon src/main.ts", "test:integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", "dev:watch-dist": "tsx ./bin/watch-dist.ts", "dev:format-check": "eslint -c eslint.format.config.js .", diff --git a/_regroup/playwright.config.ts b/_regroup/playwright.config.ts index 04bc7aaec..f5ac29541 100644 --- a/_regroup/playwright.config.ts +++ b/_regroup/playwright.config.ts @@ -27,9 +27,6 @@ export default defineConfig({ reporter: "html", /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ use: { - /* Base URL to use in actions like `await page.goto('/')`. */ - baseURL: SERVER_URL, - /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */ trace: "on-first-retry" }, diff --git a/apps/client-e2e/src/example.spec.ts b/apps/client-e2e/src/example.spec.ts deleted file mode 100644 index fa8f1f335..000000000 --- a/apps/client-e2e/src/example.spec.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { test, expect } from '@playwright/test'; - -test('has title', async ({ page }) => { - await page.goto('/'); - - // Expect h1 to contain a substring. - expect(await page.locator('h1').innerText()).toContain('Welcome'); -}); diff --git a/apps/desktop-e2e/.spec.swcrc b/apps/desktop-e2e/.spec.swcrc deleted file mode 100644 index 3b52a5376..000000000 --- a/apps/desktop-e2e/.spec.swcrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "es6" - }, - "sourceMaps": true, - "exclude": [] -} diff --git a/apps/desktop-e2e/eslint.config.mjs b/apps/desktop-e2e/eslint.config.mjs deleted file mode 100644 index 724052a2e..000000000 --- a/apps/desktop-e2e/eslint.config.mjs +++ /dev/null @@ -1,5 +0,0 @@ -import baseConfig from "../../eslint.config.mjs"; - -export default [ - ...baseConfig -]; diff --git a/apps/desktop-e2e/jest.config.ts b/apps/desktop-e2e/jest.config.ts deleted file mode 100644 index 25564ee81..000000000 --- a/apps/desktop-e2e/jest.config.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* eslint-disable */ -import { readFileSync } from 'fs'; - -// Reading the SWC compilation config for the spec files -const swcJestConfig = JSON.parse( - readFileSync(`${__dirname}/.spec.swcrc`, 'utf-8') -); - -// Disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves -swcJestConfig.swcrc = false; - -export default { - displayName: '@triliumnext/desktop-e2e', - preset: '../../jest.preset.js', - globalSetup: '/src/support/global-setup.ts', - globalTeardown: '/src/support/global-teardown.ts', - setupFiles: ['/src/support/test-setup.ts'], - testEnvironment: 'node', - transform: { - '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig], - }, - moduleFileExtensions: ['ts', 'js', 'html'], - coverageDirectory: 'test-output/jest/coverage', -}; diff --git a/apps/desktop-e2e/package.json b/apps/desktop-e2e/package.json deleted file mode 100644 index 37556fa95..000000000 --- a/apps/desktop-e2e/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "@triliumnext/desktop-e2e", - "version": "0.0.1", - "private": true, - "nx": { - "implicitDependencies": [ - "@triliumnext/desktop" - ], - "targets": { - "e2e": { - "executor": "@nx/jest:jest", - "outputs": [ - "{projectRoot}/test-output/jest/coverage" - ], - "options": { - "jestConfig": "apps/desktop-e2e/jest.config.ts", - "passWithNoTests": true - }, - "dependsOn": [ - "@triliumnext/desktop:build" - ] - } - } - } -} diff --git a/apps/desktop-e2e/src/desktop/desktop.spec.ts b/apps/desktop-e2e/src/desktop/desktop.spec.ts deleted file mode 100644 index 52572d00f..000000000 --- a/apps/desktop-e2e/src/desktop/desktop.spec.ts +++ /dev/null @@ -1,10 +0,0 @@ -import axios from 'axios'; - -describe('GET /', () => { - it('should return a message', async () => { - const res = await axios.get(`/`); - - expect(res.status).toBe(200); - expect(res.data).toEqual({ message: 'Hello API' }); - }); -}) diff --git a/apps/desktop-e2e/src/support/global-setup.ts b/apps/desktop-e2e/src/support/global-setup.ts deleted file mode 100644 index d18e0f294..000000000 --- a/apps/desktop-e2e/src/support/global-setup.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable */ -var __TEARDOWN_MESSAGE__: string; - -module.exports = async function() { - // Start services that that the app needs to run (e.g. database, docker-compose, etc.). - console.log('\nSetting up...\n'); - - // Hint: Use `globalThis` to pass variables to global teardown. - globalThis.__TEARDOWN_MESSAGE__ = '\nTearing down...\n'; -}; - diff --git a/apps/desktop-e2e/src/support/global-teardown.ts b/apps/desktop-e2e/src/support/global-teardown.ts deleted file mode 100644 index 67746cebd..000000000 --- a/apps/desktop-e2e/src/support/global-teardown.ts +++ /dev/null @@ -1,7 +0,0 @@ -/* eslint-disable */ - -module.exports = async function() { - // Put clean up logic here (e.g. stopping services, docker-compose, etc.). - // Hint: `globalThis` is shared between setup and teardown. - console.log(globalThis.__TEARDOWN_MESSAGE__); -}; diff --git a/apps/desktop-e2e/src/support/test-setup.ts b/apps/desktop-e2e/src/support/test-setup.ts deleted file mode 100644 index c803356a2..000000000 --- a/apps/desktop-e2e/src/support/test-setup.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* eslint-disable */ -import axios from 'axios'; - -module.exports = async function() { - // Configure axios for tests to use. - const host = process.env.HOST ?? 'localhost'; - const port = process.env.PORT ?? '3000'; - axios.defaults.baseURL = `http://${host}:${port}`; -}; diff --git a/apps/desktop-e2e/tsconfig.json b/apps/desktop-e2e/tsconfig.json deleted file mode 100644 index 2e98c0f60..000000000 --- a/apps/desktop-e2e/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "out-tsc/@triliumnext/desktop-e2e", - "esModuleInterop": true, - "noUnusedLocals": false, - "noImplicitAny": false - }, - "include": [ - "jest.config.ts", - "src/**/*.ts" - ], - "references": [] -} diff --git a/apps/server-e2e/.env b/apps/server-e2e/.env new file mode 100644 index 000000000..f13f7d757 --- /dev/null +++ b/apps/server-e2e/.env @@ -0,0 +1,3 @@ +TRILIUM_INTEGRATION_TEST=memory +TRILIUM_PORT=8082 +TRILIUM_DATA_DIR=apps/server/spec/db \ No newline at end of file diff --git a/apps/client-e2e/eslint.config.mjs b/apps/server-e2e/eslint.config.mjs similarity index 100% rename from apps/client-e2e/eslint.config.mjs rename to apps/server-e2e/eslint.config.mjs diff --git a/apps/client-e2e/package.json b/apps/server-e2e/package.json similarity index 50% rename from apps/client-e2e/package.json rename to apps/server-e2e/package.json index 1ada09ee3..631bc2bf5 100644 --- a/apps/client-e2e/package.json +++ b/apps/server-e2e/package.json @@ -1,10 +1,11 @@ { - "name": "@triliumnext/client-e2e", + "name": "@triliumnext/server-e2e", "version": "0.0.1", "private": true, "nx": { "implicitDependencies": [ - "@triliumnext/client" + "@triliumnext/client", + "@triliumnext/server" ] } } diff --git a/apps/client-e2e/playwright.config.ts b/apps/server-e2e/playwright.config.ts similarity index 80% rename from apps/client-e2e/playwright.config.ts rename to apps/server-e2e/playwright.config.ts index cbedd6740..0e8760653 100644 --- a/apps/client-e2e/playwright.config.ts +++ b/apps/server-e2e/playwright.config.ts @@ -3,7 +3,8 @@ import { nxE2EPreset } from '@nx/playwright/preset'; import { workspaceRoot } from '@nx/devkit'; // For CI, you may want to set BASE_URL to the deployed application. -const baseURL = process.env['BASE_URL'] || 'http://localhost:4200'; +const port = process.env['TRILIUM_PORT']; +const baseURL = process.env['BASE_URL'] || `http://localhost:${port}`; /** * Read environment variables from file. @@ -24,8 +25,8 @@ export default defineConfig({ }, /* Run your local dev server before starting the tests */ webServer: { - command: 'npx nx run @triliumnext/client:serve-static', - url: 'http://localhost:4200', + command: 'pnpm server:start-prod', + url: baseURL, reuseExistingServer: !process.env.CI, cwd: workspaceRoot }, @@ -35,16 +36,16 @@ export default defineConfig({ use: { ...devices["Desktop Chrome"] }, }, - { - name: "firefox", - use: { ...devices["Desktop Firefox"] }, - }, + // { + // name: "firefox", + // use: { ...devices["Desktop Firefox"] }, + // }, + + // { + // name: "webkit", + // use: { ...devices["Desktop Safari"] }, + // }, - { - name: "webkit", - use: { ...devices["Desktop Safari"] }, - }, - // Uncomment for mobile browsers support /* { name: 'Mobile Chrome', diff --git a/_regroup/e2e/help.spec.ts b/apps/server-e2e/src/help.spec.ts similarity index 100% rename from _regroup/e2e/help.spec.ts rename to apps/server-e2e/src/help.spec.ts diff --git a/_regroup/e2e/i18n.spec.ts b/apps/server-e2e/src/i18n.spec.ts similarity index 100% rename from _regroup/e2e/i18n.spec.ts rename to apps/server-e2e/src/i18n.spec.ts diff --git a/_regroup/e2e/layout/tab_bar.spec.ts b/apps/server-e2e/src/layout/tab_bar.spec.ts similarity index 100% rename from _regroup/e2e/layout/tab_bar.spec.ts rename to apps/server-e2e/src/layout/tab_bar.spec.ts diff --git a/_regroup/e2e/note_types/code.spec.ts b/apps/server-e2e/src/note_types/code.spec.ts similarity index 100% rename from _regroup/e2e/note_types/code.spec.ts rename to apps/server-e2e/src/note_types/code.spec.ts diff --git a/_regroup/e2e/note_types/mermaid.spec.ts b/apps/server-e2e/src/note_types/mermaid.spec.ts similarity index 100% rename from _regroup/e2e/note_types/mermaid.spec.ts rename to apps/server-e2e/src/note_types/mermaid.spec.ts diff --git a/_regroup/e2e/note_types/mindmap.spec.ts b/apps/server-e2e/src/note_types/mindmap.spec.ts similarity index 100% rename from _regroup/e2e/note_types/mindmap.spec.ts rename to apps/server-e2e/src/note_types/mindmap.spec.ts diff --git a/_regroup/e2e/note_types/note_map.spec.ts b/apps/server-e2e/src/note_types/note_map.spec.ts similarity index 100% rename from _regroup/e2e/note_types/note_map.spec.ts rename to apps/server-e2e/src/note_types/note_map.spec.ts diff --git a/_regroup/e2e/note_types/text.spec.ts b/apps/server-e2e/src/note_types/text.spec.ts similarity index 100% rename from _regroup/e2e/note_types/text.spec.ts rename to apps/server-e2e/src/note_types/text.spec.ts diff --git a/_regroup/e2e/shared_notes.spec.ts b/apps/server-e2e/src/shared_notes.spec.ts similarity index 100% rename from _regroup/e2e/shared_notes.spec.ts rename to apps/server-e2e/src/shared_notes.spec.ts diff --git a/_regroup/e2e/support/app.ts b/apps/server-e2e/src/support/app.ts similarity index 100% rename from _regroup/e2e/support/app.ts rename to apps/server-e2e/src/support/app.ts diff --git a/apps/client-e2e/tsconfig.json b/apps/server-e2e/tsconfig.json similarity index 100% rename from apps/client-e2e/tsconfig.json rename to apps/server-e2e/tsconfig.json diff --git a/apps/server/.start-prod.env b/apps/server/.start-prod.env new file mode 100644 index 000000000..b5c249243 --- /dev/null +++ b/apps/server/.start-prod.env @@ -0,0 +1,2 @@ +TRILIUM_ENV=production +TRILIUM_DATA_DIR=./apps/server/data \ No newline at end of file diff --git a/apps/server/package.json b/apps/server/package.json index 8ac5e4a06..1700422b7 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -150,6 +150,10 @@ "dependsOn": [ "build" ], "command": "bash apps/server/scripts/build-server.sh" }, + "start-prod": { + "dependsOn": [ "build" ], + "command": "node apps/server/dist/main.js" + }, "docker-build": { "dependsOn": [ "build" diff --git a/apps/server/src/services/llm/index_service.ts b/apps/server/src/services/llm/index_service.ts index 8d4adae9d..7006a13b1 100644 --- a/apps/server/src/services/llm/index_service.ts +++ b/apps/server/src/services/llm/index_service.ts @@ -54,7 +54,7 @@ class IndexService { return; } - const aiEnabled = await options.getOptionBool('aiEnabled'); + const aiEnabled = options.getOptionOrNull('aiEnabled') === "true"; if (!aiEnabled) { log.info("Index service: AI features disabled, skipping initialization"); return; diff --git a/package.json b/package.json index 08f25f259..4c659cec3 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "client:build": "nx build client", "server:build": "nx build server", "server:start": "nx run-many --target=serve --projects=client,server --parallel", - "server:start-prod": "pnpm server:build && cross-env TRILIUM_DATA_DIR=apps/server/data node apps/server/dist/main.js", + "server:start-prod": "nx run @triliumnext/server:start-prod", "electron:build": "nx build desktop", "chore:ci-update-nightly-version": "tsx ./scripts/update-nightly-version.ts", "chore:update-build-info": "tsx ./scripts/update-build-info.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 15a15b4e9..a8a3f359f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -287,8 +287,6 @@ importers: specifier: 0.7.2 version: 0.7.2 - apps/client-e2e: {} - apps/desktop: dependencies: '@electron/remote': @@ -351,7 +349,7 @@ importers: version: 1.0.2 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))) + version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)) electron: specifier: 35.1.5 version: 35.1.5 @@ -359,8 +357,6 @@ importers: specifier: ^7.1.1 version: 7.1.3 - apps/desktop-e2e: {} - apps/server: dependencies: '@highlightjs/cdn-assets': @@ -531,7 +527,7 @@ importers: version: 1.4.7 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))) + version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)) csrf-csrf: specifier: 3.1.0 version: 3.1.0 @@ -702,7 +698,7 @@ importers: version: 1.0.1 webpack: specifier: 5.99.6 - version: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) + version: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) ws: specifier: 8.18.1 version: 8.18.1(bufferutil@4.0.9)(utf-8-validate@6.0.5) @@ -713,6 +709,8 @@ importers: specifier: 3.2.0 version: 3.2.0 + apps/server-e2e: {} + packages/commons: dependencies: '@swc/helpers': @@ -15284,14 +15282,14 @@ snapshots: serialize-javascript: 6.0.2 webpack: 5.98.0(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) - copy-webpack-plugin@13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))): + copy-webpack-plugin@13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)): dependencies: glob-parent: 6.0.2 normalize-path: 3.0.0 schema-utils: 4.3.2 serialize-javascript: 6.0.2 tinyglobby: 0.2.13 - webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) + webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) core-js-compat@3.41.0: dependencies: @@ -20550,14 +20548,14 @@ snapshots: '@swc/core': 1.5.29(@swc/helpers@0.5.17) esbuild: 0.19.12 - terser-webpack-plugin@5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))): + terser-webpack-plugin@5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.2 serialize-javascript: 6.0.2 terser: 5.39.0 - webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) + webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.5.29(@swc/helpers@0.5.17) esbuild: 0.19.12 @@ -21232,7 +21230,7 @@ snapshots: - esbuild - uglify-js - webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)): + webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -21254,7 +21252,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 4.3.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))) + terser-webpack-plugin: 5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: diff --git a/tsconfig.json b/tsconfig.json index f8a33c8a9..6593e8fbc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,16 +16,13 @@ "path": "./packages/turndown-plugin-gfm" }, { - "path": "./apps/client-e2e" + "path": "./apps/server-e2e" }, { "path": "./apps/client" }, { "path": "./apps/desktop" - }, - { - "path": "./apps/desktop-e2e" } ] }