Skip to content

Sync upstream changes#2

Open
Fusenheizi wants to merge 216 commits into
20260320from
main
Open

Sync upstream changes#2
Fusenheizi wants to merge 216 commits into
20260320from
main

Conversation

@Fusenheizi
Copy link
Copy Markdown
Owner

Merge upstream changes into fork while preserving local commits.

RHZHZ and others added 30 commits February 9, 2026 22:26
Removed state and function.isFlippedhandleCardFlip
Added div to encapsulate front and back.flip-card-inner
Updated CSS for smoother transitions and added .perspective
Modified hover effects for better interaction.
针对 Next.js build/export 多 worker 并发场景,重构 block prefetch 的构建期协调流程,
避免 prefetch_all_blocks 在等待超时后重复执行,同时保留持锁 worker 异常后的补位能力,降低 Notion 重复请求和构建不稳定风险。

本次提交主要包括:
- 将全量 block 预热从通用 withFileLock 逻辑中拆出,改为 prefetch 专用的跨进程锁协调实现
- 为共享预热增加独立的 lock、done、skipped 标记文件,按构建会话维度协调 worker 行为
- 新增持锁心跳和 stale lock 清理机制,避免 owner 异常退出后锁长期残留
- 调整等待方语义:等待超时仅跳过当前 worker,不再让单个等待者替整轮 build 提前放弃共享预热
- 调整 skipped 语义:仅在持锁 worker 预热异常时写入全局 skipped 标记,后续成功抢锁的新 holder 仍可清理旧标记并接手预热
- 保留 done 标记复用逻辑,确保预热成功后其余 worker 直接复用缓存结果,不再重复执行全量预热
- 补充更清晰的 prefetch 日志输出,便于在 Cloudflare 等多进程构建环境中定位等待、接手和跳过行为

预期效果:
- 同一次 build/export 中仅有一个 worker 执行全量 block prefetch
- 等待超时不会直接导致其他 worker 重复启动全量预热
- 持锁 worker 异常后,后续 worker 仍可通过 stale-lock 补位接手
- 在 Notion 响应较慢或构建并发较高时,构建行为更稳定且更容易排查
Prevent invalid heading indent data from emptying the indent stack and crashing post rendering, while adding dev-only diagnostics for unknown heading blocks.

Made-with: Cursor
Increment package version for the TOC hotfix release line.

Made-with: Cursor
…g-indent-crash

Fix TOC parsing for newer Notion heading types.
…3937)

Partial merge from PR notionnext-org#3937: MenuItem.js and MenuList.js only; excludes blog.config, theme config, and yarn.lock.

Made-with: Cursor
…-lock

并发编译优化:基于 notionnext-org#3906 补强 export 阶段 block prefetch 的多 Worker 协调
Keep a guardrail in resolutions to prevent form-data from regressing to vulnerable versions while avoiding unrelated package sorting changes.

(cherry picked from commit 2eef82c)
Made-with: Cursor
…-form-data-resolution

security: pin form-data resolution to ^4.0.4
Add collection_id fallback inference for site data and config parsing when Notion metadata omits stable collection_id in newer data source structures.

(adapted from commit 6109153)

Made-with: Cursor
…lectionid-fallback

Fix Notion data source schema parsing and page list merging.
…card-hover-behavior

fix: 修复 heo 主题交流频道翻转卡片悬停状态异常
tangly1024 and others added 17 commits May 15, 2026 22:28
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat(theme): add ThoughtLite scaffold and migration plan (notionnext-org#3987)

* feat(theme-thoughtlite): ThoughtLite-style header, timeline home, article layout

* feat(theme-thoughtlite): archive, taxonomy, search UI; theme switch manifest and preview placeholders

* docs(theme-thoughtlite): footer credits upstream ThoughtLite repo and author

* docs(themes): ThoughtLite maintainer guide (zh/en) and index updates
Co-authored-by: Cursor <cursoragent@cursor.com>
…houghtLite previews

Co-authored-by: Cursor <cursoragent@cursor.com>
…ghtlite-preview-compress

Chore/thoughtlite preview compress
Migrate deploy, config, and plugin tutorials into docs/user-guide for 4.9.x, add reference manuals and per-theme pages for all 25 themes, merge duplicate Proxio/HEO docs, and document maintenance workflow in DOCUMENTATION_POLICY.

Co-authored-by: Cursor <cursoragent@cursor.com>
Add VitePress config, docs index, Cloudflare Pages build guide, and docs:site:* scripts. Build outputs to .vitepress/dist for static hosting without Notion export.

Co-authored-by: Cursor <cursoragent@cursor.com>
Add Cloudflare Pages deploy workflow using API token instead of CF Git integration. Document setup for notionnext-org and other organization repositories.

Co-authored-by: Cursor <cursoragent@cursor.com>
VitePress editLink points to docs/:path on GitHub; refresh docs/README for tree viewers; add maintain-docs page and notionnext.tangly1024.com notice on project README.

Co-authored-by: Cursor <cursoragent@cursor.com>
Online VitePress site now only builds user-guide/, index.md, and DOCUMENTATION_POLICY.md. Developer docs, theme long-form guides, and performance notes live in docs/developer/ with a clear docs/README entry.

Co-authored-by: Cursor <cursoragent@cursor.com>
Drop docs/theme-*.png and replace screenshot tables with links to preview site and THEMES_CATALOG. Fix developer doc paths in README navigation.

Co-authored-by: Cursor <cursoragent@cursor.com>
Add legacy-docs slug index, example-article, and migrate-legacy-docs script. Integrate Giscus on doc pages via VITE_GISCUS_* env (General Discussions category). Fix local search with CJK tokenize and theme extends DefaultTheme. Update deploy workflow, .env.docs.example, and maintainer guides.

Co-authored-by: Cursor <cursoragent@cursor.com>
… tokenize serialization

cjkTokenize in themeConfig was embedded into __VP_SITE_DATA__ and broke JSON.parse. Inject tokenize at runtime via enhanceApp instead.

Co-authored-by: Cursor <cursoragent@cursor.com>
- Add GOVERNANCE, CODE_OF_CONDUCT, MAINTAINERS, and community-participate guide

- Add Discussion templates, RFC workflow, and updated CONTRIBUTING/README links

- Fix Layout.vue to use DefaultTheme.Layout (restores site rendering)

- Homepage legacy Notion docs guide and VitePress nav for participation

Co-authored-by: Cursor <cursoragent@cursor.com>
Direct contributors who meet membership criteria but were not invited to post in Discussions with the org-membership template.

Co-authored-by: Cursor <cursoragent@cursor.com>
- Add PR CI (lint, types, tests, lockfile, docs build), Dependabot, labeler, stale workflow

- Add CODEOWNERS for high-impact paths only; remove default Issue assignees

- Add maintainer runbook, SUPPORT.md, and updated SECURITY/GOVERNANCE

Co-authored-by: Cursor <cursoragent@cursor.com>
@vercel
Copy link
Copy Markdown

vercel Bot commented May 17, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
notion-next Ready Ready Preview, Comment May 18, 2026 2:59am

t and others added 3 commits May 17, 2026 14:59
Discussions notionnext-org#4069 and notionnext-org#4079 created on GitHub Announcements category.

Co-authored-by: Cursor <cursoragent@cursor.com>
Add index.md for directory URLs, list every built-in theme in the sidebar,
and extend the theme doc generator with feature sections and an auto index.

Co-authored-by: Cursor <cursoragent@cursor.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

config core docs-site documentation Improvements or additions to documentation theme

Projects

None yet

Development

Successfully merging this pull request may close these issues.