From 7b6d5b14293c8ee6043aff87e18ba4ffe8c34667 Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Wed, 6 Aug 2025 08:47:53 -0500 Subject: [PATCH] chore: update marked-shiki, remove patch (#1653) --- .opencode/plugin/example.ts | 2 +- bun.lock | 7 ++----- package.json | 4 +--- packages/web/package.json | 2 +- patches/marked-shiki@1.2.0.patch | 16 ---------------- 5 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 patches/marked-shiki@1.2.0.patch diff --git a/.opencode/plugin/example.ts b/.opencode/plugin/example.ts index 998108f0..05910054 100644 --- a/.opencode/plugin/example.ts +++ b/.opencode/plugin/example.ts @@ -1,4 +1,4 @@ -import { Plugin } from "./index" +import { Plugin } from "../../packages/plugin/src/index" export const ExamplePlugin: Plugin = async ({ app, client, $ }) => { return { diff --git a/bun.lock b/bun.lock index 3fa740e1..39c91701 100644 --- a/bun.lock +++ b/bun.lock @@ -120,7 +120,7 @@ "lang-map": "0.4.0", "luxon": "3.6.1", "marked": "15.0.12", - "marked-shiki": "1.2.0", + "marked-shiki": "1.2.1", "rehype-autolink-headings": "7.1.0", "remeda": "2.26.0", "sharp": "0.32.5", @@ -139,9 +139,6 @@ "sharp", "esbuild", ], - "patchedDependencies": { - "marked-shiki@1.2.0": "patches/marked-shiki@1.2.0.patch", - }, "catalog": { "@tsconfig/node22": "22.0.2", "@types/node": "22.13.9", @@ -1174,7 +1171,7 @@ "marked": ["marked@15.0.12", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="], - "marked-shiki": ["marked-shiki@1.2.0", "", { "peerDependencies": { "marked": ">=7.0.0", "shiki": ">=1.0.0" } }, "sha512-N924hp8veE6Mc91g5/kCNVoTU7TkeJfB2G2XEWb+k1fVA0Bck2T0rVt93d39BlOYH6ohP4Q9BFlPk+UkblhXbg=="], + "marked-shiki": ["marked-shiki@1.2.1", "", { "peerDependencies": { "marked": ">=7.0.0", "shiki": ">=1.0.0" } }, "sha512-yHxYQhPY5oYaIRnROn98foKhuClark7M373/VpLxiy5TrDu9Jd/LsMwo8w+U91Up4oDb9IXFrP0N1MFRz8W/DQ=="], "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="], diff --git a/package.json b/package.json index 89fc3456..7054e287 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,5 @@ "protobufjs", "sharp" ], - "patchedDependencies": { - "marked-shiki@1.2.0": "patches/marked-shiki@1.2.0.patch" - } + "patchedDependencies": {} } diff --git a/packages/web/package.json b/packages/web/package.json index c5331dc5..433c0290 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -25,7 +25,7 @@ "lang-map": "0.4.0", "luxon": "3.6.1", "marked": "15.0.12", - "marked-shiki": "1.2.0", + "marked-shiki": "1.2.1", "rehype-autolink-headings": "7.1.0", "remeda": "2.26.0", "sharp": "0.32.5", diff --git a/patches/marked-shiki@1.2.0.patch b/patches/marked-shiki@1.2.0.patch deleted file mode 100644 index 36ac2bef..00000000 --- a/patches/marked-shiki@1.2.0.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/node_modules/marked-shiki/.bun-tag-5eae3435af8a0229 b/.bun-tag-5eae3435af8a0229 -new file mode 100644 -index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 -diff --git a/dist/index.js b/dist/index.js -index 535885e8569626d08f205e76c4944e4ebd0decab..92b5695c1b05fc7db5d26128c8f948d43c91f88a 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -4,7 +4,7 @@ function o(s = {}) { - async: !0, - async walkTokens(t) { - if (t.type !== "code" || typeof e != "function") return; -- const [a = "text", ...i] = t.lang.split(" "), { text: c } = t, r = await e(c, a, i), l = n ? n.replace("%l", String(a).toUpperCase()).replace("%s", r).replace("%t", c) : r; -+ const [a = "text", ...i] = t.lang?.split(" "), { text: c } = t, r = await e(c, a, i), l = n ? n.replace("%l", String(a).toUpperCase()).replace("%s", r).replace("%t", c) : r; - Object.assign(t, { - type: "html", - block: !0,