test: properly close cli watcher in test (unocss#2323)

wkeylin · web-flow · commit b0609a736b77 · 2023-03-07T11:04:06.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,8 +41,8 @@ jobs:
         os: [ubuntu-latest]
         node_version: [14, 16, 18]
         include:
-          # - os: macos-latest
-          #   node_version: 16
+          - os: macos-latest
+            node_version: 16
           - os: windows-latest
             node_version: 16
       fail-fast: false
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -12,6 +12,7 @@ import { applyTransformers } from '../../shared-integration/src/transformers'
 import { PrettyError, handleError } from './errors'
 import { defaultConfig } from './config'
 import type { CliOptions, ResolvedCliOptions } from './types'
+import { getWatcher } from './watcher'
 
 const name = 'unocss'
 
@@ -58,17 +59,9 @@ export async function build(_options: CliOptions) {
   const startWatcher = async () => {
     if (!options.watch)
       return
-
-    const { watch } = await import('chokidar')
     const { patterns } = options
-    const ignored = ['**/{.git,node_modules}/**']
 
-    const watcher = watch(patterns, {
-      ignoreInitial: true,
-      ignorePermissionErrors: true,
-      ignored,
-      cwd,
-    })
+    const watcher = await getWatcher(options)
 
     if (configSources.length)
       watcher.add(configSources)
diff --git a/packages/cli/src/watcher.ts b/packages/cli/src/watcher.ts
@@ -0,0 +1,22 @@
+import type { FSWatcher } from 'chokidar'
+import type { CliOptions } from './types'
+
+let watcher: FSWatcher
+
+export const getWatcher = async (options?: CliOptions) => {
+  // test case entry without options
+  if (watcher && !options)
+    return watcher
+
+  const { watch } = await import('chokidar')
+  const ignored = ['**/{.git,node_modules}/**']
+  // cli may create multiple watchers
+  const newWatcher = watch(options?.patterns as string[], {
+    ignoreInitial: true,
+    ignorePermissionErrors: true,
+    ignored,
+    cwd: options?.cwd || process.cwd(),
+  })
+  watcher = newWatcher
+  return newWatcher
+}
diff --git a/test/cli.test.ts b/test/cli.test.ts
@@ -2,6 +2,7 @@ import { resolve } from 'node:path'
 import fs from 'fs-extra'
 import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { startCli } from '../packages/cli/src/cli-start'
+import { getWatcher } from '../packages/cli/src/watcher'
 
 export const tempDir = resolve('.temp')
 export const cli = resolve(__dirname, '../packages/cli/src/cli.ts')
@@ -67,13 +68,14 @@ export default defineConfig({
 })
     `)
     for (let i = 100; i >= 0; i--) {
-      await sleep(1000)
+      await sleep(500)
       const outputChanged = await readFile(testDir as string)
       if (i === 0 || outputChanged.includes('.bg-foo')) {
         expect(outputChanged).toContain('.bg-foo{background-color:blue;}')
         break
       }
     }
+    (await getWatcher()).close()
   })
 
   it('supports variantGroup transformer', async () => {
