wip

Author: pcattori

integration/helpers/stream.ts

@@ -7,16 +7,22 @@ export async function match(
     /** Measured in ms */
     timeout?: number;
   } = {},
-): Promise<string> {
+): Promise<RegExpMatchArray> {
   // Prepare error outside of promise so that stacktrace points to caller of `matchLine`
-  const timeout = new Error(`Timed out - Could not find pattern: ${pattern}`);
-  return new Promise<string>(async (resolve, reject) => {
-    setTimeout(() => reject(timeout), options.timeout ?? 10_000);
+  const timeoutError = new Error(
+    `Timed out - Could not find pattern: ${pattern}`,
+  );
+  return new Promise(async (resolve, reject) => {
+    const timeout = setTimeout(
+      () => reject(timeoutError),
+      options.timeout ?? 10_000,
+    );
     stream.on("data", (data) => {
       const line: string = data.toString();
       const matches = line.match(pattern);
       if (matches) {
-        resolve(matches[0]);
+        resolve(matches);
+        clearTimeout(timeout);
       }
     });
   });

integration/vite-hmr-hdr-test.ts

@@ -3,10 +3,10 @@ import { expect } from "@playwright/test";
 import getPort from "get-port";
 import dedent from "dedent";
 
+import * as Express from "./helpers/express";
 import { test } from "./helpers/fixtures";
 import * as Stream from "./helpers/stream";
 import { viteMajorTemplates, getTemplates } from "./helpers/templates";
-import * as Express from "./helpers/express";
 
 const tsx = dedent;
 const mdx = dedent;
@@ -71,6 +71,7 @@ templates.forEach((template) => {
 
       const port = await getPort();
       const url = `http://localhost:${port}`;
+
       const server = $("node server.mjs", {
         env: {
           PORT: String(port),