fix(collect): invalidate cache in all workers

packages/histoire/package.json

@@ -43,6 +43,7 @@
  "test": "peeky run"
  },
  "dependencies": {
+ "@akryum/tinypool": "^0.3.1",
  "@histoire/app": "^0.15.4",
  "@histoire/controls": "^0.15.4",
  "@histoire/shared": "^0.15.4",
@@ -72,7 +73,6 @@
  "sade": "^1.8.1",
  "shiki-es": "^0.2.0",
  "sirv": "^2.0.2",
- "tinypool": "^0.1.2",
  "vite-node": "0.28.4"
  },
  "peerDependencies": {

packages/histoire/src/node/collect/index.ts

@@ -4,7 +4,7 @@ import { ViteNodeServer } from 'vite-node/server'
 import type { FetchFunction, ResolveIdFunction } from 'vite-node'
 import { relative } from 'pathe'
 import pc from 'picocolors'
-import Tinypool from 'tinypool'
+import Tinypool from '@akryum/tinypool'
 import { createBirpc } from 'birpc'
 import { cpus } from 'node:os'
 import type { ServerStoryFile } from '@histoire/shared'
@@ -82,20 +82,16 @@ export function useCollectStories (options: UseCollectStoriesOptions, ctx: Conte
  }
  }
 
- const invalidates = new Set<string>()
-
  if (mainServer) {
  mainServer.watcher.on('change', (file) => {
  file = slash(file)
- if (invalidates.has(file)) return
- invalidates.add(file)
+ threadPool.broadcastMessage({
+ kind: 'hst:invalidate',
+ file,
+ })
  })
  }
 
- function clearInvalidates () {
- invalidates.clear()
- }
-
  async function executeStoryFile (storyFile: ServerStoryFile) {
  try {
  const { workerPort } = createChannel()
@@ -104,7 +100,6 @@ export function useCollectStories (options: UseCollectStoriesOptions, ctx: Conte
  base: server.config.base,
  storyFile,
  port: workerPort,
- invalidates: Array.from(invalidates),
  }
  const { storyData } = await threadPool.run(payload, {
  transferList: [
@@ -157,6 +152,5 @@ export function useCollectStories (options: UseCollectStoriesOptions, ctx: Conte
  clearCache,
  executeStoryFile,
  destroy,
- clearInvalidates,
  }
 }

packages/histoire/src/node/collect/worker.ts

@@ -1,5 +1,6 @@
 import { fileURLToPath } from 'node:url'
 import type { MessagePort } from 'node:worker_threads'
+import { parentPort } from 'node:worker_threads'
 import { performance } from 'node:perf_hooks'
 import { ModuleCacheMap, ViteNodeRunner } from 'vite-node/client'
 import { createBirpc } from 'birpc'
@@ -16,7 +17,6 @@ export interface Payload {
  base: string
  port: MessagePort
  storyFile: ServerStoryFile
- invalidates: string[]
 }
 
 export interface ReturnData {
@@ -30,6 +30,13 @@ let _rpc: ReturnType<typeof createBirpc<{
  resolveId: ResolveIdFunction
 }>>
 
+// Cleanup module cache
+parentPort.on('message', message => {
+ if (message?.kind === 'hst:invalidate') {
+ _moduleCache.delete(message.file)
+ }
+})
+
 export default async (payload: Payload): Promise<ReturnData> => {
  const startTime = performance.now()
  process.env.HST_COLLECT = 'true'
@@ -54,11 +61,6 @@ export default async (payload: Payload): Promise<ReturnData> => {
  },
  }))
 
- // Cleanup cache
- for (const file of payload.invalidates) {
- _moduleCache.delete(file)
- }
-
  const { destroy: destroyDomEnv } = createDomEnv()
 
  const el = window.document.createElement('div')

packages/histoire/src/node/server.ts

@@ -81,7 +81,6 @@ export async function createServer (ctx: Context, options: CreateServerOptions =
  clearCache,
  executeStoryFile,
  destroy: destroyCollectStories,
- clearInvalidates,
  } = useCollectStories({
  server: nodeServer,
  mainServer: server,
@@ -189,8 +188,6 @@ export async function createServer (ctx: Context, options: CreateServerOptions =
  }
  console.log(`Collect stories end ${pc.bold(pc.blue(Math.round(performance.now() - time)))}ms`)
 
- clearInvalidates()
-
  invalidateModule(VirtualFiles.RESOLVED_STORIES_ID)
  invalidateModule(VirtualFiles.RESOLVED_SEARCH_TITLE_DATA_ID)