wip: update

Author: sapphi-red

packages/vite/src/node/build.ts

@@ -21,6 +21,7 @@ import type {
   RollupError,
   RollupLog,
   WarningHandlerWithDefault,
+  WatcherOptions,
 } from 'rolldown'
 import {
   loadFallbackPlugin as nativeLoadFallbackPlugin,
@@ -70,7 +71,6 @@ 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,

packages/vite/src/node/watch.ts

@@ -1,16 +1,13 @@
 import { EventEmitter } from 'node:events'
 import path from 'node:path'
 import type { FSWatcher, WatchOptions } from 'dep-types/chokidar'
-import type { InputOptions, OutputOptions } from 'rolldown'
+import type { OutputOptions, WatcherOptions } 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,

playground/assets/__tests__/assets.spec.ts

@@ -8,6 +8,7 @@ import {
   getColor,
   isBuild,
   isServe,
+  isWindows,
   listAssets,
   notifyRebuildComplete,
   page,
@@ -633,31 +634,35 @@ test.runIf(isBuild)('manifest', async () => {
   }
 })
 
-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)
-    const cssFile = findAssetFile(/index-[-\w]+\.css$/, 'foo')
-    expect(cssFile).not.toBe('')
-    expect(cssFile).not.toMatch(/undefined/)
-  })
+// TODO: skip on Windows due to https://github.com/rolldown/rolldown/issues/4385
+describe.runIf(isBuild && !isWindows)(
+  '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)
+      const cssFile = findAssetFile(/index-[-\w]+\.css$/, 'foo')
+      expect(cssFile).not.toBe('')
+      expect(cssFile).not.toMatch(/undefined/)
+    })
 
-  test('import module.css', async () => {
-    expect(await getColor('#foo')).toBe('red')
-    editFile('css/foo.module.css', (code) => code.replace('red', 'blue'))
-    await notifyRebuildComplete(watcher)
-    await page.reload()
-    expect(await getColor('#foo')).toBe('blue')
-  })
+    test('import module.css', async () => {
+      expect(await getColor('#foo')).toBe('red')
+      editFile('css/foo.module.css', (code) => code.replace('red', 'blue'))
+      await notifyRebuildComplete(watcher)
+      await page.reload()
+      expect(await getColor('#foo')).toBe('blue')
+    })
 
-  test('import with raw query', async () => {
-    expect(await page.textContent('.raw-query')).toBe('foo')
-    editFile('static/foo.txt', (code) => code.replace('foo', 'zoo'))
-    await notifyRebuildComplete(watcher)
-    await page.reload()
-    expect(await page.textContent('.raw-query')).toBe('zoo')
-  })
-})
+    test('import with raw query', async () => {
+      expect(await page.textContent('.raw-query')).toBe('foo')
+      editFile('static/foo.txt', (code) => code.replace('foo', 'zoo'))
+      await notifyRebuildComplete(watcher)
+      await page.reload()
+      expect(await page.textContent('.raw-query')).toBe('zoo')
+    })
+  },
+)
 
 test('inline style test', async () => {
   expect(await getBg('.inline-style')).toMatch(assetMatch)

playground/package.json

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

playground/vitestSetup.ts

@@ -20,12 +20,14 @@ import {
   preview,
 } from 'vite'
 import type { Browser, Page } from 'playwright-chromium'
-import type { RolldownWatcher, RollupError } from 'rolldown'
+import type {
+  RolldownWatcher,
+  RolldownWatcherEvent,
+  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, '../')
@@ -309,11 +311,7 @@ export async function notifyRebuildComplete(
     resolveFn = resolve
   })
 
-  // 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
+  // TODO: not supported yet (https://github.com/rolldown/rolldown/issues/4382)
   // return watcher.off('event', callback)
   return watcher
 }