wip: test

Author: sapphi-red

packages/vite/src/node/build.ts

@@ -17,11 +17,10 @@ import type {
   RolldownBuild,
   RolldownOptions,
   RolldownOutput,
+  RolldownWatcher,
   RollupError,
   RollupLog,
-  // RollupWatcher,
   WarningHandlerWithDefault,
-  // WatcherOptions,
 } from 'rolldown'
 import {
   loadFallbackPlugin as nativeLoadFallbackPlugin,
@@ -71,9 +70,11 @@ import { ssrManifestPlugin } from './ssr/ssrManifestPlugin'
 import { buildLoadFallbackPlugin } from './plugins/loadFallback'
 import { findNearestMainPackageData, findNearestPackageData } from './packages'
 import type { PackageCache } from './packages'
+import type { WatcherOptions } from './watch'
 import {
+  convertToNotifyOptions,
   getResolvedOutDirs,
-  // resolveChokidarOptions,
+  resolveChokidarOptions,
   resolveEmptyOutDir,
 } from './watch'
 import { completeSystemWrapPlugin } from './plugins/completeSystemWrap'
@@ -280,7 +281,7 @@ export interface BuildEnvironmentOptions {
    * https://rollupjs.org/configuration-options/#watch
    * @default null
    */
-  // watch?: WatcherOptions | null
+  watch?: WatcherOptions | null
   /**
    * create the Build Environment instance
    */
@@ -537,7 +538,7 @@ export async function resolveBuildPlugins(config: ResolvedConfig): Promise<{
  */
 export async function build(
   inlineConfig: InlineConfig = {},
-): Promise<RolldownOutput | RolldownOutput[] /* | RollupWatcher */> {
+): Promise<RolldownOutput | RolldownOutput[] | RolldownWatcher> {
   const builder = await createBuilder(inlineConfig, true)
   const environment = Object.values(builder.environments)[0]
   if (!environment) throw new Error('No environment found')
@@ -565,7 +566,7 @@ function resolveConfigToBuild(
  **/
 async function buildEnvironment(
   environment: BuildEnvironment,
-): Promise<RolldownOutput | RolldownOutput[] /* | RollupWatcher */> {
+): Promise<RolldownOutput | RolldownOutput[] | RolldownWatcher> {
   const { root, packageCache } = environment.config
   const options = environment.config.build
   const libOptions = options.lib
@@ -711,11 +712,11 @@ async function buildEnvironment(
     }
   }
 
-  // const outputBuildError = (e: RollupError) => {
-  //   enhanceRollupError(e)
-  //   clearLine()
-  //   logger.error(e.message, { error: e })
-  // }
+  const outputBuildError = (e: RollupError) => {
+    enhanceRollupError(e)
+    clearLine()
+    logger.error(e.message, { error: e })
+  }
 
   const isSsrTargetWebworkerEnvironment =
     environment.name === 'ssr' &&
@@ -831,42 +832,46 @@ async function buildEnvironment(
     )
 
     // watch file changes with rollup
-    // if (options.watch) {
-    //   logger.info(colors.cyan(`\nwatching for file changes...`))
-
-    //   const resolvedChokidarOptions = resolveChokidarOptions(
-    //     options.watch.chokidar,
-    //     resolvedOutDirs,
-    //     emptyOutDir,
-    //     environment.config.cacheDir,
-    //   )
-
-    //   const { watch } = await import('rollup')
-    //   const watcher = watch({
-    //     ...rollupOptions,
-    //     output: normalizedOutputs,
-    //     watch: {
-    //       ...options.watch,
-    //       chokidar: resolvedChokidarOptions,
-    //     },
-    //   })
-
-    //   watcher.on('event', (event) => {
-    //     if (event.code === 'BUNDLE_START') {
-    //       logger.info(colors.cyan(`\nbuild started...`))
-    //       if (options.write) {
-    //         prepareOutDir(resolvedOutDirs, emptyOutDir, environment)
-    //       }
-    //     } else if (event.code === 'BUNDLE_END') {
-    //       event.result.close()
-    //       logger.info(colors.cyan(`built in ${event.duration}ms.`))
-    //     } else if (event.code === 'ERROR') {
-    //       outputBuildError(event.error)
-    //     }
-    //   })
-
-    //   return watcher
-    // }
+    if (options.watch) {
+      logger.info(colors.cyan(`\nwatching for file changes...`))
+
+      const resolvedChokidarOptions = resolveChokidarOptions(
+        // @ts-expect-error TODO: chokidar option does not exist in rolldown
+        options.watch.chokidar,
+        resolvedOutDirs,
+        emptyOutDir,
+        environment.config.cacheDir,
+      )
+
+      const { watch } = await import('rolldown')
+      const watcher = watch({
+        ...rollupOptions,
+        output: normalizedOutputs,
+        watch: {
+          ...options.watch,
+          // TODO: convert chokidar options more precisely
+          // TODO: support more chokidar options
+          notify: convertToNotifyOptions(resolvedChokidarOptions),
+        },
+      })
+
+      watcher.on('event', (event) => {
+        if (event.code === 'BUNDLE_START') {
+          logger.info(colors.cyan(`\nbuild started...`))
+          if (options.write) {
+            prepareOutDir(resolvedOutDirs, emptyOutDir, environment)
+          }
+        } else if (event.code === 'BUNDLE_END') {
+          // FIXME: https://github.com/rolldown/rolldown/issues/4380
+          // event.result.close()
+          logger.info(colors.cyan(`built in ${event.duration}ms.`))
+        } else if (event.code === 'ERROR') {
+          outputBuildError(event.error)
+        }
+      })
+
+      return watcher
+    }
 
     // write or generate files with rolldown
     const { rolldown } = await import('rolldown')
@@ -1613,7 +1618,7 @@ export interface ViteBuilder {
   buildApp(): Promise<void>
   build(
     environment: BuildEnvironment,
-  ): Promise<RolldownOutput | RolldownOutput[] /* | RollupWatcher */>
+  ): Promise<RolldownOutput | RolldownOutput[] | RolldownWatcher>
 }
 
 export interface BuilderOptions {

packages/vite/src/node/watch.ts

@@ -1,13 +1,16 @@
 import { EventEmitter } from 'node:events'
 import path from 'node:path'
 import type { FSWatcher, WatchOptions } from 'dep-types/chokidar'
-import type { OutputOptions } from 'rolldown'
+import type { InputOptions, OutputOptions } from 'rolldown'
 import colors from 'picocolors'
 import { escapePath } from 'tinyglobby'
 import { withTrailingSlash } from '../shared/utils'
 import { arraify, normalizePath } from './utils'
 import type { Logger } from './logger'
 
+// TODO: expose type from rolldown
+export type WatcherOptions = Exclude<InputOptions['watch'], false | undefined>
+
 export function getResolvedOutDirs(
   root: string,
   outDir: string,
@@ -78,6 +81,15 @@ export function resolveChokidarOptions(
   return resolvedWatchOptions
 }
 
+export function convertToNotifyOptions(
+  options: WatchOptions | undefined,
+): WatcherOptions['notify'] {
+  if (!options) return
+  return {
+    pollInterval: options.interval,
+  }
+}
+
 class NoopWatcher extends EventEmitter implements FSWatcher {
   constructor(public options: WatchOptions) {
     super()

playground/assets/__tests__/assets.spec.ts

@@ -633,8 +633,7 @@ test.runIf(isBuild)('manifest', async () => {
   }
 })
 
-// TODO: rolldown does not support rebuild
-describe.runIf(isBuild).skip('css and assets in css in build watch', () => {
+describe.runIf(isBuild)('css and assets in css in build watch', () => {
   test('css will not be lost and css does not contain undefined', async () => {
     editFile('index.html', (code) => code.replace('Assets', 'assets'))
     await notifyRebuildComplete(watcher)

playground/assets/vite.config.js

@@ -15,6 +15,6 @@ export default defineConfig({
     outDir: 'dist/foo',
     assetsInlineLimit: 8000, // 8 kB
     manifest: true,
-    // watch: {},
+    watch: {},
   },
 })

playground/package.json

@@ -9,6 +9,7 @@
   "devDependencies": {
     "convert-source-map": "^2.0.0",
     "css-color-names": "^1.0.1",
-    "kill-port": "^1.6.1"
+    "kill-port": "^1.6.1",
+    "rolldown": "1.0.0-beta.8-commit.2686eb1"
   }
 }

playground/vitestSetup.ts

@@ -7,7 +7,7 @@ import type {
   InlineConfig,
   Logger,
   PluginOption,
-  // ResolvedConfig,
+  ResolvedConfig,
   UserConfig,
   ViteDevServer,
 } from 'vite'
@@ -20,10 +20,12 @@ import {
   preview,
 } from 'vite'
 import type { Browser, Page } from 'playwright-chromium'
-import type { RollupError, RollupWatcher, RollupWatcherEvent } from 'rollup'
+import type { RolldownWatcher, RollupError } from 'rolldown'
 import type { RunnerTestFile } from 'vitest'
 import { beforeAll, inject } from 'vitest'
 
+type RolldownWatcherEvent = any // TODO: export type from rolldown
+
 // #region env
 
 export const workspaceRoot = path.resolve(__dirname, '../')
@@ -70,7 +72,7 @@ export const browserErrors: Error[] = []
 export let page: Page = undefined!
 export let browser: Browser = undefined!
 export let viteTestUrl: string = ''
-export const watcher: RollupWatcher | undefined = undefined
+export let watcher: RolldownWatcher | undefined = undefined
 
 export function setViteUrl(url: string): void {
   viteTestUrl = url
@@ -242,12 +244,12 @@ export async function startDefaultServe(): Promise<void> {
     await page.goto(viteTestUrl)
   } else {
     process.env.VITE_INLINE = 'inline-build'
-    // let resolvedConfig: ResolvedConfig
+    let resolvedConfig: ResolvedConfig
     // determine build watch
     const resolvedPlugin: () => PluginOption = () => ({
       name: 'vite-plugin-watcher',
-      configResolved(_config) {
-        // resolvedConfig = config
+      configResolved(config) {
+        resolvedConfig = config
       },
     })
     const buildConfig = mergeConfig(
@@ -260,13 +262,13 @@ export async function startDefaultServe(): Promise<void> {
       const builder = await createBuilder(buildConfig)
       await builder.buildApp()
     } else {
-      /* const rollupOutput = */ await build(buildConfig)
-      // const isWatch = !!resolvedConfig!.build.watch
-      // // in build watch,call startStaticServer after the build is complete
-      // if (isWatch) {
-      //   watcher = rollupOutput as RollupWatcher
-      //   await notifyRebuildComplete(watcher)
-      // }
+      const rollupOutput = await build(buildConfig)
+      const isWatch = !!resolvedConfig!.build.watch
+      // in build watch,call startStaticServer after the build is complete
+      if (isWatch) {
+        watcher = rollupOutput as RolldownWatcher
+        await notifyRebuildComplete(watcher)
+      }
       if (buildConfig.__test__) {
         buildConfig.__test__()
       }
@@ -293,19 +295,27 @@ export async function startDefaultServe(): Promise<void> {
  * Send the rebuild complete message in build watch
  */
 export async function notifyRebuildComplete(
-  watcher: RollupWatcher,
-): Promise<RollupWatcher> {
+  watcher: RolldownWatcher,
+): Promise<RolldownWatcher> {
   let resolveFn: undefined | (() => void)
-  const callback = (event: RollupWatcherEvent): void => {
+  const callback = (event: RolldownWatcherEvent): void => {
     if (event.code === 'END') {
       resolveFn?.()
+      resolveFn = undefined // set to undefined instead of watcher.off for now
     }
   }
   watcher.on('event', callback)
   await new Promise<void>((resolve) => {
     resolveFn = resolve
   })
-  return watcher.off('event', callback)
+
+  // During tests we edit the files too fast and sometimes chokidar
+  // misses change events, so wait 100ms for consistency
+  await new Promise<void>((resolve) => setTimeout(resolve, 100))
+
+  // TODO: not supported yet
+  // return watcher.off('event', callback)
+  return watcher
 }
 
 export function createInMemoryLogger(logs: string[]): Logger {