qunitx-cli 0.17.7 → 0.18.0

package/dist/cli.js

@@ -301,16 +301,16 @@ var init_perf_logger = __esm({
   }
 });
 
-// lib/utils/early-chrome.ts
-async function shutdownEarlyBrowser() {
+// lib/utils/chrome-prelaunch.ts
+async function shutdownPrelaunch() {
   if (!earlyChrome) return;
   const { shutdown } = earlyChrome;
   earlyChrome = null;
   await shutdown();
 }
-var NON_RUN_COMMANDS, isRunCommand, browserFromArgv, openFromArgv, watchFromArgv, openWatchMode, earlyChrome, earlyBrowserPromise;
-var init_early_chrome = __esm({
-  "lib/utils/early-chrome.ts"() {
+var NON_RUN_COMMANDS, isRunCommand, browserFromArgv, openFromArgv, watchFromArgv, openWatchMode, earlyChrome, prelaunchPromise;
+var init_chrome_prelaunch = __esm({
+  "lib/utils/chrome-prelaunch.ts"() {
     init_find_chrome();
     init_pre_launch_chrome();
     init_kill_process_group();
@@ -335,12 +335,12 @@ var init_early_chrome = __esm({
         killProcessGroup(earlyChrome.proc.pid);
       });
     }
-    perfLog("early-chrome.js: module evaluated");
-    earlyBrowserPromise = isRunCommand && browserFromArgv === "chromium" ? findChrome().then((chromePath) => {
-      perfLog("early-chrome.js: findChrome resolved", chromePath);
+    perfLog("chrome-prelaunch.ts: module evaluated");
+    prelaunchPromise = isRunCommand && browserFromArgv === "chromium" ? findChrome().then((chromePath) => {
+      perfLog("chrome-prelaunch.ts: findChrome resolved", chromePath);
       return preLaunchChrome(chromePath, CHROMIUM_ARGS, !openWatchMode);
     }).then((info) => {
-      perfLog("early-chrome.js: Chrome CDP ready", info?.cdpEndpoint ?? null);
+      perfLog("chrome-prelaunch.ts: Chrome CDP ready", info?.cdpEndpoint ?? null);
       if (info) earlyChrome = info;
       return info;
     }) : Promise.resolve(null);
@@ -400,11 +400,11 @@ var init_path_exists = __esm({
   }
 });
 
-// lib/utils/read-boilerplate.ts
+// lib/utils/read-template.ts
 import fs3 from "node:fs/promises";
 import { dirname, join as join2 } from "node:path";
 import { fileURLToPath } from "node:url";
-async function readBoilerplate(relativePath) {
+async function readTemplate(relativePath) {
   const sea = await import("node:sea").catch(() => null);
   if (sea?.isSea()) return sea.getAsset(relativePath, "utf8");
   const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -418,8 +418,8 @@ async function readBoilerplate(relativePath) {
     `qunitx-cli: template "${relativePath}" not found \u2014 try reinstalling the package.`
   );
 }
-var init_read_boilerplate = __esm({
-  "lib/utils/read-boilerplate.ts"() {
+var init_read_template = __esm({
+  "lib/utils/read-template.ts"() {
   }
 });
 
@@ -438,19 +438,19 @@ var init_find_internal_assets_from_html = __esm({
   }
 });
 
-// lib/utils/html-content-marker.ts
-function findHTMLContentMarker(html) {
-  return html.includes(HTML_CONTENT_MARKER) ? HTML_CONTENT_MARKER : void 0;
+// lib/utils/html.ts
+function findScriptPlaceholder(html) {
+  return html.includes(SCRIPT_PLACEHOLDER) ? SCRIPT_PLACEHOLDER : void 0;
 }
-function htmlHasDynamicContentMarker(html) {
-  return !!findHTMLContentMarker(html) || HANDLEBARS_TOKEN_REGEX.test(html);
+function isCustomTemplate(html) {
+  return !!findScriptPlaceholder(html) || HANDLEBARS_TOKEN_REGEX.test(html);
 }
-function replaceHTMLContentMarker(html, content) {
-  const marker = findHTMLContentMarker(html);
-  if (marker) {
-    return html.replace(marker, content);
+function injectScript(html, content) {
+  const placeholder = findScriptPlaceholder(html);
+  if (placeholder) {
+    return html.replace(placeholder, content);
   }
-  if (htmlHasDynamicContentMarker(html)) {
+  if (isCustomTemplate(html)) {
     if (html.includes("</body>")) {
       return html.replace("</body>", `${content}</body>`);
     }
@@ -461,10 +461,10 @@ function replaceHTMLContentMarker(html, content) {
   }
   return html;
 }
-var HTML_CONTENT_MARKER, HANDLEBARS_TOKEN_REGEX;
-var init_html_content_marker = __esm({
-  "lib/utils/html-content-marker.ts"() {
-    HTML_CONTENT_MARKER = "{{qunitxScript}}";
+var SCRIPT_PLACEHOLDER, HANDLEBARS_TOKEN_REGEX;
+var init_html = __esm({
+  "lib/utils/html.ts"() {
+    SCRIPT_PLACEHOLDER = "{{qunitxScript}}";
     HANDLEBARS_TOKEN_REGEX = /{{\s*[^}]+\s*}}/;
   }
 });
@@ -488,12 +488,18 @@ function dumpValue(value, indent) {
   if (Array.isArray(value)) {
     if (value.length === 0) return "[]";
     const next2 = `${indent}  `;
-    return "\n" + value.map((item) => `${next2}- ${dumpValue(item, next2)}`).join("\n");
+    return "\n" + value.map((item) => {
+      const v = dumpValue(item, next2);
+      return v[0] === "\n" ? `${next2}-${v}` : `${next2}- ${v}`;
+    }).join("\n");
   }
   const entries = Object.entries(value);
   if (entries.length === 0) return "{}";
   const next = `${indent}  `;
-  return "\n" + entries.map(([entryKey, entryValue]) => `${next}${entryKey}: ${dumpValue(entryValue, next)}`).join("\n");
+  return "\n" + entries.map(([entryKey, entryValue]) => {
+    const v = dumpValue(entryValue, next);
+    return v[0] === "\n" ? `${next}${entryKey}:${v}` : `${next}${entryKey}: ${v}`;
+  }).join("\n");
 }
 function yamlLine(key, value) {
   const serialized = dumpValue(value, "");
@@ -510,12 +516,12 @@ function dumpYaml({
   at
 }) {
   return `name: ${dumpString(name, "")}
-` + yamlLine("actual", actual) + yamlLine("expected", expected) + yamlLine("message", message) + yamlLine("stack", stack) + yamlLine("at", at);
+` + yamlLine("actual", actual) + yamlLine("expected", expected) + (message !== null ? yamlLine("message", message) : "") + (stack !== null ? yamlLine("stack", stack) : "") + (at !== null ? yamlLine("at", at) : "");
 }
 var NEEDS_QUOTING;
 var init_dump_yaml = __esm({
   "lib/tap/dump-yaml.ts"() {
-    NEEDS_QUOTING = /^$|^(null|true|false|~|yes|no|on|off|y|n)$|^[{[!|>'"#%@`]|^[-?:](\s|$)|^---|^[-+]?(\d|\.\d)|^\d{4}-\d{2}-\d{2}|: |#/i;
+    NEEDS_QUOTING = /^$|^\s|^(null|true|false|~|yes|no|on|off|y|n)$|^[{[!|>'"#%@`]|^[-?:](\s|$)|^---|^[-+]?(\d|\.\d)|^\d{4}-\d{2}-\d{2}|: |#/i;
   }
 });
 
@@ -538,46 +544,55 @@ function TAPDisplayTestResult(COUNTER, details) {
   COUNTER.testCount++;
   if (details.status === "skipped") {
     COUNTER.skipCount++;
-    console.log(`ok ${COUNTER.testCount}`, details.fullName.join(" | "), "# skip");
+    process.stdout.write(`ok ${COUNTER.testCount} ${details.fullName.join(" | ")} # skip
+`);
   } else if (details.status === "todo") {
-    console.log(`not ok ${COUNTER.testCount}`, details.fullName.join(" | "), "# skip");
+    process.stdout.write(`not ok ${COUNTER.testCount} ${details.fullName.join(" | ")} # skip
+`);
   } else if (details.status === "failed") {
     COUNTER.failCount++;
-    console.log(
-      `not ok ${COUNTER.testCount}`,
-      details.fullName.join(" | "),
-      `# (${details.runtime.toFixed(0)} ms)`
+    process.stdout.write(
+      `not ok ${COUNTER.testCount} ${details.fullName.join(" | ")} # (${details.runtime.toFixed(0)} ms)
+`
     );
     details.assertions.forEach((assertion, index) => {
       if (!assertion.passed && assertion.todo === false) {
         COUNTER.errorCount = (COUNTER.errorCount ?? 0) + 1;
-        const stack = assertion.stack?.match(/\(.+\)/g);
-        console.log("  ---");
-        console.log(
+        process.stdout.write("  ---\n");
+        process.stdout.write(
           indentString(
             dumpYaml({
               name: `Assertion #${index + 1}`,
-              actual: assertion.actual ? JSON.parse(JSON.stringify(assertion.actual, getCircularReplacer())) : assertion.actual,
-              expected: assertion.expected ? JSON.parse(JSON.stringify(assertion.expected, getCircularReplacer())) : assertion.expected,
+              actual: assertion.actual !== null && typeof assertion.actual === "object" ? JSON.parse(JSON.stringify(assertion.actual, getCircularReplacer())) : assertion.actual,
+              expected: assertion.expected !== null && typeof assertion.expected === "object" ? JSON.parse(JSON.stringify(assertion.expected, getCircularReplacer())) : assertion.expected,
               message: assertion.message || null,
-              stack: assertion.stack || null,
-              at: stack ? stack[0].replace("(file://", "").replace(")", "") : null
+              // Trim leading/trailing whitespace: Chrome stacks start with "    at ..."
+              // (4 spaces per frame) which would otherwise render as "stack:     at ..." in YAML.
+              stack: assertion.stack?.trim() || null,
+              at: extractStackAt(assertion.stack)
             }),
             4
           )
         );
-        console.log("  ...");
+        process.stdout.write("  ...\n");
       }
     });
   } else if (details.status === "passed") {
     COUNTER.passCount++;
-    console.log(
-      `ok ${COUNTER.testCount}`,
-      details.fullName.join(" | "),
-      `# (${details.runtime.toFixed(0)} ms)`
+    process.stdout.write(
+      `ok ${COUNTER.testCount} ${details.fullName.join(" | ")} # (${details.runtime.toFixed(0)} ms)
+`
     );
   }
 }
+function extractStackAt(stack) {
+  if (!stack) return null;
+  const chromeMatch = stack.match(/\(([^)\n]+:[0-9]+:[0-9]+)\)/);
+  if (chromeMatch) return chromeMatch[1].replace("file://", "");
+  const geckoMatch = stack.match(/@([^\s\n@]+:[0-9]+:[0-9]+)/);
+  if (geckoMatch) return geckoMatch[1];
+  return null;
+}
 function getCircularReplacer() {
   const ancestors = [];
   return function(_key, value) {
@@ -627,8 +642,8 @@ async function bindServerToPort(server, config) {
 var EXPLICIT_PORT_RETRIES, EXPLICIT_PORT_RETRY_DELAY_MS;
 var init_bind_server_to_port = __esm({
   "lib/setup/bind-server-to-port.ts"() {
-    EXPLICIT_PORT_RETRIES = 5;
-    EXPLICIT_PORT_RETRY_DELAY_MS = 20;
+    EXPLICIT_PORT_RETRIES = 20;
+    EXPLICIT_PORT_RETRY_DELAY_MS = 50;
   }
 });
 
@@ -898,7 +913,7 @@ function setupWebServer(config, cachedContent) {
         config._onWsOpen?.();
       } else if (event === "connection") {
         config._phase = "running";
-        if (!config._groupMode) console.log("TAP version 13");
+        if (!config._groupMode) process.stdout.write("TAP version 13\n");
         if (config.debug && config._groupMode) {
           const allFiles = Object.keys(config.fsTree);
           const relFiles = allFiles.map(
@@ -907,7 +922,8 @@ function setupWebServer(config, cachedContent) {
           const shown = relFiles.slice(0, 2);
           const rest = relFiles.length - shown.length;
           const fileList = rest > 0 ? `${shown.join("  ")}  +${rest} more` : shown.join("  ");
-          console.log("#", blue(`\u2500\u2500 ${fileList} \u2500\u2500`));
+          process.stdout.write(`# ${blue(`\u2500\u2500 ${fileList} \u2500\u2500`)}
+`);
         }
         config._resetTestTimeout?.();
       } else if (event === "testEnd" && !abort) {
@@ -915,8 +931,9 @@ function setupWebServer(config, cachedContent) {
           config.lastFailedTestFiles = config.lastRanTestFiles;
         }
         if (config.debug && details.runtime > config.timeout * 0.8) {
-          console.log(
-            `# SLOW (${details.runtime.toFixed(0)}ms / ${config.timeout}ms timeout): ${details.fullName.join(" | ")}`
+          process.stdout.write(
+            `# SLOW (${details.runtime.toFixed(0)}ms / ${config.timeout}ms timeout): ${details.fullName.join(" | ")}
+`
           );
         }
         config._resetTestTimeout?.();
@@ -924,8 +941,9 @@ function setupWebServer(config, cachedContent) {
       } else if (event === "done") {
         config._phase = "done";
         if (config.debug && config._groupMode) {
-          console.log(
-            `# group done: ${details.passed} passed, ${details.failed} failed (${details.runtime}ms)`
+          process.stdout.write(
+            `# group done: ${details.passed} passed, ${details.failed} failed (${details.runtime}ms)
+`
           );
         }
         if (typeof config._testRunDone === "function") {
@@ -937,8 +955,9 @@ function setupWebServer(config, cachedContent) {
   });
   server.get("/tests.js", (_req, res) => {
     const bytes = cachedContent.allTestCode?.length ?? null;
-    console.log(
-      `# [HTTPServer] GET /tests.js \u2192 ${bytes !== null ? `${bytes} bytes` : "NOT READY (allTestCode is null)"}`
+    process.stdout.write(
+      `# [HTTPServer] GET /tests.js \u2192 ${bytes !== null ? `${bytes} bytes` : "NOT READY (allTestCode is null)"}
+`
     );
     if (bytes === null) {
       res.writeHead(503, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
@@ -953,8 +972,9 @@ function setupWebServer(config, cachedContent) {
   });
   server.get("/filtered-tests.js", (_req, res) => {
     const bytes = cachedContent.filteredTestCode?.length ?? null;
-    console.log(
-      `# [HTTPServer] GET /filtered-tests.js \u2192 ${bytes !== null ? `${bytes} bytes` : "NOT READY (filteredTestCode is null)"}`
+    process.stdout.write(
+      `# [HTTPServer] GET /filtered-tests.js \u2192 ${bytes !== null ? `${bytes} bytes` : "NOT READY (filteredTestCode is null)"}
+`
     );
     if (bytes === null) {
       res.writeHead(503, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
@@ -1026,7 +1046,10 @@ function setupWebServer(config, cachedContent) {
     } else {
       fs8.createReadStream(filePath).pipe(res);
     }
-    console.log(`# [HTTPServer] GET ${url} ${statusCode} - ${/* @__PURE__ */ new Date() - requestStartedAt}ms`);
+    process.stdout.write(
+      `# [HTTPServer] GET ${url} ${statusCode} - ${/* @__PURE__ */ new Date() - requestStartedAt}ms
+`
+    );
   });
   return server;
 }
@@ -1189,17 +1212,14 @@ function testRuntimeToInject(port, config) {
   </script>`;
 }
 function escapeAndInjectTestsToHTML(html, testRuntimeCode, testBundleUrl) {
-  return replaceHTMLContentMarker(
-    html,
-    `${testRuntimeCode}
-<script src="${testBundleUrl}" async></script>`
-  );
+  return injectScript(html, `${testRuntimeCode}
+<script src="${testBundleUrl}" async></script>`);
 }
 var fsPromise;
 var init_web_server = __esm({
   "lib/setup/web-server.ts"() {
     init_find_internal_assets_from_html();
-    init_html_content_marker();
+    init_html();
     init_display_test_result();
     init_color();
     init_path_exists();
@@ -1213,18 +1233,18 @@ async function launchBrowser(config) {
   const browserName = config.browser || "chromium";
   if (browserName === "chromium") {
     const waitStart = Date.now();
-    const [playwrightCore2, earlyChrome2] = await Promise.all([
+    const [playwrightCore2, prelaunch] = await Promise.all([
       playwrightCorePromise,
-      earlyBrowserPromise
+      prelaunchPromise
     ]);
     perfLog(
-      `browser.js: playwright-core + earlyChrome resolved in ${Date.now() - waitStart}ms, earlyChrome:`,
-      earlyChrome2?.cdpEndpoint ?? null
+      `browser.js: playwright-core + prelaunch resolved in ${Date.now() - waitStart}ms, prelaunch:`,
+      prelaunch?.cdpEndpoint ?? null
     );
-    if (earlyChrome2) {
+    if (prelaunch) {
       const connectStart = Date.now();
       const browser = await playwrightCore2.chromium.connectOverCDP({
-        endpointURL: earlyChrome2.cdpEndpoint
+        endpointURL: prelaunch.cdpEndpoint
       });
       perfLog(`browser.js: connectOverCDP took ${Date.now() - connectStart}ms`);
       return browser;
@@ -1279,8 +1299,8 @@ async function setupBrowser(config, cachedContent, existingBrowser = null) {
     }
   });
   page.on("pageerror", (error) => {
-    console.log(error.toString());
     console.error(error.toString());
+    config.COUNTER.failCount++;
   });
   return { server, browser, page };
 }
@@ -1291,7 +1311,7 @@ var init_browser = __esm({
     init_bind_server_to_port();
     init_find_chrome();
     init_chromium_args();
-    init_early_chrome();
+    init_chrome_prelaunch();
     init_perf_logger();
     playwrightCorePromise = import("playwright-core");
     perfLog("browser.js: playwright-core import started");
@@ -1369,14 +1389,20 @@ var init_run_user_module = __esm({
 
 // lib/tap/display-final-result.ts
 function TAPDisplayFinalResult({ testCount, passCount, skipCount, failCount }, timeTaken) {
-  console.log("");
-  console.log(`1..${testCount}`);
-  console.log(`# tests ${testCount}`);
-  console.log(`# pass ${passCount}`);
-  console.log(`# skip ${skipCount}`);
-  console.log(`# fail ${failCount}`);
-  console.log(`# duration ${timeTaken}`);
-  console.log("");
+  process.stdout.write("\n");
+  process.stdout.write(`1..${testCount}
+`);
+  process.stdout.write(`# tests ${testCount}
+`);
+  process.stdout.write(`# pass ${passCount}
+`);
+  process.stdout.write(`# skip ${skipCount}
+`);
+  process.stdout.write(`# fail ${failCount}
+`);
+  process.stdout.write(`# duration ${timeTaken}
+`);
+  process.stdout.write("\n");
 }
 var init_display_final_result = __esm({
   "lib/tap/display-final-result.ts"() {
@@ -1397,28 +1423,26 @@ async function buildTestBundle(config, cachedContent) {
   await fs9.mkdir(`${projectRoot}/${output}`, { recursive: true });
   const sourcemap = config.debug ? "inline" : config.watch ? "linked" : false;
   const needsDisk = true;
+  const buildOptions = {
+    stdin: {
+      contents: allTestFilePaths.map((filePath) => `import "${filePath}";`).join(""),
+      resolveDir: process.cwd()
+    },
+    bundle: true,
+    logLevel: "error",
+    outfile,
+    keepNames: true,
+    legalComments: "none",
+    target: esbuildTarget(config.browser),
+    sourcemap,
+    // Signal the runtime that all test modules are registered. The runtime's maybeStart()
+    // waits for both this event and the WebSocket 'open' event before calling QUnit.start().
+    // Dispatching from the bundle (rather than from a script onload attr) is reliable across
+    // all browsers and does not require changes to user test code.
+    footer: { js: 'window.dispatchEvent(new CustomEvent("qunitx:tests-ready"));' }
+  };
   const [allTestCode] = await Promise.all([
-    buildWithOverlayfsRetry(
-      {
-        stdin: {
-          contents: allTestFilePaths.map((filePath) => `import "${filePath}";`).join(""),
-          resolveDir: process.cwd()
-        },
-        bundle: true,
-        logLevel: "error",
-        outfile,
-        keepNames: true,
-        legalComments: "none",
-        target: esbuildTarget(config.browser),
-        sourcemap,
-        // Signal the runtime that all test modules are registered. The runtime's maybeStart()
-        // waits for both this event and the WebSocket 'open' event before calling QUnit.start().
-        // Dispatching from the bundle (rather than from a script onload attr) is reliable across
-        // all browsers and does not require changes to user test code.
-        footer: { js: 'window.dispatchEvent(new CustomEvent("qunitx:tests-ready"));' }
-      },
-      needsDisk
-    ),
+    config.watch ? buildIncrementally(buildOptions, allTestFilePaths.join("\0"), cachedContent, needsDisk) : buildWithOverlayfsRetry(buildOptions, needsDisk),
     Promise.all(
       cachedContent.htmlPathsToRunTests.map(async (htmlPath) => {
         const targetPath = `${config.projectRoot}/${config.output}${htmlPath}`;
@@ -1440,8 +1464,10 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
   }
   config.lastRanTestFiles = targetTestFilesToFilter || allTestFilePaths;
   try {
+    const preBuildPromise = cachedContent._preBuildPromise;
+    cachedContent._preBuildPromise = null;
     if (!cachedContent.allTestCode) {
-      await buildTestBundle(config, cachedContent);
+      await (preBuildPromise ?? buildTestBundle(config, cachedContent));
     }
     if (!cachedContent.allTestCode) {
       return connections;
@@ -1475,7 +1501,7 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
           connections.server && connections.server.close(),
           connections.browser && connections.browser.close()
         ]);
-        await shutdownEarlyBrowser();
+        await shutdownPrelaunch();
         return process.exit(config.COUNTER.failCount > 0 ? 1 : 0);
       }
     }
@@ -1511,16 +1537,10 @@ function buildFilteredTests(filteredTests, outputPath, config) {
     needsDisk
   );
 }
-async function buildWithOverlayfsRetry(options, needsDisk) {
+async function runWithOverlayfsRetry(getContents, needsDisk) {
   const RETRY_DELAY_MS = 100;
   const MAX_RETRIES = 3;
   const EMPTY_BUNDLE_THRESHOLD = 500;
-  const buildOpts = { ...options, write: false };
-  const getContents = async () => {
-    const result2 = await esbuild.build(buildOpts);
-    const jsFile = result2.outputFiles.find((outputFile) => !outputFile.path.endsWith(".map"));
-    return { result: result2, js: Buffer.from(jsFile.contents) };
-  };
   let { result, js } = await getContents();
   for (let retry = 1; retry <= MAX_RETRIES; retry++) {
     if (js.length >= EMPTY_BUNDLE_THRESHOLD) break;
@@ -1542,6 +1562,29 @@ async function buildWithOverlayfsRetry(options, needsDisk) {
   }
   return js;
 }
+function buildWithOverlayfsRetry(options, needsDisk) {
+  const buildOpts = { ...options, write: false };
+  return runWithOverlayfsRetry(async () => {
+    const result = await esbuild.build(buildOpts);
+    const jsFile = result.outputFiles.find((f) => !f.path.endsWith(".map"));
+    return { result, js: Buffer.from(jsFile.contents) };
+  }, needsDisk);
+}
+async function buildIncrementally(options, fileKey, cachedContent, needsDisk) {
+  const buildOpts = { ...options, write: false };
+  if (!cachedContent._esbuildContext || cachedContent._esbuildContextKey !== fileKey) {
+    cachedContent._esbuildContext?.dispose().catch(() => {
+    });
+    cachedContent._esbuildContext = await esbuild.context(buildOpts);
+    cachedContent._esbuildContextKey = fileKey;
+  }
+  const ctx = cachedContent._esbuildContext;
+  return runWithOverlayfsRetry(async () => {
+    const result = await ctx.rebuild();
+    const jsFile = result.outputFiles.find((f) => !f.path.endsWith(".map"));
+    return { result, js: Buffer.from(jsFile.contents) };
+  }, needsDisk);
+}
 function esbuildTarget(browser) {
   if (browser === "firefox") return ["firefox115"];
   if (browser === "webkit") return ["safari16"];
@@ -1626,7 +1669,7 @@ async function failOnNonWatchMode(watchMode = false, connections = {}, groupMode
       connections.server && connections.server.close(),
       connections.browser && connections.browser.close()
     ]);
-    await shutdownEarlyBrowser();
+    await shutdownPrelaunch();
     process.exit(1);
   }
 }
@@ -1634,7 +1677,7 @@ var BundleError;
 var init_tests_in_browser = __esm({
   "lib/commands/run/tests-in-browser.ts"() {
     init_color();
-    init_early_chrome();
+    init_chrome_prelaunch();
     init_time_counter();
     init_run_user_module();
     init_display_final_result();
@@ -1947,6 +1990,7 @@ import { availableParallelism } from "node:os";
 async function run(config) {
   const cachedContent = await buildCachedContent(config, config.htmlPaths);
   if (config.watch) {
+    cachedContent._preBuildPromise = buildTestBundle(config, cachedContent);
     const [connections] = await Promise.all([
       setupBrowser(config, cachedContent),
       writeOutputStaticFiles(config, cachedContent)
@@ -2011,9 +2055,10 @@ async function run(config) {
       _phase: "bundling"
     }));
     const groupCachedContents = groups.map(() => ({ ...cachedContent }));
-    console.log("TAP version 13");
-    console.log(
-      `# Running ${allFiles.length} test file${allFiles.length === 1 ? "" : "s"} across ${groupCount} group${groupCount === 1 ? "" : "s"}`
+    process.stdout.write("TAP version 13\n");
+    process.stdout.write(
+      `# Running ${allFiles.length} test file${allFiles.length === 1 ? "" : "s"} across ${groupCount} group${groupCount === 1 ? "" : "s"}
+`
     );
     const [browser] = await Promise.all([
       launchBrowser(config),
@@ -2099,7 +2144,7 @@ async function run(config) {
       clearInterval(keepAlive);
       await browser.close().catch(() => {
       });
-      await shutdownEarlyBrowser();
+      await shutdownPrelaunch();
       process.exit(exitCode);
     });
   }
@@ -2114,7 +2159,7 @@ async function buildCachedContent(config, htmlPaths) {
       if (buffer === null) return result;
       const filePath = config.htmlPaths[index];
       const html = buffer.toString();
-      if (htmlHasDynamicContentMarker(html)) {
+      if (isCustomTemplate(html)) {
         result.dynamicContentHTMLs[filePath] = html;
         result.htmlPathsToRunTests.push(filePath.replace(config.projectRoot, ""));
       } else {
@@ -2153,7 +2198,7 @@ async function addCachedContentMainHTML(projectRoot, cachedContent) {
       html: cachedContent.dynamicContentHTMLs[mainHTMLPath]
     };
   } else {
-    const html = await readBoilerplate("setup/tests.hbs");
+    const html = await readTemplate("setup/tests.hbs");
     cachedContent.mainHTML = { filePath: `${projectRoot}/test/tests.html`, html };
     cachedContent.assets.add(`${projectRoot}/node_modules/qunitx/vendor/qunit.css`);
   }
@@ -2184,7 +2229,7 @@ function normalizeInternalAssetPathFromHTML(projectRoot, assetPath, htmlPath) {
 var init_run = __esm({
   "lib/commands/run.ts"() {
     init_browser();
-    init_early_chrome();
+    init_chrome_prelaunch();
     init_open_output_in_browser();
     init_color();
     init_tests_in_browser();
@@ -2195,13 +2240,13 @@ var init_run = __esm({
     init_write_output_static_files();
     init_time_counter();
     init_display_final_result();
-    init_read_boilerplate();
-    init_html_content_marker();
+    init_read_template();
+    init_html();
   }
 });
 
 // cli.ts
-init_early_chrome();
+init_chrome_prelaunch();
 import process4 from "node:process";
 
 // lib/commands/help.ts
@@ -2211,7 +2256,7 @@ init_color();
 var package_default = {
   name: "qunitx-cli",
   type: "module",
-  version: "0.17.7",
+  version: "0.18.0",
   description: "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   author: "Izel Nakri",
   license: "MIT",
@@ -2270,7 +2315,7 @@ var package_default = {
     express: "^5.2.1",
     "js-yaml": "^4.1.1",
     prettier: "^3.8.2",
-    qunitx: "^1.2.1",
+    qunitx: "^1.2.7",
     typescript: "^6.0.2"
   },
   volta: {
@@ -2370,7 +2415,7 @@ var defaultProjectConfigValues = {
 };
 
 // lib/commands/init.ts
-init_read_boilerplate();
+init_read_template();
 async function initializeProject() {
   const projectRoot = await findProjectRoot();
   const oldPackageJSON = JSON.parse(await fs4.readFile(`${projectRoot}/package.json`));
@@ -2386,7 +2431,7 @@ async function initializeProject() {
   ]);
 }
 async function writeTestsHTML(projectRoot, config, oldPackageJSON) {
-  const testHTMLTemplateBuffer = await readBoilerplate("setup/tests.hbs");
+  const testHTMLTemplateBuffer = await readTemplate("setup/tests.hbs");
   return await Promise.all(
     config.htmlPaths.map(async (htmlPath) => {
       const targetPath = `${projectRoot}/${htmlPath}`;
@@ -2416,7 +2461,7 @@ async function rewritePackageJSON(projectRoot, config, oldPackageJSON) {
 async function writeTSConfigIfNeeded(projectRoot) {
   const targetPath = `${projectRoot}/tsconfig.json`;
   if (!await pathExists(targetPath)) {
-    const tsConfigTemplate = await readBoilerplate("setup/tsconfig.json");
+    const tsConfigTemplate = await readTemplate("setup/tsconfig.json");
     await fs4.writeFile(targetPath, tsConfigTemplate);
     console.log(`${targetPath} written`);
   }
@@ -2426,7 +2471,7 @@ async function writeTSConfigIfNeeded(projectRoot) {
 init_color();
 import fs5 from "node:fs/promises";
 init_path_exists();
-init_read_boilerplate();
+init_read_template();
 
 // lib/utils/convert-to-pascal-case.ts
 function convertToPascalCase(str) {
@@ -2448,7 +2493,7 @@ async function generateTestFiles() {
     console.log(`${path6} already exists!`);
     return;
   }
-  const testJSContent = await readBoilerplate("test.js");
+  const testJSContent = await readTemplate("test.js");
   const targetFolderPaths = path6.split("/");
   targetFolderPaths.pop();
   await fs5.mkdir(targetFolderPaths.join("/"), { recursive: true });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qunitx-cli",
   "type": "module",
-  "version": "0.17.7",
+  "version": "0.18.0",
   "description": "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   "author": "Izel Nakri",
   "license": "MIT",
@@ -60,7 +60,7 @@
     "express": "^5.2.1",
     "js-yaml": "^4.1.1",
     "prettier": "^3.8.2",
-    "qunitx": "^1.2.1",
+    "qunitx": "^1.2.7",
     "typescript": "^6.0.2"
   },
   "volta": {