diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index a194a40b4..f06e7b3e9 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -82,7 +82,7 @@ jobs: require-healthy: true - name: Run Playwright tests - run: TRILIUM_DOCKER=1 TRILIUM_PORT=8082 pnpx nx run -t e2e + run: TRILIUM_DOCKER=1 TRILIUM_PORT=8082 pnpx nx run server-e2e:e2e - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: @@ -129,7 +129,6 @@ jobs: - name: Set TEST_TAG to lowercase run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV - - name: Checkout repository uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 @@ -142,6 +141,9 @@ jobs: - name: Install dependencies run: pnpm install --frozen-lockfile + - name: Run the TypeScript build + run: pnpm run server:build + - name: Update build info run: pnpm run chore:update-build-info diff --git a/apps/client/src/services/content_renderer.ts b/apps/client/src/services/content_renderer.ts index 0bf7bca28..619d2d7a6 100644 --- a/apps/client/src/services/content_renderer.ts +++ b/apps/client/src/services/content_renderer.ts @@ -14,7 +14,7 @@ import { applySingleBlockSyntaxHighlight, applySyntaxHighlight } from "./syntax_ import { loadElkIfNeeded, postprocessMermaidSvg } from "./mermaid.js"; import { normalizeMimeTypeForCKEditor } from "./mime_type_definitions.js"; import renderDoc from "./doc_renderer.js"; -import { t } from "i18next"; +import { t } from "../services/i18n.js"; import WheelZoom from 'vanilla-js-wheel-zoom'; let idCounter = 1; diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css index aa3936a22..178e97a28 100644 --- a/apps/client/src/stylesheets/style.css +++ b/apps/client/src/stylesheets/style.css @@ -590,11 +590,6 @@ table.promoted-attributes-in-tooltip th { } .tooltip-trigger { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; background: transparent; pointer-events: none; } diff --git a/apps/client/src/stylesheets/theme-next/notes/text.css b/apps/client/src/stylesheets/theme-next/notes/text.css index 22770d27a..30b92266a 100644 --- a/apps/client/src/stylesheets/theme-next/notes/text.css +++ b/apps/client/src/stylesheets/theme-next/notes/text.css @@ -81,9 +81,6 @@ } /* Checked list item */ -:root ul.ck.ck-list button.ck-button.ck-on:not(:hover) { - background: transparent !important; -} :root ul.ck.ck-list button.ck-button:hover, :root ul.ck.ck-list button.ck-button.ck-on:hover { diff --git a/apps/client/src/widgets/note_language.ts b/apps/client/src/widgets/note_language.ts index 45fcf02c9..398951e20 100644 --- a/apps/client/src/widgets/note_language.ts +++ b/apps/client/src/widgets/note_language.ts @@ -1,7 +1,6 @@ import { Dropdown } from "bootstrap"; import NoteContextAwareWidget from "./note_context_aware_widget.js"; -import { getAvailableLocales, getLocaleById } from "../services/i18n.js"; -import { t } from "i18next"; +import { getAvailableLocales, getLocaleById, t } from "../services/i18n.js"; import type { EventData } from "../components/app_context.js"; import type FNote from "../entities/fnote.js"; import attributes from "../services/attributes.js"; diff --git a/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts b/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts index 6ec033df5..2db3e0031 100644 --- a/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts +++ b/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts @@ -72,7 +72,7 @@ export default class AbstractCodeTypeWidget extends TypeWidget { * @param the note that was changed. * @param new content of the note. */ - _update(note: FNote, content: string) { + _update(note: { mime: string }, content: string) { this.codeEditor.setText(content); this.codeEditor.setMimeType(note.mime); this.codeEditor.clearHistory(); diff --git a/apps/client/src/widgets/type_widgets/content/backend_log.ts b/apps/client/src/widgets/type_widgets/content/backend_log.ts index efd8ff6ff..b6f78f9fa 100644 --- a/apps/client/src/widgets/type_widgets/content/backend_log.ts +++ b/apps/client/src/widgets/type_widgets/content/backend_log.ts @@ -1,6 +1,7 @@ import server from "../../../services/server.js"; import AbstractCodeTypeWidget from "../abstract_code_type_widget.js"; import type { EventData } from "../../../components/app_context.js"; +import type { EditorConfig } from "@triliumnext/codemirror"; const TPL = /*html*/`