From d0b34f635d40b395764ba2d50fc50c99ef4d7ef6 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 27 Dec 2023 22:04:29 -0500
Subject: [PATCH 01/43] feat(build): log duration for each task, use humanized
 format

---
 package.json            |  2 ++
 pnpm-lock.yaml          | 14 ++++++++++++++
 src/node/build/build.ts | 11 +++++++----
 src/node/utils/task.ts  | 15 ++++++++++++---
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index bfc8ec25..22a3b6e2 100644
--- a/package.json
+++ b/package.json
@@ -137,6 +137,7 @@
     "@types/debug": "^4.1.12",
     "@types/escape-html": "^1.0.4",
     "@types/fs-extra": "^11.0.4",
+    "@types/humanize-duration": "^3.27.3",
     "@types/lodash.template": "^4.5.3",
     "@types/mark.js": "^8.11.12",
     "@types/markdown-it-attrs": "^4.1.3",
@@ -160,6 +161,7 @@
     "fs-extra": "^11.2.0",
     "get-port": "^7.0.0",
     "gray-matter": "^4.0.3",
+    "humanize-duration": "^3.31.0",
     "lint-staged": "^15.2.0",
     "lodash.template": "^4.5.0",
     "lru-cache": "^10.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ba4c0aaf..24948b52 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -111,6 +111,9 @@ importers:
       '@types/fs-extra':
         specifier: ^11.0.4
         version: 11.0.4
+      '@types/humanize-duration':
+        specifier: ^3.27.3
+        version: 3.27.3
       '@types/lodash.template':
         specifier: ^4.5.3
         version: 4.5.3
@@ -180,6 +183,9 @@ importers:
       gray-matter:
         specifier: ^4.0.3
         version: 4.0.3
+      humanize-duration:
+        specifier: ^3.31.0
+        version: 3.31.0
       lint-staged:
         specifier: ^15.2.0
         version: 15.2.0(supports-color@9.4.0)
@@ -1146,6 +1152,10 @@ packages:
     resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
     dev: true
 
+  /@types/humanize-duration@3.27.3:
+    resolution: {integrity: sha512-wiiiFYjnrYDJE/ujU7wS/NShqp12IKrejozjDtcejP0zYi+cjyjVcfZHwcFUDKVJ7tHGsmgeW2ED92ABIIjfpg==}
+    dev: true
+
   /@types/jquery@3.5.29:
     resolution: {integrity: sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==}
     dependencies:
@@ -2742,6 +2752,10 @@ packages:
     engines: {node: '>=16.17.0'}
     dev: true
 
+  /humanize-duration@3.31.0:
+    resolution: {integrity: sha512-fRrehgBG26NNZysRlTq1S+HPtDpp3u+Jzdc/d5A4cEzOD86YLAkDaJyJg8krSdCi7CJ+s7ht3fwRj8Dl+Btd0w==}
+    dev: true
+
   /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     dependencies:
diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 7dca478a..46e4d5c0 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -15,12 +15,13 @@ import { task } from '../utils/task'
 import { bundle } from './bundle'
 import { generateSitemap } from './generateSitemap'
 import { renderPage } from './render'
