diff --git a/package.json b/package.json index aea3dc43c..894303b0c 100644 --- a/package.json +++ b/package.json @@ -89,11 +89,11 @@ "pnpm": { "patchedDependencies": { "immer@10.1.1": "patches/immer@10.1.1.patch", - "re-resizable": "patches/re-resizable@6.9.17.patch", + "re-resizable@6.11.2": "patches/re-resizable@6.11.2.patch", "hono": "patches/hono.patch", - "electron-context-menu": "patches/electron-context-menu.patch", - "@mozilla/readability": "patches/@mozilla__readability.patch", - "daisyui": "patches/daisyui.patch", + "electron-context-menu@4.0.5": "patches/electron-context-menu@4.0.5.patch", + "@mozilla/readability@0.6.0": "patches/@mozilla__readability@0.6.0.patch", + "daisyui@4.12.24": "patches/daisyui@4.12.24.patch", "jsonpointer": "patches/jsonpointer.patch", "workbox-precaching": "patches/workbox-precaching.patch", "@pengx17/electron-forge-maker-appimage": "patches/@pengx17__electron-forge-maker-appimage.patch", diff --git a/patches/@mozilla__readability.patch b/patches/@mozilla__readability.patch deleted file mode 100644 index d40b5b321..000000000 --- a/patches/@mozilla__readability.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Readability-readerable.js b/Readability-readerable.js -index 892169fb94999987e895846b7605f9c4cf32802c..6c75e61f3c5e0b6143860fa1aa8c652548a78760 100644 ---- a/Readability-readerable.js -+++ b/Readability-readerable.js -@@ -29,7 +29,7 @@ var REGEXPS = { - function isNodeVisible(node) { - // Have to null-check node.style and node.className.indexOf to deal with SVG and MathML nodes. - return (!node.style || node.style.display != "none") -- && !node.hasAttribute("hidden") -+ && !(node.hasAttribute("hidden") && !node.id.startsWith("S:")) - //check for "fallback-image" so that wikimedia math images are displayed - && (!node.hasAttribute("aria-hidden") || node.getAttribute("aria-hidden") != "true" || (node.className && node.className.indexOf && node.className.indexOf("fallback-image") !== -1)); - } diff --git a/patches/@mozilla__readability@0.6.0.patch b/patches/@mozilla__readability@0.6.0.patch new file mode 100644 index 000000000..d44c25039 --- /dev/null +++ b/patches/@mozilla__readability@0.6.0.patch @@ -0,0 +1,12 @@ +diff --git a/Readability-readerable.js b/Readability-readerable.js +index e50a6e8a9b6e409a39adff0b77d35159cd9deb74..ae4496260700b09d5028616f30f4dd32f401feab 100644 +--- a/Readability-readerable.js ++++ b/Readability-readerable.js +@@ -32,6 +32,7 @@ function isNodeVisible(node) { + return ( + (!node.style || node.style.display != "none") && + !node.hasAttribute("hidden") && ++ !node.id.startsWith("S:") && + //check for "fallback-image" so that wikimedia math images are displayed + (!node.hasAttribute("aria-hidden") || + node.getAttribute("aria-hidden") != "true" || diff --git a/patches/daisyui.patch b/patches/daisyui@4.12.24.patch similarity index 67% rename from patches/daisyui.patch rename to patches/daisyui@4.12.24.patch index 44088b564..4f1cfc8f7 100644 --- a/patches/daisyui.patch +++ b/patches/daisyui@4.12.24.patch @@ -1,18 +1,11 @@ diff --git a/src/index.js b/src/index.js -index 18ee99048c31ab0e8e82601cb8021bd54cb5d780..4ff72db4c66ce9549dce240f19eef15b43a26774 100644 +index 18ee99048c31ab0e8e82601cb8021bd54cb5d780..0c8d04d9b615a9e894c3b860b44dd67844471f23 100644 --- a/src/index.js +++ b/src/index.js -@@ -125,23 +125,27 @@ const mainFunction = ({ addBase, addComponents, config }) => { - } - } - -+ - module.exports = tailwindPlugin(mainFunction, { - theme: { - extend: { +@@ -131,17 +131,21 @@ module.exports = tailwindPlugin(mainFunction, { colors: { ...colorObject, -- // adding all Tailwind `neutral` shades here so they don't get overridden by daisyUI `neutral` color + // adding all Tailwind `neutral` shades here so they don't get overridden by daisyUI `neutral` color - "neutral-50": "#fafafa", - "neutral-100": "#f5f5f5", - "neutral-200": "#e5e5e5", @@ -26,7 +19,7 @@ index 18ee99048c31ab0e8e82601cb8021bd54cb5d780..4ff72db4c66ce9549dce240f19eef15b - "neutral-950": "#0a0a0a", + "neutral": { + DEFAULT: "var(--fallback-n,oklch(var(--n)/))", -+ 50: "#fafafa", ++ 50: "#fafafa", + 100: "#f5f5f5", + 200: "#e5e5e5", + 300: "#d4d4d4", @@ -37,8 +30,8 @@ index 18ee99048c31ab0e8e82601cb8021bd54cb5d780..4ff72db4c66ce9549dce240f19eef15b + 800: "#262626", + 900: "#171717", + 950: "#0a0a0a", -+ }, -+ "neutral-content": "var(--fallback-nc,oklch(var(--nc)/))", ++ }, ++ "neutral-content": "var(--fallback-nc,oklch(var(--nc)/))", }, ...utilityClasses, }, diff --git a/patches/electron-context-menu.patch b/patches/electron-context-menu@4.0.5.patch similarity index 73% rename from patches/electron-context-menu.patch rename to patches/electron-context-menu@4.0.5.patch index 01d80b8c0..5bf3e4910 100644 --- a/patches/electron-context-menu.patch +++ b/patches/electron-context-menu@4.0.5.patch @@ -1,5 +1,5 @@ diff --git a/index.js b/index.js -index b10daea2fbcee2eaeed9c61103eb89d93d4ee50d..5392745cdcdead1fbb39c17c42f3ed15f4141e35 100644 +index 8ec2624b2ed049733788311aed0852432dbefb42..d872e82d5a12d175d17579e7449fe38de5f02bde 100644 --- a/index.js +++ b/index.js @@ -378,6 +378,7 @@ export default function contextMenu(options = {}) { diff --git a/patches/hono.patch b/patches/hono.patch index 8d3b80d1e..23e38360d 100644 --- a/patches/hono.patch +++ b/patches/hono.patch @@ -1,8 +1,8 @@ diff --git a/dist/types/client/types.d.ts b/dist/types/client/types.d.ts -index 35e2c7a1dccc9f148c87ba07d71d7f6101106f2d..5c52cd70594e57d8c375f2c048dd337eaa55e906 100644 +index fb6f879fd1975b72b6c392e540dc3e2a1110e589..827da42e242012a69ad554f866fcfb7fd58692ff 100644 --- a/dist/types/client/types.d.ts +++ b/dist/types/client/types.d.ts -@@ -52,7 +52,7 @@ type ClientResponseOfEndpoint = T extends { +@@ -51,7 +51,7 @@ type ClientResponseOfEndpoint = T extends { output: infer O; outputFormat: infer F; status: infer S; diff --git a/patches/re-resizable@6.9.17.patch b/patches/re-resizable@6.11.2.patch similarity index 81% rename from patches/re-resizable@6.9.17.patch rename to patches/re-resizable@6.11.2.patch index be8b84d82..5484571e4 100644 --- a/patches/re-resizable@6.9.17.patch +++ b/patches/re-resizable@6.11.2.patch @@ -1,9 +1,9 @@ diff --git a/lib/resizer.js b/lib/resizer.js -index a051e406e92de35277d9aa335302a9216943f5b4..6214d334cf4840748e0ea192ace51129b414acc8 100644 +index c465561d31edf2087c45cdf7b7a2af16e3edd9c3..31c0a258f0c8176eb274e4b292fde1b12040891e 100644 --- a/lib/resizer.js +++ b/lib/resizer.js -@@ -25,32 +25,32 @@ var __assign = (this && this.__assign) || function () { - import * as React from 'react'; +@@ -13,33 +13,33 @@ import { jsx as _jsx } from "react/jsx-runtime"; + import { memo, useCallback, useMemo } from 'react'; var rowSizeBase = { width: '100%', - height: '10px', @@ -26,6 +26,7 @@ index a051e406e92de35277d9aa335302a9216943f5b4..6214d334cf4840748e0ea192ace51129 + width: '40px', + height: '40px', position: 'absolute', + zIndex: 1, }; var styles = { - top: __assign(__assign({}, rowSizeBase), { top: '-5px' }), @@ -45,5 +46,5 @@ index a051e406e92de35277d9aa335302a9216943f5b4..6214d334cf4840748e0ea192ace51129 + bottomLeft: __assign(__assign({}, edgeBase), { left: '-20px', bottom: '-20px', cursor: 'sw-resize' }), + topLeft: __assign(__assign({}, edgeBase), { left: '-20px', top: '-20px', cursor: 'nw-resize' }), }; - var Resizer = /** @class */ (function (_super) { - __extends(Resizer, _super); + export var Resizer = memo(function (props) { + var onResizeStart = props.onResizeStart, direction = props.direction, children = props.children, replaceStyles = props.replaceStyles, className = props.className; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index da57a1fe3..946867401 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,23 +18,23 @@ patchedDependencies: '@microflash/remark-callout-directives': hash: bl6uhe4vs4xm3d2jmecdpzbh2m path: patches/@microflash__remark-callout-directives.patch - '@mozilla/readability': - hash: 43niildbdafdxi7qfcwhpkkxwa - path: patches/@mozilla__readability.patch + '@mozilla/readability@0.6.0': + hash: tcrtng7itw73xfw4zpcltvxf4e + path: patches/@mozilla__readability@0.6.0.patch '@pengx17/electron-forge-maker-appimage': hash: vov3v67fgv3lrfz3n24bnubw4m path: patches/@pengx17__electron-forge-maker-appimage.patch - daisyui: - hash: igsntdatmoaxzwxof4bkkh35fy - path: patches/daisyui.patch + daisyui@4.12.24: + hash: kauabb6uyb6mqty5xbraxqjogy + path: patches/daisyui@4.12.24.patch devlop: hash: xzgzapu45daboiid4fiusduvwa path: patches/devlop.patch - electron-context-menu: - hash: c53at4t5fflixuwjz35hmcqdu4 - path: patches/electron-context-menu.patch + electron-context-menu@4.0.5: + hash: idx5ni4vivbczlm3odxrcnocbm + path: patches/electron-context-menu@4.0.5.patch hono: - hash: qptujxncoai6tukc4qaqsrqk24 + hash: ilgmwbmxq7ndzom6bsxwnexiky path: patches/hono.patch immer@10.1.1: hash: og7mbnoo5vh43tjlw5rbmrdbvu @@ -42,9 +42,9 @@ patchedDependencies: jsonpointer: hash: prxuhlhyjugus5tiew4vc3pahu path: patches/jsonpointer.patch - re-resizable: - hash: yitcmpfwcomg2fky72uc3lhk2i - path: patches/re-resizable@6.9.17.patch + re-resizable@6.11.2: + hash: yyoomfolrhjt3tvpzaxibro3iu + path: patches/re-resizable@6.11.2.patch react-native-sheet-transitions: hash: xmkq4ssu3mefxtr2e65xl27hxi path: patches/react-native-sheet-transitions.patch @@ -317,7 +317,7 @@ importers: version: 17.4.4 hono: specifier: 4.7.4 - version: 4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24) + version: 4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky) html-minifier-terser: specifier: 7.2.0 version: 7.2.0 @@ -380,7 +380,7 @@ importers: version: 2.0.0 electron-context-menu: specifier: 4.0.5 - version: 4.0.5(patch_hash=c53at4t5fflixuwjz35hmcqdu4) + version: 4.0.5(patch_hash=idx5ni4vivbczlm3odxrcnocbm) electron-log: specifier: 5.3.2 version: 5.3.2 @@ -453,7 +453,7 @@ importers: version: 4.0.0 hono: specifier: 4.7.4 - version: 4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24) + version: 4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky) apps/desktop/src/renderer: dependencies: @@ -639,7 +639,7 @@ importers: version: 0.2.0(shiki@3.2.1) re-resizable: specifier: 6.11.2 - version: 6.11.2(patch_hash=yitcmpfwcomg2fky72uc3lhk2i)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.11.2(patch_hash=yyoomfolrhjt3tvpzaxibro3iu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-blurhash: specifier: 0.3.0 version: 0.3.0(blurhash@2.0.5)(react@18.3.1) @@ -916,7 +916,7 @@ importers: version: 14.0.2(expo@52.0.38(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@expo/metro-runtime@4.0.1(react-native@0.77.1(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@types/react@18.3.12)(bufferutil@4.0.9)(react@18.3.1)(utf-8-validate@6.0.5)))(bufferutil@4.0.9)(encoding@0.1.13)(graphql@16.8.1)(react-native-webview@13.13.4(react-native@0.77.1(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@types/react@18.3.12)(bufferutil@4.0.9)(react@18.3.1)(utf-8-validate@6.0.5))(react@18.3.1))(react-native@0.77.1(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@types/react@18.3.12)(bufferutil@4.0.9)(react@18.3.1)(utf-8-validate@6.0.5))(react@18.3.1)(utf-8-validate@6.0.5))(react-native@0.77.1(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@types/react@18.3.12)(bufferutil@4.0.9)(react@18.3.1)(utf-8-validate@6.0.5)) hono: specifier: 4.7.4 - version: 4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24) + version: 4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky) immer: specifier: 10.1.1 version: 10.1.1(patch_hash=og7mbnoo5vh43tjlw5rbmrdbvu) @@ -1206,7 +1206,7 @@ importers: version: 4.0.3 daisyui: specifier: 4.12.24 - version: 4.12.24(patch_hash=igsntdatmoaxzwxof4bkkh35fy)(postcss@8.5.3) + version: 4.12.24(patch_hash=kauabb6uyb6mqty5xbraxqjogy)(postcss@8.5.3) dotenv-flow: specifier: 4.1.0 version: 4.1.0 @@ -1492,7 +1492,7 @@ importers: version: link:../utils hono: specifier: 4.7.4 - version: 4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24) + version: 4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky) packages/shared: dependencies: @@ -1504,7 +1504,7 @@ importers: version: 1.0.1(@types/node@22.13.10) '@hono/node-server': specifier: 1.13.8 - version: 1.13.8(hono@4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24)) + version: 1.13.8(hono@4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky)) '@t3-oss/env-core': specifier: 0.12.0 version: 0.12.0(typescript@5.8.2)(valibot@1.0.0-beta.15(typescript@5.8.2))(zod@3.24.2) @@ -1516,7 +1516,7 @@ importers: version: 0.40.0(lfgoa6uvatktntjnogv3tipozy) hono: specifier: 4.7.4 - version: 4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24) + version: 4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky) sonner: specifier: 2.0.1 version: 2.0.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1536,7 +1536,7 @@ importers: version: link:../types '@mozilla/readability': specifier: 0.6.0 - version: 0.6.0(patch_hash=43niildbdafdxi7qfcwhpkkxwa) + version: 0.6.0(patch_hash=tcrtng7itw73xfw4zpcltvxf4e) chardet: specifier: 2.1.0 version: 2.1.0 @@ -19286,9 +19286,9 @@ snapshots: '@hexagon/base64@1.1.28': {} - '@hono/node-server@1.13.8(hono@4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24))': + '@hono/node-server@1.13.8(hono@4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky))': dependencies: - hono: 4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24) + hono: 4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky) '@hookform/resolvers@4.1.3(react-hook-form@7.54.2(react@18.3.1))': dependencies: @@ -19711,7 +19711,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@mozilla/readability@0.6.0(patch_hash=43niildbdafdxi7qfcwhpkkxwa)': {} + '@mozilla/readability@0.6.0(patch_hash=tcrtng7itw73xfw4zpcltvxf4e)': {} '@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3': optional: true @@ -24261,7 +24261,7 @@ snapshots: culori@3.3.0: {} - daisyui@4.12.24(patch_hash=igsntdatmoaxzwxof4bkkh35fy)(postcss@8.5.3): + daisyui@4.12.24(patch_hash=kauabb6uyb6mqty5xbraxqjogy)(postcss@8.5.3): dependencies: css-selector-tokenizer: 0.8.0 culori: 3.3.0 @@ -24763,7 +24763,7 @@ snapshots: - dmg-builder - supports-color - electron-context-menu@4.0.5(patch_hash=c53at4t5fflixuwjz35hmcqdu4): + electron-context-menu@4.0.5(patch_hash=idx5ni4vivbczlm3odxrcnocbm): dependencies: cli-truncate: 4.0.0 electron-dl: 4.0.0 @@ -27366,7 +27366,7 @@ snapshots: dependencies: react-is: 16.13.1 - hono@4.7.4(patch_hash=qptujxncoai6tukc4qaqsrqk24): {} + hono@4.7.4(patch_hash=ilgmwbmxq7ndzom6bsxwnexiky): {} hosted-git-info@2.8.9: {} @@ -30913,7 +30913,7 @@ snapshots: minimist: 1.2.8 strip-json-comments: 2.0.1 - re-resizable@6.11.2(patch_hash=yitcmpfwcomg2fky72uc3lhk2i)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + re-resizable@6.11.2(patch_hash=yyoomfolrhjt3tvpzaxibro3iu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: react: 18.3.1 react-dom: 18.3.1(react@18.3.1)