monocart-reporter 2.0.0 → 2.0.2

package/lib/plugins/coverage/coverage.js

@@ -32,17 +32,20 @@ const attachCoverageReport = async (data, testInfo, options = {}) => {
     await coverageReport.add(data);
     const coverageResults = await coverageReport.generate();
 
-    // save report json
-    const definition = Util.attachments.coverage;
-    const reportPath = path.resolve(htmlDir, definition.reportFile);
-    Util.writeJSONSync(reportPath, coverageResults);
-
-    // save attachments html link
-    testInfo.attachments.push({
-        name: definition.name,
-        contentType: definition.contentType,
-        path: coverageResults.reportPath
-    });
+    const reportPath = coverageResults.reportPath;
+    if (reportPath && fs.existsSync(reportPath)) {
+        // save report json
+        const definition = Util.attachments.coverage;
+        const reportJsonPath = path.resolve(htmlDir, definition.reportFile);
+        Util.writeJSONSync(reportJsonPath, coverageResults);
+
+        // save attachments html link
+        testInfo.attachments.push({
+            name: definition.name,
+            contentType: definition.contentType,
+            path: reportPath
+        });
+    }
 
     return coverageResults;
 };
@@ -101,12 +104,16 @@ const generateGlobalCoverageReport = async (reporterOptions) => {
 
     // console.log('global coverage report', report);
 
-    return {
-        global: true,
-        type: 'coverage',
-        name: coverageResults.name,
-        path: coverageResults.reportPath
-    };
+    const reportPath = coverageResults.reportPath;
+    if (reportPath && fs.existsSync(reportPath)) {
+        return {
+            global: true,
+            type: 'coverage',
+            name: coverageResults.name,
+            path: reportPath
+        };
+    }
+
 };
 
 module.exports = {

package/lib/plugins/network/network.js

@@ -100,11 +100,11 @@ const saveNetworkHtmlReport = async (reportData, _options) => {
 
     // deps
     const jsFiles = ['monocart-code-viewer', 'monocart-formatter', 'turbogrid'].map((it) => {
-        return path.resolve(`node_modules/${it}/dist/${it}.js`);
+        return Util.resolveNodeModule(`${it}/dist/${it}.js`);
     });
 
-    jsFiles.push(path.resolve(__dirname, '../../packages/monocart-common.js'));
-    jsFiles.push(path.resolve(__dirname, '../../packages/monocart-network.js'));
+    jsFiles.push(Util.resolvePackage('monocart-common.js'));
+    jsFiles.push(Util.resolvePackage('monocart-network.js'));
 
     const options = {
         inline,

package/lib/utils/util.js

@@ -151,6 +151,34 @@ const Util = {
         Util.initDir(assetsDir);
     },
 
+    resolveNodeModule: (p) => {
+        // same level dep
+        const dep = path.resolve(__dirname, '../../../', p);
+        if (fs.existsSync(dep)) {
+            return dep;
+        }
+
+        // root
+        const cwd = path.resolve('node_modules', p);
+        if (fs.existsSync(cwd)) {
+            return cwd;
+        }
+
+        // sub node modules
+        const sub = path.resolve(__dirname, '../../node_modules', p);
+        if (fs.existsSync(sub)) {
+            return sub;
+        }
+
+        Util.logError(`Not found module: ${p}`);
+
+        return cwd;
+    },
+
+    resolvePackage: (p) => {
+        return path.resolve(__dirname, '../packages', p);
+    },
+
     saveHtmlReport: async (options) => {
 
         const {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-reporter",
-    "version": "2.0.0",
+    "version": "2.0.2",
     "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": {
@@ -48,7 +48,7 @@
         "koa": "^2.14.2",
         "koa-static-resolver": "^1.0.4",
         "lz-utils": "^2.0.1",
-        "monocart-coverage-reports": "^1.0.6",
+        "monocart-coverage-reports": "^1.0.8",
         "nodemailer": "^6.9.7",
         "open": "^9.1.0",
         "turbogrid": "^3.0.10"
@@ -61,7 +61,7 @@
         "eslint-config-plus": "^1.0.6",
         "eslint-plugin-html": "^7.1.0",
         "eslint-plugin-vue": "^9.19.2",
-        "stylelint": "^15.11.0",
+        "stylelint": "^16.0.2",
         "stylelint-config-plus": "^1.0.4",
         "vine-ui": "^3.1.12"
     }