+import humanizeDuration from 'humanize-duration'
 
 export async function build(
   root?: string,
   buildOptions: BuildOptions & { base?: string; mpa?: string } = {}
 ) {
-  const start = Date.now()
+  const timeStart = performance.now()
 
   process.env.NODE_ENV = 'production'
   const siteConfig = await resolveConfig(root, 'build', 'production')
@@ -143,9 +144,11 @@ export async function build(
   await siteConfig.buildEnd?.(siteConfig)
   clearCache()
 
-  siteConfig.logger.info(
-    `build complete in ${((Date.now() - start) / 1000).toFixed(2)}s.`
-  )
+  const timeEnd = performance.now()
+  const duration = humanizeDuration(timeEnd - timeStart, {
+    maxDecimalPoints: 2
+  })
+  siteConfig.logger.info(`build complete in ${duration}.`)
 }
 
 function linkVue() {
diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index 1d8a3322..667caf67 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -1,4 +1,5 @@
 import ora from 'ora'
+import humanizeDuration from 'humanize-duration'
 
 export const okMark = '\x1b[32m✓\x1b[0m'
 export const failMark = '\x1b[31m✖\x1b[0m'
@@ -7,12 +8,20 @@ export async function task(taskName: string, task: () => Promise<void>) {
   const spinner = ora({ discardStdin: false })
   spinner.start(taskName + '...')
 
+  let symbol = okMark
+  const timeStart = performance.now()
+
   try {
     await task()
   } catch (e) {
-    spinner.stopAndPersist({ symbol: failMark })
+    symbol = failMark
     throw e
+  } finally {
+    const timeEnd = performance.now()
+    const duration = humanizeDuration(timeEnd - timeStart, {
+      maxDecimalPoints: 2
+    })
+    const text = `${taskName} (${duration})`
+    spinner.stopAndPersist({ symbol, text })
   }
-
-  spinner.stopAndPersist({ symbol: okMark })
 }

From 0b37eff97e06bd630ea14203a520d5767319803c Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 27 Dec 2023 22:20:44 -0500
Subject: [PATCH 02/43] feat(build): log duration for each task, use humanized
 format modify log format, use dash instead of parenthesis

---
 src/node/utils/task.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index 667caf67..4a65e6e6 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -21,7 +21,7 @@ export async function task(taskName: string, task: () => Promise<void>) {
     const duration = humanizeDuration(timeEnd - timeStart, {
       maxDecimalPoints: 2
     })
-    const text = `${taskName} (${duration})`
+    const text = `${taskName} - ${duration}`
     spinner.stopAndPersist({ symbol, text })
   }
 }

From e568de361f3f9de24ac7e4becb64925b88721492 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 27 Dec 2023 23:23:23 -0500
Subject: [PATCH 03/43] feat(build): add progress handler for task callback,
 show progress for render closes #3384

---
 src/node/build/build.ts |  9 ++++++---
 src/node/utils/task.ts  | 19 +++++++++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 46e4d5c0..7686365b 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -55,7 +55,7 @@ export async function build(
     const entryPath = path.join(siteConfig.tempDir, 'app.js')
     const { render } = await import(pathToFileURL(entryPath).toString())
 
-    await task('rendering pages', async () => {
+    await task('rendering pages', async (updateProgress) => {
       const appChunk =
         clientResult &&
         (clientResult.output.find(
@@ -108,9 +108,11 @@ export async function build(
           ])
         }
       }
-
+      debugger
+      const pages = ['404.md', ...siteConfig.pages]
+      let count_done = 0
       await pMap(
-        ['404.md', ...siteConfig.pages],
+        pages,
         async (page) => {
           await renderPage(
             render,
@@ -124,6 +126,7 @@ export async function build(
             metadataScript,
             additionalHeadTags
           )
+          updateProgress(++count_done, pages.length)
         },
         { concurrency: siteConfig.buildConcurrency }
       )
diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index 4a65e6e6..691624a9 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -4,7 +4,12 @@ import humanizeDuration from 'humanize-duration'
 export const okMark = '\x1b[32m✓\x1b[0m'
 export const failMark = '\x1b[31m✖\x1b[0m'
 
-export async function task(taskName: string, task: () => Promise<void>) {
+type UpdateHandle = (done: number, total?: number) => any
+
+export async function task<T>(
+  taskName: string,
+  task: (update: UpdateHandle) => Promise<T>
+): Promise<T> {
   const spinner = ora({ discardStdin: false })
   spinner.start(taskName + '...')
 
@@ -12,7 +17,17 @@ export async function task(taskName: string, task: () => Promise<void>) {
   const timeStart = performance.now()
 
   try {
-    await task()
+    const updateHandle: UpdateHandle = (done, total) => {
+      if (total === undefined) {
+        spinner.text = `${taskName} [ ${done} ]`
+      } else {
+        // match length to display them in same width
+        const _total = `${total}`
+        const _done = `${done}`.padStart(_total.length, ' ')
+        spinner.text = `${taskName} [ ${_done} / ${_total} ]`
+      }
+    }
+    return await task(updateHandle)
   } catch (e) {
     symbol = failMark
     throw e

From 8849d8552317ee60761634e080381838d462d848 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 27 Dec 2023 23:45:41 -0500
Subject: [PATCH 04/43] fix: remove debugger statement for local test

---
 src/node/build/build.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 7686365b..8d5cf937 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -108,7 +108,7 @@ export async function build(
           ])
         }
       }
-      debugger
+
       const pages = ['404.md', ...siteConfig.pages]
       let count_done = 0
       await pMap(

From 9281648b3e7422363cefab57cdc33b67960d9d64 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 29 Dec 2023 00:19:26 -0500
Subject: [PATCH 05/43] move callback function outside try catch block,
 refactor logic

---
 src/node/utils/task.ts | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index 691624a9..cd77d4fd 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -4,7 +4,7 @@ import humanizeDuration from 'humanize-duration'
 export const okMark = '\x1b[32m✓\x1b[0m'
 export const failMark = '\x1b[31m✖\x1b[0m'
 
-type UpdateHandle = (done: number, total?: number) => any
+export type UpdateHandle = (done: number, total?: number) => any
 
 export async function task<T>(
   taskName: string,
@@ -13,23 +13,24 @@ export async function task<T>(
   const spinner = ora({ discardStdin: false })
   spinner.start(taskName + '...')
 
-  let symbol = okMark
+  const updateHandle: UpdateHandle = (done, total) => {
+    if (total === undefined) {
+      spinner.text = `${taskName} [ ${done} ]`
+    } else {
+      // match length to display them in same width
+      const _total = `${total}`
+      const _done = `${done}`.padStart(_total.length, ' ')
+      spinner.text = `${taskName} [ ${_done} / ${_total} ]`
+    }
+  }
+
   const timeStart = performance.now()
+  let success = true
 
   try {
-    const updateHandle: UpdateHandle = (done, total) => {
-      if (total === undefined) {
-        spinner.text = `${taskName} [ ${done} ]`
-      } else {
-        // match length to display them in same width
-        const _total = `${total}`
-        const _done = `${done}`.padStart(_total.length, ' ')
-        spinner.text = `${taskName} [ ${_done} / ${_total} ]`
-      }
-    }
     return await task(updateHandle)
   } catch (e) {
-    symbol = failMark
+    success = false
     throw e
   } finally {
     const timeEnd = performance.now()
@@ -37,6 +38,7 @@ export async function task<T>(
       maxDecimalPoints: 2
     })
     const text = `${taskName} - ${duration}`
+    const symbol = success ? okMark : failMark
     spinner.stopAndPersist({ symbol, text })
   }
 }

From f9f968499a610b88a1a4ee0b83c4ae2710834248 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 29 Dec 2023 02:53:23 -0500
Subject: [PATCH 06/43] config: use local machine's cpu count for default
 concurrency value

---
 src/node/config.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/node/config.ts b/src/node/config.ts
index ee0e2e94..9fcf4625 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -19,6 +19,7 @@ import {
   type SiteData
 } from './shared'
 import type { RawConfigExports, SiteConfig, UserConfig } from './siteConfig'
+import { cpus } from 'os'
 
 export { resolvePages } from './plugins/dynamicRoutesPlugin'
 export * from './siteConfig'
@@ -142,7 +143,11 @@ export async function resolveConfig(
     rewrites,
     userConfig,
     sitemap: userConfig.sitemap,
-    buildConcurrency: userConfig.buildConcurrency ?? 64
+    buildConcurrency: Math.max(
+      userConfig.buildConcurrency ?? cpus().length,
+      1 // At least one thread required
+    ),
+    multithreadRender: userConfig.multithreadRender ?? false
   }
 
   // to be shared with content loaders

From 5c06a082f396873200f5d1234f0cee54b6f9fffa Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 29 Dec 2023 02:55:22 -0500
Subject: [PATCH 07/43] render: code cleanup (html composition)

---
 src/node/build/render.ts | 59 +++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index 8818a5e1..cd877b08 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -148,37 +148,34 @@ export async function renderPage(
     }
   }
 
-  const html = `<!DOCTYPE html>
-<html lang="${siteData.lang}" dir="${siteData.dir}">
-  <head>
-    <meta charset="utf-8">
-    ${
-      isMetaViewportOverridden(head)
-        ? ''
-        : '<meta name="viewport" content="width=device-width,initial-scale=1">'
-    }
-    <title>${title}</title>
-    ${
-      isDescriptionOverridden(head)
-        ? ''
-        : `<meta name="description" content="${description}">`
-    }
-    <meta name="generator" content="VitePress v${version}">
-    ${stylesheetLink}
-    ${metadataScript.inHead ? metadataScript.html : ''}
-    ${
-      appChunk
-        ? `<script type="module" src="${siteData.base}${appChunk.fileName}"></script>`
-        : ''
-    }
-    ${await renderHead(head)}
-  </head>
-  <body>${teleports?.body || ''}
-    <div id="app">${content}</div>
-    ${metadataScript.inHead ? '' : metadataScript.html}
-    ${inlinedScript}
-  </body>
-</html>`
+  const html = [
+    `<!DOCTYPE html>`,
+    `<html lang="${siteData.lang}" dir="${siteData.dir}">`,
+    `<head>`,
+    `<meta charset="utf-8">`,
+    isMetaViewportOverridden(head)
+      ? ''
+      : '<meta name="viewport" content="width=device-width,initial-scale=1">',
+    `<title>${title}</title>`,
+    isDescriptionOverridden(head)
+      ? ''
+      : `<meta name="description" content="${description}">`,
+    `<meta name="generator" content="VitePress v${version}">`,
+    stylesheetLink,
+    metadataScript.inHead ? metadataScript.html : '',
+    appChunk
+      ? `<script type="module" src="${siteData.base}${appChunk.fileName}"></script>`
+      : '',
+    await renderHead(head),
+    `</head>`,
+    `<body>`,
+    teleports?.body || '',
+    `<div id="app">${content}</div>`,
+    metadataScript.inHead ? '' : metadataScript.html,
+    inlinedScript,
+    `</body>`,
+    `</html>`
+  ].join('')
 
   const htmlFileName = path.join(config.outDir, page.replace(/\.md$/, '.html'))
   await fs.ensureDir(path.dirname(htmlFileName))

From e5ed19d67d92462b1727f78ee2e4680a9ff502db Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 29 Dec 2023 02:56:11 -0500
Subject: [PATCH 08/43] feat/multithread-render: it works!

---
 package.json                    |  1 +
 pnpm-lock.yaml                  |  7 +++
 rollup.config.ts                | 18 +++++++-
 src/node/build/build.ts         | 54 +++++++++++++----------
 src/node/build/render-worker.ts | 77 +++++++++++++++++++++++++++++++++
 src/node/build/render.ts        | 34 +++++++++++----
 src/node/siteConfig.ts          |  8 ++++
 7 files changed, 165 insertions(+), 34 deletions(-)
 create mode 100644 src/node/build/render-worker.ts

diff --git a/package.json b/package.json
index 22a3b6e2..1883ed93 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,7 @@
     "mark.js": "8.11.1",
     "minisearch": "^6.3.0",
     "mrmime": "^2.0.0",
+    "rpc-magic-proxy": "0.0.0-beta.0",
     "shikiji": "^0.9.12",
     "shikiji-transformers": "^0.9.12",
     "vite": "^5.0.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 24948b52..cd0f668f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -44,6 +44,9 @@ importers:
       mrmime:
         specifier: ^2.0.0
         version: 2.0.0
+      rpc-magic-proxy:
+        specifier: 0.0.0-beta.0
+        version: 0.0.0-beta.0
       shikiji:
         specifier: ^0.9.12
         version: 0.9.12
@@ -3913,6 +3916,10 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.1
       fsevents: 2.3.3
 
+  /rpc-magic-proxy@0.0.0-beta.0:
+    resolution: {integrity: sha512-1UFsu4fpV/OGL8c1knrnx613zzZY9XSbqLUd5pSmOfh0ErAz1R8Dve5S65otFAtNtTO56SWFHbutHcw1lUkkcg==}
+    dev: false
+
   /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
diff --git a/rollup.config.ts b/rollup.config.ts
index 83fb93ec..877c4ecc 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -46,12 +46,28 @@ const plugins = [
   json()
 ]
 
+const node_root = r('src/node/')
+
 const esmBuild: RollupOptions = {
   input: [r('src/node/index.ts'), r('src/node/cli.ts')],
   output: {
     format: 'esm',
     entryFileNames: `[name].js`,
-    chunkFileNames: 'serve-[hash].js',
+    chunkFileNames(chunk) {
+      console.log('chunkFileNames =>', chunk.name)
+      return `${chunk.name}-[hash].js`
+    },
+    manualChunks(id) {
+      // All workers will be chunked into a single file
+      if (!id.startsWith(node_root)) return
+      id = id.slice(node_root.length).replace(/^\//, '')
+      const match = /^.*\-worker(?=(\.(js|ts))?$)/i.exec(id)
+      if (match) {
+        const [name] = match
+        console.log('manualChunks worker =>', name)
+        return name
+      }
+    },
     dir: r('dist/node'),
     sourcemap: DEV
   },
diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 8d5cf937..42d616a1 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -14,7 +14,7 @@ import { deserializeFunctions, serializeFunctions } from '../utils/fnSerialize'
 import { task } from '../utils/task'
 import { bundle } from './bundle'
 import { generateSitemap } from './generateSitemap'
-import { renderPage } from './render'
+import { renderPage, type RenderPageContext } from './render'
 import humanizeDuration from 'humanize-duration'
 
 export async function build(
@@ -52,10 +52,9 @@ export async function build(
       return
     }
 
-    const entryPath = path.join(siteConfig.tempDir, 'app.js')
-    const { render } = await import(pathToFileURL(entryPath).toString())
-
     await task('rendering pages', async (updateProgress) => {
+      const entryPath = path.join(siteConfig.tempDir, 'app.js')
+
       const appChunk =
         clientResult &&
         (clientResult.output.find(
@@ -109,27 +108,34 @@ export async function build(
         }
       }
 
+      const context: RenderPageContext = {
+        config: siteConfig,
+        result: clientResult,
+        appChunk,
+        cssChunk,
+        assets,
+        pageToHashMap,
+        metadataScript,
+        additionalHeadTags
+      }
+
       const pages = ['404.md', ...siteConfig.pages]
-      let count_done = 0
-      await pMap(
-        pages,
-        async (page) => {
-          await renderPage(
-            render,
-            siteConfig,
-            siteConfig.rewrites.map[page] || page,
-            clientResult,
-            appChunk,
-            cssChunk,
-            assets,
-            pageToHashMap,
-            metadataScript,
-            additionalHeadTags
-          )
-          updateProgress(++count_done, pages.length)
-        },
-        { concurrency: siteConfig.buildConcurrency }
-      )
+
+      if (siteConfig.multithreadRender) {
+        const { default: cluster } = await import('./render-worker')
+        await cluster(entryPath, context, pages, updateProgress)
+      } else {
+        let count_done = 0
+        const { render } = await import(pathToFileURL(entryPath).toString())
+        await pMap(
+          pages,
+          async (page) => {
+            await renderPage(render, page, context)
+            updateProgress(++count_done, pages.length)
+          },
+          { concurrency: siteConfig.buildConcurrency }
+        )
+      }
     })
 
     // emit page hash map for the case where a user session is open
diff --git a/src/node/build/render-worker.ts b/src/node/build/render-worker.ts
new file mode 100644
index 00000000..a2c412f5
--- /dev/null
+++ b/src/node/build/render-worker.ts
@@ -0,0 +1,77 @@
+import { Worker, workerData, isMainThread, parentPort } from 'worker_threads'
+import { type UpdateHandle } from '../utils/task'
+import { type RenderPageContext } from './render'
+
+type TaskAllocator<T> = () => Promise<T | undefined>
+
+import RpcContext from 'rpc-magic-proxy'
+
+export default async function cluster(
+  entryPath: string,
+  context: RenderPageContext,
+  pages: string[],
+  update: UpdateHandle
+) {
+  const concurrency = context.config.buildConcurrency || 1
+  const num_tasks = pages.length
+  let progress = -concurrency
+
+  const pageAlloc: TaskAllocator<string> = async () => {
+    progress++
+    if (progress >= 0) update(progress, num_tasks)
+    return pages.shift()
+  }
+
+  const tasks = []
+
+  for (let _ = 0; _ < concurrency; _++) {
+    const ctx = new RpcContext()
+    const workerData = await ctx.serialize({
+      entryPath,
+      pageAlloc,
+      context,
+      workload: 'render'
+    })
+    const worker = new Worker(new URL(import.meta.url), { workerData })
+    ctx.bind(worker)
+    tasks.push(
+      new Promise((res, rej) =>
+        worker.once('exit', (code) => {
+          if (code === 0) res(code)
+          else rej()
+        })
+      )
+    )
+  }
+
+  await Promise.all(tasks)
+}
+
+async function renderWorker() {
+  const ctx = new RpcContext(parentPort!)
+  try {
+    const {
+      entryPath,
+      pageAlloc,
+      context
+    }: {
+      entryPath: string
+      pageAlloc: TaskAllocator<string>
+      context: RenderPageContext
+    } = ctx.deserialize(workerData)
+    const { pathToFileURL } = await import('url')
+    const { renderPage } = await import('./render')
+    const { render } = await import(pathToFileURL(entryPath).toString())
+    while (true) {
+      const page = await pageAlloc()
+      if (!page) break
+      await renderPage(render, page, context)
+    }
+  } catch (e) {
+    console.error(e)
+  } finally {
+    ctx.reset()
+  }
+}
+
+if (!isMainThread && workerData?.workload === 'render') renderWorker()
diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index cd877b08..72485851 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -19,18 +19,34 @@ import {
 } from '../shared'
 import { version } from '../../../package.json'
 
+export interface RenderPageContext {
+  config: SiteConfig
+  result: Rollup.RollupOutput | null
+  appChunk: Rollup.OutputChunk | null
+  cssChunk: Rollup.OutputAsset | null
+  assets: string[]
+  pageToHashMap: Record<string, string>
+  metadataScript: { html: string; inHead: boolean }
+  additionalHeadTags: HeadConfig[]
+}
+
 export async function renderPage(
   render: (path: string) => Promise<SSGContext>,
-  config: SiteConfig,
-  page: string, // foo.md
-  result: Rollup.RollupOutput | null,
-  appChunk: Rollup.OutputChunk | null,
-  cssChunk: Rollup.OutputAsset | null,
-  assets: string[],
-  pageToHashMap: Record<string, string>,
-  metadataScript: { html: string; inHead: boolean },
-  additionalHeadTags: HeadConfig[]
+  pageNameRaw: string,
+  renderContext: RenderPageContext
 ) {
+  const {
+    config,
+    result,
+    appChunk,
+    cssChunk,
+    assets,
+    pageToHashMap,
+    metadataScript,
+    additionalHeadTags
+  } = renderContext
+
+  const page = config.rewrites.inv[pageNameRaw] || pageNameRaw
   const routePath = `/${page.replace(/\.md$/, '')}`
   const siteData = resolveSiteDataByRoute(config.site, routePath)
 
diff --git a/src/node/siteConfig.ts b/src/node/siteConfig.ts
index 74174280..21b99bce 100644
--- a/src/node/siteConfig.ts
+++ b/src/node/siteConfig.ts
@@ -156,6 +156,13 @@ export interface UserConfig<ThemeConfig = any>
    */
   buildConcurrency?: number
 
+  /**
+   * This option allows you to enable or disable the multithread render.
+   * @experimental
+   * @default false
+   */
+  multithreadRender?: boolean
+
   /**
    * @experimental
    *
@@ -250,4 +257,5 @@ export interface SiteConfig<ThemeConfig = any>
   logger: Logger
   userConfig: UserConfig
   buildConcurrency: number
+  multithreadRender: boolean
 }

From b796f2152a19db0f5f7673cbddb0f9b1bd0770e7 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 29 Dec 2023 03:50:52 -0500
Subject: [PATCH 09/43] rollup.config: clarify comment

---
 rollup.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollup.config.ts b/rollup.config.ts
index 877c4ecc..49692956 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -58,7 +58,7 @@ const esmBuild: RollupOptions = {
       return `${chunk.name}-[hash].js`
     },
     manualChunks(id) {
-      // All workers will be chunked into a single file
+      // Chunk each worker into a separate file
       if (!id.startsWith(node_root)) return
       id = id.slice(node_root.length).replace(/^\//, '')
       const match = /^.*\-worker(?=(\.(js|ts))?$)/i.exec(id)

From 2149f6bffd84b86d2c69ed9edf5500cc1130bf87 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 29 Dec 2023 03:51:48 -0500
Subject: [PATCH 10/43] rollup.config: remove debug console logging

---
 rollup.config.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rollup.config.ts b/rollup.config.ts
index 49692956..40478c70 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -54,7 +54,6 @@ const esmBuild: RollupOptions = {
     format: 'esm',
     entryFileNames: `[name].js`,
     chunkFileNames(chunk) {
-      console.log('chunkFileNames =>', chunk.name)
       return `${chunk.name}-[hash].js`
     },
     manualChunks(id) {
@@ -64,7 +63,6 @@ const esmBuild: RollupOptions = {
       const match = /^.*\-worker(?=(\.(js|ts))?$)/i.exec(id)
       if (match) {
         const [name] = match
-        console.log('manualChunks worker =>', name)
         return name
       }
     },

From 1b47c8e3eb38f68c1fd003c5f16c01772cd1d529 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 29 Dec 2023 12:45:03 -0500
Subject: [PATCH 11/43] perf: improve rpc efficiency

---
 package.json                    |  2 +-
 pnpm-lock.yaml                  |  8 ++++----
 src/node/build/render-worker.ts | 36 +++++++++++++++++++--------------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 1883ed93..0b9c8dc6 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "mark.js": "8.11.1",
     "minisearch": "^6.3.0",
     "mrmime": "^2.0.0",
-    "rpc-magic-proxy": "0.0.0-beta.0",
+    "rpc-magic-proxy": "0.0.0-beta.1",
     "shikiji": "^0.9.12",
     "shikiji-transformers": "^0.9.12",
     "vite": "^5.0.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cd0f668f..11c9cbb3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,8 +45,8 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       rpc-magic-proxy:
-        specifier: 0.0.0-beta.0
-        version: 0.0.0-beta.0
+        specifier: 0.0.0-beta.1
+        version: 0.0.0-beta.1
       shikiji:
         specifier: ^0.9.12
         version: 0.9.12
@@ -3916,8 +3916,8 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.1
       fsevents: 2.3.3
 
-  /rpc-magic-proxy@0.0.0-beta.0:
-    resolution: {integrity: sha512-1UFsu4fpV/OGL8c1knrnx613zzZY9XSbqLUd5pSmOfh0ErAz1R8Dve5S65otFAtNtTO56SWFHbutHcw1lUkkcg==}
+  /rpc-magic-proxy@0.0.0-beta.1:
+    resolution: {integrity: sha512-Vqf8sflbh/Xpw6pfFAV+sd4iY3yJYN/vhh0WdTMTVGg5Lva3gwumPfSA4X5RFjSulLcjxusOUrlXp9vJ8ycgKQ==}
     dev: false
 
   /run-parallel@1.2.0:
diff --git a/src/node/build/render-worker.ts b/src/node/build/render-worker.ts
index a2c412f5..04ce2773 100644
--- a/src/node/build/render-worker.ts
+++ b/src/node/build/render-worker.ts
@@ -14,24 +14,25 @@ export default async function cluster(
 ) {
   const concurrency = context.config.buildConcurrency || 1
   const num_tasks = pages.length
-  let progress = -concurrency
 
   const pageAlloc: TaskAllocator<string> = async () => {
-    progress++
-    if (progress >= 0) update(progress, num_tasks)
-    return pages.shift()
+    const page = pages.shift()
+    if (page) update(num_tasks - pages.length, num_tasks)
+    return page
   }
 
   const tasks = []
 
+  const ctx = new RpcContext()
+  const workerData = await ctx.serialize({
+    concurrency,
+    entryPath,
+    pageAlloc,
+    context,
+    workload: 'render'
+  })
+
   for (let _ = 0; _ < concurrency; _++) {
-    const ctx = new RpcContext()
-    const workerData = await ctx.serialize({
-      entryPath,
-      pageAlloc,
-      context,
-      workload: 'render'
-    })
     const worker = new Worker(new URL(import.meta.url), { workerData })
     ctx.bind(worker)
     tasks.push(
@@ -51,10 +52,12 @@ async function renderWorker() {
   const ctx = new RpcContext(parentPort!)
   try {
     const {
+      concurrency,
       entryPath,
       pageAlloc,
       context
     }: {
+      concurrency: number
       entryPath: string
       pageAlloc: TaskAllocator<string>
       context: RenderPageContext
@@ -62,11 +65,14 @@ async function renderWorker() {
     const { pathToFileURL } = await import('url')
     const { renderPage } = await import('./render')
     const { render } = await import(pathToFileURL(entryPath).toString())
-    while (true) {
-      const page = await pageAlloc()
-      if (!page) break
-      await renderPage(render, page, context)
+    async function executor() {
+      while (true) {
+        const page = await pageAlloc()
+        if (!page) break
+        await renderPage(render, page, context)
+      }
     }
+    await Promise.all(Array.from({ length: concurrency * 4 }, () => executor()))
   } catch (e) {
     console.error(e)
   } finally {

From 541ad0a2ca7a82ebc4f80f18d5ff669872f97e63 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Sat, 30 Dec 2023 11:15:00 -0500
Subject: [PATCH 12/43] cleanup logic, improve perf

---
 src/node/build/render-worker.ts | 14 ++++++++++----
 src/node/siteConfig.ts          |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/node/build/render-worker.ts b/src/node/build/render-worker.ts
index 04ce2773..8f8c890d 100644
--- a/src/node/build/render-worker.ts
+++ b/src/node/build/render-worker.ts
@@ -12,7 +12,14 @@ export default async function cluster(
   pages: string[],
   update: UpdateHandle
 ) {
-  const concurrency = context.config.buildConcurrency || 1
+  // - Each render worker could consume up to 150% of a CPU core.
+  // - One extra core is allocated to the main thread.
+  // - Excess worker will cause too much RPC workload for main thread,
+  //   therefore harm the overall performance.
+  const concurrency = Math.round(
+    Math.max((context.config.buildConcurrency - 1) / 1.5, 1)
+  )
+
   const num_tasks = pages.length
 
   const pageAlloc: TaskAllocator<string> = async () => {
@@ -52,12 +59,10 @@ async function renderWorker() {
   const ctx = new RpcContext(parentPort!)
   try {
     const {
-      concurrency,
       entryPath,
       pageAlloc,
       context
     }: {
-      concurrency: number
       entryPath: string
       pageAlloc: TaskAllocator<string>
       context: RenderPageContext
@@ -72,7 +77,8 @@ async function renderWorker() {
         await renderPage(render, page, context)
       }
     }
-    await Promise.all(Array.from({ length: concurrency * 4 }, () => executor()))
+    const concurrency = Math.max(context.config.buildConcurrency, 1)
+    await Promise.all(Array.from({ length: concurrency }, () => executor()))
   } catch (e) {
     console.error(e)
   } finally {
diff --git a/src/node/siteConfig.ts b/src/node/siteConfig.ts
index 21b99bce..92bae1d0 100644
--- a/src/node/siteConfig.ts
+++ b/src/node/siteConfig.ts
@@ -152,7 +152,7 @@ export interface UserConfig<ThemeConfig = any>
    * A lower number will reduce the memory usage but will increase the build time.
    *
    * @experimental
-   * @default 64
+   * @default "Number of CPU cores available"
    */
   buildConcurrency?: number
 

From 8c429b447342eb315b45871673e1253ec5eaf9f3 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Sat, 30 Dec 2023 12:39:24 -0500
Subject: [PATCH 13/43] revert rollup.config:  manualChunks not helpful

---
 rollup.config.ts | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/rollup.config.ts b/rollup.config.ts
index 40478c70..83fb93ec 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -46,26 +46,12 @@ const plugins = [
   json()
 ]
 
-const node_root = r('src/node/')
-
 const esmBuild: RollupOptions = {
   input: [r('src/node/index.ts'), r('src/node/cli.ts')],
   output: {
     format: 'esm',
     entryFileNames: `[name].js`,
-    chunkFileNames(chunk) {
-      return `${chunk.name}-[hash].js`
-    },
-    manualChunks(id) {
-      // Chunk each worker into a separate file
-      if (!id.startsWith(node_root)) return
-      id = id.slice(node_root.length).replace(/^\//, '')
-      const match = /^.*\-worker(?=(\.(js|ts))?$)/i.exec(id)
-      if (match) {
-        const [name] = match
-        return name
-      }
-    },
+    chunkFileNames: 'serve-[hash].js',
     dir: r('dist/node'),
     sourcemap: DEV
   },

From ace515b3f9e4ea956271cad281855f3d9a168da7 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Sat, 30 Dec 2023 19:10:58 -0500
Subject: [PATCH 14/43] use picocolors instead of terminal control sequence for
 color marks

---
 src/node/utils/task.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index cd77d4fd..9ceb247a 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -1,8 +1,9 @@
 import ora from 'ora'
 import humanizeDuration from 'humanize-duration'
+import c from 'picocolors'
 
-export const okMark = '\x1b[32m✓\x1b[0m'
-export const failMark = '\x1b[31m✖\x1b[0m'
+export const okMark = c.green('✓')
+export const failMark = c.red('✖')
 
 export type UpdateHandle = (done: number, total?: number) => any
 

From 9195369746adc479d354e5d0362c265cc0d9894e Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Sat, 30 Dec 2023 19:32:02 -0500
Subject: [PATCH 15/43] expose updateHandle for subtasks

---
 src/node/utils/task.ts | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index 9ceb247a..1466454b 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -5,7 +5,17 @@ import c from 'picocolors'
 export const okMark = c.green('✓')
 export const failMark = c.red('✖')
 
-export type UpdateHandle = (done: number, total?: number) => any
+export type UpdateHandle = (
+  done?: number,
+  total?: number,
+  subtask?: string
+) => any
+
+let updateHandle: UpdateHandle | null = null
+
+export const updateCurrentTask: UpdateHandle = (...args) => {
+  updateHandle?.(...args)
+}
 
 export async function task<T>(
   taskName: string,
@@ -14,14 +24,17 @@ export async function task<T>(
   const spinner = ora({ discardStdin: false })
   spinner.start(taskName + '...')
 
-  const updateHandle: UpdateHandle = (done, total) => {
-    if (total === undefined) {
-      spinner.text = `${taskName} [ ${done} ]`
+  updateHandle = (done, total, subtask) => {
+    const taskFullName = subtask ? `${taskName} - ${subtask}` : taskName
+    if (done === undefined) {
+      spinner.text = taskFullName + '...'
+    } else if (total === undefined) {
+      spinner.text = `${taskFullName} [ ${done} ]`
     } else {
       // match length to display them in same width
       const _total = `${total}`
       const _done = `${done}`.padStart(_total.length, ' ')
-      spinner.text = `${taskName} [ ${_done} / ${_total} ]`
+      spinner.text = `${taskFullName} [ ${_done} / ${_total} ]`
     }
   }
 
@@ -34,6 +47,7 @@ export async function task<T>(
     success = false
     throw e
   } finally {
+    updateHandle = null
     const timeEnd = performance.now()
     const duration = humanizeDuration(timeEnd - timeStart, {
       maxDecimalPoints: 2

From 007fa592dafacaf8e16a3a550c85a1c4ef3eb3de Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Sat, 30 Dec 2023 20:24:54 -0500
Subject: [PATCH 16/43] build/bundle: use task return value passthrough

---
 src/node/build/bundle.ts | 63 ++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 159bb43c..8d19cee3 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -143,40 +143,41 @@ export async function bundle(
     configFile: config.vite?.configFile
   })
 
-  let clientResult!: Rollup.RollupOutput | null
-  let serverResult!: Rollup.RollupOutput
-
-  await task('building client + server bundles', async () => {
-    clientResult = config.mpa
-      ? null
-      : ((await build(await resolveViteConfig(false))) as Rollup.RollupOutput)
-    serverResult = (await build(
-      await resolveViteConfig(true)
-    )) as Rollup.RollupOutput
-  })
+  const serverResult = await task(
+    'building server bundle',
+    () => resolveViteConfig(true).then(build) as Promise<Rollup.RollupOutput>
+  )
 
-  if (config.mpa) {
-    // in MPA mode, we need to copy over the non-js asset files from the
-    // server build since there is no client-side build.
-    await Promise.all(
-      serverResult.output.map(async (chunk) => {
-        if (!chunk.fileName.endsWith('.js')) {
-          const tempPath = path.resolve(config.tempDir, chunk.fileName)
-          const outPath = path.resolve(config.outDir, chunk.fileName)
-          await fs.copy(tempPath, outPath)
+  const clientResult = !config.mpa
+    ? await task(
+        'building client bundle',
+        () =>
+          resolveViteConfig(false).then(build) as Promise<Rollup.RollupOutput>
+      )
+    : await task('building client bundle (MPA)', async () => {
+        // in MPA mode, we need to copy over the non-js asset files from the
+        // server build since there is no client-side build.
+        await Promise.all(
+          serverResult.output.map(async (chunk) => {
+            if (!chunk.fileName.endsWith('.js')) {
+              const tempPath = path.resolve(config.tempDir, chunk.fileName)
+              const outPath = path.resolve(config.outDir, chunk.fileName)
+              await fs.copy(tempPath, outPath)
+            }
+          })
+        )
+        // also copy over public dir
+        const publicDir = path.resolve(config.srcDir, 'public')
+        if (fs.existsSync(publicDir)) {
+          await fs.copy(publicDir, config.outDir)
+        }
+        // build <script client> bundle
+        if (Object.keys(clientJSMap).length) {
+          return buildMPAClient(clientJSMap, config)
+        } else {
+          return null
         }
       })
-    )
-    // also copy over public dir
-    const publicDir = path.resolve(config.srcDir, 'public')
-    if (fs.existsSync(publicDir)) {
-      await fs.copy(publicDir, config.outDir)
-    }
-    // build <script client> bundle
-    if (Object.keys(clientJSMap).length) {
-      clientResult = await buildMPAClient(clientJSMap, config)
-    }
-  }
 
   return { clientResult, serverResult, pageToHashMap }
 }

From 25ca443e27c60ad375420397e38fd72bb0b45aeb Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Tue, 2 Jan 2024 22:34:39 -0500
Subject: [PATCH 17/43] infrastructure: worker context and dispatch manager

---
 package.json            |   1 +
 pnpm-lock.yaml          |   7 +++
 src/node/build/build.ts |   6 +++
 src/node/config.ts      |   3 +-
 src/node/server.ts      |   4 ++
 src/node/siteConfig.ts  |  13 +++++
 src/node/utils/queue.ts |  36 +++++++++++++
 src/node/worker.ts      | 114 ++++++++++++++++++++++++++++++++++++++++
 8 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 src/node/utils/queue.ts
 create mode 100644 src/node/worker.ts

diff --git a/package.json b/package.json
index 75c2c130..7bedad70 100644
--- a/package.json
+++ b/package.json
@@ -191,6 +191,7 @@
     "rollup": "^4.9.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
+    "rpc-magic-proxy": "0.0.0-beta.3",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 114185c9..1360b0f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -273,6 +273,9 @@ importers:
       rollup-plugin-esbuild:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.2)(supports-color@9.4.0)
+      rpc-magic-proxy:
+        specifier: 0.0.0-beta.3
+        version: 0.0.0-beta.3
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -3890,6 +3893,10 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.2
       fsevents: 2.3.3
 
+  /rpc-magic-proxy@0.0.0-beta.3:
+    resolution: {integrity: sha512-k1hVDnaX4TBxVWpW6tRoc3qCyuuJ8luOeK4ArqkFJKinBa0yVnZzgYVtvLzC9iWnVzNKIQNNsxkth445nKWL1Q==}
+    dev: true
+
   /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 8d5cf937..336f106c 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -16,6 +16,7 @@ import { bundle } from './bundle'
 import { generateSitemap } from './generateSitemap'
 import { renderPage } from './render'
 import humanizeDuration from 'humanize-duration'
+import { launchWorkers, waitWorkers } from '../worker'
 
 export async function build(
   root?: string,
@@ -27,6 +28,9 @@ export async function build(
   const siteConfig = await resolveConfig(root, 'build', 'production')
   const unlinkVue = linkVue()
 
+  if (siteConfig.parallel)
+    launchWorkers(siteConfig.buildConcurrency, { config: siteConfig })
+
   if (buildOptions.base) {
     siteConfig.site.base = buildOptions.base
     delete buildOptions.base
@@ -147,6 +151,8 @@ export async function build(
   await siteConfig.buildEnd?.(siteConfig)
   clearCache()
 
+  if (siteConfig.parallel) await waitWorkers()
+
   const timeEnd = performance.now()
   const duration = humanizeDuration(timeEnd - timeStart, {
     maxDecimalPoints: 2
diff --git a/src/node/config.ts b/src/node/config.ts
index 6d1bbd49..585933de 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -143,7 +143,8 @@ export async function resolveConfig(
     rewrites,
     userConfig,
     sitemap: userConfig.sitemap,
-    buildConcurrency: userConfig.buildConcurrency ?? 64
+    buildConcurrency: userConfig.buildConcurrency ?? 64,
+    parallel: userConfig.parallel ?? true
   }
 
   // to be shared with content loaders
diff --git a/src/node/server.ts b/src/node/server.ts
index 4105edfe..8e6f2349 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -1,6 +1,7 @@
 import { createServer as createViteServer, type ServerOptions } from 'vite'
 import { resolveConfig } from './config'
 import { createVitePressPlugin } from './plugin'
+import { launchWorkers } from './worker'
 
 export async function createServer(
   root: string = process.cwd(),
@@ -9,6 +10,9 @@ export async function createServer(
 ) {
   const config = await resolveConfig(root)
 
+  if (config.parallel)
+    launchWorkers(config.buildConcurrency, { config: config })
+
   if (serverOptions.base) {
     config.site.base = serverOptions.base
     delete serverOptions.base
diff --git a/src/node/siteConfig.ts b/src/node/siteConfig.ts
index 74174280..3ba79649 100644
--- a/src/node/siteConfig.ts
+++ b/src/node/siteConfig.ts
@@ -156,6 +156,18 @@ export interface UserConfig<ThemeConfig = any>
    */
   buildConcurrency?: number
 
+  /**
+   * This option is the general switch for enabling parallel computing. When
+   * enabled, vitepress will create worker threads and distribute workload to
+   * them. Currently, the following features are supported:
+   * 1. Parallel SPA Bundling
+   * 2. Parallel SSR Rendering
+   * 3. Parallel Local Search Indexing (when using default splitter)
+   * @experimental
+   * @default true
+   */
+  parallel?: boolean
+
   /**
    * @experimental
    *
@@ -250,4 +262,5 @@ export interface SiteConfig<ThemeConfig = any>
   logger: Logger
   userConfig: UserConfig
   buildConcurrency: number
+  parallel: boolean
 }
diff --git a/src/node/utils/queue.ts b/src/node/utils/queue.ts
new file mode 100644
index 00000000..26a8123e
--- /dev/null
+++ b/src/node/utils/queue.ts
@@ -0,0 +1,36 @@
+// Asynchronous queue with a close method
+export default class Queue<T> {
+  private queue: Array<T> = []
+  private pending: Array<(data: T | null) => void> = []
+  #closed: boolean = false
+
+  get closed() {
+    return this.#closed
+  }
+
+  async *items() {
+    while (true) {
+      const item = await this.dequeue()
+      if (item === null) break
+      yield item
+    }
+  }
+
+  enqueue(data: T) {
+    if (this.closed)
+      throw new Error(`Failed to enqueue ${data}, queue already closed`)
+    if (this.pending.length) this.pending.shift()!(data)
+    else this.queue.push(data)
+  }
+
+  async dequeue(): Promise<T | null> {
+    if (this.closed) return null
+    if (this.queue.length) return this.queue.shift()!
+    return new Promise((res) => this.pending.push(res))
+  }
+
+  close() {
+    this.#closed = true
+    for (const res of this.pending) res(null)
+  }
+}
diff --git a/src/node/worker.ts b/src/node/worker.ts
new file mode 100644
index 00000000..359af0df
--- /dev/null
+++ b/src/node/worker.ts
@@ -0,0 +1,114 @@
+import { Worker, isMainThread, parentPort, workerData } from 'worker_threads'
+import RpcContext from 'rpc-magic-proxy'
+import Queue from './utils/queue'
+
+const WORKER_MAGIC = '::vitepress::build-worker::'
+
+interface WorkerTask {
+  name: string
+  argv: any[]
+  resolve: (retVal: any) => void
+  reject: (error?: any) => void
+}
+
+/*=============================== Main Thread ===============================*/
+
+// Owned by main thread, will be distributed to workers
+const taskQueue = new Queue<WorkerTask>()
+
+// This function will be exposed to workers via magic proxy
+function getNextTask() {
+  return taskQueue.dequeue()
+}
+
+export function dispatchWork(name: string, ...argv: any[]): Promise<any> {
+  return new Promise((resolve, reject) =>
+    taskQueue.enqueue({ name, argv, resolve, reject })
+  )
+}
+
+const workers: Worker[] = []
+
+export async function launchWorkers(numWorkers: number, context: Object) {
+  const ctx = new RpcContext()
+  const workerData = await ctx.serialize({
+    [WORKER_MAGIC]: '',
+    getNextTask,
+    context
+  })
+  for (let i = 0; i < numWorkers; i++) {
+    const worker = new Worker(new URL(import.meta.url), { workerData })
+    ctx.bind(worker)
+    workers.push(worker)
+  }
+}
+
+export function updateContext(context: Object) {
+  for (const worker of workers) {
+    worker.postMessage({
+      [WORKER_MAGIC]: 'update/context',
+      context
+    })
+  }
+}
+
+// Wait for workers to drain the taskQueue and exit.
+export function waitWorkers() {
+  const allClosed = workers.map(
+    (w) => new Promise((res) => w.once('exit', res))
+  )
+  taskQueue.close()
+  return Promise.all(allClosed)
+}
+
+/*============================== Worker Thread ==============================*/
+
+const registry: Map<string, { main: Function; init?: Function }> = new Map()
+
+export function registerWorkload(
+  name: string,
+  main: (...argv: any[]) => any,
+  init?: () => void
+) {
+  // Only register workload in worker threads
+  if (isMainThread) return
+  if (registry.has(name)) {
+    throw new Error(`Workload "${name}" already registered.`)
+  }
+  registry.set(name, { main, init })
+}
+
+// Will keep querying next workload from main thread
+async function workerMain() {
+  const ctx = new RpcContext(parentPort!)
+  const {
+    getNextTask,
+    context
+  }: {
+    getNextTask: () => Promise<WorkerTask | null>
+    context: Object
+  } = ctx.deserialize(workerData)
+
+  parentPort!.on('message', (msg) => {
+    if (msg?.[WORKER_MAGIC] === 'update/context') {
+      Object.assign(context, msg.context)
+    }
+  })
+
+  while (true) {
+    const task = await getNextTask()
+    if (task === null) break
+    const { name, argv, resolve, reject } = task
+    if (!registry.has(name)) throw new Error(`No task "${name}" registered.`)
+    const { main, init } = registry.get(name)!
+    if (init) {
+      init.apply(context)
+      delete registry.get(name)!.init
+    }
+    await (main.apply(context, argv) as Promise<any>).then(resolve, reject)
+  }
+  ctx.reset()
+  process.exit(0)
+}
+
+if (!isMainThread && WORKER_MAGIC in workerData) workerMain()

From e7c0a82c24fb03d1dc306943fd023f228379750f Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Tue, 2 Jan 2024 22:40:09 -0500
Subject: [PATCH 18/43] feat: report subtask progress without a spinner

---
 src/node/utils/task.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index 1466454b..2ab921e3 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -4,6 +4,7 @@ import c from 'picocolors'
 
 export const okMark = c.green('✓')
 export const failMark = c.red('✖')
+export const clearLine = '\x1b[2K\r'
 
 export type UpdateHandle = (
   done?: number,
@@ -14,7 +15,17 @@ export type UpdateHandle = (
 let updateHandle: UpdateHandle | null = null
 
 export const updateCurrentTask: UpdateHandle = (...args) => {
-  updateHandle?.(...args)
+  if (updateHandle) updateHandle(...args)
+  else if (!process.stderr.isTTY) {
+    return
+  } else if (args.length === 0) {
+    process.stderr.write(clearLine)
+  } else {
+    const name = args[2] || 'unknown task'
+    process.stderr.write(
+      `${clearLine}${name} [${args.slice(0, 2).join(' / ')}]`
+    )
+  }
 }
 
 export async function task<T>(

From cc101a7095dd2e379b3262f0470bd711de1ff152 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Tue, 2 Jan 2024 23:17:02 -0500
Subject: [PATCH 19/43] fix outdated pnpm lock file

---
 package.json   | 2 +-
 pnpm-lock.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index cdb3e00e..40496dc4 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,6 @@
     "focus-trap": "^7.5.4",
     "mark.js": "8.11.1",
     "minisearch": "^6.3.0",
-    "rpc-magic-proxy": "0.0.0-beta.1",
     "shikiji": "^0.9.16",
     "shikiji-core": "^0.9.16",
     "shikiji-transformers": "^0.9.16",
@@ -191,6 +190,7 @@
     "rollup": "^4.9.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
+    "rpc-magic-proxy": "0.0.0-beta.3",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f771e798..3189a375 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,9 +41,6 @@ importers:
       minisearch:
         specifier: ^6.3.0
         version: 6.3.0
-      rpc-magic-proxy:
-        specifier: 0.0.0-beta.3
-        version: 0.0.0-beta.3
       shikiji:
         specifier: ^0.9.16
         version: 0.9.16
@@ -273,6 +270,9 @@ importers:
       rollup-plugin-esbuild:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.2)(supports-color@9.4.0)
+      rpc-magic-proxy:
+        specifier: 0.0.0-beta.3
+        version: 0.0.0-beta.3
       semver:
         specifier: ^7.5.4
         version: 7.5.4

From 2449ffc67009cec2d73ec422dcd927ce68c61059 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Tue, 2 Jan 2024 23:17:47 -0500
Subject: [PATCH 20/43] fix merge errors

---
 src/node/build/build.ts         | 7 +++++--
 src/node/build/render-worker.ts | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 8d42e732..924ff5f0 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -53,7 +53,10 @@ export async function build(
     }
 
     await task('rendering pages', async (updateProgress) => {
-      const entryPath = pathToFileURL(path.join(siteConfig.tempDir, 'app.js')).toString() + '?t=' + Date.now()
+      const entryPath =
+        pathToFileURL(path.join(siteConfig.tempDir, 'app.js')).toString() +
+        '?t=' +
+        Date.now()
 
       const appChunk =
         clientResult &&
@@ -126,7 +129,7 @@ export async function build(
         await cluster(entryPath, context, pages, updateProgress)
       } else {
         let count_done = 0
-        const { render } = await import(pathToFileURL(entryPath).toString())
+        const { render } = await import(entryPath)
         await pMap(
           pages,
           async (page) => {
diff --git a/src/node/build/render-worker.ts b/src/node/build/render-worker.ts
index 8f8c890d..48dfad13 100644
--- a/src/node/build/render-worker.ts
+++ b/src/node/build/render-worker.ts
@@ -67,9 +67,8 @@ async function renderWorker() {
       pageAlloc: TaskAllocator<string>
       context: RenderPageContext
     } = ctx.deserialize(workerData)
-    const { pathToFileURL } = await import('url')
     const { renderPage } = await import('./render')
-    const { render } = await import(pathToFileURL(entryPath).toString())
+    const { render } = await import(entryPath)
     async function executor() {
       while (true) {
         const page = await pageAlloc()

From 9d5aedc8017beb3a348fb7c8a1a667026bdceccf Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 3 Jan 2024 00:03:10 -0500
Subject: [PATCH 21/43] perf(localSearch): Use JSDOM for section split, adapt
 to worker API

---
 package.json                          |   3 +
 src/node/plugins/localSearchPlugin.ts | 165 ++++++++++++++++++--------
 2 files changed, 119 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index 7bedad70..6c127ae8 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,7 @@
     "@vueuse/core": "^10.7.1",
     "@vueuse/integrations": "^10.7.1",
     "focus-trap": "^7.5.4",
+    "jsdom": "^23.0.1",
     "mark.js": "8.11.1",
     "minisearch": "^6.3.0",
     "mrmime": "^2.0.0",
@@ -139,6 +140,7 @@
     "@types/escape-html": "^1.0.4",
     "@types/fs-extra": "^11.0.4",
     "@types/humanize-duration": "^3.27.3",
+    "@types/jsdom": "^21.1.6",
     "@types/lodash.template": "^4.5.3",
     "@types/mark.js": "^8.11.12",
     "@types/markdown-it-attrs": "^4.1.3",
@@ -155,6 +157,7 @@
     "conventional-changelog-cli": "^4.1.0",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
+    "dom-traverse": "^0.0.1",
     "esbuild": "^0.19.11",
     "escape-html": "^1.0.3",
     "execa": "^8.0.1",
diff --git a/src/node/plugins/localSearchPlugin.ts b/src/node/plugins/localSearchPlugin.ts
index e94eafb7..b71a9dfd 100644
--- a/src/node/plugins/localSearchPlugin.ts
+++ b/src/node/plugins/localSearchPlugin.ts
@@ -13,6 +13,10 @@ import {
   type MarkdownEnv
 } from '../shared'
 import { processIncludes } from '../utils/processIncludes'
+import { updateCurrentTask } from '../utils/task'
+import type { PageSplitSection } from '../../../types/local-search'
+import { registerWorkload, dispatchWork } from '../worker'
+import Queue from '../utils/queue'
 
 const debug = _debug('vitepress:local-search')
 
@@ -122,7 +126,16 @@ export async function localSearchPlugin(
     return id
   }
 
-  async function indexFile(page: string) {
+  function scanForLocales() {
+    for (const page of siteConfig.pages) {
+      const file = path.join(siteConfig.srcDir, page)
+      const locale = getLocaleForPath(file)
+      // dry-fetch the index for this locale
+      getIndexByLocale(locale)
+    }
+  }
+
+  async function indexFile(page: string, parallel: boolean = false) {
     const file = path.join(siteConfig.srcDir, page)
     // get file metadata
     const fileId = getDocId(file)
@@ -133,8 +146,10 @@ export async function localSearchPlugin(
     const sections =
       // user provided generator
       (await options.miniSearch?._splitIntoSections?.(file, html)) ??
+      // default implementation (parallel)
+      (parallel ? parallelSplitter(html, fileId) : undefined) ??
       // default implementation
-      splitPageIntoSections(html)
+      splitPageIntoSections(html, fileId)
     // add sections to the locale index
     for await (const section of sections) {
       if (!section || !(section.text || section.titles)) break
@@ -149,14 +164,27 @@ export async function localSearchPlugin(
     }
   }
 
-  async function scanForBuild() {
-    debug('🔍️ Indexing files for search...')
-    await pMap(siteConfig.pages, indexFile, {
-      concurrency: siteConfig.buildConcurrency
-    })
-    debug('✅ Indexing finished...')
+  async function indexAll() {
+    const concurrency = siteConfig.buildConcurrency
+    let numIndexed = 0
+
+    const updateProgress = () =>
+      updateCurrentTask(
+        ++numIndexed,
+        siteConfig.pages.length,
+        'indexing local search'
+      )
+    await pMap(
+      siteConfig.pages,
+      (page) => indexFile(page, siteConfig.parallel).then(updateProgress),
+      { concurrency }
+    )
+
+    updateCurrentTask()
   }
 
+  let indexAllPromise: Promise<void> | undefined
+
   return {
     name: 'vitepress:local-search',
 
@@ -172,7 +200,6 @@ export async function localSearchPlugin(
 
     async configureServer(_server) {
       server = _server
-      await scanForBuild()
       onIndexUpdated()
     },
 
@@ -184,25 +211,23 @@ export async function localSearchPlugin(
 
     async load(id) {
       if (id === LOCAL_SEARCH_INDEX_REQUEST_PATH) {
-        if (process.env.NODE_ENV === 'production') {
-          await scanForBuild()
-        }
+        console.log('\n🔍️ load', id)
+        scanForLocales()
         let records: string[] = []
         for (const [locale] of indexByLocales) {
           records.push(
             `${JSON.stringify(
               locale
-            )}: () => import('@localSearchIndex${locale}')`
+            )}: () => import('${LOCAL_SEARCH_INDEX_ID}-${locale}')`
           )
         }
         return `export default {${records.join(',')}}`
       } else if (id.startsWith(LOCAL_SEARCH_INDEX_REQUEST_PATH)) {
+        console.log('\n🔍️ load', id)
+        const locale = id.slice(LOCAL_SEARCH_INDEX_REQUEST_PATH.length + 1)
+        await (indexAllPromise ??= indexAll())
         return `export default ${JSON.stringify(
-          JSON.stringify(
-            indexByLocales.get(
-              id.replace(LOCAL_SEARCH_INDEX_REQUEST_PATH, '')
-            ) ?? {}
-          )
+          JSON.stringify(indexByLocales.get(locale) ?? {})
         )}`
       }
     },
@@ -217,40 +242,82 @@ export async function localSearchPlugin(
   }
 }
 
-const headingRegex = /<h(\d*).*?>(.*?<a.*? href="#.*?".*?>.*?<\/a>)<\/h\1>/gi
-const headingContentRegex = /(.*?)<a.*? href="#(.*?)".*?>.*?<\/a>/i
-
-/**
- * Splits HTML into sections based on headings
- */
-function* splitPageIntoSections(html: string) {
-  const result = html.split(headingRegex)
-  result.shift()
-  let parentTitles: string[] = []
-  for (let i = 0; i < result.length; i += 3) {
-    const level = parseInt(result[i]) - 1
-    const heading = result[i + 1]
-    const headingResult = headingContentRegex.exec(heading)
-    const title = clearHtmlTags(headingResult?.[1] ?? '').trim()
-    const anchor = headingResult?.[2] ?? ''
-    const content = result[i + 2]
-    if (!title || !content) continue
-    const titles = parentTitles.slice(0, level)
-    titles[level] = title
-    yield { anchor, titles, text: getSearchableText(content) }
-    if (level === 0) {
-      parentTitles = [title]
-    } else {
-      parentTitles[level] = title
+async function* splitPageIntoSections(html: string, fileId: string) {
+  const { JSDOM } = await import('jsdom')
+  const { default: traverse, Node } = await import('dom-traverse')
+  const dom = JSDOM.fragment(html)
+  // Stack of title hierarchy for current working section
+  const titleStack: Array<{ level: number; text: string }> = []
+  // Set of all used ids (for duplicate id detection)
+  const existingIdSet = new Set()
+  // Current working section
+  let section: PageSplitSection = { text: '', titles: [''] }
+  function submit() {
+    section.text = section.text.replace(/\W+/gs, ' ').trim()
+    return section
+  }
+  // Traverse the DOM
+  for (const [node, skipChildren] of traverse.skippable(dom)) {
+    if (node.nodeType === Node.ELEMENT_NODE) {
+      const el = node as Element
+      if (!/^H\d+$/i.test(el.tagName)) continue
+      if (!el.hasAttribute('id')) continue
+      const id = el.getAttribute('id')!
+      if (existingIdSet.has(id)) {
+        console.error(`\x1b[2K\r⚠️  Duplicate heading id "${id}" in ${fileId}`)
+        continue
+      }
+      existingIdSet.add(id)
+      // Submit previous section
+      if (section.text || section.anchor) yield submit()
+      // Pop adjacent titles depending on level
+      const level = parseInt(el.tagName.slice(1))
+      while (titleStack.length > 0) {
+        if (titleStack.at(-1)!.level >= level) titleStack.pop()
+        else break
+      }
+      titleStack.push({ level, text: el.textContent ?? '' })
+      // Create new section
+      section = {
+        text: '',
+        anchor: id,
+        titles: titleStack.map((_) => _.text)
+      }
+      skipChildren()
+    } else if (node.nodeType === Node.TEXT_NODE) {
+      // Collect text content
+      section.text += node.textContent
     }
   }
+  // Submit last section
+  yield submit()
 }
 
-function getSearchableText(content: string) {
-  content = clearHtmlTags(content)
-  return content
+// Worker proxy in main thread
+function parallelSplitter(html: string, fileId: string) {
+  const queue = new Queue<PageSplitSection>()
+  dispatchWork(
+    'local-search::split',
+    html,
+    fileId,
+    queue.enqueue.bind(queue),
+    queue.close.bind(queue)
+  )
+  return queue.items()
 }
 
-function clearHtmlTags(str: string) {
-  return str.replace(/<[^>]*>/g, '')
-}
+// Worker proxy in worker thread
+registerWorkload(
+  'local-search::split',
+  async (
+    html: string,
+    fileId: string,
+    _yield: (section: PageSplitSection) => Promise<void>,
+    _end: () => Promise<void>
+  ) => {
+    for await (const section of splitPageIntoSections(html, fileId)) {
+      await _yield(section)
+    }
+    await _end()
+  }
+)

From 3a720eb7e2c66ca836b3d53aa1ad6c741c50fb62 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 3 Jan 2024 00:20:10 -0500
Subject: [PATCH 22/43] refactor localSearch: clean up code

---
 src/node/plugins/localSearchPlugin.ts | 30 +++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/node/plugins/localSearchPlugin.ts b/src/node/plugins/localSearchPlugin.ts
index b71a9dfd..88d0f543 100644
--- a/src/node/plugins/localSearchPlugin.ts
+++ b/src/node/plugins/localSearchPlugin.ts
@@ -13,10 +13,8 @@ import {
   type MarkdownEnv
 } from '../shared'
 import { processIncludes } from '../utils/processIncludes'
-import { updateCurrentTask } from '../utils/task'
+import { updateCurrentTask, clearLine } from '../utils/task'
 import type { PageSplitSection } from '../../../types/local-search'
-import { registerWorkload, dispatchWork } from '../worker'
-import Queue from '../utils/queue'
 
 const debug = _debug('vitepress:local-search')
 
@@ -242,7 +240,10 @@ export async function localSearchPlugin(
   }
 }
 
-async function* splitPageIntoSections(html: string, fileId: string) {
+async function* splitPageIntoSections(
+  html: string,
+  pageName: string = 'Unknown Document'
+) {
   const { JSDOM } = await import('jsdom')
   const { default: traverse, Node } = await import('dom-traverse')
   const dom = JSDOM.fragment(html)
@@ -252,10 +253,6 @@ async function* splitPageIntoSections(html: string, fileId: string) {
   const existingIdSet = new Set()
   // Current working section
   let section: PageSplitSection = { text: '', titles: [''] }
-  function submit() {
-    section.text = section.text.replace(/\W+/gs, ' ').trim()
-    return section
-  }
   // Traverse the DOM
   for (const [node, skipChildren] of traverse.skippable(dom)) {
     if (node.nodeType === Node.ELEMENT_NODE) {
@@ -263,13 +260,16 @@ async function* splitPageIntoSections(html: string, fileId: string) {
       if (!/^H\d+$/i.test(el.tagName)) continue
       if (!el.hasAttribute('id')) continue
       const id = el.getAttribute('id')!
+      // Skip duplicate id, content will be treated as normal text
       if (existingIdSet.has(id)) {
-        console.error(`\x1b[2K\r⚠️  Duplicate heading id "${id}" in ${fileId}`)
+        console.error(
+          `${clearLine}⚠️  Duplicate heading id "${id}" in ${pageName}`
+        )
         continue
       }
       existingIdSet.add(id)
       // Submit previous section
-      if (section.text || section.anchor) yield submit()
+      if (section.text || section.anchor) yield section
       // Pop adjacent titles depending on level
       const level = parseInt(el.tagName.slice(1))
       while (titleStack.length > 0) {
@@ -290,10 +290,14 @@ async function* splitPageIntoSections(html: string, fileId: string) {
     }
   }
   // Submit last section
-  yield submit()
+  yield section
 }
 
-// Worker proxy in main thread
+/*=============================== Worker API ===============================*/
+import { registerWorkload, dispatchWork } from '../worker'
+import Queue from '../utils/queue'
+
+// Worker proxy (main thread)
 function parallelSplitter(html: string, fileId: string) {
   const queue = new Queue<PageSplitSection>()
   dispatchWork(
@@ -306,7 +310,7 @@ function parallelSplitter(html: string, fileId: string) {
   return queue.items()
 }
 
-// Worker proxy in worker thread
+// Worker proxy (worker thread)
 registerWorkload(
   'local-search::split',
   async (

From 14262087b9c2bd2b3d06dba939c6b166dac4b43c Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 3 Jan 2024 00:20:50 -0500
Subject: [PATCH 23/43] update pnpm lock file

---
 pnpm-lock.yaml | 235 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 223 insertions(+), 12 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3189a375..8ab80fe3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,6 +35,9 @@ importers:
       focus-trap:
         specifier: ^7.5.4
         version: 7.5.4
+      jsdom:
+        specifier: ^23.0.1
+        version: 23.0.1(supports-color@9.4.0)
       mark.js:
         specifier: 8.11.1
         version: 8.11.1
@@ -114,6 +117,9 @@ importers:
       '@types/humanize-duration':
         specifier: ^3.27.3
         version: 3.27.3
+      '@types/jsdom':
+        specifier: ^21.1.6
+        version: 21.1.6
       '@types/lodash.template':
         specifier: ^4.5.3
         version: 4.5.3
@@ -162,6 +168,9 @@ importers:
       debug:
         specifier: ^4.3.4
         version: 4.3.4(supports-color@9.4.0)
+      dom-traverse:
+        specifier: ^0.0.1
+        version: 0.0.1
       esbuild:
         specifier: ^0.19.11
         version: 0.19.11
@@ -293,7 +302,7 @@ importers:
         version: 5.3.3
       vitest:
         specifier: ^1.1.1
-        version: 1.1.1(@types/node@20.10.6)(supports-color@9.4.0)
+        version: 1.1.1(@types/node@20.10.6)(jsdom@23.0.1)(supports-color@9.4.0)
       vue-tsc:
         specifier: ^1.8.27
         version: 1.8.27(typescript@5.3.3)
@@ -1162,6 +1171,14 @@ packages:
       '@types/sizzle': 2.3.8
     dev: true
 
+  /@types/jsdom@21.1.6:
+    resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
+    dependencies:
+      '@types/node': 20.10.6
+      '@types/tough-cookie': 4.0.5
+      parse5: 7.1.2
+    dev: true
+
   /@types/jsonfile@6.1.4:
     resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==}
     dependencies:
@@ -1299,6 +1316,10 @@ packages:
     resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==}
     dev: true
 
+  /@types/tough-cookie@4.0.5:
+    resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
+    dev: true
+
   /@types/web-bluetooth@0.0.20:
     resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
     dev: false
@@ -1571,6 +1592,14 @@ packages:
     resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==}
     dev: true
 
+  /agent-base@7.1.0(supports-color@9.4.0):
+    resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
+    engines: {node: '>= 14'}
+    dependencies:
+      debug: 4.3.4(supports-color@9.4.0)
+    transitivePeerDependencies:
+      - supports-color
+
   /algoliasearch@4.22.0:
     resolution: {integrity: sha512-gfceltjkwh7PxXwtkS8KVvdfK+TSNQAWUeNSxf4dA29qW5tf2EGwa8jkJujlT9jLm17cixMVoGNc+GJFO1Mxhg==}
     dependencies:
@@ -1688,7 +1717,6 @@ packages:
 
   /asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-    dev: true
 
   /available-typed-arrays@1.0.5:
     resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
@@ -1882,7 +1910,6 @@ packages:
     engines: {node: '>= 0.8'}
     dependencies:
       delayed-stream: 1.0.0
-    dev: true
 
   /commander@11.1.0:
     resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
@@ -2104,6 +2131,12 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
+  /cssstyle@3.0.0:
+    resolution: {integrity: sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==}
+    engines: {node: '>=14'}
+    dependencies:
+      rrweb-cssom: 0.6.0
+
   /csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
     dev: false
@@ -2113,6 +2146,13 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
+  /data-urls@5.0.0:
+    resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
+    engines: {node: '>=18'}
+    dependencies:
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.0.0
+
   /de-indent@1.0.2:
     resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
     dev: true
@@ -2140,7 +2180,9 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 9.4.0
-    dev: true
+
+  /decimal.js@10.4.3:
+    resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
 
   /deep-eql@4.1.3:
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
@@ -2175,7 +2217,6 @@ packages:
   /delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
-    dev: true
 
   /diff-sequences@29.6.3:
     resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
@@ -2190,6 +2231,10 @@ packages:
       entities: 2.2.0
     dev: true
 
+  /dom-traverse@0.0.1:
+    resolution: {integrity: sha512-NH2OTY2d0oma7Xpf+iVgF1CJVMMi2sgrF80tqOovW62lgrl+5/C2+UyshS2crg7bJdn1bkY6iZnRwNS4WVVQTw==}
+    dev: true
+
   /domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
     dev: true
@@ -2480,7 +2525,6 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
-    dev: true
 
   /fs-extra@11.2.0:
     resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
@@ -2706,6 +2750,12 @@ packages:
       lru-cache: 10.1.0
     dev: true
 
+  /html-encoding-sniffer@4.0.0:
+    resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      whatwg-encoding: 3.1.1
+
   /htmlparser2@5.0.1:
     resolution: {integrity: sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==}
     dependencies:
@@ -2724,6 +2774,24 @@ packages:
       entities: 2.2.0
     dev: true
 
+  /http-proxy-agent@7.0.0(supports-color@9.4.0):
+    resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
+    engines: {node: '>= 14'}
+    dependencies:
+      agent-base: 7.1.0(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@9.4.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  /https-proxy-agent@7.0.2(supports-color@9.4.0):
+    resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
+    engines: {node: '>= 14'}
+    dependencies:
+      agent-base: 7.1.0(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@9.4.0)
+    transitivePeerDependencies:
+      - supports-color
+
   /human-signals@5.0.0:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
     engines: {node: '>=16.17.0'}
@@ -2733,6 +2801,12 @@ packages:
     resolution: {integrity: sha512-fRrehgBG26NNZysRlTq1S+HPtDpp3u+Jzdc/d5A4cEzOD86YLAkDaJyJg8krSdCi7CJ+s7ht3fwRj8Dl+Btd0w==}
     dev: true
 
+  /iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      safer-buffer: 2.1.2
+
   /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     dependencies:
@@ -2876,6 +2950,9 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
   /is-reference@1.2.1:
     resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
     dependencies:
@@ -2985,6 +3062,41 @@ packages:
       esprima: 4.0.1
     dev: true
 
+  /jsdom@23.0.1(supports-color@9.4.0):
+    resolution: {integrity: sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      canvas: ^2.11.2
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+    dependencies:
+      cssstyle: 3.0.0
+      data-urls: 5.0.0
+      decimal.js: 10.4.3
+      form-data: 4.0.0
+      html-encoding-sniffer: 4.0.0
+      http-proxy-agent: 7.0.0(supports-color@9.4.0)
+      https-proxy-agent: 7.0.2(supports-color@9.4.0)
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.7
+      parse5: 7.1.2
+      rrweb-cssom: 0.6.0
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.3
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 3.1.1
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.0.0
+      ws: 8.16.0
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
   /json-parse-better-errors@1.0.2:
     resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
     dev: true
@@ -3278,14 +3390,12 @@ packages:
   /mime-db@1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
-    dev: true
 
   /mime-types@2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
     dependencies:
       mime-db: 1.52.0
-    dev: true
 
   /mime@2.6.0:
     resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
@@ -3360,7 +3470,6 @@ packages:
 
   /ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-    dev: true
 
   /muggle-string@0.3.1:
     resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
@@ -3455,6 +3564,9 @@ packages:
       boolbase: 1.0.0
     dev: true
 
+  /nwsapi@2.2.7:
+    resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
+
   /object-inspect@1.13.1:
     resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
     dev: true
@@ -3569,6 +3681,11 @@ packages:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
     dev: true
 
+  /parse5@7.1.2:
+    resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
+    dependencies:
+      entities: 4.5.0
+
   /path-browserify@1.0.1:
     resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
     dev: true
@@ -3735,6 +3852,9 @@ packages:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
     dev: true
 
+  /psl@1.9.0:
+    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
+
   /punycode.js@2.3.1:
     resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
     engines: {node: '>=6'}
@@ -3743,7 +3863,9 @@ packages:
   /punycode@2.3.1:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
-    dev: true
+
+  /querystringify@2.2.0:
+    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
 
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
@@ -3802,6 +3924,9 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /requires-port@1.0.0:
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+
   /resolve-pkg-maps@1.0.0:
     resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
     dev: true
@@ -3895,6 +4020,9 @@ packages:
     resolution: {integrity: sha512-k1hVDnaX4TBxVWpW6tRoc3qCyuuJ8luOeK4ArqkFJKinBa0yVnZzgYVtvLzC9iWnVzNKIQNNsxkth445nKWL1Q==}
     dev: true
 
+  /rrweb-cssom@0.6.0:
+    resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
+
   /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
@@ -3929,10 +4057,19 @@ packages:
       is-regex: 1.1.4
     dev: true
 
+  /safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
   /sax@1.3.0:
     resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==}
     dev: true
 
+  /saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+    dependencies:
+      xmlchars: 2.2.0
+
   /section-matter@1.0.0:
     resolution: {integrity: sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==}
     engines: {node: '>=4'}
@@ -4266,13 +4403,15 @@ packages:
   /supports-color@9.4.0:
     resolution: {integrity: sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==}
     engines: {node: '>=12'}
-    dev: true
 
   /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
     dev: true
 
+  /symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+
   /tabbable@6.2.0:
     resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==}
     dev: false
@@ -4328,10 +4467,25 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /tough-cookie@4.1.3:
+    resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
+    engines: {node: '>=6'}
+    dependencies:
+      psl: 1.9.0
+      punycode: 2.3.1
+      universalify: 0.2.0
+      url-parse: 1.5.10
+
   /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
     dev: true
 
+  /tr46@5.0.0:
+    resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
+    engines: {node: '>=18'}
+    dependencies:
+      punycode: 2.3.1
+
   /trouter@3.2.1:
     resolution: {integrity: sha512-oY3CmIiEYOe1YMEzh++I67lrNOUldtCeuLL0vRPydvQLHZpSJ03B5dgDFlpFsiriMq6e//NDjjopjUzXOztHow==}
     engines: {node: '>=6'}
@@ -4429,11 +4583,21 @@ packages:
   /undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
+  /universalify@0.2.0:
+    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
+    engines: {node: '>= 4.0.0'}
+
   /universalify@2.0.1:
     resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
     engines: {node: '>= 10.0.0'}
     dev: true
 
+  /url-parse@1.5.10:
+    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+    dependencies:
+      querystringify: 2.2.0
+      requires-port: 1.0.0
+
   /valid-data-url@3.0.1:
     resolution: {integrity: sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==}
     engines: {node: '>=10'}
@@ -4507,7 +4671,7 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vitest@1.1.1(@types/node@20.10.6)(supports-color@9.4.0):
+  /vitest@1.1.1(@types/node@20.10.6)(jsdom@23.0.1)(supports-color@9.4.0):
     resolution: {integrity: sha512-Ry2qs4UOu/KjpXVfOCfQkTnwSXYGrqTbBZxw6reIYEFjSy1QUARRg5pxiI5BEXy+kBVntxUYNMlq4Co+2vD3fQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -4543,6 +4707,7 @@ packages:
       chai: 4.3.10
       debug: 4.3.4(supports-color@9.4.0)
       execa: 8.0.1
+      jsdom: 23.0.1(supports-color@9.4.0)
       local-pkg: 0.5.0
       magic-string: 0.30.5
       pathe: 1.1.1
@@ -4614,6 +4779,12 @@ packages:
       typescript: 5.3.3
     dev: false
 
+  /w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
+    dependencies:
+      xml-name-validator: 5.0.0
+
   /wait-on@7.2.0(debug@4.3.4):
     resolution: {integrity: sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==}
     engines: {node: '>=12.0.0'}
@@ -4646,6 +4817,27 @@ packages:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
     dev: true
 
+  /webidl-conversions@7.0.0:
+    resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
+    engines: {node: '>=12'}
+
+  /whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      iconv-lite: 0.6.3
+
+  /whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+
+  /whatwg-url@14.0.0:
+    resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==}
+    engines: {node: '>=18'}
+    dependencies:
+      tr46: 5.0.0
+      webidl-conversions: 7.0.0
+
   /whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
     dependencies:
@@ -4737,6 +4929,25 @@ packages:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
     dev: true
 
+  /ws@8.16.0:
+    resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  /xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+
+  /xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
   /xmldom-sre@0.1.31:
     resolution: {integrity: sha512-f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw==}
     engines: {node: '>=0.1'}

From d86be7ae232f2710efde2622e97432df4923cf92 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 3 Jan 2024 05:23:03 -0500
Subject: [PATCH 24/43] render and mini search splitter both working under the
 new API

---
 package.json                          |  2 +-
 pnpm-lock.yaml                        |  8 +--
 src/node/build/build.ts               | 53 ++++++++++++-----
 src/node/build/render-worker.ts       |  4 +-
 src/node/config.ts                    |  4 +-
 src/node/plugins/localSearchPlugin.ts |  6 +-
 src/node/server.ts                    |  3 +-
 src/node/siteConfig.ts                |  7 ++-
 src/node/worker.ts                    | 85 +++++++++++++++++++--------
 9 files changed, 115 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index 108c6de0..83a6532b 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "rollup": "^4.9.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
-    "rpc-magic-proxy": "0.0.0-beta.3",
+    "rpc-magic-proxy": "^1.0.2",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8ab80fe3..34b61d87 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -280,8 +280,8 @@ importers:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.2)(supports-color@9.4.0)
       rpc-magic-proxy:
-        specifier: 0.0.0-beta.3
-        version: 0.0.0-beta.3
+        specifier: ^1.0.2
+        version: 1.0.2
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -4016,8 +4016,8 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.2
       fsevents: 2.3.3
 
-  /rpc-magic-proxy@0.0.0-beta.3:
-    resolution: {integrity: sha512-k1hVDnaX4TBxVWpW6tRoc3qCyuuJ8luOeK4ArqkFJKinBa0yVnZzgYVtvLzC9iWnVzNKIQNNsxkth445nKWL1Q==}
+  /rpc-magic-proxy@1.0.2:
+    resolution: {integrity: sha512-JsYJRMVi1rbkcA3ByfuwdkfB2eTXWrmTy4PM6ayQiqTiG6gWaV3hQD4EpHrCFw8CHqmqGNFPMe3iOWvqM071PA==}
     dev: true
 
   /rrweb-cssom@0.6.0:
diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 526d4850..53b90f00 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -9,7 +9,7 @@ import { pathToFileURL } from 'url'
 import type { BuildOptions, Rollup } from 'vite'
 import { resolveConfig, type SiteConfig } from '../config'
 import { clearCache } from '../markdownToVue'
-import { slash, type HeadConfig } from '../shared'
+import { slash, type HeadConfig, type SSGContext } from '../shared'
 import { deserializeFunctions, serializeFunctions } from '../utils/fnSerialize'
 import { task } from '../utils/task'
 import { bundle } from './bundle'
@@ -17,6 +17,23 @@ import { generateSitemap } from './generateSitemap'
 import { renderPage, type RenderPageContext } from './render'
 import humanizeDuration from 'humanize-duration'
 import { launchWorkers, waitWorkers } from '../worker'
+import { registerWorkload, updateContext, dispatchWork } from '../worker'
+
+type RenderFn = (path: string) => Promise<SSGContext>
+
+// Worker proxy (worker thread)
+registerWorkload(
+  'build::render-page',
+  function workload(
+    this: RenderPageContext & { render: RenderFn },
+    page: string
+  ) {
+    return renderPage(this.render, page, this)
+  },
+  async function init(this: { renderEntry: string; render: RenderFn }) {
+    this.render = (await import(this.renderEntry)).render as RenderFn
+  }
+)
 
 export async function build(
   root?: string,
@@ -29,7 +46,7 @@ export async function build(
   const unlinkVue = linkVue()
 
   if (siteConfig.parallel)
-    launchWorkers(siteConfig.buildConcurrency, { config: siteConfig })
+    launchWorkers(siteConfig.concurrency, { config: siteConfig })
 
   if (buildOptions.base) {
     siteConfig.site.base = buildOptions.base
@@ -57,7 +74,7 @@ export async function build(
     }
 
     await task('rendering pages', async (updateProgress) => {
-      const entryPath =
+      const renderEntry =
         pathToFileURL(path.join(siteConfig.tempDir, 'app.js')).toString() +
         '?t=' +
         Date.now()
@@ -126,23 +143,27 @@ export async function build(
         additionalHeadTags
       }
 
-      const pages = ['404.md', ...siteConfig.pages]
+      let task: (page: string) => Promise<void>
 
       if (siteConfig.parallel) {
-        const { default: cluster } = await import('./render-worker')
-        await cluster(entryPath, context, pages, updateProgress)
+        const { config, ...additionalContext } = context
+        await updateContext({ renderEntry, ...additionalContext })
+        console.log('all context updated')
+        task = (page) => dispatchWork('build::render-page', page)
       } else {
-        let count_done = 0
-        const { render } = await import(entryPath)
-        await pMap(
-          pages,
-          async (page) => {
-            await renderPage(render, page, context)
-            updateProgress(++count_done, pages.length)
-          },
-          { concurrency: siteConfig.buildConcurrency }
-        )
+        const { render } = await import(renderEntry)
+        task = (page) => renderPage(render, page, context)
       }
+
+      const pages = ['404.md', ...siteConfig.pages]
+      let count_done = 0
+      await pMap(
+        pages,
+        (page) => task(page).then(updateProgress(++count_done, pages.length)),
+        {
+          concurrency: siteConfig.concurrency
+        }
+      )
     })
 
     // emit page hash map for the case where a user session is open
diff --git a/src/node/build/render-worker.ts b/src/node/build/render-worker.ts
index 48dfad13..ab799093 100644
--- a/src/node/build/render-worker.ts
+++ b/src/node/build/render-worker.ts
@@ -17,7 +17,7 @@ export default async function cluster(
   // - Excess worker will cause too much RPC workload for main thread,
   //   therefore harm the overall performance.
   const concurrency = Math.round(
-    Math.max((context.config.buildConcurrency - 1) / 1.5, 1)
+    Math.max((context.config.concurrency - 1) / 1.5, 1)
   )
 
   const num_tasks = pages.length
@@ -76,7 +76,7 @@ async function renderWorker() {
         await renderPage(render, page, context)
       }
     }
-    const concurrency = Math.max(context.config.buildConcurrency, 1)
+    const concurrency = Math.max(context.config.concurrency, 1)
     await Promise.all(Array.from({ length: concurrency }, () => executor()))
   } catch (e) {
     console.error(e)
diff --git a/src/node/config.ts b/src/node/config.ts
index 9408d1fa..7a6aa084 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -144,8 +144,8 @@ export async function resolveConfig(
     rewrites,
     userConfig,
     sitemap: userConfig.sitemap,
-    buildConcurrency: Math.max(
-      userConfig.buildConcurrency ?? cpus().length,
+    concurrency: Math.max(
+      userConfig.concurrency ?? Math.round(cpus().length / 1.5),
       1 // At least one thread required
     ),
     parallel: userConfig.parallel ?? true
diff --git a/src/node/plugins/localSearchPlugin.ts b/src/node/plugins/localSearchPlugin.ts
index 88d0f543..6becb146 100644
--- a/src/node/plugins/localSearchPlugin.ts
+++ b/src/node/plugins/localSearchPlugin.ts
@@ -163,7 +163,7 @@ export async function localSearchPlugin(
   }
 
   async function indexAll() {
-    const concurrency = siteConfig.buildConcurrency
+    const concurrency = siteConfig.concurrency
     let numIndexed = 0
 
     const updateProgress = () =>
@@ -174,7 +174,7 @@ export async function localSearchPlugin(
       )
     await pMap(
       siteConfig.pages,
-      (page) => indexFile(page, siteConfig.parallel).then(updateProgress),
+      (page) => indexFile(page, !!siteConfig.parallel).then(updateProgress),
       { concurrency }
     )
 
@@ -209,7 +209,6 @@ export async function localSearchPlugin(
 
     async load(id) {
       if (id === LOCAL_SEARCH_INDEX_REQUEST_PATH) {
-        console.log('\n🔍️ load', id)
         scanForLocales()
         let records: string[] = []
         for (const [locale] of indexByLocales) {
@@ -221,7 +220,6 @@ export async function localSearchPlugin(
         }
         return `export default {${records.join(',')}}`
       } else if (id.startsWith(LOCAL_SEARCH_INDEX_REQUEST_PATH)) {
-        console.log('\n🔍️ load', id)
         const locale = id.slice(LOCAL_SEARCH_INDEX_REQUEST_PATH.length + 1)
         await (indexAllPromise ??= indexAll())
         return `export default ${JSON.stringify(
diff --git a/src/node/server.ts b/src/node/server.ts
index 8e6f2349..d1792edd 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -10,8 +10,7 @@ export async function createServer(
 ) {
   const config = await resolveConfig(root)
 
-  if (config.parallel)
-    launchWorkers(config.buildConcurrency, { config: config })
+  if (config.parallel) launchWorkers(config.concurrency, { config: config })
 
   if (serverOptions.base) {
     config.site.base = serverOptions.base
diff --git a/src/node/siteConfig.ts b/src/node/siteConfig.ts
index 7881993f..2a861aec 100644
--- a/src/node/siteConfig.ts
+++ b/src/node/siteConfig.ts
@@ -150,11 +150,12 @@ export interface UserConfig<ThemeConfig = any>
   /**
    * This option allows you to configure the concurrency of the build.
    * A lower number will reduce the memory usage but will increase the build time.
+   * When parallel is enabled, this option indicates the number of threads.
    *
    * @experimental
-   * @default "Number of CPU cores available"
+   * @default "Number of CPU cores available / 150%"
    */
-  buildConcurrency?: number
+  concurrency?: number
 
   /**
    * This option is the general switch for enabling parallel computing. When
@@ -261,6 +262,6 @@ export interface SiteConfig<ThemeConfig = any>
   }
   logger: Logger
   userConfig: UserConfig
-  buildConcurrency: number
+  concurrency: number
   parallel: boolean
 }
diff --git a/src/node/worker.ts b/src/node/worker.ts
index 359af0df..4b7e4e97 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -11,6 +11,25 @@ interface WorkerTask {
   reject: (error?: any) => void
 }
 
+interface WorkerHooks {
+  // Update worker's context
+  context: (ctx: Object | null) => void
+}
+
+function deferPromise<T>(): {
+  promise: Promise<T>
+  resolve: (val: T) => void
+  reject: (error?: any) => void
+} {
+  let resolve: (val: T) => void
+  let reject: (error?: any) => void
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res
+    reject = rej
+  })
+  return { promise, resolve: resolve!, reject: reject! }
+}
+
 /*=============================== Main Thread ===============================*/
 
 // Owned by main thread, will be distributed to workers
@@ -27,29 +46,35 @@ export function dispatchWork(name: string, ...argv: any[]): Promise<any> {
   )
 }
 
-const workers: Worker[] = []
+const workers: Array<Worker & { hooks: WorkerHooks }> = []
 
 export async function launchWorkers(numWorkers: number, context: Object) {
+  const allInitialized: Array<Promise<void>> = []
   const ctx = new RpcContext()
-  const workerData = await ctx.serialize({
-    [WORKER_MAGIC]: '',
-    getNextTask,
-    context
-  })
   for (let i = 0; i < numWorkers; i++) {
-    const worker = new Worker(new URL(import.meta.url), { workerData })
+    const { promise, resolve } = deferPromise<void>()
+    const initWorkerHooks = (hooks: WorkerHooks) => {
+      worker.hooks = hooks
+      resolve()
+    }
+    const payload = await ctx.serialize({
+      initWorkerHooks,
+      getNextTask,
+      context
+    })
+    const worker = new Worker(new URL(import.meta.url), {
+      workerData: { [WORKER_MAGIC]: payload }
+    }) as Worker & { hooks: WorkerHooks }
     ctx.bind(worker)
     workers.push(worker)
+    allInitialized.push(promise)
+    worker.on('error', console.error)
   }
+  await Promise.all(allInitialized)
 }
 
 export function updateContext(context: Object) {
-  for (const worker of workers) {
-    worker.postMessage({
-      [WORKER_MAGIC]: 'update/context',
-      context
-    })
-  }
+  return Promise.all(workers.map(({ hooks }) => hooks.context(context)))
 }
 
 // Wait for workers to drain the taskQueue and exit.
@@ -82,16 +107,20 @@ export function registerWorkload(
 async function workerMain() {
   const ctx = new RpcContext(parentPort!)
   const {
+    initWorkerHooks,
     getNextTask,
     context
   }: {
     getNextTask: () => Promise<WorkerTask | null>
+    initWorkerHooks: (hooks: Object) => Promise<void>
     context: Object
-  } = ctx.deserialize(workerData)
-
-  parentPort!.on('message', (msg) => {
-    if (msg?.[WORKER_MAGIC] === 'update/context') {
-      Object.assign(context, msg.context)
+  } = ctx.deserialize(workerData[WORKER_MAGIC])
+  // Upon worker initialization, report back the hooks that main thread can use
+  // to reach this worker.
+  await initWorkerHooks({
+    context(ctx: Object | null) {
+      if (ctx === null) for (const k in context) delete (context as any)[k]
+      else Object.assign(context, ctx)
     }
   })
 
@@ -100,15 +129,25 @@ async function workerMain() {
     if (task === null) break
     const { name, argv, resolve, reject } = task
     if (!registry.has(name)) throw new Error(`No task "${name}" registered.`)
-    const { main, init } = registry.get(name)!
+    const el = registry.get(name)!
+    const { main, init } = el
     if (init) {
-      init.apply(context)
-      delete registry.get(name)!.init
+      try {
+        await init.apply(context)
+      } catch (e) {
+        console.error(`worker: failed to init workload "${name}": ${e}`)
+      }
+      el.init = undefined
+    }
+    try {
+      resolve(await main.apply(context, argv))
+    } catch (e) {
+      console.error(`worker: task "${name}" error`, e)
+      reject(e)
     }
-    await (main.apply(context, argv) as Promise<any>).then(resolve, reject)
   }
+
   ctx.reset()
-  process.exit(0)
 }
 
 if (!isMainThread && WORKER_MAGIC in workerData) workerMain()

From 304a9e5352d120524e12ac4657fd98b9bf60a24c Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 3 Jan 2024 05:41:03 -0500
Subject: [PATCH 25/43] build: remove debug log

---
 src/node/build/build.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 53b90f00..8514988b 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -148,7 +148,6 @@ export async function build(
       if (siteConfig.parallel) {
         const { config, ...additionalContext } = context
         await updateContext({ renderEntry, ...additionalContext })
-        console.log('all context updated')
         task = (page) => dispatchWork('build::render-page', page)
       } else {
         const { render } = await import(renderEntry)

From 6f3d80e73ca7bfa0022f59b9475f261b069cb668 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Wed, 3 Jan 2024 06:32:47 -0500
Subject: [PATCH 26/43] remove unneeded file

---
 src/node/build/render-worker.ts | 88 ---------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 src/node/build/render-worker.ts

diff --git a/src/node/build/render-worker.ts b/src/node/build/render-worker.ts
deleted file mode 100644
index ab799093..00000000
--- a/src/node/build/render-worker.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Worker, workerData, isMainThread, parentPort } from 'worker_threads'
-import { type UpdateHandle } from '../utils/task'
-import { type RenderPageContext } from './render'
-
-type TaskAllocator<T> = () => Promise<T | undefined>
-
-import RpcContext from 'rpc-magic-proxy'
-
-export default async function cluster(
-  entryPath: string,
-  context: RenderPageContext,
-  pages: string[],
-  update: UpdateHandle
-) {
-  // - Each render worker could consume up to 150% of a CPU core.
-  // - One extra core is allocated to the main thread.
-  // - Excess worker will cause too much RPC workload for main thread,
-  //   therefore harm the overall performance.
-  const concurrency = Math.round(
-    Math.max((context.config.concurrency - 1) / 1.5, 1)
-  )
-
-  const num_tasks = pages.length
-
-  const pageAlloc: TaskAllocator<string> = async () => {
-    const page = pages.shift()
-    if (page) update(num_tasks - pages.length, num_tasks)
-    return page
-  }
-
-  const tasks = []
-
-  const ctx = new RpcContext()
-  const workerData = await ctx.serialize({
-    concurrency,
-    entryPath,
-    pageAlloc,
-    context,
-    workload: 'render'
-  })
-
-  for (let _ = 0; _ < concurrency; _++) {
-    const worker = new Worker(new URL(import.meta.url), { workerData })
-    ctx.bind(worker)
-    tasks.push(
-      new Promise((res, rej) =>
-        worker.once('exit', (code) => {
-          if (code === 0) res(code)
-          else rej()
-        })
-      )
-    )
-  }
-
-  await Promise.all(tasks)
-}
-
-async function renderWorker() {
-  const ctx = new RpcContext(parentPort!)
-  try {
-    const {
-      entryPath,
-      pageAlloc,
-      context
-    }: {
-      entryPath: string
-      pageAlloc: TaskAllocator<string>
-      context: RenderPageContext
-    } = ctx.deserialize(workerData)
-    const { renderPage } = await import('./render')
-    const { render } = await import(entryPath)
-    async function executor() {
-      while (true) {
-        const page = await pageAlloc()
-        if (!page) break
-        await renderPage(render, page, context)
-      }
-    }
-    const concurrency = Math.max(context.config.concurrency, 1)
-    await Promise.all(Array.from({ length: concurrency }, () => executor()))
-  } catch (e) {
-    console.error(e)
-  } finally {
-    ctx.reset()
-  }
-}
-
-if (!isMainThread && workerData?.workload === 'render') renderWorker()

From a45bae92ff8fea579dc7447f5d7a7f17561ff1a6 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Thu, 4 Jan 2024 04:51:29 -0500
Subject: [PATCH 27/43] upgrade rpc-magic-proxy to 1.0.3

---
 package.json   | 2 +-
 pnpm-lock.yaml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 83a6532b..36b19fa1 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "rollup": "^4.9.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
-    "rpc-magic-proxy": "^1.0.2",
+    "rpc-magic-proxy": "^1.0.3",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 34b61d87..7b9bd509 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -280,8 +280,8 @@ importers:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.2)(supports-color@9.4.0)
       rpc-magic-proxy:
-        specifier: ^1.0.2
-        version: 1.0.2
+        specifier: ^1.0.3
+        version: 1.0.3
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -4016,8 +4016,8 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.2
       fsevents: 2.3.3
 
-  /rpc-magic-proxy@1.0.2:
-    resolution: {integrity: sha512-JsYJRMVi1rbkcA3ByfuwdkfB2eTXWrmTy4PM6ayQiqTiG6gWaV3hQD4EpHrCFw8CHqmqGNFPMe3iOWvqM071PA==}
+  /rpc-magic-proxy@1.0.3:
+    resolution: {integrity: sha512-g4d9A3byHcht4YoF+IB44476w/ZlFMFkzUdwfvUpAzFS5MWQnerG6EaFI5Y5dsIbTabwHnmcbiwOGCusVNaFmA==}
     dev: true
 
   /rrweb-cssom@0.6.0:

From 3479538d5d244aaeb4240caf87f0ed91a846248f Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Thu, 4 Jan 2024 05:34:14 -0500
Subject: [PATCH 28/43] upgrade rpc-magic-proxy to 1.0.4

---
 package.json   | 2 +-
 pnpm-lock.yaml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 36b19fa1..a3d541e6 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "rollup": "^4.9.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
-    "rpc-magic-proxy": "^1.0.3",
+    "rpc-magic-proxy": "^1.0.4",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7b9bd509..b8c812d7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -280,8 +280,8 @@ importers:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.2)(supports-color@9.4.0)
       rpc-magic-proxy:
-        specifier: ^1.0.3
-        version: 1.0.3
+        specifier: ^1.0.4
+        version: 1.0.4
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -4016,8 +4016,8 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.2
       fsevents: 2.3.3
 
-  /rpc-magic-proxy@1.0.3:
-    resolution: {integrity: sha512-g4d9A3byHcht4YoF+IB44476w/ZlFMFkzUdwfvUpAzFS5MWQnerG6EaFI5Y5dsIbTabwHnmcbiwOGCusVNaFmA==}
+  /rpc-magic-proxy@1.0.4:
+    resolution: {integrity: sha512-NBlP+nhif5hOKi76FZP/O4TvJgzGK9AuyDJTd/MeYQD0vlpzmKGa6Uy2sdTOeYBW2KMPlJqmTFDpxuaxEAIs9w==}
     dev: true
 
   /rrweb-cssom@0.6.0:

From d79465ab10f09004d3da15893e8103e36d978a26 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Thu, 4 Jan 2024 06:12:03 -0500
Subject: [PATCH 29/43] everything is working !!!

---
 src/node/build/build.ts               |  35 +--
 src/node/build/bundle.ts              | 308 ++++++--------------------
 src/node/build/viteConfig.ts          | 223 +++++++++++++++++++
 src/node/markdownToVue.ts             |   9 +-
 src/node/plugins/localSearchPlugin.ts |  38 ++--
 src/node/utils/task.ts                |  12 +-
 src/node/worker.ts                    | 134 +++++++----
 7 files changed, 439 insertions(+), 320 deletions(-)
 create mode 100644 src/node/build/viteConfig.ts

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 8514988b..23aec78d 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -17,20 +17,26 @@ import { generateSitemap } from './generateSitemap'
 import { renderPage, type RenderPageContext } from './render'
 import humanizeDuration from 'humanize-duration'
 import { launchWorkers, waitWorkers } from '../worker'
-import { registerWorkload, updateContext, dispatchWork } from '../worker'
+import { registerWorkload, updateContext } from '../worker'
 
 type RenderFn = (path: string) => Promise<SSGContext>
 
+// Worker: workload functions will be called with `this` context
+export interface WorkerContext {
+  config: SiteConfig
+  options: BuildOptions
+}
+
 // Worker proxy (worker thread)
-registerWorkload(
-  'build::render-page',
-  function workload(
-    this: RenderPageContext & { render: RenderFn },
-    page: string
-  ) {
+const dispatchRenderPageWork = registerWorkload(
+  'build:render-page',
+  function (page: string) {
     return renderPage(this.render, page, this)
   },
-  async function init(this: { renderEntry: string; render: RenderFn }) {
+  async function init(
+    this: WorkerContext &
+      RenderPageContext & { render: RenderFn; renderEntry: string }
+  ) {
     this.render = (await import(this.renderEntry)).render as RenderFn
   }
 )
@@ -46,7 +52,10 @@ export async function build(
   const unlinkVue = linkVue()
 
   if (siteConfig.parallel)
-    launchWorkers(siteConfig.concurrency, { config: siteConfig })
+    launchWorkers(siteConfig.concurrency, {
+      config: siteConfig,
+      options: buildOptions
+    })
 
   if (buildOptions.base) {
     siteConfig.site.base = buildOptions.base
@@ -64,9 +73,9 @@ export async function build(
   }
 
   try {
-    const { clientResult, serverResult, pageToHashMap } = await bundle(
-      siteConfig,
-      buildOptions
+    const { clientResult, serverResult, pageToHashMap } = await task(
+      'building client + server bundles',
+      () => bundle(siteConfig, buildOptions)
     )
 
     if (process.env.BUNDLE_ONLY) {
@@ -148,7 +157,7 @@ export async function build(
       if (siteConfig.parallel) {
         const { config, ...additionalContext } = context
         await updateContext({ renderEntry, ...additionalContext })
-        task = (page) => dispatchWork('build::render-page', page)
+        task = (page) => dispatchRenderPageWork(page)
       } else {
         const { render } = await import(renderEntry)
         task = (page) => renderPage(render, page, context)
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 9e145cb7..65d64a46 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -1,38 +1,59 @@
 import fs from 'fs-extra'
 import path from 'path'
-import { fileURLToPath } from 'url'
-import {
-  build,
-  normalizePath,
-  type BuildOptions,
-  type Rollup,
-  type InlineConfig as ViteInlineConfig
-} from 'vite'
-import { APP_PATH } from '../alias'
+import { build, type BuildOptions, type Rollup } from 'vite'
 import type { SiteConfig } from '../config'
-import { createVitePressPlugin } from '../plugin'
-import { escapeRegExp, sanitizeFileName, slash } from '../shared'
-import { task } from '../utils/task'
+import { updateCurrentTask } from '../utils/task'
 import { buildMPAClient } from './buildMPAClient'
+import { registerWorkload } from '../worker'
+import resolveViteConfig from './viteConfig'
+import { type WorkerContext } from './build'
+
+const dispatchBundleWorkload = registerWorkload('build:bundle', bundleWorkload)
+
+async function bundleWorkload(this: WorkerContext, ssr: boolean) {
+  const pageToHashMap = Object.create(null) as Record<string, string>
+  const clientJSMap = Object.create(null) as Record<string, string>
+  const result = (await build(
+    await resolveViteConfig(ssr, {
+      config: this.config,
+      options: this.options,
+      pageToHashMap,
+      clientJSMap
+    })
+  )) as Rollup.RollupOutput
+  return { result, pageToHashMap, clientJSMap }
+}
 
-// https://github.com/vitejs/vite/blob/d2aa0969ee316000d3b957d7e879f001e85e369e/packages/vite/src/node/plugins/splitVendorChunk.ts#L14
-const CSS_LANGS_RE =
-  /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/
-
-const clientDir = normalizePath(
-  path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../client')
-)
-
-// these deps are also being used in the client code (outside of the theme)
-// exclude them from the theme chunk so there is no circular dependency
-const excludedModules = [
-  '/@siteData',
-  'node_modules/@vueuse/core/',
-  'node_modules/@vueuse/shared/',
-  'node_modules/vue/',
-  'node_modules/vue-demi/',
-  clientDir
-]
+async function bundleMPA(
+  config: SiteConfig,
+  serverResult: Rollup.RollupOutput,
+  clientJSMap: Record<string, string>
+) {
+  updateCurrentTask(0, 1, 'bundling MPA')
+  // in MPA mode, we need to copy over the non-js asset files from the
+  // server build since there is no client-side build.
+  await Promise.all(
+    serverResult.output.map(async (chunk) => {
+      if (!chunk.fileName.endsWith('.js')) {
+        const tempPath = path.resolve(config.tempDir, chunk.fileName)
+        const outPath = path.resolve(config.outDir, chunk.fileName)
+        await fs.copy(tempPath, outPath)
+      }
+    })
+  )
+  // also copy over public dir
+  const publicDir = path.resolve(config.srcDir, 'public')
+  if (fs.existsSync(publicDir)) {
+    await fs.copy(publicDir, config.outDir)
+  }
+  updateCurrentTask()
+  // build <script client> bundle
+  if (Object.keys(clientJSMap).length) {
+    return buildMPAClient(clientJSMap, config)
+  } else {
+    return null
+  }
+}
 
 // bundles the VitePress app for both client AND server.
 export async function bundle(
@@ -46,216 +67,27 @@ export async function bundle(
   const pageToHashMap = Object.create(null)
   const clientJSMap = Object.create(null)
 
-  // define custom rollup input
-  // this is a multi-entry build - every page is considered an entry chunk
-  // the loading is done via filename conversion rules so that the
-  // metadata doesn't need to be included in the main chunk.
-  const input: Record<string, string> = {}
-  config.pages.forEach((file) => {
-    // page filename conversion
-    // foo/bar.md -> foo_bar.md
-    const alias = config.rewrites.map[file] || file
-    input[slash(alias).replace(/\//g, '_')] = path.resolve(config.srcDir, file)
-  })
-
-  const themeEntryRE = new RegExp(
-    `^${escapeRegExp(
-      path.resolve(config.themeDir, 'index.js').replace(/\\/g, '/')
-    ).slice(0, -2)}m?(j|t)s`
+  const [server, client] = await Promise.all(
+    config.parallel
+      ? [
+          dispatchBundleWorkload(true),
+          config.mpa ? null : dispatchBundleWorkload(false)
+        ]
+      : [
+          bundleWorkload.apply({ config, options }, [true]),
+          config.mpa ? null : bundleWorkload.apply({ config, options }, [false])
+        ]
   )
 
-  // resolve options to pass to vite
-  const { rollupOptions } = options
+  // Update maps
+  Object.assign(pageToHashMap, server.pageToHashMap, client?.pageToHashMap)
+  Object.assign(clientJSMap, server.clientJSMap, client?.clientJSMap)
 
-  const resolveViteConfig = async (
-    ssr: boolean
-  ): Promise<ViteInlineConfig> => ({
-    root: config.srcDir,
-    cacheDir: config.cacheDir,
-    base: config.site.base,
-    logLevel: config.vite?.logLevel ?? 'warn',
-    plugins: await createVitePressPlugin(
-      config,
-      ssr,
-      pageToHashMap,
-      clientJSMap
-    ),
-    ssr: {
-      noExternal: ['vitepress', '@docsearch/css']
-    },
-    build: {
-      ...options,
-      emptyOutDir: true,
-      ssr,
-      ssrEmitAssets: config.mpa,
-      // minify with esbuild in MPA mode (for CSS)
-      minify: ssr
-        ? config.mpa
-          ? 'esbuild'
-          : false
-        : typeof options.minify === 'boolean'
-          ? options.minify
-          : !process.env.DEBUG,
-      outDir: ssr ? config.tempDir : config.outDir,
-      cssCodeSplit: false,
-      rollupOptions: {
-        ...rollupOptions,
-        input: {
-          ...input,
-          // use different entry based on ssr or not
-          app: path.resolve(APP_PATH, ssr ? 'ssr.js' : 'index.js')
-        },
-        // important so that each page chunk and the index export things for each
-        // other
-        preserveEntrySignatures: 'allow-extension',
-        output: {
-          sanitizeFileName,
-          ...rollupOptions?.output,
-          assetFileNames: `${config.assetsDir}/[name].[hash].[ext]`,
-          ...(ssr
-            ? {
-                entryFileNames: '[name].js',
-                chunkFileNames: '[name].[hash].js'
-              }
-            : {
-                entryFileNames: `${config.assetsDir}/[name].[hash].js`,
-                chunkFileNames(chunk) {
-                  // avoid ads chunk being intercepted by adblock
-                  return /(?:Carbon|BuySell)Ads/.test(chunk.name)
-                    ? `${config.assetsDir}/chunks/ui-custom.[hash].js`
-                    : `${config.assetsDir}/chunks/[name].[hash].js`
-                },
-                manualChunks(id, ctx) {
-                  // move known framework code into a stable chunk so that
-                  // custom theme changes do not invalidate hash for all pages
-                  if (id.startsWith('\0vite')) {
-                    return 'framework'
-                  }
-                  if (id.includes('plugin-vue:export-helper')) {
-                    return 'framework'
-                  }
-                  if (
-                    id.includes(`${clientDir}/app`) &&
-                    id !== `${clientDir}/app/index.js`
-                  ) {
-                    return 'framework'
-                  }
-                  if (
-                    isEagerChunk(id, ctx.getModuleInfo) &&
-                    /@vue\/(runtime|shared|reactivity)/.test(id)
-                  ) {
-                    return 'framework'
-                  }
-
-                  if (
-                    (id.startsWith(`${clientDir}/theme-default`) ||
-                      !excludedModules.some((i) => id.includes(i))) &&
-                    staticImportedByEntry(
-                      id,
-                      ctx.getModuleInfo,
-                      cacheTheme,
-                      themeEntryRE
-                    )
-                  ) {
-                    return 'theme'
-                  }
-                }
-              })
-        }
-      }
-    },
-    configFile: config.vite?.configFile
-  })
-
-  const serverResult = await task(
-    'building server bundle',
-    () => resolveViteConfig(true).then(build) as Promise<Rollup.RollupOutput>
-  )
-
-  const clientResult = !config.mpa
-    ? await task(
-        'building client bundle',
-        () =>
-          resolveViteConfig(false).then(build) as Promise<Rollup.RollupOutput>
-      )
-    : await task('building client bundle (MPA)', async () => {
-        // in MPA mode, we need to copy over the non-js asset files from the
-        // server build since there is no client-side build.
-        await Promise.all(
-          serverResult.output.map(async (chunk) => {
-            if (!chunk.fileName.endsWith('.js')) {
-              const tempPath = path.resolve(config.tempDir, chunk.fileName)
-              const outPath = path.resolve(config.outDir, chunk.fileName)
-              await fs.copy(tempPath, outPath)
-            }
-          })
-        )
-        // also copy over public dir
-        const publicDir = path.resolve(config.srcDir, 'public')
-        if (fs.existsSync(publicDir)) {
-          await fs.copy(publicDir, config.outDir)
-        }
-        // build <script client> bundle
-        if (Object.keys(clientJSMap).length) {
-          return buildMPAClient(clientJSMap, config)
-        } else {
-          return null
-        }
-      })
-
-  return { clientResult, serverResult, pageToHashMap }
-}
-
-const cache = new Map<string, boolean>()
-const cacheTheme = new Map<string, boolean>()
-
-/**
- * Check if a module is statically imported by at least one entry.
- */
-function isEagerChunk(id: string, getModuleInfo: Rollup.GetModuleInfo) {
-  if (
-    id.includes('node_modules') &&
-    !CSS_LANGS_RE.test(id) &&
-    staticImportedByEntry(id, getModuleInfo, cache)
-  ) {
-    return true
+  return {
+    clientResult: config.mpa
+      ? await bundleMPA(config, server.result, clientJSMap)
+      : client?.result!,
+    serverResult: server.result,
+    pageToHashMap
   }
 }
-
-function staticImportedByEntry(
-  id: string,
-  getModuleInfo: Rollup.GetModuleInfo,
-  cache: Map<string, boolean>,
-  entryRE: RegExp | null = null,
-  importStack: string[] = []
-): boolean {
-  if (cache.has(id)) {
-    return !!cache.get(id)
-  }
-  if (importStack.includes(id)) {
-    // circular deps!
-    cache.set(id, false)
-    return false
-  }
-  const mod = getModuleInfo(id)
-  if (!mod) {
-    cache.set(id, false)
-    return false
-  }
-
-  if (entryRE ? entryRE.test(id) : mod.isEntry) {
-    cache.set(id, true)
-    return true
-  }
-  const someImporterIs = mod.importers.some((importer: string) =>
-    staticImportedByEntry(
-      importer,
-      getModuleInfo,
-      cache,
-      entryRE,
-      importStack.concat(id)
-    )
-  )
-  cache.set(id, someImporterIs)
-  return someImporterIs
-}
diff --git a/src/node/build/viteConfig.ts b/src/node/build/viteConfig.ts
new file mode 100644
index 00000000..1ab66883
--- /dev/null
+++ b/src/node/build/viteConfig.ts
@@ -0,0 +1,223 @@
+import path from 'path'
+import { fileURLToPath } from 'url'
+import {
+  normalizePath,
+  type BuildOptions,
+  type Rollup,
+  type InlineConfig as ViteInlineConfig
+} from 'vite'
+import { APP_PATH } from '../alias'
+import type { SiteConfig } from '../config'
+import { slash } from '../shared'
+import { createVitePressPlugin } from '../plugin'
+import { escapeRegExp, sanitizeFileName } from '../shared'
+
+// https://github.com/vitejs/vite/blob/d2aa0969ee316000d3b957d7e879f001e85e369e/packages/vite/src/node/plugins/splitVendorChunk.ts#L14
+const CSS_LANGS_RE =
+  /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/
+
+const clientDir = normalizePath(
+  path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../client')
+)
+
+// these deps are also being used in the client code (outside of the theme)
+// exclude them from the theme chunk so there is no circular dependency
+const excludedModules = [
+  '/@siteData',
+  'node_modules/@vueuse/core/',
+  'node_modules/@vueuse/shared/',
+  'node_modules/vue/',
+  'node_modules/vue-demi/',
+  clientDir
+]
+
+const themeEntryRE = (themeDir: string) =>
+  new RegExp(
+    `^${escapeRegExp(
+      path.resolve(themeDir, 'index.js').replace(/\\/g, '/')
+    ).slice(0, -2)}m?(j|t)s`
+  )
+
+const cache = new Map<string, boolean>()
+const cacheTheme = new Map<string, boolean>()
+
+/**
+ * Check if a module is statically imported by at least one entry.
+ */
+function isEagerChunk(id: string, getModuleInfo: Rollup.GetModuleInfo) {
+  if (
+    id.includes('node_modules') &&
+    !CSS_LANGS_RE.test(id) &&
+    staticImportedByEntry(id, getModuleInfo, cache)
+  ) {
+    return true
+  }
+}
+
+function staticImportedByEntry(
+  id: string,
+  getModuleInfo: Rollup.GetModuleInfo,
+  cache: Map<string, boolean>,
+  entryRE: RegExp | null = null,
+  importStack: string[] = []
+): boolean {
+  if (cache.has(id)) {
+    return !!cache.get(id)
+  }
+  if (importStack.includes(id)) {
+    // circular deps!
+    cache.set(id, false)
+    return false
+  }
+  const mod = getModuleInfo(id)
+  if (!mod) {
+    cache.set(id, false)
+    return false
+  }
+
+  if (entryRE ? entryRE.test(id) : mod.isEntry) {
+    cache.set(id, true)
+    return true
+  }
+  const someImporterIs = mod.importers.some((importer: string) =>
+    staticImportedByEntry(
+      importer,
+      getModuleInfo,
+      cache,
+      entryRE,
+      importStack.concat(id)
+    )
+  )
+  cache.set(id, someImporterIs)
+  return someImporterIs
+}
+
+// define custom rollup input
+// this is a multi-entry build - every page is considered an entry chunk
+// the loading is done via filename conversion rules so that the
+// metadata doesn't need to be included in the main chunk.
+const resolveInput = (config: SiteConfig) =>
+  Object.fromEntries(
+    config.pages.map((file) => {
+      // page filename conversion
+      // foo/bar.md -> foo_bar.md
+      const alias = config.rewrites.map[file] || file
+      return [
+        slash(alias).replace(/\//g, '_'),
+        path.resolve(config.srcDir, file)
+      ]
+    })
+  ) as Record<string, string>
+
+export default async function resolveViteConfig(
+  ssr: boolean,
+  {
+    config,
+    options,
+    pageToHashMap,
+    clientJSMap
+  }: {
+    config: SiteConfig
+    options: BuildOptions
+    pageToHashMap: Record<string, string>
+    clientJSMap: Record<string, string>
+  }
+): Promise<ViteInlineConfig> {
+  return {
+    root: config.srcDir,
+    cacheDir: config.cacheDir,
+    base: config.site.base,
+    logLevel: config.vite?.logLevel ?? 'warn',
+    plugins: await createVitePressPlugin(
+      config,
+      ssr,
+      pageToHashMap,
+      clientJSMap
+    ),
+    ssr: {
+      noExternal: ['vitepress', '@docsearch/css']
+    },
+    build: {
+      ...options,
+      emptyOutDir: true,
+      ssr,
+      ssrEmitAssets: config.mpa,
+      // minify with esbuild in MPA mode (for CSS)
+      minify: ssr
+        ? config.mpa
+          ? 'esbuild'
+          : false
+        : typeof options.minify === 'boolean'
+          ? options.minify
+          : !process.env.DEBUG,
+      outDir: ssr ? config.tempDir : config.outDir,
+      cssCodeSplit: false,
+      rollupOptions: {
+        ...options.rollupOptions,
+        input: {
+          ...resolveInput(config),
+          // use different entry based on ssr or not
+          app: path.resolve(APP_PATH, ssr ? 'ssr.js' : 'index.js')
+        },
+        // important so that each page chunk and the index export things for each
+        // other
+        preserveEntrySignatures: 'allow-extension',
+        output: {
+          sanitizeFileName,
+          ...options.rollupOptions?.output,
+          assetFileNames: `${config.assetsDir}/[name].[hash].[ext]`,
+          ...(ssr
+            ? {
+                entryFileNames: '[name].js',
+                chunkFileNames: '[name].[hash].js'
+              }
+            : {
+                entryFileNames: `${config.assetsDir}/[name].[hash].js`,
+                chunkFileNames(chunk) {
+                  // avoid ads chunk being intercepted by adblock
+                  return /(?:Carbon|BuySell)Ads/.test(chunk.name)
+                    ? `${config.assetsDir}/chunks/ui-custom.[hash].js`
+                    : `${config.assetsDir}/chunks/[name].[hash].js`
+                },
+                manualChunks(id, ctx) {
+                  // move known framework code into a stable chunk so that
+                  // custom theme changes do not invalidate hash for all pages
+                  if (id.startsWith('\0vite')) {
+                    return 'framework'
+                  }
+                  if (id.includes('plugin-vue:export-helper')) {
+                    return 'framework'
+                  }
+                  if (
+                    id.includes(`${clientDir}/app`) &&
+                    id !== `${clientDir}/app/index.js`
+                  ) {
+                    return 'framework'
+                  }
+                  if (
+                    isEagerChunk(id, ctx.getModuleInfo) &&
+                    /@vue\/(runtime|shared|reactivity)/.test(id)
+                  ) {
+                    return 'framework'
+                  }
+
+                  if (
+                    (id.startsWith(`${clientDir}/theme-default`) ||
+                      !excludedModules.some((i) => id.includes(i))) &&
+                    staticImportedByEntry(
+                      id,
+                      ctx.getModuleInfo,
+                      cacheTheme,
+                      themeEntryRE(config.themeDir)
+                    )
+                  ) {
+                    return 'theme'
+                  }
+                }
+              })
+        }
+      }
+    },
+    configFile: config.vite?.configFile
+  }
+}
diff --git a/src/node/markdownToVue.ts b/src/node/markdownToVue.ts
index fd3b0d88..0b102f43 100644
--- a/src/node/markdownToVue.ts
+++ b/src/node/markdownToVue.ts
@@ -72,10 +72,17 @@ export async function createMarkdownToVueRenderFn(
     const cacheKey = JSON.stringify({ src, file: fileOrig })
 
     if (isBuild || options.cache !== false) {
+      const metrics = {
+        lookUpTime: performance.now(),
+        keyLength: cacheKey.length
+      }
       const cached = cache.get(cacheKey)
+      metrics.lookUpTime = performance.now() - metrics.lookUpTime
       if (cached) {
-        debug(`[cache hit] ${relativePath}`)
+        debug(`[cache hit] ${relativePath} ${JSON.stringify(metrics)}`)
         return cached
+      } else {
+        debug(`[cache miss] ${relativePath} ${JSON.stringify(metrics)}`)
       }
     }
 
diff --git a/src/node/plugins/localSearchPlugin.ts b/src/node/plugins/localSearchPlugin.ts
index 6becb146..89efc896 100644
--- a/src/node/plugins/localSearchPlugin.ts
+++ b/src/node/plugins/localSearchPlugin.ts
@@ -10,7 +10,8 @@ import {
   resolveSiteDataByRoute,
   slash,
   type DefaultTheme,
-  type MarkdownEnv
+  type MarkdownEnv,
+  type Awaitable
 } from '../shared'
 import { processIncludes } from '../utils/processIncludes'
 import { updateCurrentTask, clearLine } from '../utils/task'
@@ -292,30 +293,17 @@ async function* splitPageIntoSections(
 }
 
 /*=============================== Worker API ===============================*/
-import { registerWorkload, dispatchWork } from '../worker'
+import { registerWorkload } from '../worker'
 import Queue from '../utils/queue'
 
-// Worker proxy (main thread)
-function parallelSplitter(html: string, fileId: string) {
-  const queue = new Queue<PageSplitSection>()
-  dispatchWork(
-    'local-search::split',
-    html,
-    fileId,
-    queue.enqueue.bind(queue),
-    queue.close.bind(queue)
-  )
-  return queue.items()
-}
-
 // Worker proxy (worker thread)
-registerWorkload(
-  'local-search::split',
+const dispatchPageSplitWork = registerWorkload(
+  'local-search:split',
   async (
     html: string,
     fileId: string,
-    _yield: (section: PageSplitSection) => Promise<void>,
-    _end: () => Promise<void>
+    _yield: (section: PageSplitSection) => Awaitable<void>,
+    _end: () => Awaitable<void>
   ) => {
     for await (const section of splitPageIntoSections(html, fileId)) {
       await _yield(section)
@@ -323,3 +311,15 @@ registerWorkload(
     await _end()
   }
 )
+
+// Worker proxy (main thread)
+function parallelSplitter(html: string, fileId: string) {
+  const queue = new Queue<PageSplitSection>()
+  dispatchPageSplitWork(
+    html,
+    fileId,
+    queue.enqueue.bind(queue),
+    queue.close.bind(queue)
+  )
+  return queue.items()
+}
diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index 2ab921e3..91779af4 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -1,6 +1,7 @@
 import ora from 'ora'
 import humanizeDuration from 'humanize-duration'
 import c from 'picocolors'
+import { workerMeta } from '../worker'
 
 export const okMark = c.green('✓')
 export const failMark = c.red('✖')
@@ -15,7 +16,8 @@ export type UpdateHandle = (
 let updateHandle: UpdateHandle | null = null
 
 export const updateCurrentTask: UpdateHandle = (...args) => {
-  if (updateHandle) updateHandle(...args)
+  if (workerMeta) workerMeta.updateCurrentTask(...args)
+  else if (updateHandle) updateHandle(...args)
   else if (!process.stderr.isTTY) {
     return
   } else if (args.length === 0) {
@@ -32,6 +34,14 @@ export async function task<T>(
   taskName: string,
   task: (update: UpdateHandle) => Promise<T>
 ): Promise<T> {
+  if (workerMeta) {
+    let retVal: T
+    await workerMeta.task(taskName, async (handle: UpdateHandle) => {
+      retVal = await task(handle)
+    })
+    return retVal!
+  }
+
   const spinner = ora({ discardStdin: false })
   spinner.start(taskName + '...')
 
diff --git a/src/node/worker.ts b/src/node/worker.ts
index 4b7e4e97..d30da076 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -1,9 +1,23 @@
 import { Worker, isMainThread, parentPort, workerData } from 'worker_threads'
-import RpcContext from 'rpc-magic-proxy'
+import RpcContext, { deferPromise } from 'rpc-magic-proxy'
+import { task, updateCurrentTask } from './utils/task'
 import Queue from './utils/queue'
-
-const WORKER_MAGIC = '::vitepress::build-worker::'
-
+import _debug from 'debug'
+
+let debug = _debug('vitepress:worker:main')
+const WORKER_MAGIC = 'vitepress:worker'
+
+function debugArgv(...argv: any[]) {
+  if (!debug.enabled) return ''
+  return argv
+    .map((v) => {
+      const t = typeof v
+      if (v?.length !== undefined) return `${t}[${v.length}]`
+      else return t
+    })
+    .join(', ')
+}
+/*=============================== Main Thread ===============================*/
 interface WorkerTask {
   name: string
   argv: any[]
@@ -11,60 +25,66 @@ interface WorkerTask {
   reject: (error?: any) => void
 }
 
-interface WorkerHooks {
-  // Update worker's context
-  context: (ctx: Object | null) => void
-}
-
-function deferPromise<T>(): {
-  promise: Promise<T>
-  resolve: (val: T) => void
-  reject: (error?: any) => void
-} {
-  let resolve: (val: T) => void
-  let reject: (error?: any) => void
-  const promise = new Promise<T>((res, rej) => {
-    resolve = res
-    reject = rej
-  })
-  return { promise, resolve: resolve!, reject: reject! }
-}
-
-/*=============================== Main Thread ===============================*/
-
 // Owned by main thread, will be distributed to workers
 const taskQueue = new Queue<WorkerTask>()
 
 // This function will be exposed to workers via magic proxy
-function getNextTask() {
-  return taskQueue.dequeue()
+async function getNextTask() {
+  const task = await taskQueue.dequeue()
+  if (task !== null) {
+    debug('[proxy] got task', task.name, '(', debugArgv(...task.argv), ')')
+  }
+  debugger
+  return task
 }
 
-export function dispatchWork(name: string, ...argv: any[]): Promise<any> {
-  return new Promise((resolve, reject) =>
-    taskQueue.enqueue({ name, argv, resolve, reject })
-  )
+function dispatchWork(name: string, ...argv: any[]): Promise<any> {
+  if (workerMeta) {
+    debug('dispatch', name, '(', debugArgv(...argv), ')')
+    return workerMeta.dispatchWork(name, ...argv)
+  } else {
+    debug('dispatch', name, '(', debugArgv(...argv), ')')
+    return new Promise((resolve, reject) =>
+      taskQueue.enqueue({ name, argv, resolve, reject })
+    )
+  }
 }
 
-const workers: Array<Worker & { hooks: WorkerHooks }> = []
+type WorkerWithHooks = Worker & {
+  hooks: {
+    // Update worker's context
+    updateContext: (ctx: Object | null) => void
+  }
+}
+
+const workers: Array<WorkerWithHooks> = []
 
 export async function launchWorkers(numWorkers: number, context: Object) {
   const allInitialized: Array<Promise<void>> = []
   const ctx = new RpcContext()
   for (let i = 0; i < numWorkers; i++) {
-    const { promise, resolve } = deferPromise<void>()
-    const initWorkerHooks = (hooks: WorkerHooks) => {
+    const workerId = (i + 1).toString().padStart(2, '0')
+    const { promise, resolve } = deferPromise()
+    const initWorkerHooks = (hooks: WorkerWithHooks['hooks']) => {
       worker.hooks = hooks
       resolve()
     }
+    const debug = _debug(`vitepress:worker:${workerId.padEnd(4)}`)
     const payload = await ctx.serialize({
+      workerMeta: {
+        workerId,
+        dispatchWork,
+        debug: debug.enabled ? debug : null,
+        task,
+        updateCurrentTask
+      } as typeof workerMeta,
       initWorkerHooks,
       getNextTask,
       context
     })
     const worker = new Worker(new URL(import.meta.url), {
       workerData: { [WORKER_MAGIC]: payload }
-    }) as Worker & { hooks: WorkerHooks }
+    }) as WorkerWithHooks
     ctx.bind(worker)
     workers.push(worker)
     allInitialized.push(promise)
@@ -74,7 +94,7 @@ export async function launchWorkers(numWorkers: number, context: Object) {
 }
 
 export function updateContext(context: Object) {
-  return Promise.all(workers.map(({ hooks }) => hooks.context(context)))
+  return Promise.all(workers.map(({ hooks }) => hooks.updateContext(context)))
 }
 
 // Wait for workers to drain the taskQueue and exit.
@@ -88,37 +108,54 @@ export function waitWorkers() {
 
 /*============================== Worker Thread ==============================*/
 
+export let workerMeta: {
+  workerId: string
+  dispatchWork: typeof dispatchWork
+  debug: typeof debug
+  task: typeof task
+  updateCurrentTask: typeof updateCurrentTask
+} | null = null
+
 const registry: Map<string, { main: Function; init?: Function }> = new Map()
 
-export function registerWorkload(
+export function registerWorkload<T extends Object, K extends any[], V>(
   name: string,
-  main: (...argv: any[]) => any,
-  init?: () => void
+  main: (this: T, ...args: K) => V,
+  init?: (this: T, ...args: void[]) => void
 ) {
-  // Only register workload in worker threads
-  if (isMainThread) return
-  if (registry.has(name)) {
-    throw new Error(`Workload "${name}" already registered.`)
+  if (!isMainThread) {
+    // Only register workload in worker threads
+    if (registry.has(name)) {
+      throw new Error(`Workload "${name}" already registered.`)
+    }
+    registry.set(name, { main, init })
   }
-  registry.set(name, { main, init })
+  return (...args: Parameters<typeof main>) =>
+    dispatchWork(name, ...args) as Promise<Awaited<ReturnType<typeof main>>>
 }
 
 // Will keep querying next workload from main thread
-async function workerMain() {
+async function workerMainLoop() {
   const ctx = new RpcContext(parentPort!)
   const {
+    workerMeta: _workerMeta,
     initWorkerHooks,
     getNextTask,
     context
   }: {
+    workerMeta: typeof workerMeta
     getNextTask: () => Promise<WorkerTask | null>
     initWorkerHooks: (hooks: Object) => Promise<void>
     context: Object
   } = ctx.deserialize(workerData[WORKER_MAGIC])
+  // Set up magic proxy to main thread dispatchWork
+  workerMeta = _workerMeta!
+  if (workerMeta.debug) debug = workerMeta.debug
+  else debug = (() => {}) as any as typeof debug
   // Upon worker initialization, report back the hooks that main thread can use
   // to reach this worker.
   await initWorkerHooks({
-    context(ctx: Object | null) {
+    updateContext(ctx: Object | null) {
       if (ctx === null) for (const k in context) delete (context as any)[k]
       else Object.assign(context, ctx)
     }
@@ -128,6 +165,7 @@ async function workerMain() {
     const task = await getNextTask()
     if (task === null) break
     const { name, argv, resolve, reject } = task
+    debug('got task', name, '(', debugArgv(...argv), ')')
     if (!registry.has(name)) throw new Error(`No task "${name}" registered.`)
     const el = registry.get(name)!
     const { main, init } = el
@@ -142,7 +180,7 @@ async function workerMain() {
     try {
       resolve(await main.apply(context, argv))
     } catch (e) {
-      console.error(`worker: task "${name}" error`, e)
+      console.error(`worker:${workerMeta.workerId}: task "${name}" error`, e)
       reject(e)
     }
   }
@@ -150,4 +188,4 @@ async function workerMain() {
   ctx.reset()
 }
 
-if (!isMainThread && WORKER_MAGIC in workerData) workerMain()
+if (!isMainThread && WORKER_MAGIC in workerData) workerMainLoop()

From 9307bbba75f4dad76337b3da8a9fa973b5108786 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Thu, 4 Jan 2024 13:21:13 -0500
Subject: [PATCH 30/43] fix: make contentLoader happy

---
 package.json             |  2 +-
 pnpm-lock.yaml           |  8 ++++----
 src/node/build/bundle.ts | 10 +++++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index a3d541e6..5c613b1a 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "rollup": "^4.9.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
-    "rpc-magic-proxy": "^1.0.4",
+    "rpc-magic-proxy": "^1.0.5",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b8c812d7..a58ef09f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -280,8 +280,8 @@ importers:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.2)(supports-color@9.4.0)
       rpc-magic-proxy:
-        specifier: ^1.0.4
-        version: 1.0.4
+        specifier: ^1.0.5
+        version: 1.0.5
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -4016,8 +4016,8 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.2
       fsevents: 2.3.3
 
-  /rpc-magic-proxy@1.0.4:
-    resolution: {integrity: sha512-NBlP+nhif5hOKi76FZP/O4TvJgzGK9AuyDJTd/MeYQD0vlpzmKGa6Uy2sdTOeYBW2KMPlJqmTFDpxuaxEAIs9w==}
+  /rpc-magic-proxy@1.0.5:
+    resolution: {integrity: sha512-fd9jbcTrde8F1Nb8+dbl17CYbtBOvzxgnZzYBZ8wV+hwEOZDFPiWvl3yfnJjnYXHmMNSadFkLAa/L9lUA4f8eQ==}
     dev: true
 
   /rrweb-cssom@0.6.0:
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 65d64a46..7aa928dd 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -8,7 +8,15 @@ import { registerWorkload } from '../worker'
 import resolveViteConfig from './viteConfig'
 import { type WorkerContext } from './build'
 
-const dispatchBundleWorkload = registerWorkload('build:bundle', bundleWorkload)
+const dispatchBundleWorkload = registerWorkload(
+  'build:bundle',
+  bundleWorkload,
+  function (this: WorkerContext) {
+    // To make contentLoader happy
+    // @ts-ignore
+    global.VITEPRESS_CONFIG = this.config
+  }
+)
 
 async function bundleWorkload(this: WorkerContext, ssr: boolean) {
   const pageToHashMap = Object.create(null) as Record<string, string>

From 8b8fe146dd254ed016bc510b920c1fb324458982 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Thu, 4 Jan 2024 13:21:55 -0500
Subject: [PATCH 31/43] dirty fix: bypass side effect of md.render()

---
 src/node/build/build.ts | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 23aec78d..e4fcf925 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -18,6 +18,8 @@ import { renderPage, type RenderPageContext } from './render'
 import humanizeDuration from 'humanize-duration'
 import { launchWorkers, waitWorkers } from '../worker'
 import { registerWorkload, updateContext } from '../worker'
+import { createMarkdownRenderer } from '../markdown/markdown'
+import type { DefaultTheme } from '../shared'
 
 type RenderFn = (path: string) => Promise<SSGContext>
 
@@ -51,11 +53,30 @@ export async function build(
   const siteConfig = await resolveConfig(root, 'build', 'production')
   const unlinkVue = linkVue()
 
-  if (siteConfig.parallel)
-    launchWorkers(siteConfig.concurrency, {
+  if (siteConfig.parallel) {
+    // Dirty fix: md.render() has side effects on env.
+    // When user provides a custom render function, it will be invoked in the
+    // main thread, but md.render will be called in the worker thread. The side
+    // effects on env will be lost. So we need to make _render a curry function,
+    // and use `md` provided in the main thread
+    const config = siteConfig as SiteConfig<DefaultTheme.Config>
+    const search = config.site?.themeConfig?.search
+    if (search?.provider === 'local' && search?.options?._render) {
+      const md = await createMarkdownRenderer(
+        config.srcDir,
+        config.markdown,
+        config.site.base,
+        config.logger
+      )
+      const _render = search.options._render
+      search.options._render = (src, env, _) => _render(src, env, md)
+    }
+
+    await launchWorkers(siteConfig.concurrency, {
       config: siteConfig,
       options: buildOptions
     })
+  }
 
   if (buildOptions.base) {
     siteConfig.site.base = buildOptions.base
@@ -189,7 +210,7 @@ export async function build(
   await siteConfig.buildEnd?.(siteConfig)
   clearCache()
 
-  if (siteConfig.parallel) await waitWorkers()
+  if (siteConfig.parallel) await waitWorkers('build finish')
 
   const timeEnd = performance.now()
   const duration = humanizeDuration(timeEnd - timeStart, {

From c3df64af548d77353e968094b6e1df8fefbe11c4 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Thu, 4 Jan 2024 13:47:14 -0500
Subject: [PATCH 32/43] cleanup worker code, solve server hanging issue (only
 happens in tests)

---
 src/node/build/build.ts |  4 ++--
 src/node/server.ts      |  8 ++++++--
 src/node/worker.ts      | 30 +++++++++++++++---------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index e4fcf925..b8c88e96 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -16,7 +16,7 @@ import { bundle } from './bundle'
 import { generateSitemap } from './generateSitemap'
 import { renderPage, type RenderPageContext } from './render'
 import humanizeDuration from 'humanize-duration'
-import { launchWorkers, waitWorkers } from '../worker'
+import { launchWorkers, stopWorkers } from '../worker'
 import { registerWorkload, updateContext } from '../worker'
 import { createMarkdownRenderer } from '../markdown/markdown'
 import type { DefaultTheme } from '../shared'
@@ -210,7 +210,7 @@ export async function build(
   await siteConfig.buildEnd?.(siteConfig)
   clearCache()
 
-  if (siteConfig.parallel) await waitWorkers('build finish')
+  if (siteConfig.parallel) await stopWorkers('build finish')
 
   const timeEnd = performance.now()
   const duration = humanizeDuration(timeEnd - timeStart, {
diff --git a/src/node/server.ts b/src/node/server.ts
index d1792edd..ef4d819b 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -1,7 +1,7 @@
 import { createServer as createViteServer, type ServerOptions } from 'vite'
 import { resolveConfig } from './config'
 import { createVitePressPlugin } from './plugin'
-import { launchWorkers } from './worker'
+import { launchWorkers, stopWorkers } from './worker'
 
 export async function createServer(
   root: string = process.cwd(),
@@ -25,5 +25,9 @@ export async function createServer(
     server: serverOptions,
     customLogger: config.logger,
     configFile: config.vite?.configFile
-  })
+  }).then((server) =>
+    Object.assign({}, server, {
+      close: () => server.close().then(() => stopWorkers('server.close()'))
+    })
+  )
 }
diff --git a/src/node/worker.ts b/src/node/worker.ts
index d30da076..39fff6e5 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -28,22 +28,10 @@ interface WorkerTask {
 // Owned by main thread, will be distributed to workers
 const taskQueue = new Queue<WorkerTask>()
 
-// This function will be exposed to workers via magic proxy
-async function getNextTask() {
-  const task = await taskQueue.dequeue()
-  if (task !== null) {
-    debug('[proxy] got task', task.name, '(', debugArgv(...task.argv), ')')
-  }
-  debugger
-  return task
-}
-
 function dispatchWork(name: string, ...argv: any[]): Promise<any> {
   if (workerMeta) {
-    debug('dispatch', name, '(', debugArgv(...argv), ')')
     return workerMeta.dispatchWork(name, ...argv)
   } else {
-    debug('dispatch', name, '(', debugArgv(...argv), ')')
     return new Promise((resolve, reject) =>
       taskQueue.enqueue({ name, argv, resolve, reject })
     )
@@ -62,6 +50,7 @@ const workers: Array<WorkerWithHooks> = []
 export async function launchWorkers(numWorkers: number, context: Object) {
   const allInitialized: Array<Promise<void>> = []
   const ctx = new RpcContext()
+  const getNextTask = () => taskQueue.dequeue()
   for (let i = 0; i < numWorkers; i++) {
     const workerId = (i + 1).toString().padStart(2, '0')
     const { promise, resolve } = deferPromise()
@@ -98,12 +87,24 @@ export function updateContext(context: Object) {
 }
 
 // Wait for workers to drain the taskQueue and exit.
-export function waitWorkers() {
+export async function stopWorkers(reason: string = 'exit') {
   const allClosed = workers.map(
     (w) => new Promise((res) => w.once('exit', res))
   )
   taskQueue.close()
-  return Promise.all(allClosed)
+  debug('waiting for workers, exiting because', reason)
+  const success = await Promise.any([
+    Promise.all(allClosed).then(() => true),
+    new Promise<false>((res) => setTimeout(() => res(false), 1000))
+  ])
+  if (!success) {
+    console.warn('forcefully terminating workers')
+    for (const w of workers) {
+      try {
+        w.terminate()
+      } catch (e) {}
+    }
+  }
 }
 
 /*============================== Worker Thread ==============================*/
@@ -184,7 +185,6 @@ async function workerMainLoop() {
       reject(e)
     }
   }
-
   ctx.reset()
 }
 

From 8edb0763d1f4fd2e29dab9b1285bcd7b97b43383 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Thu, 4 Jan 2024 13:47:59 -0500
Subject: [PATCH 33/43] test script: use run-s instead of run-p for prettier
 console output, helps debug

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5c613b1a..d4d59acb 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "build:prepare": "rimraf dist && node scripts/copyShared",
     "build:client": "vue-tsc --noEmit -p src/client && tsc -p src/client && node scripts/copyClient",
     "build:node": "tsc -p src/node --noEmit && rollup --config rollup.config.ts --configPlugin esbuild",
-    "test": "run-p --aggregate-output test:unit test:e2e test:init",
+    "test": "run-s test:unit test:e2e test:init",
     "test:unit": "vitest run -r __tests__/unit",
     "test:unit:watch": "vitest -r __tests__/unit",
     "test:e2e": "run-s test:e2e-dev test:e2e-build",

From 346e54d57a66bba643bfae62d58dee22390fc287 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 5 Jan 2024 11:01:01 -0500
Subject: [PATCH 34/43] siteConfig: provide better control over parallelism,
 disable parallel bundle by default

---
 package.json                          |  2 +-
 pnpm-lock.yaml                        |  8 ++--
 src/node/build/build.ts               | 30 ++-------------
 src/node/build/bundle.ts              | 54 +++++++++++++--------------
 src/node/build/viteConfig.ts          | 25 ++++---------
 src/node/config.ts                    |  2 +-
 src/node/plugins/localSearchPlugin.ts |  7 +++-
 src/node/server.ts                    |  5 ++-
 src/node/siteConfig.ts                |  7 ++--
 src/node/worker.ts                    | 28 ++++++++++++--
 10 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/package.json b/package.json
index d4d59acb..26953841 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "rollup": "^4.9.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
-    "rpc-magic-proxy": "^1.0.5",
+    "rpc-magic-proxy": "^1.0.6",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a58ef09f..717807fb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -280,8 +280,8 @@ importers:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.2)(supports-color@9.4.0)
       rpc-magic-proxy:
-        specifier: ^1.0.5
-        version: 1.0.5
+        specifier: ^1.0.6
+        version: 1.0.6
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -4016,8 +4016,8 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.2
       fsevents: 2.3.3
 
-  /rpc-magic-proxy@1.0.5:
-    resolution: {integrity: sha512-fd9jbcTrde8F1Nb8+dbl17CYbtBOvzxgnZzYBZ8wV+hwEOZDFPiWvl3yfnJjnYXHmMNSadFkLAa/L9lUA4f8eQ==}
+  /rpc-magic-proxy@1.0.6:
+    resolution: {integrity: sha512-0h0zldD09BLpMi/46xuGFsre2h68LVhIIEqjrSq0bAyeP+ph4/BDmoG4ykNFrU7v2Bx4mS3vX/KNZPVlG6JXQQ==}
     dev: true
 
   /rrweb-cssom@0.6.0:
diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index b8c88e96..c8ede08e 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -16,10 +16,8 @@ import { bundle } from './bundle'
 import { generateSitemap } from './generateSitemap'
 import { renderPage, type RenderPageContext } from './render'
 import humanizeDuration from 'humanize-duration'
-import { launchWorkers, stopWorkers } from '../worker'
+import { launchWorkers, shouldUseParallel, stopWorkers } from '../worker'
 import { registerWorkload, updateContext } from '../worker'
-import { createMarkdownRenderer } from '../markdown/markdown'
-import type { DefaultTheme } from '../shared'
 
 type RenderFn = (path: string) => Promise<SSGContext>
 
@@ -53,25 +51,7 @@ export async function build(
   const siteConfig = await resolveConfig(root, 'build', 'production')
   const unlinkVue = linkVue()
 
-  if (siteConfig.parallel) {
-    // Dirty fix: md.render() has side effects on env.
-    // When user provides a custom render function, it will be invoked in the
-    // main thread, but md.render will be called in the worker thread. The side
-    // effects on env will be lost. So we need to make _render a curry function,
-    // and use `md` provided in the main thread
-    const config = siteConfig as SiteConfig<DefaultTheme.Config>
-    const search = config.site?.themeConfig?.search
-    if (search?.provider === 'local' && search?.options?._render) {
-      const md = await createMarkdownRenderer(
-        config.srcDir,
-        config.markdown,
-        config.site.base,
-        config.logger
-      )
-      const _render = search.options._render
-      search.options._render = (src, env, _) => _render(src, env, md)
-    }
-
+  if (shouldUseParallel(siteConfig)) {
     await launchWorkers(siteConfig.concurrency, {
       config: siteConfig,
       options: buildOptions
@@ -175,7 +155,7 @@ export async function build(
 
       let task: (page: string) => Promise<void>
 
-      if (siteConfig.parallel) {
+      if (shouldUseParallel(siteConfig, 'render')) {
         const { config, ...additionalContext } = context
         await updateContext({ renderEntry, ...additionalContext })
         task = (page) => dispatchRenderPageWork(page)
@@ -209,9 +189,7 @@ export async function build(
   await generateSitemap(siteConfig)
   await siteConfig.buildEnd?.(siteConfig)
   clearCache()
-
-  if (siteConfig.parallel) await stopWorkers('build finish')
-
+  await stopWorkers('build complete')
   const timeEnd = performance.now()
   const duration = humanizeDuration(timeEnd - timeStart, {
     maxDecimalPoints: 2
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 7aa928dd..db4c28b1 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -1,12 +1,13 @@
 import fs from 'fs-extra'
 import path from 'path'
-import { build, type BuildOptions, type Rollup } from 'vite'
+import { build, type BuildOptions, type PluginOption, type Rollup } from 'vite'
 import type { SiteConfig } from '../config'
 import { updateCurrentTask } from '../utils/task'
 import { buildMPAClient } from './buildMPAClient'
-import { registerWorkload } from '../worker'
+import { registerWorkload, shouldUseParallel } from '../worker'
 import resolveViteConfig from './viteConfig'
 import { type WorkerContext } from './build'
+import { createVitePressPlugin } from '../plugin'
 
 const dispatchBundleWorkload = registerWorkload(
   'build:bundle',
@@ -18,18 +19,18 @@ const dispatchBundleWorkload = registerWorkload(
   }
 )
 
-async function bundleWorkload(this: WorkerContext, ssr: boolean) {
-  const pageToHashMap = Object.create(null) as Record<string, string>
-  const clientJSMap = Object.create(null) as Record<string, string>
-  const result = (await build(
+async function bundleWorkload(
+  this: WorkerContext,
+  ssr: boolean,
+  plugins: PluginOption[]
+) {
+  return build(
     await resolveViteConfig(ssr, {
       config: this.config,
       options: this.options,
-      pageToHashMap,
-      clientJSMap
+      plugins
     })
-  )) as Rollup.RollupOutput
-  return { result, pageToHashMap, clientJSMap }
+  ) as Promise<Rollup.RollupOutput>
 }
 
 async function bundleMPA(
@@ -75,27 +76,26 @@ export async function bundle(
   const pageToHashMap = Object.create(null)
   const clientJSMap = Object.create(null)
 
-  const [server, client] = await Promise.all(
-    config.parallel
-      ? [
-          dispatchBundleWorkload(true),
-          config.mpa ? null : dispatchBundleWorkload(false)
-        ]
-      : [
-          bundleWorkload.apply({ config, options }, [true]),
-          config.mpa ? null : bundleWorkload.apply({ config, options }, [false])
-        ]
+  const [serverResult, clientResult] = await Promise.all(
+    [true, false].map(async (ssr) => {
+      if (!ssr && config.mpa) return null
+      const plugins = await createVitePressPlugin(
+        config,
+        ssr,
+        pageToHashMap,
+        clientJSMap
+      )
+      return shouldUseParallel(config, 'bundle')
+        ? dispatchBundleWorkload(ssr, plugins)
+        : bundleWorkload.apply({ config, options }, [ssr, plugins])
+    })
   )
 
-  // Update maps
-  Object.assign(pageToHashMap, server.pageToHashMap, client?.pageToHashMap)
-  Object.assign(clientJSMap, server.clientJSMap, client?.clientJSMap)
-
   return {
     clientResult: config.mpa
-      ? await bundleMPA(config, server.result, clientJSMap)
-      : client?.result!,
-    serverResult: server.result,
+      ? await bundleMPA(config, serverResult!, clientJSMap)
+      : clientResult!,
+    serverResult: serverResult!,
     pageToHashMap
   }
 }
diff --git a/src/node/build/viteConfig.ts b/src/node/build/viteConfig.ts
index 1ab66883..80041d73 100644
--- a/src/node/build/viteConfig.ts
+++ b/src/node/build/viteConfig.ts
@@ -4,12 +4,12 @@ import {
   normalizePath,
   type BuildOptions,
   type Rollup,
-  type InlineConfig as ViteInlineConfig
+  type InlineConfig as ViteInlineConfig,
+  type PluginOption
 } from 'vite'
 import { APP_PATH } from '../alias'
 import type { SiteConfig } from '../config'
 import { slash } from '../shared'
-import { createVitePressPlugin } from '../plugin'
 import { escapeRegExp, sanitizeFileName } from '../shared'
 
 // https://github.com/vitejs/vite/blob/d2aa0969ee316000d3b957d7e879f001e85e369e/packages/vite/src/node/plugins/splitVendorChunk.ts#L14
@@ -114,13 +114,11 @@ export default async function resolveViteConfig(
   {
     config,
     options,
-    pageToHashMap,
-    clientJSMap
+    plugins
   }: {
     config: SiteConfig
     options: BuildOptions
-    pageToHashMap: Record<string, string>
-    clientJSMap: Record<string, string>
+    plugins: PluginOption[]
   }
 ): Promise<ViteInlineConfig> {
   return {
@@ -128,12 +126,7 @@ export default async function resolveViteConfig(
     cacheDir: config.cacheDir,
     base: config.site.base,
     logLevel: config.vite?.logLevel ?? 'warn',
-    plugins: await createVitePressPlugin(
-      config,
-      ssr,
-      pageToHashMap,
-      clientJSMap
-    ),
+    plugins,
     ssr: {
       noExternal: ['vitepress', '@docsearch/css']
     },
@@ -144,12 +137,8 @@ export default async function resolveViteConfig(
       ssrEmitAssets: config.mpa,
       // minify with esbuild in MPA mode (for CSS)
       minify: ssr
-        ? config.mpa
-          ? 'esbuild'
-          : false
-        : typeof options.minify === 'boolean'
-          ? options.minify
-          : !process.env.DEBUG,
+        ? config.mpa && 'esbuild'
+        : options.minify ?? !process.env.DEBUG,
       outDir: ssr ? config.tempDir : config.outDir,
       cssCodeSplit: false,
       rollupOptions: {
diff --git a/src/node/config.ts b/src/node/config.ts
index 7a6aa084..8d71aeb8 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -148,7 +148,7 @@ export async function resolveConfig(
       userConfig.concurrency ?? Math.round(cpus().length / 1.5),
       1 // At least one thread required
     ),
-    parallel: userConfig.parallel ?? true
+    parallel: userConfig.parallel ?? ['render', 'local-search']
   }
 
   // to be shared with content loaders
diff --git a/src/node/plugins/localSearchPlugin.ts b/src/node/plugins/localSearchPlugin.ts
index 89efc896..e4f04a68 100644
--- a/src/node/plugins/localSearchPlugin.ts
+++ b/src/node/plugins/localSearchPlugin.ts
@@ -173,9 +173,12 @@ export async function localSearchPlugin(
         siteConfig.pages.length,
         'indexing local search'
       )
+
+    const parallel = shouldUseParallel(siteConfig, 'local-search')
+
     await pMap(
       siteConfig.pages,
-      (page) => indexFile(page, !!siteConfig.parallel).then(updateProgress),
+      (page) => indexFile(page, parallel).then(updateProgress),
       { concurrency }
     )
 
@@ -293,7 +296,7 @@ async function* splitPageIntoSections(
 }
 
 /*=============================== Worker API ===============================*/
-import { registerWorkload } from '../worker'
+import { registerWorkload, shouldUseParallel } from '../worker'
 import Queue from '../utils/queue'
 
 // Worker proxy (worker thread)
diff --git a/src/node/server.ts b/src/node/server.ts
index ef4d819b..ff079188 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -1,7 +1,7 @@
 import { createServer as createViteServer, type ServerOptions } from 'vite'
 import { resolveConfig } from './config'
 import { createVitePressPlugin } from './plugin'
-import { launchWorkers, stopWorkers } from './worker'
+import { launchWorkers, stopWorkers, shouldUseParallel } from './worker'
 
 export async function createServer(
   root: string = process.cwd(),
@@ -10,7 +10,8 @@ export async function createServer(
 ) {
   const config = await resolveConfig(root)
 
-  if (config.parallel) launchWorkers(config.concurrency, { config: config })
+  if (shouldUseParallel(config))
+    launchWorkers(config.concurrency, { config: config })
 
   if (serverOptions.base) {
     config.site.base = serverOptions.base
diff --git a/src/node/siteConfig.ts b/src/node/siteConfig.ts
index 2a861aec..518d399e 100644
--- a/src/node/siteConfig.ts
+++ b/src/node/siteConfig.ts
@@ -13,6 +13,7 @@ import type {
   SSGContext,
   SiteData
 } from './shared'
+import type { SupportsParallel } from './worker'
 
 export type RawConfigExports<ThemeConfig = any> =
   | Awaitable<UserConfig<ThemeConfig>>
@@ -165,9 +166,9 @@ export interface UserConfig<ThemeConfig = any>
    * 2. Parallel SSR Rendering
    * 3. Parallel Local Search Indexing (when using default splitter)
    * @experimental
-   * @default true
+   * @default ['render', 'local-search']
    */
-  parallel?: boolean
+  parallel?: boolean | SupportsParallel[]
 
   /**
    * @experimental
@@ -263,5 +264,5 @@ export interface SiteConfig<ThemeConfig = any>
   logger: Logger
   userConfig: UserConfig
   concurrency: number
-  parallel: boolean
+  parallel: boolean | SupportsParallel[]
 }
diff --git a/src/node/worker.ts b/src/node/worker.ts
index 39fff6e5..32c846d4 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -1,8 +1,25 @@
 import { Worker, isMainThread, parentPort, workerData } from 'worker_threads'
 import RpcContext, { deferPromise } from 'rpc-magic-proxy'
 import { task, updateCurrentTask } from './utils/task'
+import c from 'picocolors'
 import Queue from './utils/queue'
 import _debug from 'debug'
+import type { SiteConfig } from 'siteConfig'
+
+export type SupportsParallel = 'bundle' | 'render' | 'local-search'
+
+/**
+ * Checks if the given task should be run in parallel.
+ * If task is omitted, checks if any task should be run in parallel.
+ */
+export function shouldUseParallel(config: SiteConfig, task?: SupportsParallel) {
+  const { parallel = false } = config
+  if (task === undefined)
+    return parallel === true || (Array.isArray(parallel) && parallel.length > 0)
+  if (typeof parallel === 'boolean') return parallel
+  if (Array.isArray(parallel)) return parallel.includes(task)
+  throw new TypeError(`Invalid value for config.parallel: ${parallel}`)
+}
 
 let debug = _debug('vitepress:worker:main')
 const WORKER_MAGIC = 'vitepress:worker'
@@ -66,7 +83,7 @@ export async function launchWorkers(numWorkers: number, context: Object) {
         debug: debug.enabled ? debug : null,
         task,
         updateCurrentTask
-      } as typeof workerMeta,
+      },
       initWorkerHooks,
       getNextTask,
       context
@@ -137,7 +154,7 @@ export function registerWorkload<T extends Object, K extends any[], V>(
 
 // Will keep querying next workload from main thread
 async function workerMainLoop() {
-  const ctx = new RpcContext(parentPort!)
+  const ctx = new RpcContext({ preserveThis: true }).bind(parentPort!)
   const {
     workerMeta: _workerMeta,
     initWorkerHooks,
@@ -174,14 +191,17 @@ async function workerMainLoop() {
       try {
         await init.apply(context)
       } catch (e) {
-        console.error(`worker: failed to init workload "${name}": ${e}`)
+        console.error(c.red(`worker: failed to init workload "${name}":`), e)
       }
       el.init = undefined
     }
     try {
       resolve(await main.apply(context, argv))
     } catch (e) {
-      console.error(`worker:${workerMeta.workerId}: task "${name}" error`, e)
+      console.error(
+        c.red(`worker:${workerMeta.workerId} error running task "${name}":`),
+        e
+      )
       reject(e)
     }
   }

From 77f708a2e5ff5d67a73dcb08559784d78199770b Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 5 Jan 2024 17:49:18 -0500
Subject: [PATCH 35/43] cleanup code

---
 src/node/build/build.ts  |  4 +--
 src/node/build/bundle.ts | 13 ++++---
 src/node/worker.ts       | 73 ++++++++++++++++++++++------------------
 3 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index c8ede08e..f6467fb4 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -52,7 +52,7 @@ export async function build(
   const unlinkVue = linkVue()
 
   if (shouldUseParallel(siteConfig)) {
-    await launchWorkers(siteConfig.concurrency, {
+    launchWorkers(siteConfig.concurrency, {
       config: siteConfig,
       options: buildOptions
     })
@@ -189,7 +189,7 @@ export async function build(
   await generateSitemap(siteConfig)
   await siteConfig.buildEnd?.(siteConfig)
   clearCache()
-  await stopWorkers('build complete')
+  stopWorkers('build complete')
   const timeEnd = performance.now()
   const duration = humanizeDuration(timeEnd - timeStart, {
     maxDecimalPoints: 2
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index db4c28b1..f381785f 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -24,13 +24,12 @@ async function bundleWorkload(
   ssr: boolean,
   plugins: PluginOption[]
 ) {
-  return build(
-    await resolveViteConfig(ssr, {
-      config: this.config,
-      options: this.options,
-      plugins
-    })
-  ) as Promise<Rollup.RollupOutput>
+  const config = await resolveViteConfig(ssr, {
+    config: this.config,
+    options: this.options,
+    plugins
+  })
+  return build(config) as Promise<Rollup.RollupOutput>
 }
 
 async function bundleMPA(
diff --git a/src/node/worker.ts b/src/node/worker.ts
index 32c846d4..97045ea6 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -5,6 +5,7 @@ import c from 'picocolors'
 import Queue from './utils/queue'
 import _debug from 'debug'
 import type { SiteConfig } from 'siteConfig'
+import humanizeDuration from 'humanize-duration'
 
 export type SupportsParallel = 'bundle' | 'render' | 'local-search'
 
@@ -23,17 +24,6 @@ export function shouldUseParallel(config: SiteConfig, task?: SupportsParallel) {
 
 let debug = _debug('vitepress:worker:main')
 const WORKER_MAGIC = 'vitepress:worker'
-
-function debugArgv(...argv: any[]) {
-  if (!debug.enabled) return ''
-  return argv
-    .map((v) => {
-      const t = typeof v
-      if (v?.length !== undefined) return `${t}[${v.length}]`
-      else return t
-    })
-    .join(', ')
-}
 /*=============================== Main Thread ===============================*/
 interface WorkerTask {
   name: string
@@ -43,36 +33,41 @@ interface WorkerTask {
 }
 
 // Owned by main thread, will be distributed to workers
-const taskQueue = new Queue<WorkerTask>()
+let taskQueue: Queue<WorkerTask> | null = null
 
 function dispatchWork(name: string, ...argv: any[]): Promise<any> {
   if (workerMeta) {
     return workerMeta.dispatchWork(name, ...argv)
+  } else if (taskQueue) {
+    const { promise, resolve, reject } = deferPromise()
+    taskQueue.enqueue({ name, argv, resolve, reject })
+    return promise
   } else {
-    return new Promise((resolve, reject) =>
-      taskQueue.enqueue({ name, argv, resolve, reject })
-    )
+    throw new Error(`trying to dispatch ${name} before launching workers.`)
   }
 }
 
-type WorkerWithHooks = Worker & {
+type WorkerInstance = Worker & {
+  workerId: string
   hooks: {
     // Update worker's context
     updateContext: (ctx: Object | null) => void
   }
 }
 
-const workers: Array<WorkerWithHooks> = []
+const workers: Array<WorkerInstance> = []
 
 export async function launchWorkers(numWorkers: number, context: Object) {
+  debug(`launching ${numWorkers} workers`)
+  taskQueue = new Queue<WorkerTask>()
   const allInitialized: Array<Promise<void>> = []
   const ctx = new RpcContext()
-  const getNextTask = () => taskQueue.dequeue()
+  const getNextTask = () => taskQueue?.dequeue() ?? null
   for (let i = 0; i < numWorkers; i++) {
     const workerId = (i + 1).toString().padStart(2, '0')
     const { promise, resolve } = deferPromise()
-    const initWorkerHooks = (hooks: WorkerWithHooks['hooks']) => {
-      worker.hooks = hooks
+    const initWorkerHooks = (hooks: WorkerInstance['hooks']) => {
+      Object.assign(worker, { workerId, hooks })
       resolve()
     }
     const debug = _debug(`vitepress:worker:${workerId.padEnd(4)}`)
@@ -80,6 +75,7 @@ export async function launchWorkers(numWorkers: number, context: Object) {
       workerMeta: {
         workerId,
         dispatchWork,
+        // Save some RPC overhead when debugger is not active
         debug: debug.enabled ? debug : null,
         task,
         updateCurrentTask
@@ -90,7 +86,7 @@ export async function launchWorkers(numWorkers: number, context: Object) {
     })
     const worker = new Worker(new URL(import.meta.url), {
       workerData: { [WORKER_MAGIC]: payload }
-    }) as WorkerWithHooks
+    }) as WorkerInstance
     ctx.bind(worker)
     workers.push(worker)
     allInitialized.push(promise)
@@ -105,14 +101,17 @@ export function updateContext(context: Object) {
 
 // Wait for workers to drain the taskQueue and exit.
 export async function stopWorkers(reason: string = 'exit') {
-  const allClosed = workers.map(
-    (w) => new Promise((res) => w.once('exit', res))
+  debug('stopping workers:', reason)
+  const allClosed = workers.map((w) =>
+    new Promise<void>((res) => w.once('exit', () => res())).then(() =>
+      debug(`worker:${w.workerId} confirmed exit`)
+    )
   )
-  taskQueue.close()
-  debug('waiting for workers, exiting because', reason)
+  taskQueue?.close()
+  taskQueue = null
   const success = await Promise.any([
     Promise.all(allClosed).then(() => true),
-    new Promise<false>((res) => setTimeout(() => res(false), 1000))
+    new Promise<false>((res) => setTimeout(() => res(false), 2000))
   ])
   if (!success) {
     console.warn('forcefully terminating workers')
@@ -141,11 +140,10 @@ export function registerWorkload<T extends Object, K extends any[], V>(
   main: (this: T, ...args: K) => V,
   init?: (this: T, ...args: void[]) => void
 ) {
+  // Only register workload in worker threads
   if (!isMainThread) {
-    // Only register workload in worker threads
-    if (registry.has(name)) {
+    if (registry.has(name))
       throw new Error(`Workload "${name}" already registered.`)
-    }
     registry.set(name, { main, init })
   }
   return (...args: Parameters<typeof main>) =>
@@ -170,6 +168,7 @@ async function workerMainLoop() {
   workerMeta = _workerMeta!
   if (workerMeta.debug) debug = workerMeta.debug
   else debug = (() => {}) as any as typeof debug
+  debug(`started`)
   // Upon worker initialization, report back the hooks that main thread can use
   // to reach this worker.
   await initWorkerHooks({
@@ -179,21 +178,24 @@ async function workerMainLoop() {
     }
   })
 
+  let workTime = 0
   while (true) {
     const task = await getNextTask()
     if (task === null) break
     const { name, argv, resolve, reject } = task
-    debug('got task', name, '(', debugArgv(...argv), ')')
     if (!registry.has(name)) throw new Error(`No task "${name}" registered.`)
     const el = registry.get(name)!
     const { main, init } = el
+    const timeStart = performance.now()
     if (init) {
       try {
         await init.apply(context)
       } catch (e) {
         console.error(c.red(`worker: failed to init workload "${name}":`), e)
+        reject(e)
+      } finally {
+        el.init = undefined
       }
-      el.init = undefined
     }
     try {
       resolve(await main.apply(context, argv))
@@ -203,9 +205,16 @@ async function workerMainLoop() {
         e
       )
       reject(e)
+    } finally {
+      workTime += performance.now() - timeStart
     }
   }
   ctx.reset()
+  const duration = humanizeDuration(workTime, {
+    maxDecimalPoints: 2
+  })
+  await debug(`stopped - total workload: ${duration}`)
 }
 
-if (!isMainThread && WORKER_MAGIC in workerData) workerMainLoop()
+if (!isMainThread && workerData?.[WORKER_MAGIC])
+  workerMainLoop().then(() => process.exit())

From e75adf9eec42591db54af1319a0064448614562f Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Fri, 5 Jan 2024 18:00:48 -0500
Subject: [PATCH 36/43] revert irrelevant change

---
 src/node/markdownToVue.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/node/markdownToVue.ts b/src/node/markdownToVue.ts
index 0b102f43..fd3b0d88 100644
--- a/src/node/markdownToVue.ts
+++ b/src/node/markdownToVue.ts
@@ -72,17 +72,10 @@ export async function createMarkdownToVueRenderFn(
     const cacheKey = JSON.stringify({ src, file: fileOrig })
 
     if (isBuild || options.cache !== false) {
-      const metrics = {
-        lookUpTime: performance.now(),
-        keyLength: cacheKey.length
-      }
       const cached = cache.get(cacheKey)
-      metrics.lookUpTime = performance.now() - metrics.lookUpTime
       if (cached) {
-        debug(`[cache hit] ${relativePath} ${JSON.stringify(metrics)}`)
+        debug(`[cache hit] ${relativePath}`)
         return cached
-      } else {
-        debug(`[cache miss] ${relativePath} ${JSON.stringify(metrics)}`)
       }
     }
 

From e98da5ba9c4d4120b066ab046ccf25566bc4e4c0 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Mon, 8 Jan 2024 13:10:21 -0500
Subject: [PATCH 37/43] resolve pnpm lock error

---
 package.json       |  2 +-
 pnpm-lock.yaml     | 14 +++++++-------
 src/node/worker.ts | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index a96e5404..72c62fe1 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "rollup": "^4.9.4",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
-    "rpc-magic-proxy": "^1.0.6",
+    "rpc-magic-proxy": "^2.0.5",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8bfedc26..9a2dfb3d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -280,8 +280,8 @@ importers:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.4)(supports-color@9.4.0)
       rpc-magic-proxy:
-        specifier: ^1.0.6
-        version: 1.0.6
+        specifier: ^2.0.5
+        version: 2.0.5
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -302,7 +302,7 @@ importers:
         version: 5.3.3
       vitest:
         specifier: ^1.1.3
-        version: 1.1.3(@types/node@20.10.7)(supports-color@9.4.0)
+        version: 1.1.3(@types/node@20.10.7)(jsdom@23.0.1)(supports-color@9.4.0)
       vue-tsc:
         specifier: ^1.8.27
         version: 1.8.27(typescript@5.3.3)
@@ -1173,7 +1173,7 @@ packages:
   /@types/jsdom@21.1.6:
     resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
     dependencies:
-      '@types/node': 20.10.6
+      '@types/node': 20.10.7
       '@types/tough-cookie': 4.0.5
       parse5: 7.1.2
     dev: true
@@ -4024,8 +4024,8 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.4
       fsevents: 2.3.3
 
-  /rpc-magic-proxy@1.0.6:
-    resolution: {integrity: sha512-0h0zldD09BLpMi/46xuGFsre2h68LVhIIEqjrSq0bAyeP+ph4/BDmoG4ykNFrU7v2Bx4mS3vX/KNZPVlG6JXQQ==}
+  /rpc-magic-proxy@2.0.5:
+    resolution: {integrity: sha512-kWSijJDMMpYdOW79eMLfRQLuKtrTVeV0fsm6s9pjhujD0Z9cD1ZbutT1q4h7PGwr1qEWwcdgMEPgKUiqOX2JoQ==}
     dev: true
 
   /rrweb-cssom@0.6.0:
@@ -4679,7 +4679,7 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vitest@1.1.3(@types/node@20.10.7)(supports-color@9.4.0):
+  /vitest@1.1.3(@types/node@20.10.7)(jsdom@23.0.1)(supports-color@9.4.0):
     resolution: {integrity: sha512-2l8om1NOkiA90/Y207PsEvJLYygddsOyr81wLQ20Ra8IlLKbyQncWsGZjnbkyG2KwwuTXLQjEPOJuxGMG8qJBQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
diff --git a/src/node/worker.ts b/src/node/worker.ts
index 97045ea6..69cdb50a 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -1,5 +1,5 @@
 import { Worker, isMainThread, parentPort, workerData } from 'worker_threads'
-import RpcContext, { deferPromise } from 'rpc-magic-proxy'
+import RPCContext, { deferPromise } from 'rpc-magic-proxy'
 import { task, updateCurrentTask } from './utils/task'
 import c from 'picocolors'
 import Queue from './utils/queue'
@@ -61,11 +61,11 @@ export async function launchWorkers(numWorkers: number, context: Object) {
   debug(`launching ${numWorkers} workers`)
   taskQueue = new Queue<WorkerTask>()
   const allInitialized: Array<Promise<void>> = []
-  const ctx = new RpcContext()
+  const ctx = new RPCContext()
   const getNextTask = () => taskQueue?.dequeue() ?? null
   for (let i = 0; i < numWorkers; i++) {
     const workerId = (i + 1).toString().padStart(2, '0')
-    const { promise, resolve } = deferPromise()
+    const { promise, resolve } = deferPromise<void>()
     const initWorkerHooks = (hooks: WorkerInstance['hooks']) => {
       Object.assign(worker, { workerId, hooks })
       resolve()
@@ -87,7 +87,7 @@ export async function launchWorkers(numWorkers: number, context: Object) {
     const worker = new Worker(new URL(import.meta.url), {
       workerData: { [WORKER_MAGIC]: payload }
     }) as WorkerInstance
-    ctx.bind(worker)
+    ctx.bind(worker as any)
     workers.push(worker)
     allInitialized.push(promise)
     worker.on('error', console.error)
@@ -152,7 +152,7 @@ export function registerWorkload<T extends Object, K extends any[], V>(
 
 // Will keep querying next workload from main thread
 async function workerMainLoop() {
-  const ctx = new RpcContext({ preserveThis: true }).bind(parentPort!)
+  const ctx = new RPCContext().bind(parentPort! as any)
   const {
     workerMeta: _workerMeta,
     initWorkerHooks,
@@ -163,7 +163,7 @@ async function workerMainLoop() {
     getNextTask: () => Promise<WorkerTask | null>
     initWorkerHooks: (hooks: Object) => Promise<void>
     context: Object
-  } = ctx.deserialize(workerData[WORKER_MAGIC])
+  } = ctx.deserialize(workerData[WORKER_MAGIC]) as any
   // Set up magic proxy to main thread dispatchWork
   workerMeta = _workerMeta!
   if (workerMeta.debug) debug = workerMeta.debug

From 58627479c534e3a67b64b81d8106eca08de41f8e Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Mon, 8 Jan 2024 13:11:50 -0500
Subject: [PATCH 38/43] local search: avoid indexing 2 times when bundling for
 server and client

---
 src/node/plugins/localSearchPlugin.ts | 106 +++++++++++++-------------
 1 file changed, 51 insertions(+), 55 deletions(-)

diff --git a/src/node/plugins/localSearchPlugin.ts b/src/node/plugins/localSearchPlugin.ts
index e4f04a68..b282aa7b 100644
--- a/src/node/plugins/localSearchPlugin.ts
+++ b/src/node/plugins/localSearchPlugin.ts
@@ -5,7 +5,10 @@ import pMap from 'p-map'
 import path from 'path'
 import type { Plugin, ViteDevServer } from 'vite'
 import type { SiteConfig } from '../config'
-import { createMarkdownRenderer } from '../markdown/markdown'
+import {
+  createMarkdownRenderer,
+  type MarkdownRenderer
+} from '../markdown/markdown'
 import {
   resolveSiteDataByRoute,
   slash,
@@ -29,6 +32,26 @@ interface IndexObject {
   titles: string[]
 }
 
+let md: MarkdownRenderer
+
+let flagAllIndexed = false
+const taskByLocale = new Map<string, Promise<void>>()
+const filesByLocale = new Map<string, Set<string>>()
+const indexByLocale = new Map<string, MiniSearch<IndexObject>>()
+
+function getIndexByLocale(locale: string, options?: any) {
+  let index = indexByLocale.get(locale)
+  if (!index) {
+    index = new MiniSearch<IndexObject>({
+      fields: ['title', 'titles', 'text'],
+      storeFields: ['title', 'titles'],
+      ...options
+    })
+    indexByLocale.set(locale, index)
+  }
+  return index
+}
+
 export async function localSearchPlugin(
   siteConfig: SiteConfig<DefaultTheme.Config>
 ): Promise<Plugin> {
@@ -48,7 +71,7 @@ export async function localSearchPlugin(
     }
   }
 
-  const md = await createMarkdownRenderer(
+  md ??= await createMarkdownRenderer(
     siteConfig.srcDir,
     siteConfig.markdown,
     siteConfig.site.base,
@@ -71,21 +94,6 @@ export async function localSearchPlugin(
     }
   }
 
-  const indexByLocales = new Map<string, MiniSearch<IndexObject>>()
-
-  function getIndexByLocale(locale: string) {
-    let index = indexByLocales.get(locale)
-    if (!index) {
-      index = new MiniSearch<IndexObject>({
-        fields: ['title', 'titles', 'text'],
-        storeFields: ['title', 'titles'],
-        ...options.miniSearch?.options
-      })
-      indexByLocales.set(locale, index)
-    }
-    return index
-  }
-
   function getLocaleForPath(file: string) {
     const relativePath = slash(path.relative(siteConfig.srcDir, file))
     const siteData = resolveSiteDataByRoute(siteConfig.site, relativePath)
@@ -125,21 +133,10 @@ export async function localSearchPlugin(
     return id
   }
 
-  function scanForLocales() {
-    for (const page of siteConfig.pages) {
-      const file = path.join(siteConfig.srcDir, page)
-      const locale = getLocaleForPath(file)
-      // dry-fetch the index for this locale
-      getIndexByLocale(locale)
-    }
-  }
-
-  async function indexFile(page: string, parallel: boolean = false) {
-    const file = path.join(siteConfig.srcDir, page)
-    // get file metadata
+  async function indexFile(file: string, parallel: boolean = false) {
     const fileId = getDocId(file)
     const locale = getLocaleForPath(file)
-    const index = getIndexByLocale(locale)
+    const index = getIndexByLocale(locale, options.miniSearch?.options)
     // retrieve file and split into "sections"
     const html = await render(file)
     const sections =
@@ -163,29 +160,28 @@ export async function localSearchPlugin(
     }
   }
 
-  async function indexAll() {
-    const concurrency = siteConfig.concurrency
-    let numIndexed = 0
-
-    const updateProgress = () =>
-      updateCurrentTask(
-        ++numIndexed,
-        siteConfig.pages.length,
-        'indexing local search'
-      )
-
-    const parallel = shouldUseParallel(siteConfig, 'local-search')
+  function indexAll() {
+    if (flagAllIndexed) return
+    flagAllIndexed = true
 
-    await pMap(
-      siteConfig.pages,
-      (page) => indexFile(page, parallel).then(updateProgress),
-      { concurrency }
-    )
+    for (const page of siteConfig.pages) {
+      const file = path.join(siteConfig.srcDir, page)
+      const locale = getLocaleForPath(file)
+      if (!filesByLocale.has(locale)) filesByLocale.set(locale, new Set())
+      filesByLocale.get(locale)!.add(file)
+    }
+  }
 
-    updateCurrentTask()
+  async function indexLocale(locale: string) {
+    let numIndexed = 0
+    const update = () =>
+      updateCurrentTask(++numIndexed, files.length, `🔍️ indexing ${locale}`)
+    const files = [...filesByLocale.get(locale)!]
+    const task = (f: string) => indexFile(f, parallel).then(update)
+    await pMap(files, task, { concurrency: siteConfig.concurrency })
   }
 
-  let indexAllPromise: Promise<void> | undefined
+  const parallel = shouldUseParallel(siteConfig, 'local-search')
 
   return {
     name: 'vitepress:local-search',
@@ -213,28 +209,28 @@ export async function localSearchPlugin(
 
     async load(id) {
       if (id === LOCAL_SEARCH_INDEX_REQUEST_PATH) {
-        scanForLocales()
+        indexAll()
         let records: string[] = []
-        for (const [locale] of indexByLocales) {
+        for (const [locale] of filesByLocale) {
           records.push(
             `${JSON.stringify(
               locale
-            )}: () => import('${LOCAL_SEARCH_INDEX_ID}-${locale}')`
+            )}: () => import('${LOCAL_SEARCH_INDEX_ID}:${locale}')`
           )
         }
         return `export default {${records.join(',')}}`
       } else if (id.startsWith(LOCAL_SEARCH_INDEX_REQUEST_PATH)) {
         const locale = id.slice(LOCAL_SEARCH_INDEX_REQUEST_PATH.length + 1)
-        await (indexAllPromise ??= indexAll())
+        await ((taskByLocale as any)[locale] ??= indexLocale(locale))
         return `export default ${JSON.stringify(
-          JSON.stringify(indexByLocales.get(locale) ?? {})
+          JSON.stringify(indexByLocale.get(locale) ?? {})
         )}`
       }
     },
 
     async handleHotUpdate({ file }) {
       if (file.endsWith('.md')) {
-        await indexFile(file)
+        await indexFile(file, parallel)
         debug('🔍️ Updated', file)
         onIndexUpdated()
       }

From 1c880a83ab67150ca218ba1191872bcc895dad80 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Mon, 8 Jan 2024 15:36:47 -0500
Subject: [PATCH 39/43] package upgrade

---
 package.json   | 2 +-
 pnpm-lock.yaml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 72c62fe1..de976c97 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "rollup": "^4.9.4",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
-    "rpc-magic-proxy": "^2.0.5",
+    "rpc-magic-proxy": "^2.0.6",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9a2dfb3d..3477519c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -280,8 +280,8 @@ importers:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.4)(supports-color@9.4.0)
       rpc-magic-proxy:
-        specifier: ^2.0.5
-        version: 2.0.5
+        specifier: ^2.0.6
+        version: 2.0.6
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -4024,8 +4024,8 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.4
       fsevents: 2.3.3
 
-  /rpc-magic-proxy@2.0.5:
-    resolution: {integrity: sha512-kWSijJDMMpYdOW79eMLfRQLuKtrTVeV0fsm6s9pjhujD0Z9cD1ZbutT1q4h7PGwr1qEWwcdgMEPgKUiqOX2JoQ==}
+  /rpc-magic-proxy@2.0.6:
+    resolution: {integrity: sha512-PtJfEIwXiFg64FUXUGv6cot6X3RssVeQ6Xb7t8lHaAPRDEwvuZf6zCNtHEyxgFw3qnBf+LyoLAX9EOl0ipNvig==}
     dev: true
 
   /rrweb-cssom@0.6.0:

From 5493202cb2f05d5cf4bca22c55366adb6ed94105 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Mon, 8 Jan 2024 16:38:09 -0500
Subject: [PATCH 40/43] revert changes for parallel bundling

---
 src/node/build/bundle.ts              | 312 +++++++++++++++++++-------
 src/node/build/render.ts              |  63 +++---
 src/node/build/viteConfig.ts          | 212 -----------------
 src/node/plugins/localSearchPlugin.ts |  13 +-
 src/node/server.ts                    |   5 +-
 src/node/utils/queue.ts               |   1 +
 src/node/worker.ts                    |  22 +-
 7 files changed, 297 insertions(+), 331 deletions(-)
 delete mode 100644 src/node/build/viteConfig.ts

diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index f381785f..6eee911d 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -1,67 +1,38 @@
 import fs from 'fs-extra'
 import path from 'path'
-import { build, type BuildOptions, type PluginOption, type Rollup } from 'vite'
+import { fileURLToPath } from 'url'
+import {
+  build,
+  normalizePath,
+  type BuildOptions,
+  type Rollup,
+  type InlineConfig as ViteInlineConfig
+} from 'vite'
+import { APP_PATH } from '../alias'
 import type { SiteConfig } from '../config'
-import { updateCurrentTask } from '../utils/task'
-import { buildMPAClient } from './buildMPAClient'
-import { registerWorkload, shouldUseParallel } from '../worker'
-import resolveViteConfig from './viteConfig'
-import { type WorkerContext } from './build'
 import { createVitePressPlugin } from '../plugin'
+import { escapeRegExp, sanitizeFileName, slash } from '../shared'
+import { task } from '../utils/task'
+import { buildMPAClient } from './buildMPAClient'
 
-const dispatchBundleWorkload = registerWorkload(
-  'build:bundle',
-  bundleWorkload,
-  function (this: WorkerContext) {
-    // To make contentLoader happy
-    // @ts-ignore
-    global.VITEPRESS_CONFIG = this.config
-  }
-)
+// https://github.com/vitejs/vite/blob/d2aa0969ee316000d3b957d7e879f001e85e369e/packages/vite/src/node/plugins/splitVendorChunk.ts#L14
+const CSS_LANGS_RE =
+  /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/
 
-async function bundleWorkload(
-  this: WorkerContext,
-  ssr: boolean,
-  plugins: PluginOption[]
-) {
-  const config = await resolveViteConfig(ssr, {
-    config: this.config,
-    options: this.options,
-    plugins
-  })
-  return build(config) as Promise<Rollup.RollupOutput>
-}
+const clientDir = normalizePath(
+  path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../client')
+)
 
-async function bundleMPA(
-  config: SiteConfig,
-  serverResult: Rollup.RollupOutput,
-  clientJSMap: Record<string, string>
-) {
-  updateCurrentTask(0, 1, 'bundling MPA')
-  // in MPA mode, we need to copy over the non-js asset files from the
-  // server build since there is no client-side build.
-  await Promise.all(
-    serverResult.output.map(async (chunk) => {
-      if (!chunk.fileName.endsWith('.js')) {
-        const tempPath = path.resolve(config.tempDir, chunk.fileName)
-        const outPath = path.resolve(config.outDir, chunk.fileName)
-        await fs.copy(tempPath, outPath)
-      }
-    })
-  )
-  // also copy over public dir
-  const publicDir = path.resolve(config.srcDir, 'public')
-  if (fs.existsSync(publicDir)) {
-    await fs.copy(publicDir, config.outDir)
-  }
-  updateCurrentTask()
-  // build <script client> bundle
-  if (Object.keys(clientJSMap).length) {
-    return buildMPAClient(clientJSMap, config)
-  } else {
-    return null
-  }
-}
+// these deps are also being used in the client code (outside of the theme)
+// exclude them from the theme chunk so there is no circular dependency
+const excludedModules = [
+  '/@siteData',
+  'node_modules/@vueuse/core/',
+  'node_modules/@vueuse/shared/',
+  'node_modules/vue/',
+  'node_modules/vue-demi/',
+  clientDir
+]
 
 // bundles the VitePress app for both client AND server.
 export async function bundle(
@@ -75,26 +46,215 @@ export async function bundle(
   const pageToHashMap = Object.create(null)
   const clientJSMap = Object.create(null)
 
-  const [serverResult, clientResult] = await Promise.all(
-    [true, false].map(async (ssr) => {
-      if (!ssr && config.mpa) return null
-      const plugins = await createVitePressPlugin(
-        config,
-        ssr,
-        pageToHashMap,
-        clientJSMap
-      )
-      return shouldUseParallel(config, 'bundle')
-        ? dispatchBundleWorkload(ssr, plugins)
-        : bundleWorkload.apply({ config, options }, [ssr, plugins])
-    })
+  // define custom rollup input
+  // this is a multi-entry build - every page is considered an entry chunk
+  // the loading is done via filename conversion rules so that the
+  // metadata doesn't need to be included in the main chunk.
+  const input: Record<string, string> = {}
+  config.pages.forEach((file) => {
+    // page filename conversion
+    // foo/bar.md -> foo_bar.md
+    const alias = config.rewrites.map[file] || file
+    input[slash(alias).replace(/\//g, '_')] = path.resolve(config.srcDir, file)
+  })
+
+  const themeEntryRE = new RegExp(
+    `^${escapeRegExp(
+      path.resolve(config.themeDir, 'index.js').replace(/\\/g, '/')
+    ).slice(0, -2)}m?(j|t)s`
   )
 
-  return {
-    clientResult: config.mpa
-      ? await bundleMPA(config, serverResult!, clientJSMap)
-      : clientResult!,
-    serverResult: serverResult!,
-    pageToHashMap
+  // resolve options to pass to vite
+  const { rollupOptions } = options
+
+  const resolveViteConfig = async (
+    ssr: boolean
+  ): Promise<ViteInlineConfig> => ({
+    root: config.srcDir,
+    cacheDir: config.cacheDir,
+    base: config.site.base,
+    logLevel: config.vite?.logLevel ?? 'warn',
+    plugins: await createVitePressPlugin(
+      config,
+      ssr,
+      pageToHashMap,
+      clientJSMap
+    ),
+    ssr: {
+      noExternal: ['vitepress', '@docsearch/css']
+    },
+    build: {
+      ...options,
+      emptyOutDir: true,
+      ssr,
+      ssrEmitAssets: config.mpa,
+      // minify with esbuild in MPA mode (for CSS)
+      minify: ssr
+        ? config.mpa
+          ? 'esbuild'
+          : false
+        : typeof options.minify === 'boolean'
+          ? options.minify
+          : !process.env.DEBUG,
+      outDir: ssr ? config.tempDir : config.outDir,
+      cssCodeSplit: false,
+      rollupOptions: {
+        ...rollupOptions,
+        input: {
+          ...input,
+          // use different entry based on ssr or not
+          app: path.resolve(APP_PATH, ssr ? 'ssr.js' : 'index.js')
+        },
+        // important so that each page chunk and the index export things for each
+        // other
+        preserveEntrySignatures: 'allow-extension',
+        output: {
+          sanitizeFileName,
+          ...rollupOptions?.output,
+          assetFileNames: `${config.assetsDir}/[name].[hash].[ext]`,
+          ...(ssr
+            ? {
+                entryFileNames: '[name].js',
+                chunkFileNames: '[name].[hash].js'
+              }
+            : {
+                entryFileNames: `${config.assetsDir}/[name].[hash].js`,
+                chunkFileNames(chunk) {
+                  // avoid ads chunk being intercepted by adblock
+                  return /(?:Carbon|BuySell)Ads/.test(chunk.name)
+                    ? `${config.assetsDir}/chunks/ui-custom.[hash].js`
+                    : `${config.assetsDir}/chunks/[name].[hash].js`
+                },
+                manualChunks(id, ctx) {
+                  // move known framework code into a stable chunk so that
+                  // custom theme changes do not invalidate hash for all pages
+                  if (id.startsWith('\0vite')) {
+                    return 'framework'
+                  }
+                  if (id.includes('plugin-vue:export-helper')) {
+                    return 'framework'
+                  }
+                  if (
+                    id.includes(`${clientDir}/app`) &&
+                    id !== `${clientDir}/app/index.js`
+                  ) {
+                    return 'framework'
+                  }
+                  if (
+                    isEagerChunk(id, ctx.getModuleInfo) &&
+                    /@vue\/(runtime|shared|reactivity)/.test(id)
+                  ) {
+                    return 'framework'
+                  }
+
+                  if (
+                    (id.startsWith(`${clientDir}/theme-default`) ||
+                      !excludedModules.some((i) => id.includes(i))) &&
+                    staticImportedByEntry(
+                      id,
+                      ctx.getModuleInfo,
+                      cacheTheme,
+                      themeEntryRE
+                    )
+                  ) {
+                    return 'theme'
+                  }
+                }
+              })
+        }
+      }
+    },
+    configFile: config.vite?.configFile
+  })
+
+  let clientResult!: Rollup.RollupOutput | null
+  let serverResult!: Rollup.RollupOutput
+
+  await task('building client + server bundles', async () => {
+    clientResult = config.mpa
+      ? null
+      : ((await build(await resolveViteConfig(false))) as Rollup.RollupOutput)
+    serverResult = (await build(
+      await resolveViteConfig(true)
+    )) as Rollup.RollupOutput
+  })
+
+  if (config.mpa) {
+    // in MPA mode, we need to copy over the non-js asset files from the
+    // server build since there is no client-side build.
+    await Promise.all(
+      serverResult.output.map(async (chunk) => {
+        if (!chunk.fileName.endsWith('.js')) {
+          const tempPath = path.resolve(config.tempDir, chunk.fileName)
+          const outPath = path.resolve(config.outDir, chunk.fileName)
+          await fs.copy(tempPath, outPath)
+        }
+      })
+    )
+    // also copy over public dir
+    const publicDir = path.resolve(config.srcDir, 'public')
+    if (fs.existsSync(publicDir)) {
+      await fs.copy(publicDir, config.outDir)
+    }
+    // build <script client> bundle
+    if (Object.keys(clientJSMap).length) {
+      clientResult = await buildMPAClient(clientJSMap, config)
+    }
+  }
+
+  return { clientResult, serverResult, pageToHashMap }
+}
+
+const cache = new Map<string, boolean>()
+const cacheTheme = new Map<string, boolean>()
+
+/**
+ * Check if a module is statically imported by at least one entry.
+ */
+function isEagerChunk(id: string, getModuleInfo: Rollup.GetModuleInfo) {
+  if (
+    id.includes('node_modules') &&
+    !CSS_LANGS_RE.test(id) &&
+    staticImportedByEntry(id, getModuleInfo, cache)
+  ) {
+    return true
+  }
+}
+
+function staticImportedByEntry(
+  id: string,
+  getModuleInfo: Rollup.GetModuleInfo,
+  cache: Map<string, boolean>,
+  entryRE: RegExp | null = null,
+  importStack: string[] = []
+): boolean {
+  if (cache.has(id)) {
+    return !!cache.get(id)
+  }
+  if (importStack.includes(id)) {
+    // circular deps!
+    cache.set(id, false)
+    return false
   }
+  const mod = getModuleInfo(id)
+  if (!mod) {
+    cache.set(id, false)
+    return false
+  }
+
+  if (entryRE ? entryRE.test(id) : mod.isEntry) {
+    cache.set(id, true)
+    return true
+  }
+  const someImporterIs = mod.importers.some((importer: string) =>
+    staticImportedByEntry(
+      importer,
+      getModuleInfo,
+      cache,
+      entryRE,
+      importStack.concat(id)
+    )
+  )
+  cache.set(id, someImporterIs)
+  return someImporterIs
 }
diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index df8fb5e1..0182a8d8 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -32,7 +32,7 @@ export interface RenderPageContext {
 
 export async function renderPage(
   render: (path: string) => Promise<SSGContext>,
-  pageNameRaw: string,
+  page: string,
   renderContext: RenderPageContext
 ) {
   const {
@@ -46,7 +46,7 @@ export async function renderPage(
     additionalHeadTags
   } = renderContext
 
-  const page = config.rewrites.inv[pageNameRaw] || pageNameRaw
+  page = config.rewrites.inv[page] ?? page
   const routePath = `/${page.replace(/\.md$/, '')}`
   const siteData = resolveSiteDataByRoute(config.site, routePath)
 
@@ -170,34 +170,37 @@ export async function renderPage(
 
   const dir = pageData.frontmatter.dir || siteData.dir || 'ltr'
 
-  const html = [
-    `<!DOCTYPE html>`,
-    `<html lang="${siteData.lang}" dir="${dir}">`,
-    `<head>`,
-    `<meta charset="utf-8">`,
-    isMetaViewportOverridden(head)
-      ? ''
-      : '<meta name="viewport" content="width=device-width,initial-scale=1">',
-    `<title>${title}</title>`,
-    isDescriptionOverridden(head)
-      ? ''
-      : `<meta name="description" content="${description}">`,
-    `<meta name="generator" content="VitePress v${version}">`,
-    stylesheetLink,
-    metadataScript.inHead ? metadataScript.html : '',
-    appChunk
-      ? `<script type="module" src="${siteData.base}${appChunk.fileName}"></script>`
-      : '',
-    await renderHead(head),
-    `</head>`,
-    `<body>`,
-    teleports?.body || '',
-    `<div id="app">${content}</div>`,
-    metadataScript.inHead ? '' : metadataScript.html,
-    inlinedScript,
-    `</body>`,
-    `</html>`
-  ].join('')
+  const html = `<!DOCTYPE html>
+<html lang="${siteData.lang}" dir="${dir}">
+  <head>
+    <meta charset="utf-8">
+    ${
+      isMetaViewportOverridden(head)
+        ? ''
+        : '<meta name="viewport" content="width=device-width,initial-scale=1">'
+    }
+    <title>${title}</title>
+    ${
+      isDescriptionOverridden(head)
+        ? ''
+        : `<meta name="description" content="${description}">`
+    }
+    <meta name="generator" content="VitePress v${version}">
+    ${stylesheetLink}
+    ${metadataScript.inHead ? metadataScript.html : ''}
+    ${
+      appChunk
+        ? `<script type="module" src="${siteData.base}${appChunk.fileName}"></script>`
+        : ''
+    }
+    ${await renderHead(head)}
+  </head>
+  <body>${teleports?.body || ''}
+    <div id="app">${content}</div>
+    ${metadataScript.inHead ? '' : metadataScript.html}
+    ${inlinedScript}
+  </body>
+</html>`
 
   const htmlFileName = path.join(config.outDir, page.replace(/\.md$/, '.html'))
   await fs.ensureDir(path.dirname(htmlFileName))
diff --git a/src/node/build/viteConfig.ts b/src/node/build/viteConfig.ts
deleted file mode 100644
index 80041d73..00000000
--- a/src/node/build/viteConfig.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-import path from 'path'
-import { fileURLToPath } from 'url'
-import {
-  normalizePath,
-  type BuildOptions,
-  type Rollup,
-  type InlineConfig as ViteInlineConfig,
-  type PluginOption
-} from 'vite'
-import { APP_PATH } from '../alias'
-import type { SiteConfig } from '../config'
-import { slash } from '../shared'
-import { escapeRegExp, sanitizeFileName } from '../shared'
-
-// https://github.com/vitejs/vite/blob/d2aa0969ee316000d3b957d7e879f001e85e369e/packages/vite/src/node/plugins/splitVendorChunk.ts#L14
-const CSS_LANGS_RE =
-  /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/
-
-const clientDir = normalizePath(
-  path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../client')
-)
-
-// these deps are also being used in the client code (outside of the theme)
-// exclude them from the theme chunk so there is no circular dependency
-const excludedModules = [
-  '/@siteData',
-  'node_modules/@vueuse/core/',
-  'node_modules/@vueuse/shared/',
-  'node_modules/vue/',
-  'node_modules/vue-demi/',
-  clientDir
-]
-
-const themeEntryRE = (themeDir: string) =>
-  new RegExp(
-    `^${escapeRegExp(
-      path.resolve(themeDir, 'index.js').replace(/\\/g, '/')
-    ).slice(0, -2)}m?(j|t)s`
-  )
-
-const cache = new Map<string, boolean>()
-const cacheTheme = new Map<string, boolean>()
-
-/**
- * Check if a module is statically imported by at least one entry.
- */
-function isEagerChunk(id: string, getModuleInfo: Rollup.GetModuleInfo) {
-  if (
-    id.includes('node_modules') &&
-    !CSS_LANGS_RE.test(id) &&
-    staticImportedByEntry(id, getModuleInfo, cache)
-  ) {
-    return true
-  }
-}
-
-function staticImportedByEntry(
-  id: string,
-  getModuleInfo: Rollup.GetModuleInfo,
-  cache: Map<string, boolean>,
-  entryRE: RegExp | null = null,
-  importStack: string[] = []
-): boolean {
-  if (cache.has(id)) {
-    return !!cache.get(id)
-  }
-  if (importStack.includes(id)) {
-    // circular deps!
-    cache.set(id, false)
-    return false
-  }
-  const mod = getModuleInfo(id)
-  if (!mod) {
-    cache.set(id, false)
-    return false
-  }
-
-  if (entryRE ? entryRE.test(id) : mod.isEntry) {
-    cache.set(id, true)
-    return true
-  }
-  const someImporterIs = mod.importers.some((importer: string) =>
-    staticImportedByEntry(
-      importer,
-      getModuleInfo,
-      cache,
-      entryRE,
-      importStack.concat(id)
-    )
-  )
-  cache.set(id, someImporterIs)
-  return someImporterIs
-}
-
-// define custom rollup input
-// this is a multi-entry build - every page is considered an entry chunk
-// the loading is done via filename conversion rules so that the
-// metadata doesn't need to be included in the main chunk.
-const resolveInput = (config: SiteConfig) =>
-  Object.fromEntries(
-    config.pages.map((file) => {
-      // page filename conversion
-      // foo/bar.md -> foo_bar.md
-      const alias = config.rewrites.map[file] || file
-      return [
-        slash(alias).replace(/\//g, '_'),
-        path.resolve(config.srcDir, file)
-      ]
-    })
-  ) as Record<string, string>
-
-export default async function resolveViteConfig(
-  ssr: boolean,
-  {
-    config,
-    options,
-    plugins
-  }: {
-    config: SiteConfig
-    options: BuildOptions
-    plugins: PluginOption[]
-  }
-): Promise<ViteInlineConfig> {
-  return {
-    root: config.srcDir,
-    cacheDir: config.cacheDir,
-    base: config.site.base,
-    logLevel: config.vite?.logLevel ?? 'warn',
-    plugins,
-    ssr: {
-      noExternal: ['vitepress', '@docsearch/css']
-    },
-    build: {
-      ...options,
-      emptyOutDir: true,
-      ssr,
-      ssrEmitAssets: config.mpa,
-      // minify with esbuild in MPA mode (for CSS)
-      minify: ssr
-        ? config.mpa && 'esbuild'
-        : options.minify ?? !process.env.DEBUG,
-      outDir: ssr ? config.tempDir : config.outDir,
-      cssCodeSplit: false,
-      rollupOptions: {
-        ...options.rollupOptions,
-        input: {
-          ...resolveInput(config),
-          // use different entry based on ssr or not
-          app: path.resolve(APP_PATH, ssr ? 'ssr.js' : 'index.js')
-        },
-        // important so that each page chunk and the index export things for each
-        // other
-        preserveEntrySignatures: 'allow-extension',
-        output: {
-          sanitizeFileName,
-          ...options.rollupOptions?.output,
-          assetFileNames: `${config.assetsDir}/[name].[hash].[ext]`,
-          ...(ssr
-            ? {
-                entryFileNames: '[name].js',
-                chunkFileNames: '[name].[hash].js'
-              }
-            : {
-                entryFileNames: `${config.assetsDir}/[name].[hash].js`,
-                chunkFileNames(chunk) {
-                  // avoid ads chunk being intercepted by adblock
-                  return /(?:Carbon|BuySell)Ads/.test(chunk.name)
-                    ? `${config.assetsDir}/chunks/ui-custom.[hash].js`
-                    : `${config.assetsDir}/chunks/[name].[hash].js`
-                },
-                manualChunks(id, ctx) {
-                  // move known framework code into a stable chunk so that
-                  // custom theme changes do not invalidate hash for all pages
-                  if (id.startsWith('\0vite')) {
-                    return 'framework'
-                  }
-                  if (id.includes('plugin-vue:export-helper')) {
-                    return 'framework'
-                  }
-                  if (
-                    id.includes(`${clientDir}/app`) &&
-                    id !== `${clientDir}/app/index.js`
-                  ) {
-                    return 'framework'
-                  }
-                  if (
-                    isEagerChunk(id, ctx.getModuleInfo) &&
-                    /@vue\/(runtime|shared|reactivity)/.test(id)
-                  ) {
-                    return 'framework'
-                  }
-
-                  if (
-                    (id.startsWith(`${clientDir}/theme-default`) ||
-                      !excludedModules.some((i) => id.includes(i))) &&
-                    staticImportedByEntry(
-                      id,
-                      ctx.getModuleInfo,
-                      cacheTheme,
-                      themeEntryRE(config.themeDir)
-                    )
-                  ) {
-                    return 'theme'
-                  }
-                }
-              })
-        }
-      }
-    },
-    configFile: config.vite?.configFile
-  }
-}
diff --git a/src/node/plugins/localSearchPlugin.ts b/src/node/plugins/localSearchPlugin.ts
index b282aa7b..673e5eeb 100644
--- a/src/node/plugins/localSearchPlugin.ts
+++ b/src/node/plugins/localSearchPlugin.ts
@@ -32,9 +32,11 @@ interface IndexObject {
   titles: string[]
 }
 
+// SSR being `true` or `false` dose not affect the config related to markdown
+// renderer, so it can be reused.
 let md: MarkdownRenderer
 
-let flagAllIndexed = false
+let flagScanned = false
 const taskByLocale = new Map<string, Promise<void>>()
 const filesByLocale = new Map<string, Set<string>>()
 const indexByLocale = new Map<string, MiniSearch<IndexObject>>()
@@ -160,9 +162,10 @@ export async function localSearchPlugin(
     }
   }
 
-  function indexAll() {
-    if (flagAllIndexed) return
-    flagAllIndexed = true
+  // scan all pages, group by locale and create empty indexes accordingly.
+  function scanForIndex() {
+    if (flagScanned) return
+    flagScanned = true
 
     for (const page of siteConfig.pages) {
       const file = path.join(siteConfig.srcDir, page)
@@ -209,7 +212,7 @@ export async function localSearchPlugin(
 
     async load(id) {
       if (id === LOCAL_SEARCH_INDEX_REQUEST_PATH) {
-        indexAll()
+        scanForIndex()
         let records: string[] = []
         for (const [locale] of filesByLocale) {
           records.push(
diff --git a/src/node/server.ts b/src/node/server.ts
index ff079188..953d7daf 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -28,7 +28,10 @@ export async function createServer(
     configFile: config.vite?.configFile
   }).then((server) =>
     Object.assign({}, server, {
-      close: () => server.close().then(() => stopWorkers('server.close()'))
+      close() {
+        stopWorkers('server.close()')
+        return server.close()
+      }
     })
   )
 }
diff --git a/src/node/utils/queue.ts b/src/node/utils/queue.ts
index 26a8123e..dff9753e 100644
--- a/src/node/utils/queue.ts
+++ b/src/node/utils/queue.ts
@@ -19,6 +19,7 @@ export default class Queue<T> {
   enqueue(data: T) {
     if (this.closed)
       throw new Error(`Failed to enqueue ${data}, queue already closed`)
+    if (data === null) return this.close()
     if (this.pending.length) this.pending.shift()!(data)
     else this.queue.push(data)
   }
diff --git a/src/node/worker.ts b/src/node/worker.ts
index 69cdb50a..6e716f07 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -1,5 +1,8 @@
 import { Worker, isMainThread, parentPort, workerData } from 'worker_threads'
-import RPCContext, { deferPromise } from 'rpc-magic-proxy'
+import RPCContext, {
+  deferPromise,
+  type RPCContextOptions
+} from 'rpc-magic-proxy'
 import { task, updateCurrentTask } from './utils/task'
 import c from 'picocolors'
 import Queue from './utils/queue'
@@ -7,8 +10,12 @@ import _debug from 'debug'
 import type { SiteConfig } from 'siteConfig'
 import humanizeDuration from 'humanize-duration'
 
-export type SupportsParallel = 'bundle' | 'render' | 'local-search'
+export type SupportsParallel = 'render' | 'local-search'
 
+const options: RPCContextOptions = {
+  carryThis: false,
+  carrySideEffect: false
+}
 /**
  * Checks if the given task should be run in parallel.
  * If task is omitted, checks if any task should be run in parallel.
@@ -61,7 +68,7 @@ export async function launchWorkers(numWorkers: number, context: Object) {
   debug(`launching ${numWorkers} workers`)
   taskQueue = new Queue<WorkerTask>()
   const allInitialized: Array<Promise<void>> = []
-  const ctx = new RPCContext()
+  const ctx = new RPCContext(options)
   const getNextTask = () => taskQueue?.dequeue() ?? null
   for (let i = 0; i < numWorkers; i++) {
     const workerId = (i + 1).toString().padStart(2, '0')
@@ -99,7 +106,8 @@ export function updateContext(context: Object) {
   return Promise.all(workers.map(({ hooks }) => hooks.updateContext(context)))
 }
 
-// Wait for workers to drain the taskQueue and exit.
+// Wait for workers to finish and exit.
+// Will return immediately if no worker exists.
 export async function stopWorkers(reason: string = 'exit') {
   debug('stopping workers:', reason)
   const allClosed = workers.map((w) =>
@@ -111,10 +119,10 @@ export async function stopWorkers(reason: string = 'exit') {
   taskQueue = null
   const success = await Promise.any([
     Promise.all(allClosed).then(() => true),
-    new Promise<false>((res) => setTimeout(() => res(false), 2000))
+    new Promise<false>((res) => setTimeout(() => res(false), 1500))
   ])
   if (!success) {
-    console.warn('forcefully terminating workers')
+    debug('forcefully terminating workers')
     for (const w of workers) {
       try {
         w.terminate()
@@ -152,7 +160,7 @@ export function registerWorkload<T extends Object, K extends any[], V>(
 
 // Will keep querying next workload from main thread
 async function workerMainLoop() {
-  const ctx = new RPCContext().bind(parentPort! as any)
+  const ctx = new RPCContext(options).bind(parentPort! as any)
   const {
     workerMeta: _workerMeta,
     initWorkerHooks,

From 1dd35b222658a8cf5c0c6c3106d95d54c646cab9 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Mon, 8 Jan 2024 16:50:38 -0500
Subject: [PATCH 41/43] strip changes from #3385

---
 package.json                          |  2 -
 pnpm-lock.yaml                        | 14 -----
 src/node/build/build.ts               | 19 +++----
 src/node/plugins/localSearchPlugin.ts | 11 ++--
 src/node/utils/task.ts                | 76 +++------------------------
 src/node/worker.ts                    |  7 +--
 6 files changed, 19 insertions(+), 110 deletions(-)

diff --git a/package.json b/package.json
index de976c97..c6321b40 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,6 @@
     "@types/debug": "^4.1.12",
     "@types/escape-html": "^1.0.4",
     "@types/fs-extra": "^11.0.4",
-    "@types/humanize-duration": "^3.27.3",
     "@types/jsdom": "^21.1.6",
     "@types/lodash.template": "^4.5.3",
     "@types/mark.js": "^8.11.12",
@@ -164,7 +163,6 @@
     "fs-extra": "^11.2.0",
     "get-port": "^7.0.0",
     "gray-matter": "^4.0.3",
-    "humanize-duration": "^3.31.0",
     "lint-staged": "^15.2.0",
     "lodash.template": "^4.5.0",
     "lru-cache": "^10.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3477519c..5d10e226 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -114,9 +114,6 @@ importers:
       '@types/fs-extra':
         specifier: ^11.0.4
         version: 11.0.4
-      '@types/humanize-duration':
-        specifier: ^3.27.3
-        version: 3.27.3
       '@types/jsdom':
         specifier: ^21.1.6
         version: 21.1.6
@@ -192,9 +189,6 @@ importers:
       gray-matter:
         specifier: ^4.0.3
         version: 4.0.3
-      humanize-duration:
-        specifier: ^3.31.0
-        version: 3.31.0
       lint-staged:
         specifier: ^15.2.0
         version: 15.2.0(supports-color@9.4.0)
@@ -1160,10 +1154,6 @@ packages:
     resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
     dev: true
 
-  /@types/humanize-duration@3.27.3:
-    resolution: {integrity: sha512-wiiiFYjnrYDJE/ujU7wS/NShqp12IKrejozjDtcejP0zYi+cjyjVcfZHwcFUDKVJ7tHGsmgeW2ED92ABIIjfpg==}
-    dev: true
-
   /@types/jquery@3.5.29:
     resolution: {integrity: sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==}
     dependencies:
@@ -2803,10 +2793,6 @@ packages:
     engines: {node: '>=16.17.0'}
     dev: true
 
-  /humanize-duration@3.31.0:
-    resolution: {integrity: sha512-fRrehgBG26NNZysRlTq1S+HPtDpp3u+Jzdc/d5A4cEzOD86YLAkDaJyJg8krSdCi7CJ+s7ht3fwRj8Dl+Btd0w==}
-    dev: true
-
   /iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index f6467fb4..5a5ba4a5 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -74,16 +74,16 @@ export async function build(
   }
 
   try {
-    const { clientResult, serverResult, pageToHashMap } = await task(
-      'building client + server bundles',
-      () => bundle(siteConfig, buildOptions)
+    const { clientResult, serverResult, pageToHashMap } = await bundle(
+      siteConfig,
+      buildOptions
     )
 
     if (process.env.BUNDLE_ONLY) {
       return
     }
 
-    await task('rendering pages', async (updateProgress) => {
+    await task('rendering pages', async () => {
       const renderEntry =
         pathToFileURL(path.join(siteConfig.tempDir, 'app.js')).toString() +
         '?t=' +
@@ -165,14 +165,9 @@ export async function build(
       }
 
       const pages = ['404.md', ...siteConfig.pages]
-      let count_done = 0
-      await pMap(
-        pages,
-        (page) => task(page).then(updateProgress(++count_done, pages.length)),
-        {
-          concurrency: siteConfig.concurrency
-        }
-      )
+      await pMap(pages, task, {
+        concurrency: siteConfig.concurrency
+      })
     })
 
     // emit page hash map for the case where a user session is open
diff --git a/src/node/plugins/localSearchPlugin.ts b/src/node/plugins/localSearchPlugin.ts
index 673e5eeb..5a62fb49 100644
--- a/src/node/plugins/localSearchPlugin.ts
+++ b/src/node/plugins/localSearchPlugin.ts
@@ -17,7 +17,6 @@ import {
   type Awaitable
 } from '../shared'
 import { processIncludes } from '../utils/processIncludes'
-import { updateCurrentTask, clearLine } from '../utils/task'
 import type { PageSplitSection } from '../../../types/local-search'
 
 const debug = _debug('vitepress:local-search')
@@ -176,12 +175,10 @@ export async function localSearchPlugin(
   }
 
   async function indexLocale(locale: string) {
-    let numIndexed = 0
-    const update = () =>
-      updateCurrentTask(++numIndexed, files.length, `🔍️ indexing ${locale}`)
     const files = [...filesByLocale.get(locale)!]
-    const task = (f: string) => indexFile(f, parallel).then(update)
-    await pMap(files, task, { concurrency: siteConfig.concurrency })
+    await pMap(files, (f) => indexFile(f, parallel), {
+      concurrency: siteConfig.concurrency
+    })
   }
 
   const parallel = shouldUseParallel(siteConfig, 'local-search')
@@ -264,7 +261,7 @@ async function* splitPageIntoSections(
       // Skip duplicate id, content will be treated as normal text
       if (existingIdSet.has(id)) {
         console.error(
-          `${clearLine}⚠️  Duplicate heading id "${id}" in ${pageName}`
+          `\x1b[2K\r  ⚠️  Duplicate heading id "${id}" in ${pageName}`
         )
         continue
       }
diff --git a/src/node/utils/task.ts b/src/node/utils/task.ts
index 91779af4..1d8a3322 100644
--- a/src/node/utils/task.ts
+++ b/src/node/utils/task.ts
@@ -1,80 +1,18 @@
 import ora from 'ora'
-import humanizeDuration from 'humanize-duration'
-import c from 'picocolors'
-import { workerMeta } from '../worker'
 
-export const okMark = c.green('✓')
-export const failMark = c.red('✖')
-export const clearLine = '\x1b[2K\r'
-
-export type UpdateHandle = (
-  done?: number,
-  total?: number,
-  subtask?: string
-) => any
-
-let updateHandle: UpdateHandle | null = null
-
-export const updateCurrentTask: UpdateHandle = (...args) => {
-  if (workerMeta) workerMeta.updateCurrentTask(...args)
-  else if (updateHandle) updateHandle(...args)
-  else if (!process.stderr.isTTY) {
-    return
-  } else if (args.length === 0) {
-    process.stderr.write(clearLine)
-  } else {
-    const name = args[2] || 'unknown task'
-    process.stderr.write(
-      `${clearLine}${name} [${args.slice(0, 2).join(' / ')}]`
-    )
-  }
-}
-
-export async function task<T>(
-  taskName: string,
-  task: (update: UpdateHandle) => Promise<T>
-): Promise<T> {
-  if (workerMeta) {
-    let retVal: T
-    await workerMeta.task(taskName, async (handle: UpdateHandle) => {
-      retVal = await task(handle)
-    })
-    return retVal!
-  }
+export const okMark = '\x1b[32m✓\x1b[0m'
+export const failMark = '\x1b[31m✖\x1b[0m'
 
+export async function task(taskName: string, task: () => Promise<void>) {
   const spinner = ora({ discardStdin: false })
   spinner.start(taskName + '...')
 
-  updateHandle = (done, total, subtask) => {
-    const taskFullName = subtask ? `${taskName} - ${subtask}` : taskName
-    if (done === undefined) {
-      spinner.text = taskFullName + '...'
-    } else if (total === undefined) {
-      spinner.text = `${taskFullName} [ ${done} ]`
-    } else {
-      // match length to display them in same width
-      const _total = `${total}`
-      const _done = `${done}`.padStart(_total.length, ' ')
-      spinner.text = `${taskFullName} [ ${_done} / ${_total} ]`
-    }
-  }
-
-  const timeStart = performance.now()
-  let success = true
-
   try {
-    return await task(updateHandle)
+    await task()
   } catch (e) {
-    success = false
+    spinner.stopAndPersist({ symbol: failMark })
     throw e
-  } finally {
-    updateHandle = null
-    const timeEnd = performance.now()
-    const duration = humanizeDuration(timeEnd - timeStart, {
-      maxDecimalPoints: 2
-    })
-    const text = `${taskName} - ${duration}`
-    const symbol = success ? okMark : failMark
-    spinner.stopAndPersist({ symbol, text })
   }
+
+  spinner.stopAndPersist({ symbol: okMark })
 }
diff --git a/src/node/worker.ts b/src/node/worker.ts
index 6e716f07..4628d017 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -3,7 +3,6 @@ import RPCContext, {
   deferPromise,
   type RPCContextOptions
 } from 'rpc-magic-proxy'
-import { task, updateCurrentTask } from './utils/task'
 import c from 'picocolors'
 import Queue from './utils/queue'
 import _debug from 'debug'
@@ -83,9 +82,7 @@ export async function launchWorkers(numWorkers: number, context: Object) {
         workerId,
         dispatchWork,
         // Save some RPC overhead when debugger is not active
-        debug: debug.enabled ? debug : null,
-        task,
-        updateCurrentTask
+        debug: debug.enabled ? debug : null
       },
       initWorkerHooks,
       getNextTask,
@@ -137,8 +134,6 @@ export let workerMeta: {
   workerId: string
   dispatchWork: typeof dispatchWork
   debug: typeof debug
-  task: typeof task
-  updateCurrentTask: typeof updateCurrentTask
 } | null = null
 
 const registry: Map<string, { main: Function; init?: Function }> = new Map()

From e5a1c7577ba810e53a94ed9d20f2c6ef2c4f7260 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Mon, 8 Jan 2024 16:54:58 -0500
Subject: [PATCH 42/43] fix broken imports due to stripped feature

---
 src/node/build/build.ts | 11 ++++-------
 src/node/worker.ts      |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 5a5ba4a5..09a9ae09 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -15,7 +15,6 @@ import { task } from '../utils/task'
 import { bundle } from './bundle'
 import { generateSitemap } from './generateSitemap'
 import { renderPage, type RenderPageContext } from './render'
-import humanizeDuration from 'humanize-duration'
 import { launchWorkers, shouldUseParallel, stopWorkers } from '../worker'
 import { registerWorkload, updateContext } from '../worker'
 
@@ -45,7 +44,7 @@ export async function build(
   root?: string,
   buildOptions: BuildOptions & { base?: string; mpa?: string } = {}
 ) {
-  const timeStart = performance.now()
+  const start = Date.now()
 
   process.env.NODE_ENV = 'production'
   const siteConfig = await resolveConfig(root, 'build', 'production')
@@ -185,11 +184,9 @@ export async function build(
   await siteConfig.buildEnd?.(siteConfig)
   clearCache()
   stopWorkers('build complete')
-  const timeEnd = performance.now()
-  const duration = humanizeDuration(timeEnd - timeStart, {
-    maxDecimalPoints: 2
-  })
-  siteConfig.logger.info(`build complete in ${duration}.`)
+  siteConfig.logger.info(
+    `build complete in ${((Date.now() - start) / 1000).toFixed(2)}s.`
+  )
 }
 
 function linkVue() {
diff --git a/src/node/worker.ts b/src/node/worker.ts
index 4628d017..8ef29528 100644
--- a/src/node/worker.ts
+++ b/src/node/worker.ts
@@ -7,7 +7,6 @@ import c from 'picocolors'
 import Queue from './utils/queue'
 import _debug from 'debug'
 import type { SiteConfig } from 'siteConfig'
-import humanizeDuration from 'humanize-duration'
 
 export type SupportsParallel = 'render' | 'local-search'
 
@@ -213,10 +212,8 @@ async function workerMainLoop() {
     }
   }
   ctx.reset()
-  const duration = humanizeDuration(workTime, {
-    maxDecimalPoints: 2
-  })
-  await debug(`stopped - total workload: ${duration}`)
+  const duration = (workTime / 1000).toFixed(2)
+  await debug(`stopped - total workload: ${duration}s`)
 }
 
 if (!isMainThread && workerData?.[WORKER_MAGIC])

From 671087cfbdec7a8f29afa00245866d0227b63468 Mon Sep 17 00:00:00 2001
From: Yuxuan Zhang <github@z-yx.cc>
Date: Sat, 13 Jan 2024 18:51:26 -0500
Subject: [PATCH 43/43] fix pnpm lock file after merge

---
 pnpm-lock.yaml | 70 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 15bdc8bf..a2d2dec1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -273,6 +273,9 @@ importers:
       rollup-plugin-esbuild:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.19.11)(rollup@4.9.5)(supports-color@9.4.0)
+      rpc-magic-proxy:
+        specifier: ^2.0.6
+        version: 2.0.6
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -293,7 +296,7 @@ importers:
         version: 5.3.3
       vitest:
         specifier: ^1.2.0
-        version: 1.2.0(@types/node@20.11.0)(supports-color@9.4.0)
+        version: 1.2.0(@types/node@20.11.0)(jsdom@23.0.1)(supports-color@9.4.0)
       vue-tsc:
         specifier: ^1.8.27
         version: 1.8.27(typescript@5.3.3)
@@ -1253,7 +1256,7 @@ packages:
   /@types/jsdom@21.1.6:
     resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
     dependencies:
-      '@types/node': 20.10.7
+      '@types/node': 20.11.0
       '@types/tough-cookie': 4.0.5
       parse5: 7.1.2
     dev: true
@@ -1405,6 +1408,10 @@ packages:
     resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==}
     dev: true
 
+  /@types/tough-cookie@4.0.5:
+    resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
+    dev: true
+
   /@types/trusted-types@2.0.7:
     resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
     dev: true
@@ -1690,6 +1697,14 @@ packages:
     resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==}
     dev: true
 
+  /agent-base@7.1.0(supports-color@9.4.0):
+    resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
+    engines: {node: '>= 14'}
+    dependencies:
+      debug: 4.3.4(supports-color@9.4.0)
+    transitivePeerDependencies:
+      - supports-color
+
   /algoliasearch@4.22.1:
     resolution: {integrity: sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg==}
     dependencies:
@@ -2275,6 +2290,13 @@ packages:
     engines: {node: '>= 12'}
     dev: true
 
+  /data-urls@5.0.0:
+    resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
+    engines: {node: '>=18'}
+    dependencies:
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.0.0
+
   /de-indent@1.0.2:
     resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
     dev: true
@@ -3076,6 +3098,12 @@ packages:
       lru-cache: 10.1.0
     dev: true
 
+  /html-encoding-sniffer@4.0.0:
+    resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      whatwg-encoding: 3.1.1
+
   /html-void-elements@3.0.0:
     resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
     dev: true
@@ -3125,6 +3153,12 @@ packages:
     engines: {node: '>=16.17.0'}
     dev: true
 
+  /iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      safer-buffer: 2.1.2
+
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
     dev: true
@@ -3296,6 +3330,9 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
+  /is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
   /is-reference@1.2.1:
     resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
     dependencies:
@@ -4144,7 +4181,6 @@ packages:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
     dependencies:
       entities: 4.5.0
-    dev: true
 
   /path-browserify@1.0.1:
     resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
@@ -4465,6 +4501,9 @@ packages:
       unified: 11.0.4
     dev: true
 
+  /requires-port@1.0.0:
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+
   /resolve-pkg-maps@1.0.0:
     resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
     dev: true
@@ -4556,6 +4595,13 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.9.5
       fsevents: 2.3.3
 
+  /rpc-magic-proxy@2.0.6:
+    resolution: {integrity: sha512-PtJfEIwXiFg64FUXUGv6cot6X3RssVeQ6Xb7t8lHaAPRDEwvuZf6zCNtHEyxgFw3qnBf+LyoLAX9EOl0ipNvig==}
+    dev: true
+
+  /rrweb-cssom@0.6.0:
+    resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
+
   /run-applescript@7.0.0:
     resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==}
     engines: {node: '>=18'}
@@ -5088,6 +5134,12 @@ packages:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
     dev: true
 
+  /tr46@5.0.0:
+    resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
+    engines: {node: '>=18'}
+    dependencies:
+      punycode: 2.3.1
+
   /trim-lines@3.0.1:
     resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
     dev: true
@@ -5259,11 +5311,21 @@ packages:
       unist-util-visit-parents: 6.0.1
     dev: true
 
+  /universalify@0.2.0:
+    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
+    engines: {node: '>= 4.0.0'}
+
   /universalify@2.0.1:
     resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
     engines: {node: '>= 10.0.0'}
     dev: true
 
+  /url-parse@1.5.10:
+    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+    dependencies:
+      querystringify: 2.2.0
+      requires-port: 1.0.0
+
   /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: true
@@ -5363,7 +5425,7 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vitest@1.2.0(@types/node@20.11.0)(supports-color@9.4.0):
+  /vitest@1.2.0(@types/node@20.11.0)(jsdom@23.0.1)(supports-color@9.4.0):
     resolution: {integrity: sha512-Ixs5m7BjqvLHXcibkzKRQUvD/XLw0E3rvqaCMlrm/0LMsA0309ZqYvTlPzkhh81VlEyVZXFlwWnkhb6/UMtcaQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true