Merge pull request #25 from AxaFrance/fix/issue

fix: solve issue with default lang and when reports option is undefined
AxaFrance · May 2, 2023 · 0adf92b · 0adf92b
2 parents 53387c7 + b3a5f2f
commit 0adf92b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/main.js b/src/main.js
@@ -11,6 +11,13 @@ const defaultThreshold = {
   fail: 30
 };
 
+const formatReports = reports => {
+  if(!reports){
+    return [];
+  }
+  return Array.isArray(reports) ? reports : [reports];
+};
+
 module.exports = async (_options) => {
   let options = {
     ...defaultThreshold,
@@ -29,15 +36,14 @@ module.exports = async (_options) => {
   const resultsGlobal = aggregatorGlobalService(options, resultsGlobalLighthouse, resultsGlobalEcoindex);
 
 
-  const reports = Array.isArray(options.reports) ? options.reports : [options.reports];
+  const reports = formatReports(options.reports);
   const destFolder = path.join(process.cwd(), options.outputPath ?? "globalReports");
   if(fs.existsSync(destFolder)){
     fs.rmSync(destFolder, { recursive: true });
   }
   fs.mkdirSync(destFolder, { recursive: true });
   options.outputPath = destFolder;
 
-
   await Promise.all(reports.map(report => {
     if(typeof report !== "string"){
       return report(options, resultsGlobal);

diff --git a/src/reporters/generatorReports.js b/src/reporters/generatorReports.js
@@ -3,7 +3,7 @@ const path = require("path");
 const folderTranslate = "translate";
 const minify = require("html-minifier").minify;
 const fse = require("fs-extra");
-
+const defaultLang = "en-GB";
 const {
   globalNoteTag,
   globalPerformanceTag,
@@ -108,8 +108,9 @@ const generateReports = async (options, results) => {
     console.log("Generate reports html.");
   }
   if (!options.lang) {
-    options.lang = "en-GB";
+    options.lang = defaultLang;
   }
+
   options.translations = populateTranslation(options);
 
   if (options.srcLighthouse) {
@@ -386,16 +387,21 @@ const populateTemplateEcoIndex = (options, ecoIndex, numberPage) => {
 };
 
 const populateTranslation = options => {
-  const templateFile = `${options.lang}.json`;
+  const i18nFile = `${options.lang}.json`;
 
   if (options?.verbose) {
-    console.log("Translate by files:", templateFile);
+    console.log("Translate by files:", i18nFile);
   }
-  const templatePath = path.join(__dirname, folderTranslate, templateFile);
+  const templatePath = path.join(__dirname, folderTranslate, i18nFile);
   if (fs.existsSync(templatePath)) {
     return require(templatePath);
   }
-  return require(dafaultPath);
+
+  if (options?.verbose) {
+    console.log(`The file ${i18nFile} does not exist. We will use the default one.`);
+  }
+
+  return populateTranslation({ ...options, lang: defaultLang});
 };
 
 const generateCSSClassBasedOnValue = (value, { pass, fail }) => {