@zohodesk/react-cli 1.1.7 → 1.1.8-exp.2

package/lib/utils/deprecationSupport.js

@@ -0,0 +1,123 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deprecationSupport = deprecationSupport;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _deprecationLogger = require("../deprecationLogger");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// function selectn(obj, key) {
+//   let temp = obj;
+//   let keys = key.split('.');
+//   for (let i = 0; i < keys.length; i++) {
+//     const element = keys[i];
+//     temp = temp && temp[element];
+//   }
+//   return temp;
+// }
+function deprecationSupport(options) {
+  options.app.plugins = options.app.plugins || {
+    valueReplacer: false,
+    hasRTL: false,
+    selectorReplace: false,
+    hoverActive: false,
+    combinerMediaQuery: false,
+    cssVariableReplacement: false,
+    selectorWeight: false,
+    minifier: false,
+    composeMinification: false
+  };
+  options.docs.plugins = options.docs.plugins || {
+    valueReplacer: false,
+    hasRTL: false,
+    selectorReplace: false,
+    hoverActive: false,
+    combinerMediaQuery: false,
+    cssVariableReplacement: false,
+    selectorWeight: false,
+    minifier: false,
+    composeMinification: false
+  };
+  options.css.plugins = options.css.plugins || {
+    valueReplacer: false,
+    hasRTL: false,
+    selectorReplace: false,
+    hoverActive: false,
+    combinerMediaQuery: false,
+    cssVariableReplacement: false,
+    selectorWeight: false,
+    minifier: false,
+    composeMinification: false
+  }; // deprecationLoggerStart();
+  // if (selectn(options, ".app.hasRTL") === true) {
+
+  if (options.app.hasRTL === true) {
+    (0, _deprecationLogger.deprecateOption)('app.hasRTL', 'app.plugins.hasRTL');
+    options.app.plugins.hasRTL = true;
+  }
+
+  if (options.docs.hasRTL === true) {
+    (0, _deprecationLogger.deprecateOption)('docs.hasRTL', 'docs.plugins.hasRTL');
+    options.docs.plugins.hasRTL = true;
+  }
+
+  if (options.app.rtlExclude.length > 0) {
+    (0, _deprecationLogger.deprecateOption)('app.rtlExclude', 'app.exclude.rtl');
+    options.app.exclude.rtl = options.app.rtlExclude;
+  }
+
+  if (options.docs.rtlExclude.length > 0) {
+    (0, _deprecationLogger.deprecateOption)('docs.rtlExclude', 'docs.exclude.rtl');
+    options.docs.exclude.rtl = options.docs.rtlExclude;
+  }
+
+  if (options.app.selectorReplace !== null) {
+    (0, _deprecationLogger.deprecateMessage)('when you use app.selectorReplace mention enable or disable app.plugins.selectorReplace by setting value to true or false');
+    options.app.plugins.selectorReplace = true;
+  }
+
+  if (options.docs.selectorReplace !== null) {
+    (0, _deprecationLogger.deprecateMessage)('when you use app.selectorReplace mention enable or disable app.plugins.selectorReplace by setting value to true or false');
+    options.docs.plugins.selectorReplace = true;
+  }
+
+  if (options.css.valueReplacer !== null) {
+    (0, _deprecationLogger.deprecateMessage)('when you use app.valueReplacer mention enable or disable app.plugins.valueReplacer by setting value to true or false');
+    options.app.plugins.valueReplacer = true;
+  }
+
+  if (options.app.exclude && options.app.exclude.hasRTL && options.app.exclude.rtl && options.app.exclude.hasRTL.length === 0 && options.app.exclude.rtl.length > 0) {
+    (0, _deprecationLogger.deprecateOption)('app.hasRTL', 'app.plugins.hasRTL');
+    options.app.exclude.hasRTL = options.app.exclude.rtl;
+  }
+
+  if (options.docs.exclude && options.docs.exclude.hasRTL && options.docs.exclude.rtl && options.docs.exclude.hasRTL.length === 0 && options.docs.exclude.rtl.length > 0) {
+    (0, _deprecationLogger.deprecateOption)('docs.hasRTL', 'docs.plugins.hasRTL');
+    options.docs.exclude.hasRTL = options.docs.exclude.rtl;
+  }
+
+  if (!options.app.patterns) {
+    options.app.patterns = {};
+  }
+
+  function addExcludesToPattern(patterns, exclude) {
+    Object.keys(patterns).forEach(key => {
+      if (exclude[key] && patterns[key].length === 0) {
+        let tempArr = exclude[key];
+        tempArr = tempArr.map(x => _path.default.join('!**', x, '**')); // Since patterns[key] is empty we need to wildcard for allow all others.
+
+        tempArr.unshift('*');
+        patterns[key] = tempArr;
+      }
+    });
+  }
+
+  addExcludesToPattern(options.app.patterns, options.app.exclude);
+  addExcludesToPattern(options.docs.patterns, options.docs.exclude);
+  (0, _deprecationLogger.deprecationLoggerEnd)();
+}

