From d958ee82cd8481bdc0a985b9f6796933c645ab63 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 01:49:16 +0000 Subject: [PATCH 1/7] fix(deps): update dependency ollama to v0.5.15 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 581465dc8..473e300bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,7 +68,7 @@ "multer": "1.4.5-lts.2", "normalize-strings": "1.1.1", "normalize.css": "8.0.1", - "ollama": "0.5.14", + "ollama": "0.5.15", "openai": "4.93.0", "rand-token": "1.0.1", "safe-compare": "1.1.4", @@ -15926,9 +15926,9 @@ } }, "node_modules/ollama": { - "version": "0.5.14", - "resolved": "https://registry.npmjs.org/ollama/-/ollama-0.5.14.tgz", - "integrity": "sha512-pvOuEYa2WkkAumxzJP0RdEYHkbZ64AYyyUszXVX7ruLvk5L+EiO2G71da2GqEQ4IAk4j6eLoUbGk5arzFT1wJA==", + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/ollama/-/ollama-0.5.15.tgz", + "integrity": "sha512-TSaZSJyP7MQJFjSmmNsoJiriwa3U+/UJRw6+M8aucs5dTsaWNZsBIGpDb5rXnW6nXxJBB/z79gZY8IaiIQgelQ==", "license": "MIT", "dependencies": { "whatwg-fetch": "^3.6.20" diff --git a/package.json b/package.json index d766e456d..3ee6df183 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "multer": "1.4.5-lts.2", "normalize-strings": "1.1.1", "normalize.css": "8.0.1", - "ollama": "0.5.14", + "ollama": "0.5.15", "openai": "4.93.0", "rand-token": "1.0.1", "safe-compare": "1.1.4", From ce05d70fe325ddcd92a4aacdc8bc3b8d603f7bc2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 01:49:27 +0000 Subject: [PATCH 2/7] chore(deps): update dependency @playwright/test to v1.52.0 --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 581465dc8..3f4392e1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "@fullcalendar/timegrid": "6.1.17", "@mermaid-js/layout-elk": "0.1.7", "@mind-elixir/node-menu": "1.0.5", - "@playwright/test": "1.51.1", + "@playwright/test": "1.52.0", "@popperjs/core": "2.11.8", "@stylistic/eslint-plugin": "4.2.0", "@types/archiver": "6.0.3", @@ -3918,13 +3918,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.51.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.51.1.tgz", - "integrity": "sha512-nM+kEaTSAoVlXmMPH10017vn3FSiFqr/bh4fKg9vmAdMfd9SDqRZNvPSiAHADc/itWak+qPvMPZQOPwCBW7k7Q==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz", + "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.51.1" + "playwright": "1.52.0" }, "bin": { "playwright": "cli.js" @@ -16747,13 +16747,13 @@ } }, "node_modules/playwright": { - "version": "1.51.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.51.1.tgz", - "integrity": "sha512-kkx+MB2KQRkyxjYPc3a0wLZZoDczmppyGJIvQ43l+aZihkaVvmu/21kiyaHeHjiFxjxNNFnUncKmcGIyOojsaw==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz", + "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.51.1" + "playwright-core": "1.52.0" }, "bin": { "playwright": "cli.js" @@ -16766,9 +16766,9 @@ } }, "node_modules/playwright-core": { - "version": "1.51.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.51.1.tgz", - "integrity": "sha512-/crRMj8+j/Nq5s8QcvegseuyeZPxpQCZb6HNk3Sos3BlZyAknRjoyJPFWkpNn8v0+P3WiwqFF8P+zQo4eqiNuw==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz", + "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/package.json b/package.json index d766e456d..6e9cbf38b 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "@fullcalendar/timegrid": "6.1.17", "@mermaid-js/layout-elk": "0.1.7", "@mind-elixir/node-menu": "1.0.5", - "@playwright/test": "1.51.1", + "@playwright/test": "1.52.0", "@popperjs/core": "2.11.8", "@stylistic/eslint-plugin": "4.2.0", "@types/archiver": "6.0.3", From c594f5b5eea51600de11ca464e0d3ee16ecd475c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 01:49:45 +0000 Subject: [PATCH 3/7] chore(deps): update apple-actions/import-codesign-certs action to v5 --- .github/actions/build-electron/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml index 2fd8d1a7d..b1bbbb79e 100644 --- a/.github/actions/build-electron/action.yml +++ b/.github/actions/build-electron/action.yml @@ -21,7 +21,7 @@ runs: # Certificate setup - name: Import Apple certificates if: inputs.os == 'macos' - uses: apple-actions/import-codesign-certs@v3 + uses: apple-actions/import-codesign-certs@v5 with: p12-file-base64: ${{ env.APPLE_APP_CERTIFICATE_BASE64 }} p12-password: ${{ env.APPLE_APP_CERTIFICATE_PASSWORD }} @@ -30,7 +30,7 @@ runs: - name: Install Installer certificate if: inputs.os == 'macos' - uses: apple-actions/import-codesign-certs@v3 + uses: apple-actions/import-codesign-certs@v5 with: p12-file-base64: ${{ env.APPLE_INSTALLER_CERTIFICATE_BASE64 }} p12-password: ${{ env.APPLE_INSTALLER_CERTIFICATE_PASSWORD }} From 728d5ac68acb72479d256e28e2a1ba0664b246be Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Fri, 18 Apr 2025 10:39:40 +0300 Subject: [PATCH 4/7] style(next)/restyle CKEditor: improve the appearance of popups --- src/public/stylesheets/theme-next-dark.css | 2 ++ src/public/stylesheets/theme-next-light.css | 2 ++ src/public/stylesheets/theme-next/notes/text.css | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/public/stylesheets/theme-next-dark.css b/src/public/stylesheets/theme-next-dark.css index 2dbeb525c..98f379c6e 100644 --- a/src/public/stylesheets/theme-next-dark.css +++ b/src/public/stylesheets/theme-next-dark.css @@ -232,6 +232,8 @@ --help-kbd-shortcut-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7); --help-code-color: inherit; --help-code-background: #565656; + + --ck-editor-popup-border-color: var(--modal-border-color); } /* diff --git a/src/public/stylesheets/theme-next-light.css b/src/public/stylesheets/theme-next-light.css index 46c116e39..7793d8ece 100644 --- a/src/public/stylesheets/theme-next-light.css +++ b/src/public/stylesheets/theme-next-light.css @@ -232,4 +232,6 @@ --help-kbd-shortcut-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3); --help-code-color: black; --help-code-background: #d7d5d5; + + --ck-editor-popup-border-color: var(--dropdown-border-color); } diff --git a/src/public/stylesheets/theme-next/notes/text.css b/src/public/stylesheets/theme-next/notes/text.css index 8dd09c485..0e673e9b2 100644 --- a/src/public/stylesheets/theme-next/notes/text.css +++ b/src/public/stylesheets/theme-next/notes/text.css @@ -36,14 +36,14 @@ :root .ck.ck-dropdown__panel, :root .ck-balloon-panel { --ck-color-panel-background: var(--menu-background-color); - --ck-color-panel-border: var(--modal-border-color); + --ck-color-panel-border: var(--ck-editor-popup-border-color); box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity)); - border: 1px solid var(--modal-border-color) !important; + border: 1px solid var(--ck-editor-popup-border-color) !important; border-radius: var(--dropdown-border-radius) !important; background: var(--menu-background-color) !important; backdrop-filter: var(--dropdown-backdrop-filter); - padding: var(--menu-padding-size); + padding: 4px; } :root ul.ck.ck-list, From 99e6a64c3b6da939db212c745c8dd5bab4b8ae9a Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Fri, 18 Apr 2025 10:46:43 +0300 Subject: [PATCH 5/7] style(next)/restyle CKEditor: improve the appearance of popups --- src/public/stylesheets/theme-next/notes/text.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/public/stylesheets/theme-next/notes/text.css b/src/public/stylesheets/theme-next/notes/text.css index 0e673e9b2..9e37e21a1 100644 --- a/src/public/stylesheets/theme-next/notes/text.css +++ b/src/public/stylesheets/theme-next/notes/text.css @@ -39,11 +39,12 @@ --ck-color-panel-border: var(--ck-editor-popup-border-color); box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity)); + outline: transparent !important; border: 1px solid var(--ck-editor-popup-border-color) !important; border-radius: var(--dropdown-border-radius) !important; background: var(--menu-background-color) !important; backdrop-filter: var(--dropdown-backdrop-filter); - padding: 4px; + padding: 4px; } :root ul.ck.ck-list, From cd94668650e2f21d9a4ad3ba995deba58ac20608 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Fri, 18 Apr 2025 11:03:57 +0300 Subject: [PATCH 6/7] style(next)/restyle CKEditor: restyle tooltips --- src/public/stylesheets/theme-next/notes/text.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/public/stylesheets/theme-next/notes/text.css b/src/public/stylesheets/theme-next/notes/text.css index 9e37e21a1..64c55e6b0 100644 --- a/src/public/stylesheets/theme-next/notes/text.css +++ b/src/public/stylesheets/theme-next/notes/text.css @@ -53,6 +53,19 @@ background: transparent; } +/* Tooltip */ +:root div.ck.ck-balloon-panel.ck-tooltip { + --ck-color-panel-background: var(--toast-background); /* Arrow */ + border-color: transparent !important; + border-radius: 6px !important; + padding: 0 10px 2px 10px; + background-color: var(--toast-background) !important; +} + +:root div.ck.ck-balloon-panel.ck-tooltip * { + color: var(--toast-text-color) !important; +} + /* Dropdown list item */ :root ul.ck.ck-list button.ck-button { padding: 2px 16px; From a22909582aaeed874dcd541b6ac1f1e0c234b577 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 10:00:22 +0000 Subject: [PATCH 7/7] fix(deps): update dependency openai to v4.95.0 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 473e300bf..f4f48d998 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,7 +69,7 @@ "normalize-strings": "1.1.1", "normalize.css": "8.0.1", "ollama": "0.5.15", - "openai": "4.93.0", + "openai": "4.95.0", "rand-token": "1.0.1", "safe-compare": "1.1.4", "sanitize-filename": "1.6.3", @@ -15994,9 +15994,9 @@ "license": "MIT" }, "node_modules/openai": { - "version": "4.93.0", - "resolved": "https://registry.npmjs.org/openai/-/openai-4.93.0.tgz", - "integrity": "sha512-2kONcISbThKLfm7T9paVzg+QCE1FOZtNMMUfXyXckUAoXRRS/mTP89JSDHPMp8uM5s0bz28RISbvQjArD6mgUQ==", + "version": "4.95.0", + "resolved": "https://registry.npmjs.org/openai/-/openai-4.95.0.tgz", + "integrity": "sha512-tWHLTA+/HHyWlP8qg0mQLDSpI2NQLhk6zHLJL8yb59qn2pEI8rbEiAGSDPViLvi3BRDoQZIX5scaJ3xYGr2nhw==", "license": "Apache-2.0", "dependencies": { "@types/node": "^18.11.18", diff --git a/package.json b/package.json index 3ee6df183..8f299313a 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "normalize-strings": "1.1.1", "normalize.css": "8.0.1", "ollama": "0.5.15", - "openai": "4.93.0", + "openai": "4.95.0", "rand-token": "1.0.1", "safe-compare": "1.1.4", "sanitize-filename": "1.6.3",