feat: copy lighthouse and ecoindex folders into the target folder

AxaFrance · Mar 30, 2023 · b2705e2 · b2705e2
1 parent 743ffab
commit b2705e2
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 6 deletions.
diff --git a/cypress-demo/config.js b/cypress-demo/config.js
@@ -8,7 +8,7 @@ module.exports = {
   reports: [
     "html",
     (_options, result) => {
-      console.log(result)
+      console.log(result);
     },
   ],
   verbose: true,

diff --git a/cypress-demo/cypress.config.js b/cypress-demo/cypress.config.js
@@ -21,6 +21,7 @@ if(fs.existsSync(ecoIndexOutputPathDir)){
 fs.mkdirSync(ecoIndexOutputPathDir, {recursive: true});
 fs.mkdirSync(lighthouseOutputPathDir, {recursive: true});
 
+
 module.exports = defineConfig({
     e2e: {
         setupNodeEvents(on) {
@@ -37,10 +38,12 @@ module.exports = defineConfig({
             on("task", {
                 lighthouse: lighthouse(result => {
                     const url = result.lhr.finalUrl;
-                    const finalPath = path.resolve(__dirname, path.join(lighthouseOutputPathDir, `${url.replace("://", "_").replace("/", "_")}.json`));
                     fs.writeFileSync(
-                        finalPath,
+                        path.resolve(__dirname, path.join(lighthouseOutputPathDir, `${url.replace("://", "_").replace("/", "_")}.json`)),
                         JSON.stringify(result.lhr, undefined, 2));
+                    fs.writeFileSync(
+                        path.resolve(__dirname, path.join(lighthouseOutputPathDir, `${url.replace("://", "_").replace("/", "_")}.html`)),
+                        result.report);
                 }),
                 checkEcoIndex: ({ url }) => checkEcoIndex({ 
                     url, 

diff --git a/cypress-demo/cypress/e2e/demo.cy.js b/cypress-demo/cypress/e2e/demo.cy.js
@@ -10,6 +10,6 @@ describe("template spec", () => {
 
     it("lighthouse", () => {
         cy.visit(url);
-        cy.lighthouse();
+        cy.lighthouse(undefined, { output: "html"});
     });
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "command-line-args": "^5.2.1",
     "command-line-usage": "^5.0.0",
     "ejs": "^3.1.8",
+    "fs-extra": "^11.1.1",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

diff --git a/src/reporters/generatorReports.js b/src/reporters/generatorReports.js
@@ -2,6 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const folderTranslate = "translate";
 const minify = require("html-minifier").minify;
+const fse = require("fs-extra");
 
 const {
   globalNoteTag,
@@ -37,6 +38,7 @@ const computeCssClassForMetrics = require("./utils/computeCssClassForMetrics");
 const pageInErrorOrWarning = require("./utils/displayPageErrorIcon");
 const { statusGreen } = require("./utils/statusGreen");
 const { statusPerPage } = require("./utils/statusPerPage");
+const { basename } = require("path");
 
 
 
@@ -100,10 +102,30 @@ const generateReports = async (options, results) => {
     options.lang = "en-GB";
   }
   options.translations = populateTranslation(options);
+
+  if(options.srcLighthouse){
+    const finalSrcLighthouse = options.outputPath + "/" + basename(options.srcLighthouse);
+    fse.copySync(options.srcLighthouse, finalSrcLighthouse, { overwrite: true });
+    options.srcLighthouse = finalSrcLighthouse;
+  }
+  if(options.srcEcoIndex){
+    const finalSrcEcoIndex = options.outputPath + "/" + basename(options.srcEcoIndex);
+    fse.copySync(options.srcEcoIndex, finalSrcEcoIndex, { overwrite: true });
+    options.srcEcoIndex = finalSrcEcoIndex;
+  }
+  results.perPages = results.perPages.map(page => {
+    return {
+      ...page,
+      lighthouseReport: page.lighthouseReport ? `${options.srcLighthouse}/${basename(page.lighthouseReport)}` : "",
+    };
+  });
+
   const htmlPerPageResult = await populateTemplatePerPage(options, results);
   let htmlResult = await populateTemplate(options, results, htmlPerPageResult);
 
+
 
+
   const minifyOptions = {
     includeAutoGeneratedTags: true,
     removeAttributeQuotes: true,