package/lib/utils/getOptions.js

@@ -7,14 +7,20 @@ exports.default = void 0;
 
 var _child_process = require("child_process");
 
-var _fs = _interopRequireDefault(require("fs"));
+var _fs = _interopRequireWildcard(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
 var _schemas = _interopRequireDefault(require("../schemas"));
 
+var _deprecationSupport = require("./deprecationSupport");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 // import { argv } from 'process';
 const args = process.argv.slice(2); // console.log('argv', argv);
 
@@ -122,85 +128,19 @@ const defaulter = (target, source) => {
   return defaultObject;
 };
 
-global.reactCLIOptions = null; // function selectn(obj, key) {
-//   let temp = obj;
-//   let keys = key.split('.');
-//   for (let i = 0; i < keys.length; i++) {
-//     const element = keys[i];
-//     temp = temp && temp[element];
-//   }
-//   return temp;
-// }
-
-function deprecationSupport(options) {
-  // if (selectn(options, ".app.hasRTL") === true) {
-  if (options.app.hasRTL === true) {
-    options.app.plugins.hasRTL = true;
-  }
-
-  if (options.docs.hasRTL === true) {
-    options.docs.plugins.hasRTL = true;
-  }
-
-  if (options.app.rtlExclude.length > 0) {
-    options.app.exclude.rtl = options.app.rtlExclude;
-  }
+global.reactCLIOptions = null;
 
-  if (options.docs.rtlExclude.length > 0) {
-    options.docs.exclude.rtl = options.docs.rtlExclude;
-  }
+const getOptionsFromConfigFile = (appPath, configFileName) => {
+  const fileName = configFileName || 'build.config.js';
 
-  if (options.app.selectorReplace !== null) {
-    options.app.plugins.selectorReplace = true;
-  }
+  const packagePath = _path.default.join(appPath, fileName);
 
-  if (options.docs.selectorReplace !== null) {
-    options.docs.plugins.selectorReplace = true;
+  if ((0, _fs.existsSync)(packagePath)) {
+    return require(packagePath).config;
   }
 
-  if (options.css.valueReplacer !== null) {
-    options.app.plugins.valueReplacer = true;
-  }
-
-  options.app.exclude.hasRTL = options.app.exclude.rtl;
-
-  if (!options.app.patterns) {
-    options.app.patterns = {};
-  }
-
-  if (options.app.patterns.valueReplacer.length === 0) {
-    options.app.patterns.valueReplacer = ['*'];
-  }
-
-  if (options.app.patterns.selectorReplace.length === 0) {
-    options.app.patterns.selectorReplace = ['*'];
-  }
-
-  if (options.docs.patterns.selectorReplace.length === 0) {
-    options.docs.patterns.selectorReplace = ['*'];
-  }
-
-  Object.keys(options.app.patterns).forEach(key => {
-    if (options.app.exclude[key] && options.app.patterns[key].length === 0) {
-      let tempArr = options.app.exclude[key];
-      tempArr = tempArr.map(x => {
-        x = x.replace(/\//gi, _path.default.sep);
-        return `!**${x[0] === _path.default.sep || x[0] === '@' ? '' : _path.default.sep}${x}${x[x.length - 1] === _path.default.sep ? '' : _path.default.sep}**`;
-      });
-      options.app.patterns[key] = tempArr;
-    }
-  });
-  Object.keys(options.docs.patterns).forEach(key => {
-    if (options.docs.exclude[key] && options.docs.patterns[key].length === 0) {
-      let tempArr = options.docs.exclude[key];
-      tempArr = tempArr.map(x => {
-        x = x.replace(/\//gi, _path.default.sep);
-        return `!**${x[0] === _path.default.sep || x[0] === '@' ? '' : _path.default.sep}${x}${x[x.length - 1] === _path.default.sep ? '' : _path.default.sep}**`;
-      });
-      options.docs.patterns[key] = tempArr;
-    }
-  });
-}
+  return null;
+};
 
 const getOptions = () => {
   if (global.reactCLIOptions) {
@@ -208,19 +148,19 @@ const getOptions = () => {
   }
 
   const appPath = process.cwd();
-  let userSchemas;
+  let userSchemas = getOptionsFromConfigFile(appPath, processEnv.config_file);
 
   const packagePath = _path.default.join(appPath, 'package.json');
 
   if (_fs.default.existsSync(packagePath)) {
-    userSchemas = require(packagePath)['react-cli'] || {};
+    userSchemas = userSchemas || require(packagePath)['react-cli'] || {};
   }
 
   const options = defaulter(_schemas.default, userSchemas || {}); // for future may be for npm 8 edge cases
 
   options.npmVersion = getNpmVersion();
   options.cwd = getCWD();
-  deprecationSupport(options);
+  (0, _deprecationSupport.deprecationSupport)(options);
   options.packageVersion = process.env.npm_package_version;
   global.reactCLIOptions = options;
   return options;

package/lib/utils/resultSchema.json

@@ -1,73 +1,73 @@
-{
-  "jobDetails": {
-    "isTriggeredFromGit": true,
-    "isCIPassed": true,
-    "developerName": "GITLAB_USER_NAME",
-    "jobID": "CI_PIPELINE_ID",
-    "branchName": "CI_COMMIT_REF_NAME",
-    "commitMessage": "CI_COMMIT_MESSAGE",
-    "jobURL": "CI_JOB_URL",
-    "isByManual": "CI_JOB_MANUAL",
-    "commitID": "CI_COMMIT_SHA",
-    "executionTime": "Date.now()-Date.now()",
-    "hostName": "kathir-zt252"
-  },
-  "tests": {
-    "unitCase": {
-      "startTime": "123455",
-      "endTime": "123446",
-      "isExecuted": true,
-      "numberOfSuccess": "",
-      "numberOfFails": "",
-      "numberOfCases": "",
-      "numberOfSuites": "",
-      "fileDetail": {
-        "fileName": "sample.spec.js",
-        "caseDetail": {
-          "failedCaseLists": [],
-          "passedCaseList": []
-        }
-      },
-      "coverageDetail": {
-        "codeCoveragePercentage": "",
-        "fileCoveragePercentage": ""
-      }
-    },
-    "modifiedFileUnitCase": {
-      "hasChanges": "true",
-      "startTime": "123455",
-      "endTime": "123446",
-      "isExecuted": true,
-      "isPassed": true,
-      "numberOfSuccess": "",
-      "numberOfFails": "",
-      "numberOfCases": "",
-      "numberOfSuites": "",
-      "fileDetail": {
-        "fileName": "sample.spec.js",
-        "caseDetail": {
-          "failedCaseLists": [],
-          "passedCaseList": []
-        }
-      },
-      "coverageDetail": {
-        "codeCoveragePercentage": "",
-        "fileCoveragePercentage": ""
-      }
-    },
-    "screenshotTest": {
-      "message": "some",
-      "startTime": "123455",
-      "endTime": "123446",
-      "isThisExecuted": true,
-      "compareBranch": "master",
-      "isPassed": true,
-      "result": {
-        "numberOfComponents": 200,
-        "numberOfDiffFiles": 20,
-        "improperDocsList": [],
-        "erroredComponents": []
-      }
-    }
-  }
-}
+{
+  "jobDetails": {
+    "isTriggeredFromGit": true,
+    "isCIPassed": true,
+    "developerName": "GITLAB_USER_NAME",
+    "jobID": "CI_PIPELINE_ID",
+    "branchName": "CI_COMMIT_REF_NAME",
+    "commitMessage": "CI_COMMIT_MESSAGE",
+    "jobURL": "CI_JOB_URL",
+    "isByManual": "CI_JOB_MANUAL",
+    "commitID": "CI_COMMIT_SHA",
+    "executionTime": "Date.now()-Date.now()",
+    "hostName": "kathir-zt252"
+  },
+  "tests": {
+    "unitCase": {
+      "startTime": "123455",
+      "endTime": "123446",
+      "isExecuted": true,
+      "numberOfSuccess": "",
+      "numberOfFails": "",
+      "numberOfCases": "",
+      "numberOfSuites": "",
+      "fileDetail": {
+        "fileName": "sample.spec.js",
+        "caseDetail": {
+          "failedCaseLists": [],
+          "passedCaseList": []
+        }
+      },
+      "coverageDetail": {
+        "codeCoveragePercentage": "",
+        "fileCoveragePercentage": ""
+      }
+    },
+    "modifiedFileUnitCase": {
+      "hasChanges": "true",
+      "startTime": "123455",
+      "endTime": "123446",
+      "isExecuted": true,
+      "isPassed": true,
+      "numberOfSuccess": "",
+      "numberOfFails": "",
+      "numberOfCases": "",
+      "numberOfSuites": "",
+      "fileDetail": {
+        "fileName": "sample.spec.js",
+        "caseDetail": {
+          "failedCaseLists": [],
+          "passedCaseList": []
+        }
+      },
+      "coverageDetail": {
+        "codeCoveragePercentage": "",
+        "fileCoveragePercentage": ""
+      }
+    },
+    "screenshotTest": {
+      "message": "some",
+      "startTime": "123455",
+      "endTime": "123446",
+      "isThisExecuted": true,
+      "compareBranch": "master",
+      "isPassed": true,
+      "result": {
+        "numberOfComponents": 200,
+        "numberOfDiffFiles": 20,
+        "improperDocsList": [],
+        "erroredComponents": []
+      }
+    }
+  }
+}