browser-ava 2.2.5 → 2.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-ava",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -38,7 +38,7 @@
     "@koa/cors": "^5.0.0",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
-    "es-module-lexer": "^1.4.1",
+    "es-module-lexer": "^1.5.0",
     "globby": "^14.0.1",
     "koa": "^2.15.2",
     "koa-static": "^5.0.0",
@@ -54,7 +54,7 @@
     "semantic-release": "^23.0.6"
   },
   "engines": {
-    "node": ">=20.11.1",
+    "node": ">=20.12.0",
     "bun": ">=1.0"
   },
   "repository": {

package/src/browser-ava-cli.mjs

@@ -1,5 +1,4 @@
-#!/usr/bin/env node
-import { readFileSync } from "node:fs";
+#!/usr/bin/env -S node --no-warnings --title browser-ava
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import { init, parse } from "es-module-lexer";
@@ -13,13 +12,7 @@ import { calculateSummary, summaryMessages } from "./browser/util.mjs";
 import { resolveImport, utf8EncodingOptions } from "./resolver.mjs";
 import { globby } from "globby";
 import chalk from "chalk";
-
-const { version, description } = JSON.parse(
-  readFileSync(
-    new URL("../package.json", import.meta.url).pathname,
-    utf8EncodingOptions
-  )
-);
+import pkg from "../package.json" assert { type: "json" };
 
 const knownBrowsers = {
   chrome: chromium,
@@ -39,20 +32,28 @@ Object.entries(knownBrowsers).forEach(([name, browser]) => {
 });
 
 program
-  .description(description)
-  .version(version)
+  .description(pkg.description)
+  .version(pkg.version)
   .addOption(
     new Option("-p, --port <number>", "server port to use")
       .default(8080)
       .env("PORT")
   )
   .addOption(
-    new Option("-b, --browser <name>[,secondBrowserName]", "browsers to use").env("BROWSER")
+    new Option(
+      "-b, --browser <name>[,secondBrowserName]",
+      "browsers to use"
+    ).env("BROWSER")
   )
   .option("--headless", "hide browser window", false)
+  .option(
+    "--keep-open",
+    "keep browser-ava and the browser open after execution",
+    true
+  )
   .option(
     "--no-keep-open",
-    "keep browser-ava and the page open after execution",
+    "close browser-ava and the browsers after execution",
     true
   )
   .argument("<tests...>")
@@ -207,7 +208,7 @@ async function loadAndRewriteImports(file) {
 
       d += m.length - i.n.length;
     } else {
-      console.warn(`Unable to resolve "${i.n}" may lead to import errors`);
+      console.warn(`${file}: Unable to resolve "${i.n}" may lead to import errors`);
     }
   }
   return body;

package/src/resolver.mjs

@@ -31,8 +31,8 @@ export function resolveExports(parts, pkg) {
       case "string":
         return value;
       case "object":
-        if(value['.']) {
-          return matchingCondition(value['.']);
+        if (value["."]) {
+          return matchingCondition(value["."]);
         }
         for (const condition of exportsConditionOrder) {
           if (value[condition]) {
@@ -50,6 +50,10 @@ export function resolveExports(parts, pkg) {
         return matchingCondition(pkg.exports["./" + parts.slice(1).join("/")]);
     }
   }
+
+  /*if(parts.join('/') === pkg.name) {
+    return matchingCondition(pkg.exports) || pkg.main || "index.js";
+  }*/
 }
 
 export function resolveImports(name, pkg) {
@@ -100,14 +104,20 @@ export async function resolveImport(name, base) {
   if (name.match(/^[\/\.]/)) {
     return resolve(dirname(base), name);
   }
-  let { pkg, path } = await findPackage(base);
 
   let parts = name.split(/\//);
 
   if (parts[0][0] === "@") {
+    const i = base.indexOf(parts[0]);
+    if (i > 0) {
+      base = base.substring(0, i);
+    }
+
     parts = [parts[0] + "/" + parts[1], ...parts.slice(2)];
   }
 
+  let { pkg, path } = await findPackage(base);
+
   const e = resolveExports(parts, pkg) || resolveImports(name, pkg);
 
   if (e) {