Skip to content

chore: 同步 Firefly 上游的四项修复 - #6

Merged
WirepullerDX merged 6 commits into
esafrom
sync/firefly-upstream
Nov 15, 2026
Merged

WirepullerDX merged 6 commits into
esafrom
sync/firefly-upstream

Conversation

@WirepullerDX

Copy link
Copy Markdown
Owner

同步内容

验证

  • pnpm install --frozen-lockfile 在 Windows 独立依赖目录成功。
  • pnpm check、pnpm type-check、pnpm build 和 git diff --check 通过。
  • 用实际依赖验证 \ce{}、普通公式、平板侧栏两侧回退。生产预览的三篇文章共输出四张 Mermaid 图,每张都有浅色和深色 SVG,编译后的 CSS 保留行内代码连续空格。

合并方式

请用 Create a merge commit 合入 esa,让 Git 保留上游提交关系,便于下次同步。

shkomg and others added 6 commits November 6, 2026 02:12
Inline code collapsed runs of spaces into one, so `a    b` rendered as
`a b`. Set white-space: break-spaces on inline code (code not directly
inside pre), as suggested in the issue. Code blocks are rendered by
expressive-code inside pre > code and are not affected.

Closes CuteLeaf#514
…d side has no widgets (CuteLeaf#713)

When position is "both", the 769-1279px range only shows the side configured in tabletSidebar. If that side has no enabled widgets, no sidebar column is generated at all at tablet width, while xl still shows the other one — the sidebar disappears completely.

computeGridColumns now falls back to the opposite side when the preferred tablet side is empty, so a sidebar is still rendered at tablet width. Side-specific configuration (position, tabletSidebar) and the default configuration are unchanged.

Co-authored-by: ahmetalkan <ahmetalkan@users.noreply.github.com>
…eLeaf#717)

@mermanjs/web 0.9 refuses to initialize outside a browser realm, so
the build-time rehype plugin can no longer use it. Render with the
native @mermanjs/node engine instead and keep @mermanjs/web only for
the DOM-safety assertion, which still runs in Node.

- replace initMerman/renderSvg with createNodeEngine().renderSvgSync
- pass themes through presentation.theme.preset (host_theme was removed)
- use assertSelfContainedSvgForDom (assertSafeSvgForDom was renamed)
- derive the theme name type from BUNDLED_THEME_PRESETS
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying blog with  Cloudflare Pages  Cloudflare Pages

Latest commit: 6c9e3ab
Status: ✅  Deploy successful!
Preview URL: https://038d5b65.blog-cvm.pages.dev
Branch Preview URL: https://sync-firefly-upstream.blog-cvm.pages.dev

View logs

@WirepullerDX
WirepullerDX merged commit fac51be into esa Nov 15, 2026
1 check passed
@WirepullerDX
WirepullerDX deleted the sync/firefly-upstream branch November 16, 2026 22:30
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.

5 participants