qunitx-cli 0.17.7 → 0.17.8

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*}}/;
   }
 });
@@ -627,8 +627,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;
   }
 });
 
@@ -1189,17 +1189,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 +1210,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 +1276,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 +1288,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");
@@ -1397,28 +1394,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 +1435,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 +1472,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 +1508,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 +1533,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 +1640,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 +1648,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 +1961,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)
@@ -2099,7 +2114,7 @@ async function run(config) {
       clearInterval(keepAlive);
       await browser.close().catch(() => {
       });
-      await shutdownEarlyBrowser();
+      await shutdownPrelaunch();
       process.exit(exitCode);
     });
   }
@@ -2114,7 +2129,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 +2168,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 +2199,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 +2210,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 +2226,7 @@ init_color();
 var package_default = {
   name: "qunitx-cli",
   type: "module",
-  version: "0.17.7",
+  version: "0.17.8",
   description: "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   author: "Izel Nakri",
   license: "MIT",
@@ -2270,7 +2285,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 +2385,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 +2401,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 +2431,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 +2441,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 +2463,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.17.8",
   "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": {