fix(notion): avoid patching react-notion-x package

Remove the dead update guide link, replace the react-notion-x patch-package patch with a local Collection wrapper, and remove patch-package from installs. Closes #4341.

Author: tangly1024

DEVELOPMENT.md

@@ -95,8 +95,6 @@ yarn
 - `yarn perf:audit:themes`：全主题性能审计（输出到 `docs/performance`）。
 - `yarn perf:compress-theme-previews`：批量生成主题预览 WebP 资源。
 
-- `yarn postinstall`：依赖安装后自动执行 `patch-package`。
-
 ### 代码质量工具
 
 ```bash

__tests__/components/NotionCollectionGallery.test.js

@@ -1,103 +1,44 @@
-import { execFileSync } from 'child_process'
+/** @jest-environment node */
 
-const renderGalleryScript = `
-  const React = (await import('react')).default
-  const { renderToStaticMarkup } = await import('react-dom/server')
-  const { NotionRenderer } = await import('react-notion-x')
-  const { Collection } = await import('react-notion-x/build/third-party/collection')
-  const createRecordMap = ({
-    showPageIcon,
-    titleVisible,
-    legacyTitleVisible
-  }) => ({
-    block: {
-      collection_view: {
-        value: { id: 'collection_view', type: 'collection_view',
-          collection_id: 'collection', view_ids: ['gallery_view'] }
-      },
-      page: {
-        value: { id: 'page', type: 'page', parent_table: 'collection',
-          properties: { title: [['Gallery item']] },
-          format: { page_icon: '📄' } }
-      }
-    },
-    collection: {
-      collection: {
-        value: { id: 'collection', name: [['Gallery']],
-          schema: { title: { name: 'Name', type: 'title' } } }
-      }
-    },
-    collection_view: {
-      gallery_view: {
-        value: { id: 'gallery_view', type: 'gallery',
-          format: {
-            collection_pointer: { id: 'collection' },
-            ...(showPageIcon === undefined ? {} : { show_page_icon: showPageIcon }),
-            ...(legacyTitleVisible === undefined
-              ? {}
-              : { gallery_title_visible: legacyTitleVisible }),
-            gallery_cover: { type: 'none' },
-            gallery_cover_size: 'medium',
-            gallery_cover_aspect: 'cover',
-            gallery_properties:
-              titleVisible === undefined
-                ? []
-                : [{ property: 'title', visible: titleVisible }]
-          } }
-      }
-    },
-    collection_query: {
-      collection: {
-        gallery_view: { collection_group_results: { blockIds: ['page'] } }
-      }
-    },
-    signed_urls: {}
-  })
-  const renderGallery = options =>
-    renderToStaticMarkup(
-      React.createElement(NotionRenderer, {
-        recordMap: createRecordMap(options),
-        components: { Collection }
-      })
-    )
-  process.stdout.write(JSON.stringify({
-    hidden: renderGallery({ titleVisible: false }),
-    titleVisible: renderGallery({ titleVisible: true }),
-    enabled: renderGallery({ showPageIcon: true, titleVisible: true }),
-    legacy: renderGallery({ legacyTitleVisible: true })
-  }))
-`
+import { galleryVisibilityClassName } from '@/lib/notion/galleryVisibilityClassName'
 
-describe('Notion Gallery visibility settings', () => {
-  const result = JSON.parse(
-    execFileSync(process.execPath, [
-      '--input-type=module',
-      '-e',
-      renderGalleryScript
-    ])
-  )
+const galleryView = format => ({ type: 'gallery', format })
 
+describe('Notion Gallery visibility settings', () => {
   it('hides omitted page icons and an explicitly hidden title', () => {
-    expect(result.hidden).toContain(
-      'notion-gallery notion-gallery-hide-page-icons notion-gallery-hide-titles'
-    )
+    expect(
+      galleryVisibilityClassName(
+        galleryView({
+          gallery_properties: [{ property: 'title', visible: false }]
+        })
+      )
+    ).toBe('notion-gallery-hide-page-icons notion-gallery-hide-titles')
   })
 
   it('keeps a visible title while the omitted page-icon setting stays hidden', () => {
-    expect(result.titleVisible).toContain(
-      'notion-gallery notion-gallery-hide-page-icons'
-    )
-    expect(result.titleVisible).not.toContain('notion-gallery-hide-titles')
+    expect(
+      galleryVisibilityClassName(
+        galleryView({
+          gallery_properties: [{ property: 'title', visible: true }]
+        })
+      )
+    ).toBe('notion-gallery-hide-page-icons')
   })
 
   it('keeps page icons visible when Notion explicitly enables them', () => {
-    expect(result.enabled).toContain('class="notion-gallery"')
-    expect(result.enabled).not.toContain('notion-gallery-hide-page-icons')
-    expect(result.enabled).not.toContain('notion-gallery-hide-titles')
+    expect(
+      galleryVisibilityClassName(
+        galleryView({
+          show_page_icon: true,
+          gallery_properties: [{ property: 'title', visible: true }]
+        })
+      )
+    ).toBe('')
   })
 
   it('preserves legacy Gallery data without the page-icon setting', () => {
-    expect(result.legacy).toContain('class="notion-gallery"')
-    expect(result.legacy).not.toContain('notion-gallery-hide-page-icons')
+    expect(
+      galleryVisibilityClassName(galleryView({ gallery_title_visible: true }))
+    ).toBe('')
   })
 })

components/NotionCollection.js

@@ -0,0 +1,14 @@
+import { galleryVisibilityClassName } from '@/lib/notion/galleryVisibilityClassName'
+import { Collection } from 'react-notion-x/build/third-party/collection'
+
+export default function NotionCollection(props) {
+  const className = galleryVisibilityClassName(props.collectionView)
+
+  if (!className) return <Collection {...props} />
+
+  return (
+    <div className={className}>
+      <Collection {...props} />
+    </div>
+  )
+}

components/NotionPage.js

@@ -282,10 +282,7 @@ const AdEmbed = dynamic(
 )
 
 const Collection = dynamic(
-  () =>
-    import('react-notion-x/build/third-party/collection').then(
-      m => m.Collection
-    ),
+  () => import('@/components/NotionCollection'),
   {
     ssr: true
   }

docs/user-guide/update.md

@@ -134,9 +134,6 @@ NotionNext教程
 操作方式，联系小助理告知”代码付费升级“，定价是￥**9.9/**次。
 :::
 
-- 更多手动方案，感谢网友们的分享！
-[NotionNext更新冲突手动解决方案 | 凌云·LinYun](https://www.linyunlink.top/article/post-240629)
-
 NotionNext更新冲突？网上教程还要VS code和git?通通不需要，马上解决冲突！
 [047 一种更新NotionNext版本的简单方法 | Dongdong’s Blog](https://ddw2019.com/047)
 

lib/notion/galleryVisibilityClassName.js

@@ -0,0 +1,23 @@
+export function galleryVisibilityClassName(collectionView) {
+  if (collectionView?.type !== 'gallery') return ''
+
+  const {
+    gallery_properties,
+    gallery_title_visible,
+    show_page_icon
+  } = collectionView.format || {}
+  const titleProperty = gallery_properties?.find(
+    property => property.property === 'title'
+  )
+
+  return [
+    (show_page_icon === false ||
+      (show_page_icon == null && gallery_title_visible == null)) &&
+      'notion-gallery-hide-page-icons',
+    (titleProperty
+      ? titleProperty.visible === false
+      : gallery_title_visible === false) && 'notion-gallery-hide-titles'
+  ]
+    .filter(Boolean)
+    .join(' ')
+}

package.json

@@ -63,8 +63,7 @@
     "translate:all": "node scripts/translate/index.js --batch",
     "translate:check": "node scripts/translate/index.js --check-drift",
     "translate:backfill": "node scripts/translate/index.js --backfill",
-    "translate:diagnose": "node scripts/translate/index.js --diagnose",
-    "postinstall": "patch-package"
+    "translate:diagnose": "node scripts/translate/index.js --diagnose"
   },
   "dependencies": {
     "@clerk/localizations": "^3.37.8",
@@ -128,7 +127,6 @@
     "marked": "^18.0.6",
     "marked-highlight": "^2.2.4",
     "next-sitemap": "^1.9.12",
-    "patch-package": "^8.0.1",
     "postcss": "^8.5.15",
     "prettier": "^3.8.3",
     "sharp": "^0.35.0",