Skip to content

revert: 回滚 stream-diffs / @pierre/diffs 升级,修复代码块高亮 - #839

Merged
Simon-He95 merged 3 commits into
mainfrom
revert/stream-diffs-upgrade
Nov 20, 2026
Merged

Simon-He95 merged 3 commits into
mainfrom
revert/stream-diffs-upgrade

Conversation

@Simon-He95

Copy link
Copy Markdown
Owner

为什么回滚

3c958d4ab 把 @pierre/diffs 从 1.2.12 升到 1.6.4(stream-diffs peer 下限同时提到 >=0.0.4),升级后代码块高亮坏掉。复现和定位结论如下。

根因:worker.js 在同一个 worker 里被求值了两次

只给 dist/worker/worker.js 加 console.log 插桩(不改逻辑),在真实 playground dev + Chromium 下抓到:同一个 worker(performance.timeOrigin 相同)里出现了两个 ESM 模块实例,import.meta.url 不同:

[probe] module-init realm=1 meta=<...>/worker.js?worker_file&type=module
[probe] module-init realm=2 meta=<...>/worker.js?v=b9bf73ab

worker.js 把 renderOptions 放在模块作用域,并注册 self.addEventListener("message"),所以两份实例意味着:

  • 两个 message 监听器 → 每个请求被处理两次、回两次;
  • 第二份是在第一次 getHighlighter() 的 import("./highlights-*.js") 里被拉起来的,此时 initialize 已派发完,它永远收不到,renderOptions 停在 DEFAULT_THEMES;
  • 于是每次渲染都从第二个监听器抛出 Theme "pierre-dark" has not been resolved。

pierre-dark 是上游默认主题,没有任何地方请求它,所以报错信息很有迷惑性。

原因是 1.6.4 的 chunk 反向 import 入口:highlights-*.js、shiki-*.js、stream-tokenizer-*.js 都 import ... from "./worker.js";Vite dev 把 worker 入口按 worker.js?worker_file&type=module 加载,chunk 里的 ./worker.js 被解析成 worker.js?v=<hash>,URL 不同 → 二次求值。1.2.12 是单文件 worker.js、没有这种回边,所以不复现。prod 构建也不复现(Rollup 只产出一份,已验证)。

之前用 { dark, light } pair 初始化 pool 之所以"看起来修好了",是因为 setRenderOptions 在值相等时提前 return,pair 与同步的单名不相等才触发了广播,把两个实例都 seed 了 —— 模块仍然求值两次、每个请求仍然处理并回两次,只是 DEFAULT_THEMES 回退不再触发。所以那两个 workaround 属于掩盖,不是修复,本次一并 revert。

这个 PR 做了什么

三个 revert,最终树与升级前(3c958d4ab^)完全一致(git diff 3c958d4ab^ HEAD 为空):

  • eba6dec59 Revert 升级本身
    • @pierre/diffs ^1.6.4 → ^1.2.12,stream-diffs peer >=0.0.4 → >=0.0.2(安装的 stream-diffs 一直是 0.0.2)
    • 去掉 preferredHighlighter 的 'auto' 默认值、lineDiffType: 'word-line'、playground pool 的 mainThreadMaxCharacters / backend 参数,以及对应文档
    • 回滚 pnpm-lock.yaml
    • 同时删掉只服务这次升级评估的 scripts/benchmark-diffs-versions.mjs 和 .github/workflows/benchmark-diffs-upgrade.yml,以及 test/code-block-preferred-highlighter.test.ts
  • b0fab5111 Revert playground/src/main.ts 的 pair 初始化
  • 6ae53391e Revert playground-solid/src/workers.ts 与 playground/src/pages/perf-codeblock.vue 的 pair 对齐

验证

  • pnpm typecheck 通过
  • pnpm lint 通过
  • pnpm test -- --run:406 文件 / 3769 用例全部通过
  • 运行时(playground dev + Chromium):pool 初始化后一次 file 请求只回一次 success,零 console 错误;增强渲染面 shadow DOM 内 99 个 token span、4 种语法色
  • git grep 'preferredHighlighter\|mainThreadMaxCharacters\|word-line' 在 src/ docs/ playground*/ 无残留

后续

上游 @pierre/diffs 的 chunk 回边问题(Vite dev 下 worker 入口被二次求值)会单独反馈给上游;在它修好之前不升级。

stream-diffs 本身不需要改动:它只在类型层面引用 WorkerPoolManager,不构造 pool、不调用 setRenderOptions。

@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying markstream-vue with  Cloudflare Pages  Cloudflare Pages

Latest commit: eba6dec
Status: ✅  Deploy successful!
Preview URL: https://8a54df43.markstream-vue.pages.dev
Branch Preview URL: https://revert-stream-diffs-upgrade.markstream-vue.pages.dev

View logs

@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying markstream-vue-docs with  Cloudflare Pages  Cloudflare Pages

Latest commit: eba6dec
Status: ✅  Deploy successful!
Preview URL: https://7339e285.markstream-vue-docs.pages.dev
Branch Preview URL: https://revert-stream-diffs-upgrade.markstream-vue-docs.pages.dev

View logs

@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying markstream-nuxt with  Cloudflare Pages  Cloudflare Pages

Latest commit: eba6dec
Status: ✅  Deploy successful!
Preview URL: https://d7faea19.markstream-nuxt.pages.dev
Branch Preview URL: https://revert-stream-diffs-upgrade.markstream-nuxt.pages.dev

View logs

@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying markstream-vue2 with  Cloudflare Pages  Cloudflare Pages

Latest commit: eba6dec
Status: ✅  Deploy successful!
Preview URL: https://cf234e7f.markstream-vue2.pages.dev
Branch Preview URL: https://revert-stream-diffs-upgrade.markstream-vue2.pages.dev

View logs

@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying markstream-react with  Cloudflare Pages  Cloudflare Pages

Latest commit: eba6dec
Status: ✅  Deploy successful!
Preview URL: https://274cbbd5.markstream-react.pages.dev
Branch Preview URL: https://revert-stream-diffs-upgrade.markstream-react.pages.dev

View logs

@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying markstream-angular with  Cloudflare Pages  Cloudflare Pages

Latest commit: eba6dec
Status: ✅  Deploy successful!
Preview URL: https://d3ee14f5.markstream-angular.pages.dev
Branch Preview URL: https://revert-stream-diffs-upgrade.markstream-angular.pages.dev

View logs

@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying markstream-svelte with  Cloudflare Pages  Cloudflare Pages

Latest commit: eba6dec
Status: ✅  Deploy successful!
Preview URL: https://3fd38737.markstream-svelte.pages.dev
Branch Preview URL: https://revert-stream-diffs-upgrade.markstream-svelte.pages.dev

View logs

@Simon-He95
Simon-He95 merged commit 9f84653 into main Nov 20, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant