wip

Author: sxzz

package.json

@@ -19,14 +19,26 @@
     "dist",
     "esm-shims.js"
   ],
-  "main": "./dist/index.mjs",
+  "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
-  "types": "./dist/index.d.mts",
+  "types": "./dist/index.d.cts",
   "exports": {
-    ".": "./dist/index.mjs",
-    "./config": "./dist/config.mjs",
-    "./plugins": "./dist/plugins.mjs",
-    "./run": "./dist/run.mjs",
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs"
+    },
+    "./config": {
+      "require": "./dist/config.cjs",
+      "import": "./dist/config.mjs"
+    },
+    "./plugins": {
+      "require": "./dist/plugins.cjs",
+      "import": "./dist/plugins.mjs"
+    },
+    "./run": {
+      "require": "./dist/run.cjs",
+      "import": "./dist/run.mjs"
+    },
     "./package.json": "./package.json"
   },
   "typesVersions": {

src/features/watch.ts

@@ -3,7 +3,7 @@ import { logger, prettyName } from '../utils/logger'
 import type { ResolvedOptions } from '../options'
 import type { OutputAsset, OutputChunk, Plugin } from 'rolldown'
 
-const endsWithConfig = /[\\/](?:package\.json|tsdown\.config.*)$/
+const endsWithConfig = /[\\/]tsdown\.config.*$/
 
 export function WatchPlugin(
   chunks: Array<OutputChunk | OutputAsset>,

src/index.ts

@@ -104,7 +104,6 @@ export async function buildSingle(
   let ab: AbortController | undefined
 
   const { hooks, context } = await createHooks(config)
-  let watcher: RolldownWatcher
 
   await hooks.callHook('build:prepare', context)
   ab?.abort()
@@ -113,8 +112,9 @@ export async function buildSingle(
 
   const isMultiFormat = formats.length > 1
   const chunks: TsdownChunks = {}
+  const watchers: RolldownWatcher[] = []
 
-  async function buildByFormat(format: NormalizedFormat) {
+  async function buildOptionsByFormat(format: NormalizedFormat) {
     const buildOptions = await getBuildOptions(
       config,
       format,
@@ -129,9 +129,13 @@ export async function buildSingle(
       buildOptions,
     })
 
-    const buildOptionsList = [buildOptions]
+    const buildOptionsList: [
+      format: NormalizedFormat,
+      buildOptions: BuildOptions,
+    ][] = [[format, buildOptions]]
     if (format === 'cjs' && dts) {
-      buildOptionsList.push(
+      buildOptionsList.push([
+        format,
         await getBuildOptions(
           config,
           format,
@@ -141,72 +145,85 @@ export async function buildSingle(
           isMultiFormat,
           true,
         ),
-      )
+      ])
     }
 
-    if (watch) {
-      watcher = rolldownWatch(buildOptionsList)
-      const changedFile: string[] = []
-      let hasError = false
-      watcher.on('change', (id, event) => {
-        if (event.event === 'update') {
-          changedFile.push(id)
-        }
-      })
-      watcher.on('event', async (event) => {
-        switch (event.code) {
-          case 'START': {
+    return buildOptionsList
+  }
+  const buildOptionsList = (
+    await Promise.all(formats.map(buildOptionsByFormat))
+  ).flat()
+
+  if (watch) {
+    const watcher = rolldownWatch(buildOptionsList.map((item) => item[1]))
+    const changedFile: string[] = []
+    let hasError = false
+    watcher.on('change', (id, event) => {
+      if (event.event === 'update') {
+        changedFile.push(id)
+      }
+    })
+    watcher.on('event', async (event) => {
+      switch (event.code) {
+        case 'START': {
+          for (const format of formats) {
             chunks[format]!.length = 0
-            hasError = false
-            break
           }
+          hasError = false
+          break
+        }
 
-          case 'END': {
-            if (!hasError) {
-              await postBuild()
-            }
-            break
+        case 'END': {
+          if (!hasError) {
+            await postBuild()
           }
+          break
+        }
 
-          case 'BUNDLE_START': {
-            if (changedFile.length > 0) {
-              console.info('')
-              logger.info(
-                `Found ${bold(changedFile.join(', '))} changed, rebuilding...`,
-              )
-            }
-            changedFile.length = 0
-            break
+        case 'BUNDLE_START': {
+          if (changedFile.length > 0) {
+            console.info('')
+            logger.info(
+              `Found ${bold(changedFile.join(', '))} changed, rebuilding...`,
+            )
           }
+          changedFile.length = 0
+          break
+        }
 
-          case 'BUNDLE_END': {
-            await event.result.close()
-            logger.success(`Rebuilt in ${event.duration}ms.`)
-            break
-          }
+        case 'BUNDLE_END': {
+          await event.result.close()
+          logger.success(`Rebuilt in ${event.duration}ms.`)
+          break
+        }
 
-          case 'ERROR': {
-            await event.result.close()
-            logger.error(event.error)
-            hasError = true
-            break
-          }
+        case 'ERROR': {
+          await event.result.close()
+          logger.error(event.error)
+          hasError = true
+          break
         }
-      })
-    } else {
-      const output = (await rolldownBuild(buildOptionsList)).flatMap(
-        ({ output }) => output,
-      )
-      chunks[format] = output
+      }
+    })
+    watchers.push(watcher)
+  } else {
+    const outputs = (
+      await rolldownBuild(buildOptionsList.map((item) => item[1]))
+    ).map(({ output }) => output)
+    for (const [i, output] of outputs.entries()) {
+      const format = buildOptionsList[i][0]
+      chunks[format] ||= []
+      chunks[format].push(...output)
     }
   }
-  await Promise.all(formats.map(buildByFormat))
 
   if (watch) {
     return {
       async [Symbol.asyncDispose]() {
         ab?.abort()
-        await watcher.close()
+        for (const watcher of watchers) {
+          await watcher.close()
+        }
       },
     }
   } else {