fix chokidar glob

packages/histoire/package.json

@@ -70,6 +70,7 @@
     "markdown-it-attrs": "^4.2.0",
     "markdown-it-emoji": "^3.0.0",
     "micromatch": "^4.0.8",
+    "minimatch": "^10.0.1",
     "mrmime": "^2.0.0",
     "pathe": "^1.1.2",
     "picocolors": "^1.1.1",

packages/histoire/src/node/build.ts

@@ -1,33 +1,33 @@
-import { performance } from 'node:perf_hooks'
-import { join } from 'pathe'
+import type {
+  BuildEndCallback,
+  ChangeViteConfigCallback,
+  PreviewStoryCallback,
+} from '@histoire/shared'
+import type { RollupOutput } from 'rollup'
 import type {
   InlineConfig as ViteInlineConfig,
   Plugin as VitePlugin,
 } from 'vite'
+import type { Context } from './context.js'
+import { performance } from 'node:perf_hooks'
+import fs from 'fs-extra'
+import { lookup as lookupMime } from 'mrmime'
+import { join } from 'pathe'
+import pc from 'picocolors'
 import {
   createServer as createViteServer,
   mergeConfig as mergeViteConfig,
   build as viteBuild,
 } from 'vite'
-import fs from 'fs-extra'
-import { lookup as lookupMime } from 'mrmime'
-import pc from 'picocolors'
-import type {
-  BuildEndCallback,
-  ChangeViteConfigCallback,
-  PreviewStoryCallback,
-} from '@histoire/shared'
-import type { RollupOutput } from 'rollup'
 import { APP_PATH } from './alias.js'
-import type { Context } from './context.js'
-import { getViteConfigWithPlugins } from './vite.js'
-import { findAllStories } from './stories.js'
-import { useCollectStories } from './collect/index.js'
-import { BuildPluginApi } from './plugin.js'
+import { getSerializedStoryData } from './build-serialize.js'
+import { useCollectStories } from './collect'
 import { useModuleLoader } from './load.js'
-import { startPreview } from './preview.js'
 import { createMarkdownFilesWatcher } from './markdown.js'
