Handle TS 6 new defaults

Author: ArnaudBarre

playground/react-emotion/__tests__/react.spec.ts

@@ -32,12 +32,12 @@ test.runIf(isServe)('should hmr', async () => {
 test('should update button style', async () => {
   function getButtonBorderStyle() {
     return page.evaluate(() => {
-      return window.getComputedStyle(document.querySelector('button')).border
+      return window.getComputedStyle(document.querySelector('button')!).border
     })
   }
 
   await page.evaluate(() => {
-    return document.querySelector('button').style
+    return document.querySelector('button')!.style
   })
 
   expect(await getButtonBorderStyle()).toMatch('2px solid rgb(0, 0, 0)')

playground/test-utils.ts

@@ -39,7 +39,7 @@ function rgbToHex(rgb: string): string {
 
 async function toEl(el: string | ElementHandle): Promise<ElementHandle> {
   if (typeof el === 'string') {
-    return await page.$(el)
+    return (await page.$(el))!
   }
   return el
 }
@@ -117,14 +117,9 @@ async function untilBrowserLog(
   target?: string | RegExp | Array<string | RegExp>,
   expectOrder = true,
 ): Promise<string[]> {
-  let resolve: () => void
-  let reject: (reason: any) => void
-  const promise = new Promise<void>((_resolve, _reject) => {
-    resolve = _resolve
-    reject = _reject
-  })
+  const { promise, resolve, reject } = promiseWithResolvers<void>()
 
-  const logs = []
+  const logs: string[] = []
 
   try {
     const isMatch = (matcher: string | RegExp) => (text: string) =>
@@ -139,6 +134,9 @@ async function untilBrowserLog(
         const remainingTargets = [...target]
         processMsg = (text: string) => {
           const nextTarget = remainingTargets.shift()
+          if (!nextTarget) {
+            expect.fail('Received more logs than expected. Extra log: ' + text)
+          }
           expect(text).toMatch(nextTarget)
           return remainingTargets.length === 0
         }
@@ -186,6 +184,22 @@ export function escapeRegex(str: string): string {
   return str.replace(escapeRegexRE, '\\$&')
 }
 
+// TODO: Replace with Promise.withResolvers when bumping to Node 22
+export interface PromiseWithResolvers<T> {
+  promise: Promise<T>
+  resolve: (value: T | PromiseLike<T>) => void
+  reject: (reason?: any) => void
+}
+export function promiseWithResolvers<T>(): PromiseWithResolvers<T> {
+  let resolve: any
+  let reject: any
+  const promise = new Promise<T>((_resolve, _reject) => {
+    resolve = _resolve
+    reject = _reject
+  })
+  return { promise, resolve, reject }
+}
+
 /**
  * Before implementing a new util, check if it's not available in core https://github.com/vitejs/vite/blob/main/playground/test-utils.ts
  */

playground/tsconfig.json

@@ -5,7 +5,6 @@
     "target": "ES2023",
     "module": "preserve",
     "outDir": "dist",
-    "baseUrl": ".",
     "allowJs": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,

playground/vitestSetup.ts

@@ -81,9 +81,10 @@ export function setViteUrl(url: string): void {
 // eslint-disable-next-line no-empty-pattern
 beforeAll(async ({}, suite) => {
   testPath = suite.file.filepath!
-  testName = slash(testPath).match(/playground\/([\w-]+)\//)?.[1]
+  const playgroundDir = slash(testPath).match(/playground\/([\w-]+)\//)?.[1]
   testDir = dirname(testPath)
-  if (testName) {
+  if (playgroundDir) {
+    testName = playgroundDir
     testDir = path.resolve(workspaceRoot, 'playground-temp', testName)
   }
 
@@ -231,7 +232,7 @@ export async function startDefaultServe(): Promise<void> {
     const config = await loadConfig({ command: 'serve', mode: 'development' })
     viteServer = server = await (await createServer(config)).listen()
     viteTestUrl = stripTrailingSlashIfNeeded(
-      server.resolvedUrls.local[0],
+      server.resolvedUrls!.local[0],
       server.config.base,
     )
     await page.goto(viteTestUrl)
@@ -277,7 +278,7 @@ export async function startDefaultServe(): Promise<void> {
     // prevent preview change NODE_ENV
     process.env.NODE_ENV = _nodeEnv
     viteTestUrl = stripTrailingSlashIfNeeded(
-      previewServer.resolvedUrls.local[0],
+      previewServer.resolvedUrls!.local[0],
       previewServer.config.base,
     )
     await page.goto(viteTestUrl)

scripts/tsconfig.json

@@ -2,6 +2,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "include": ["."],
   "compilerOptions": {
+    "types": ["node"],
     "target": "esnext",
     "module": "nodenext",
     "allowImportingTsExtensions": true,