monocart-reporter 2.8.2 → 2.8.3

package/README.md

@@ -1057,6 +1057,12 @@ npx monocart merge path-to/shard*/index.json -o merged-reports/index.html
 # -c --config
 npx monocart merge path-to/shard*/index.json -c mr.config.js
 ```
+The default config files (In order of priority)
+- mr.config.js
+- mr.config.cjs
+- mr.config.mjs
+- mr.config.json
+- mr.config.ts
 
 
 ## onEnd Hook

package/lib/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const fs = require('fs');
 const path = require('path');
@@ -7,7 +7,6 @@ const https = require('https');
 const net = require('net');
 const os = require('os');
 const { pathToFileURL } = require('url');
-const { register } = require('module');
 const EC = require('eight-colors');
 const KSR = require('koa-static-resolver');
 const Koa = require('koa');
@@ -210,18 +209,41 @@ const checkRegisterFeature = () => {
     return true;
 };
 
-const initTSPreload = () => {
+const loadEnv = (cliOptions) => {
+    if (!cliOptions.env) {
+        return;
+    }
+    const envFile = cliOptions.env === true ? '.env' : cliOptions.env;
+    const loadEnvFile = process.loadEnvFile;
+    if (typeof loadEnvFile === 'function') {
+        loadEnvFile(envFile);
+    }
+};
+
+
+const initNodeOptions = async (cliOptions) => {
+
+    loadEnv(cliOptions);
 
     const supportRegister = checkRegisterFeature();
     if (!supportRegister) {
         return;
     }
 
-    register('./hooks.js', pathToFileURL(__filename));
+    // for loading mr.config.ts
+    const modulePath = cliOptions.import || cliOptions.require;
+    if (!modulePath) {
+        return;
+    }
+
+    const res = await import(modulePath);
+    if (res && typeof res.register === 'function') {
+        await res.register();
+    }
 
 };
 
-// eslint-disable-next-line complexity
+
 const resolveConfigOptions = async (configPath) => {
     // json format
     const ext = path.extname(configPath);
@@ -229,10 +251,6 @@ const resolveConfigOptions = async (configPath) => {
         return JSON.parse(Util.readFileSync(configPath));
     }
 
-    if (ext === '.ts') {
-        initTSPreload();
-    }
-
     let configOptions;
     let err;
     try {
@@ -256,6 +274,8 @@ const resolveConfigOptions = async (configPath) => {
 
 const mergeReports = async (str, cliOptions) => {
 
+    await initNodeOptions(cliOptions);
+
     const customConfig = cliOptions.config;
     const configPath = findUpConfig(customConfig);
 
@@ -321,6 +341,11 @@ program.command('merge-reports')
     .option('-n, --name <name>', 'report name for title')
     .option('-o, --outputFile <path>', 'output file')
 
+    .option('--import <module>', 'preload module at startup')
+    .option('--require <module>', 'preload module at startup')
+
+    .option('--env [path]', 'env file (default: ".env")')
+
     .action((str, options) => {
         mergeReports(str, options);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-reporter",
-    "version": "2.8.2",
+    "version": "2.8.3",
     "description": "A playwright test reporter. Shows suites/cases/steps with tree style, markdown annotations, custom columns/formatters/data collection visitors, console logs, style tags, send email.",
     "main": "lib/index.js",
     "bin": {
@@ -53,7 +53,6 @@
     "devDependencies": {
         "@babel/code-frame": "^7.24.7",
         "@playwright/test": "^1.47.2",
-        "amaro": "^0.1.8",
         "ansi-to-html": "^0.7.2",
         "async-tick": "^1.0.0",
         "autolinker": "^4.0.0",
@@ -62,7 +61,7 @@
         "dotenv": "^16.4.5",
         "eslint": "^9.11.0",
         "eslint-config-plus": "^2.0.2",
-        "eslint-plugin-html": "^8.1.1",
+        "eslint-plugin-html": "^8.1.2",
         "eslint-plugin-vue": "^9.28.0",
         "file-saver": "^2.0.5",
         "find-up": "^7.0.0",

package/lib/hooks.js

@@ -1,37 +0,0 @@
-
-const EC = require('eight-colors');
-
-const extensionsRegex = /\.ts$|\.mts$|\.cts$/;
-
-async function load(url, context, nextLoad) {
-
-    if (extensionsRegex.test(url) && !url.includes('/node_modules/')) {
-
-        const { transformSync } = await import('amaro').catch((e) => {
-            // console.log(e.message || e);
-            EC.logRed('The "amaro" module is required for loading ".ts" file, please run "npm i amaro"');
-        });
-
-        // Use format 'module' so it returns the source as-is, without stripping the types.
-        // Format 'commonjs' would not return the source for historical reasons.
-        const { source } = await nextLoad(url, {
-            ... context,
-            format: 'module'
-        });
-        if (source === null) {
-            throw new Error('Source code cannot be null or undefined');
-        }
-        const { code } = transformSync(source.toString(), {
-            mode: 'strip-only'
-        });
-        return {
-            format: 'module',
-            source: code
-        };
-    }
-    return nextLoad(url, context);
-}
-
-module.exports = {
-    load
-};