merge(main): 解决 PR #93 与 main 的构建产物冲突

合并 main 的置顶排序修复，保留分支上的微信农场种子数据更新；
统一 VERSION 后重新 build 生成 index/sw/tools 等文件。

Co-authored-by: 兰州小红鸡 <flyphp@outlook.com>

Author: cursoragent

assets/dist/home.min.js

@@ -3,7 +3,7 @@
 // 这里都是公开信息，不要把 token 等密钥放进来
 // ============================================================================
 
-export const VERSION = '20260617160000';
+export const VERSION = '20260618140000';
 
 export const CONFIG = {
   repo: {

assets/js/config.js

@@ -366,6 +366,8 @@ function postItemHtml(p, author, avatar) {
 // 懒加载状态：每次切 tab/筛选都会被替换
 let listState = null;
 let mobileHomeStickySync = null;
+/** 首屏预渲染列表仅允许复用一次（切 tab 后必须重绘） */
+let homePrerenderConsumed = false;
 
 function renderList(posts, tab = 'latest') {
   const ul = $('#postList');
@@ -433,6 +435,14 @@ function renderList(posts, tab = 'latest') {
   mobileHomeStickySync?.();
 }
 
+function prerenderListMatches(ul, posts) {
+  const items = [...ul.querySelectorAll('li.post-item')];
+  if (!items.length) return false;
+  const slugs = items.map(li => li.dataset.slug);
+  const expected = posts.slice(0, slugs.length).map(p => p.slug);
+  return slugs.length === expected.length && slugs.every((s, i) => s === expected[i]);
+}
+
 /** 保留 build 预渲染的首页列表 DOM，只绑定懒加载与无限滚动 */
 function bindPrerenderedPostList(posts) {
   const ul = $('#postList');
@@ -441,6 +451,7 @@ function bindPrerenderedPostList(posts) {
 
   const existing = ul.querySelectorAll('li.post-item');
   if (!existing.length) return false;
+  if (!prerenderListMatches(ul, posts)) return false;
 
   const author = CONFIG.site.author;
   const avatar = CONFIG.site.avatar;
@@ -768,7 +779,9 @@ function bindMobileHomeSticky() {
     } else {
       ul.classList.remove('post-list--giscus');
       const filtered = buildHomeList({ allPosts, tab, q: '', tag: activeTag });
-      const reused = tab === 'latest' && !activeTag && bindPrerenderedPostList(filtered);
+      const canReusePrerender = tab === 'latest' && !activeTag && !homePrerenderConsumed;
+      const reused = canReusePrerender && bindPrerenderedPostList(filtered);
+      if (reused) homePrerenderConsumed = true;
       if (!reused) renderList(filtered, tab);
     }
 

assets/js/home.js

@@ -1,5 +1,5 @@
 {
-  "generated": "2026-06-23T09:35:55.220Z",
+  "generated": "2026-06-23T09:53:03.306Z",
   "count": 67,
   "docs": [
     {

data/search.json

@@ -7,8 +7,8 @@
   <title>小红鸡 · 记录想法与代码</title>
   <meta name="description" content="桃李春风一杯酒，江湖夜雨十年灯。">
   <link rel="alternate" type="application/rss+xml" title="RSS" href="rss.xml">
-  <link rel="stylesheet" href="assets/dist/common.min.css?v=20260617160000">
-  <link rel="stylesheet" href="assets/dist/home.min.css?v=20260617160000">
+  <link rel="stylesheet" href="assets/dist/common.min.css?v=20260618140000">
+  <link rel="stylesheet" href="assets/dist/home.min.css?v=20260618140000">
   <script>(function(){var s=localStorage;var t=s.getItem('blog_theme')||'auto';var d=t==='auto'?(window.matchMedia('(prefers-color-scheme: dark)').matches?'dark':'light'):t;var p=s.getItem('blog_preset')||'jianshu';var h=document.documentElement;h.setAttribute('data-preset',p);h.setAttribute('data-mode',d);h.setAttribute('data-theme',d);h.dataset.themeChoice=t;})();</script>
   <style id="critical-home">
 :root{--nav-height:60px;--content-max:980px;--radius:6px;--radius-lg:10px;--primary:#EA6F5A;--text-main:#2F2F2F;--text-secondary:#6B6B6B;--text-tertiary:#9C9C9C;--border:#ECECEC;--bg:#FFF;--bg-soft:#F8F8F8;--nav-bg:rgba(255,255,255,.85);--shadow:0 1px 3px rgba(0,0,0,.04)}
@@ -274,6 +274,23 @@
         <div class="tab" data-tab="notes">随笔</div>
       </div>
       <ul id="postList" class="post-list">
+<li class="post-item" data-slug="welcome">
+      <a class="post-content" href="/post/welcome/">
+        <div class="post-author-row">
+          <div class="avatar" style="background-image:url(https://gitpull.cn/assets/uploads/2026/05/touxiang.webp)"></div>
+          <span class="name">Jimmy</span>
+          <span>·</span>
+          <span>1 个月前</span>
+          <span class="post-pin">置顶</span>
+        </div>
+        <h3 class="post-title">GitBlog：一个带伪后台的博客站点</h3>
+        <p class="post-summary">一个完全静态、托管在 GitHub Pages 上的博客，但带有可以在浏览器里直接写、直接发的&#39;伪后台&#39;。这篇文章记录它能做什么，相比传统方案为什么这样设计，以及如果你也想搭一个，要怎么开始。</p>
+        <div class="post-meta">
+          <span class="tag tag-colored" style="--tag-bg:#EEF0F3;--tag-text:#4B5563;--tag-border:#D5DAE1;--tag-dark-bg:#252A33;--tag-dark-text:#CBD5E1;--tag-dark-border:#47515F;">博客建站</span><span class="tag tag-colored" style="--tag-bg:#E8F8EE;--tag-text:#1E7A43;--tag-border:#BDE8CC;--tag-dark-bg:#153321;--tag-dark-text:#91E4AE;--tag-dark-border:#2F6A43;">教程</span><span class="tag tag-colored" style="--tag-bg:#EEF0F3;--tag-text:#4B5563;--tag-border:#D5DAE1;--tag-dark-bg:#252A33;--tag-dark-text:#CBD5E1;--tag-dark-border:#47515F;">项目介绍</span>
+        </div>
+      </a>
+      <a href="/post/welcome/" class="post-thumbnail"><img src="data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%204%203%22%2F%3E" data-src="assets/uploads/2026/05/1778490605877-blwjij-image.webp" alt="GitBlog：一个带伪后台的博客站点" loading="lazy" decoding="async" fetchpriority="low" class="lazy-pending"></a>
+    </li>
 <li class="post-item" data-slug="海门回声-黑鬼">
       <a class="post-content" href="/post/20260618/">
         <div class="post-author-row">
@@ -393,23 +410,6 @@ <h3 class="post-title">CPTI：手机上就能玩的恋爱人格小测验</h3>
       </a>
       <a href="/post/20260514/" class="post-thumbnail"><img src="data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%204%203%22%2F%3E" data-src="assets/uploads/2026/05/cptijietu1.webp" alt="CPTI：手机上就能玩的恋爱人格小测验" loading="lazy" decoding="async" fetchpriority="low" class="lazy-pending"></a>
     </li>
-<li class="post-item" data-slug="welcome">
-      <a class="post-content" href="/post/welcome/">
-        <div class="post-author-row">
-          <div class="avatar" style="background-image:url(https://gitpull.cn/assets/uploads/2026/05/touxiang.webp)"></div>
-          <span class="name">Jimmy</span>
-          <span>·</span>
-          <span>1 个月前</span>
-          <span class="post-pin">置顶</span>
-        </div>
-        <h3 class="post-title">GitBlog：一个带伪后台的博客站点</h3>
-        <p class="post-summary">一个完全静态、托管在 GitHub Pages 上的博客，但带有可以在浏览器里直接写、直接发的&#39;伪后台&#39;。这篇文章记录它能做什么，相比传统方案为什么这样设计，以及如果你也想搭一个，要怎么开始。</p>
-        <div class="post-meta">
-          <span class="tag tag-colored" style="--tag-bg:#EEF0F3;--tag-text:#4B5563;--tag-border:#D5DAE1;--tag-dark-bg:#252A33;--tag-dark-text:#CBD5E1;--tag-dark-border:#47515F;">博客建站</span><span class="tag tag-colored" style="--tag-bg:#E8F8EE;--tag-text:#1E7A43;--tag-border:#BDE8CC;--tag-dark-bg:#153321;--tag-dark-text:#91E4AE;--tag-dark-border:#2F6A43;">教程</span><span class="tag tag-colored" style="--tag-bg:#EEF0F3;--tag-text:#4B5563;--tag-border:#D5DAE1;--tag-dark-bg:#252A33;--tag-dark-text:#CBD5E1;--tag-dark-border:#47515F;">项目介绍</span>
-        </div>
-      </a>
-      <a href="/post/welcome/" class="post-thumbnail"><img src="data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%204%203%22%2F%3E" data-src="assets/uploads/2026/05/1778490605877-blwjij-image.webp" alt="GitBlog：一个带伪后台的博客站点" loading="lazy" decoding="async" fetchpriority="low" class="lazy-pending"></a>
-    </li>
 <li class="post-item" data-slug="about">
       <a class="post-content" href="/post/about/">
         <div class="post-author-row">
@@ -550,6 +550,6 @@ <h3>最近更新</h3>
   <div id="site-footer"></div>
   <div id="site-overlays"></div>
 
-  <script type="module" src="assets/dist/home.min.js?v=20260617160000"></script>
+  <script type="module" src="assets/dist/home.min.js?v=20260618140000"></script>
 </body>
 </html>

index.html

@@ -5,7 +5,7 @@
     <link>https://gitpull.cn/</link>
     <description>桃李春风一杯酒，江湖夜雨十年灯。</description>
     <language>zh-CN</language>
-    <lastBuildDate>Tue, 23 Jun 2026 09:35:55 GMT</lastBuildDate>
+    <lastBuildDate>Tue, 23 Jun 2026 09:53:03 GMT</lastBuildDate>
     <atom:link href="https://gitpull.cn/rss.xml" rel="self" type="application/rss+xml" />
     <item>
       <title>海门回声 | 黑鬼</title>

rss.xml

@@ -13,6 +13,7 @@ import {
   buildCarouselShell,
   buildCriticalHomeCss,
   postHrefFromEntry,
+  sortPostsForHomeList,
 } from './home-shell-html.mjs';
 import { bundleAssets } from './bundle-assets.mjs';
 import {
@@ -775,7 +776,7 @@ function injectHomeSeo() {
   }
 
   const hrefFn = p => postHrefFromEntry(p, postPublicAbsUrl);
-  const latestForHome = visiblePosts.slice(0, 15);
+  const latestForHome = sortPostsForHomeList(visiblePosts).slice(0, 15);
   let listHtml = '';
   if (latestForHome.length) {
     listHtml = latestForHome.map(p => buildPostItemShell(p, {

scripts/build.mjs

@@ -207,6 +207,16 @@ export function buildPostItemShell(p, { author, avatar, postHrefFromEntry: hrefF
     </li>`;
 }
 
+export function sortPostsForHomeList(posts) {
+  return [...posts].sort((a, b) => {
+    if ((b.pinned ? 1 : 0) !== (a.pinned ? 1 : 0)) return (b.pinned ? 1 : 0) - (a.pinned ? 1 : 0);
+    if (a.pinned && b.pinned && Number(a.pinnedOrder || 0) !== Number(b.pinnedOrder || 0)) {
+      return Number(a.pinnedOrder || 9999) - Number(b.pinnedOrder || 9999);
+    }
+    return new Date(b.date || 0) - new Date(a.date || 0);
+  });
+}
+
 export function pickCarouselItems(posts) {
   const sortFn = (a, b) => {
     if ((b.pinned ? 1 : 0) !== (a.pinned ? 1 : 0)) return (b.pinned ? 1 : 0) - (a.pinned ? 1 : 0);

scripts/home-shell-html.mjs

@@ -8,91 +8,91 @@
   </url>
   <url>
     <loc>https://gitpull.cn/tags.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/archives.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/series.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-age.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-fortune.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-json.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-codec.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-timestamp.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-regex.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-qrcode.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-image.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-network.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-air-conditioner.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>
   <url>
     <loc>https://gitpull.cn/tools/tool-farm-seed.html</loc>
-    <lastmod>2026-06-23T09:35:55.222Z</lastmod>
+    <lastmod>2026-06-23T09:53:03.309Z</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.6</priority>
   </url>

sitemap.xml

@@ -3,7 +3,7 @@
 // 与 ?v=VERSION 的 cache-busting 协同：CACHE_NAME 用 release VERSION 区分批次
 // ============================================================================
 
-const SW_VERSION = '20260617160000';
+const SW_VERSION = '20260618140000';
 const STATIC_CACHE = `static-${SW_VERSION}`;
 const PAGE_CACHE = `pages-${SW_VERSION}`;
 const RUNTIME_CACHE = `runtime-${SW_VERSION}`;
@@ -12,28 +12,28 @@ const RUNTIME_CACHE = `runtime-${SW_VERSION}`;
 const OFFLINE_URL = 'offline.html';
 
 const PRECACHE_ASSETS = [
-  'assets/dist/common.min.css?v=20260617160000',
-  'assets/dist/home.min.css?v=20260617160000',
-  'assets/dist/post.min.css?v=20260617160000',
-  'assets/dist/tools.min.css?v=20260617160000',
-  'assets/dist/admin.min.css?v=20260617160000',
-  'assets/dist/home.min.js?v=20260617160000',
-  'assets/dist/post.min.js?v=20260617160000',
-  'assets/dist/tags.min.js?v=20260617160000',
-  'assets/dist/archives.min.js?v=20260617160000',
-  'assets/dist/series.min.js?v=20260617160000',
-  'assets/dist/notes.min.js?v=20260617160000',
-  'assets/dist/tools.min.js?v=20260617160000',
-  'assets/dist/tool-age.min.js?v=20260617160000',
-  'assets/dist/tool-fortune.min.js?v=20260617160000',
-  'assets/dist/tool-json.min.js?v=20260617160000',
-  'assets/dist/tool-codec.min.js?v=20260617160000',
-  'assets/dist/tool-timestamp.min.js?v=20260617160000',
-  'assets/dist/tool-regex.min.js?v=20260617160000',
-  'assets/dist/tool-qrcode.min.js?v=20260617160000',
-  'assets/dist/tool-image.min.js?v=20260617160000',
-  'assets/dist/tool-network.min.js?v=20260617160000',
-  'assets/dist/tool-farm-seed.min.js?v=20260617160000',
+  'assets/dist/common.min.css?v=20260618140000',
+  'assets/dist/home.min.css?v=20260618140000',
+  'assets/dist/post.min.css?v=20260618140000',
+  'assets/dist/tools.min.css?v=20260618140000',
+  'assets/dist/admin.min.css?v=20260618140000',
+  'assets/dist/home.min.js?v=20260618140000',
+  'assets/dist/post.min.js?v=20260618140000',
+  'assets/dist/tags.min.js?v=20260618140000',
+  'assets/dist/archives.min.js?v=20260618140000',
+  'assets/dist/series.min.js?v=20260618140000',
+  'assets/dist/notes.min.js?v=20260618140000',
+  'assets/dist/tools.min.js?v=20260618140000',
+  'assets/dist/tool-age.min.js?v=20260618140000',
+  'assets/dist/tool-fortune.min.js?v=20260618140000',
+  'assets/dist/tool-json.min.js?v=20260618140000',
+  'assets/dist/tool-codec.min.js?v=20260618140000',
+  'assets/dist/tool-timestamp.min.js?v=20260618140000',
+  'assets/dist/tool-regex.min.js?v=20260618140000',
+  'assets/dist/tool-qrcode.min.js?v=20260618140000',
+  'assets/dist/tool-image.min.js?v=20260618140000',
+  'assets/dist/tool-network.min.js?v=20260618140000',
+  'assets/dist/tool-farm-seed.min.js?v=20260618140000',
 ];
 
 // 安装阶段预缓存关键文件，确保彻底离线也能至少打开首页和 offline.html