-import { getSerializedStoryData } from './build-serialize.js'
+import { BuildPluginApi } from './plugin.js'
+import { startPreview } from './preview.js'
+import { findAllStories } from './stories.js'
+import { getViteConfigWithPlugins } from './vite.js'
 
 const PRELOAD_MODULES = [
   'vendor',

packages/histoire/src/node/builtin-plugins/tailwind-tokens.ts

@@ -1,6 +1,6 @@
 import type { Plugin, PluginApiBase } from '@histoire/shared'
-import { getInjectedImport } from '../util/vendors.js'
 import { findUp } from '../util/find-up.js'
+import { getInjectedImport } from '../util/vendors.js'
 
 export interface TailwindTokensOptions {
   configFile?: string

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

@@ -1,17 +1,17 @@
-import { MessageChannel } from 'node:worker_threads'
-import { cpus } from 'node:os'
+import type { ServerStoryFile } from '@histoire/shared'
 import type { ViteDevServer } from 'vite'
-import { ViteNodeServer } from 'vite-node/server'
 import type { FetchFunction, ResolveIdFunction } from 'vite-node'
-import { relative } from 'pathe'
-import pc from 'picocolors'
+import type { Context } from '../context.js'
+import type { Payload, ReturnData } from './worker.js'
+import { cpus } from 'node:os'
+import { MessageChannel } from 'node:worker_threads'
 import Tinypool from '@akryum/tinypool'
 import { createBirpc } from 'birpc'
-import type { ServerStoryFile } from '@histoire/shared'
+import { relative } from 'pathe'
+import pc from 'picocolors'
+import { ViteNodeServer } from 'vite-node/server'
 import { createPath } from '../tree.js'
-import type { Context } from '../context.js'
 import { slash } from '../util/fs.js'
-import type { Payload, ReturnData } from './worker.js'
 
 export interface UseCollectStoriesOptions {
   server: ViteDevServer
@@ -27,8 +27,8 @@ export function useCollectStories(options: UseCollectStoriesOptions, ctx: Contex
       inline: [
         /histoire\/dist/,
         /histoire\/client/,
-        /@histoire\/[\w\d-]+\/dist/,
-        /histoire-[\w\d-]+\/dist/,
+        /@histoire\/[\w-]+\/dist/,
+        /histoire-[\w-]+\/dist/,
         /@vue\/devtools-api/,
         /vuetify/,
         // @TODO temporary fix for https://github.com/histoire-dev/histoire/issues/409

packages/histoire/src/node/commands/build.ts

@@ -11,7 +11,4 @@ export async function buildCommand(options: BuildOptions) {
     mode: 'build',
   })
   await build(ctx)
-
-  // @TODO remove when https://github.com/vitejs/vite/issues/6815 is fixed
-  process.exit(0)
 }

packages/histoire/src/node/config.ts

@@ -169,11 +169,11 @@ export async function loadConfigFile(configFile: string): Promise<Partial<Histoi
     const jiti = createJiti(__filename, {
       moduleCache: false,
     })
-    const result = await jiti.import(configFile)
-    if (!result.default) {
+    const result = await jiti.import(configFile, { default: true }) as Partial<HistoireConfig>
+    if (!result) {
       throw new Error(`Expected default export in ${configFile}`)
     }
-    return result.default
+    return result
   }
   catch (e) {
     console.error(pc.red(`Error while loading ${configFile}`))

packages/histoire/src/node/context.ts

@@ -1,5 +1,3 @@
-import type { ResolvedConfig } from 'vite'
-import { resolveConfig as resolveViteConfig } from 'vite'
 import type {
   ConfigMode,
   FinalSupportPlugin,
@@ -8,6 +6,8 @@ import type {
   ServerMarkdownFile,
   ServerStoryFile,
 } from '@histoire/shared'
+import type { ResolvedConfig } from 'vite'
+import { resolveConfig as resolveViteConfig } from 'vite'
 import { processConfig, resolveConfig } from './config.js'
 import { mergeHistoireViteConfig } from './vite.js'
 

packages/histoire/src/node/server.ts

@@ -1,16 +1,16 @@
-import { performance } from 'node:perf_hooks'
-import { createServer as createViteServer } from 'vite'
-import pc from 'picocolors'
 import type { ServerStoryFile } from '@histoire/shared'
 import type { Context } from './context.js'
-import { getViteConfigWithPlugins } from './vite.js'
-import * as VirtualFiles from './virtual/index.js'
-import { onStoryChange, onStoryListChange, watchStories } from './stories.js'
+import { performance } from 'node:perf_hooks'
+import pc from 'picocolors'
+import { createServer as createViteServer } from 'vite'
 import { useCollectStories } from './collect/index.js'
-import { DevEventPluginApi, DevPluginApi } from './plugin.js'
 import { useModuleLoader } from './load.js'
-import { wrapLogError } from './util/log.js'
 import { createMarkdownFilesWatcher, onMarkdownListChange } from './markdown.js'
+import { DevEventPluginApi, DevPluginApi } from './plugin.js'
+import { onStoryChange, onStoryListChange, watchStories } from './stories.js'
+import { wrapLogError } from './util/log.js'
+import * as VirtualFiles from './virtual/index.js'
+import { getViteConfigWithPlugins } from './vite.js'
 
 export interface CreateServerOptions {
   port?: number

packages/histoire/src/node/stories.ts

@@ -4,6 +4,7 @@ import { kebabCase } from 'change-case'
 import chokidar from 'chokidar'
 import { globby } from 'globby'
 import micromatch from 'micromatch'
+import { minimatch } from 'minimatch'
 import { basename, resolve } from 'pathe'
 
 type StoryChangeHandler = (file?: ServerStoryFile) => unknown
@@ -44,9 +45,19 @@ let context: Context
 
 export async function watchStories(newContext: Context) {
   context = newContext
-  const watcher = chokidar.watch(context.config.storyMatch, {
+
+  const watcher = chokidar.watch('.', {
+    ignored: (path, stats) => {
+      if (context.config.storyIgnored.some(pattern => minimatch(path, pattern))) {
+        return true
+      }
+      if (context.config.storyMatch.some(pattern => minimatch(path, pattern))) {
+        return false
+      }
+
+      return stats?.isFile()
+    },
     cwd: context.root,
-    ignored: context.config.storyIgnored,
   })
 
   watcher