@zohodesk/react-cli 1.1.0 → 1.1.2-9.exp.3

package/lib/utils/getOptions.js

@@ -3,18 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.defaulter = 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");
+
+var _deprecationLogger = require("../deprecationLogger");
+
+var _logger = require("../logger");
+
 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,70 +132,51 @@ 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;
-  }
+exports.defaulter = defaulter;
+global.reactCLIOptions = null;
 
-  if (options.docs.hasRTL === true) {
-    options.docs.plugins.hasRTL = true;
+const getOptionsFromConfigFile = (appPath, configFileName) => {
+  const fileName = configFileName || 'react-cli.config.js';
+
+  if (!configFileName) {
+    (0, _logger.verboseLogger)('we have used default react-cli.config.js');
   }
 
-  if (options.app.rtlExclude.length > 0) {
-    options.app.exclude.rtl = options.app.rtlExclude;
+  const packagePath = _path.default.join(appPath, fileName);
+
+  if ((0, _fs.existsSync)(packagePath)) {
+    return require(packagePath).config;
   }
 
-  if (options.docs.rtlExclude.length > 0) {
-    options.docs.exclude.rtl = options.docs.rtlExclude;
+  const oldDeprecatedConfigFilePath = _path.default.join(appPath, 'build.config.js');
+
+  if ((0, _fs.existsSync)(oldDeprecatedConfigFilePath)) {
+    (0, _deprecationLogger.deprecateMessage)('"build.config.js" file was deprecated. So Kindly rename it as "react-cli.config.js"');
+    return require(oldDeprecatedConfigFilePath).config;
   }
 
-  options.app.exclude.hasRTL = options.app.exclude.rtl;
-  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}`);
-      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}`);
-      options.docs.patterns[key] = tempArr;
-    }
-  });
-}
+  return null;
+};
 
-const getOptions = () => {
+const getOptions = fromRoot => {
   if (global.reactCLIOptions) {
     return global.reactCLIOptions;
   }
 
   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.disableDeprecationWarning || !fromRoot);
   options.packageVersion = process.env.npm_package_version;
   global.reactCLIOptions = options;
   return options;

package/lib/utils/getServerURL.js

@@ -5,13 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-let getServerURL = (serverInfo, protocol) => {
+const getServerURL = (serverInfo, protocol) => {
+  // eslint-disable-next-line prefer-const
   let {
     host,
     domain,
     port
   } = serverInfo;
 
+  if (domain === 'kubernetes') {
+    return `${protocol ? `${protocol}:` : ''}//${host}`;
+  }
+
   if (protocol) {
     if (protocol === 'ht' + 'tp') {
       port = Number(port) + 1;
@@ -20,7 +25,7 @@ let getServerURL = (serverInfo, protocol) => {
         return `${protocol ? `${protocol}:` : ''}//${host}.${domain}.zohocorpin.com:${Number(port) + 1}`;
       }
 
-      return `${protocol ? `${protocol}:` : ''}//${host}:${port}`;
+      return `${protocol ? `${protocol}:` : ''}//${host}:${Number(port) + 1}`;
     }
   }
 

package/lib/utils/index.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  log: true,
   writeFile: true,
   makeDir: true,
   getInfoFromPublicPaths: true,
   getLibraryConflict: true,
+  log: true,
   getOptions: true,
   createEventStream: true,
   getServerURL: true,
@@ -64,7 +64,13 @@ Object.defineProperty(exports, "jsonHelper", {
     return _jsonHelper.default;
   }
 });
-exports.makeDir = exports.log = void 0;
+Object.defineProperty(exports, "log", {
+  enumerable: true,
+  get: function () {
+    return _log.log;
+  }
+});
+exports.makeDir = void 0;
 Object.defineProperty(exports, "pullOrigin", {
   enumerable: true,
   get: function () {
@@ -95,6 +101,8 @@ var _stream = require("stream");
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _log = require("./log");
+
 var _getOptions = _interopRequireDefault(require("./getOptions"));
 
 var _createEventStream = _interopRequireDefault(require("./createEventStream"));
@@ -159,15 +167,23 @@ var _getComponents = _interopRequireDefault(require("./getComponents"));
 
 var _ssTestHack = _interopRequireDefault(require("./ssTestHack"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _typeCheck = require("./typeCheck");
 
-let log = (...info) => {
-  let print = console;
-  print.log(...info);
-};
+Object.keys(_typeCheck).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _typeCheck[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _typeCheck[key];
+    }
+  });
+});
 
-exports.log = log;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// eslint-disable-next-line no-duplicate-imports
 let writeFile = (outputPath, src, isPath = false) => new Promise((resolve, reject) => {
   let inStr;
 
@@ -314,9 +330,9 @@ let getLibraryConflict = (moduleObject, impactObj, changesOnly) => {
     whichLibrary = "No component file changes!";
   }
 
-  log('\n');
-  log('You can see the HTML out at coverageTest/impactLibrary.html!');
-  log('\x1b[33m%s\x1b[0m', '************************************************************ \n ');
+  (0, _log.log)('\n');
+  (0, _log.log)('You can see the HTML out at coverageTest/impactLibrary.html!');
+  (0, _log.log)('\x1b[33m%s\x1b[0m', '************************************************************ \n ');
   return {
     response: allImpactArray,
     result: {

package/lib/utils/initPreCommitHook.js

@@ -11,7 +11,7 @@ var _path = _interopRequireDefault(require("path"));
 
 var _child_process = require("child_process");
 
-var _index = require("./index");
+var _log = require("./log");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -38,7 +38,7 @@ let copyEslintConfig = rootDir => {
 
     _fs.default.writeFileSync(targetPath, src);
 
-    (0, _index.log)('Eslint config added in project root path');
+    (0, _log.log)('Eslint config added in project root path');
   }
 };
 
@@ -58,7 +58,7 @@ let initPreCommitHook = (forReactCLI = false) => {
 
       _fs.default.writeFileSync(targetPath, precommit);
 
-      (0, _index.log)('pre-commit hook added');
+      (0, _log.log)('pre-commit hook added');
     }
 
     let packagePath = _path.default.join(process.cwd(), 'package.json');
@@ -71,10 +71,10 @@ let initPreCommitHook = (forReactCLI = false) => {
 
         _fs.default.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));
 
-        (0, _index.log)('lint script added in your package.json');
+        (0, _log.log)('lint script added in your package.json');
       }
     } catch (e) {
-      (0, _index.log)('package.json not found');
+      (0, _log.log)('package.json not found');
     }
   }
 };

package/lib/utils/log.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.log = log;
+
+function log(...info) {
+  let print = console;
+  print.log(...info);
+}

package/lib/utils/object-manipulation.js

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertObjectToStringGen = convertObjectToStringGen;
+exports.removeKeysFromObject = removeKeysFromObject;
+
+function objectPathMatcher(currentKey, objHierarchy = [], keysToBeRemoved = []) {
+  const objPathKey = objHierarchy.length > 0 ? `${objHierarchy.join('.')}.${currentKey}` : currentKey;
+  return keysToBeRemoved.some(key => {
+    const isWildPath = /^\*/.test(key);
+
+    if (isWildPath) {
+      const newKey = key.replace(/\*\.?/, '');
+      return objPathKey.includes(newKey);
+    }
+
+    return key === objPathKey;
+  });
+}
+/*
+    1) *.keyTobeRemoved -> means match every object path, this key will be removed
+    2) keyToBeremoved -> means root object key
+    3) nestedPath.keyToBeRemoved -> means only that nested path key
+    4) don't need to account for array iteration, just object key path is enough in the key to be removed.
+*/
+
+
+function removeKeysFromObject(obj, keysToBeRemoved, prevKeys = []) {
+  if (Array.isArray(obj)) {
+    return obj.map(item => removeKeysFromObject(item, keysToBeRemoved, prevKeys));
+  }
+
+  if (obj && typeof obj === 'object') {
+    const filteredKeyObject = {};
+    const ObjectKeys = Object.keys(obj);
+
+    for (const objectKey of ObjectKeys) {
+      const isKeyToBeRemoved = objectPathMatcher(objectKey, prevKeys, keysToBeRemoved);
+
+      if (!isKeyToBeRemoved) {
+        filteredKeyObject[objectKey] = removeKeysFromObject(obj[objectKey], keysToBeRemoved, [...prevKeys, objectKey]);
+      }
+    }
+
+    return filteredKeyObject;
+  }
+
+  return obj;
+}
+
+function* convertObjectToStringGen(obj) {
+  if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || obj === null) {
+    yield JSON.stringify(obj);
+  } else if (Array.isArray(obj)) {
+    yield '[';
+    let isFirst = true;
+
+    for (let item of obj) {
+      if (item === undefined) {
+        item = null;
+      }
+
+      yield `${isFirst ? '' : ','}`;
+      yield* convertObjectToStringGen(item);
+      isFirst = false;
+    }
+
+    yield ']';
+  } else {
+    yield '{';
+    let isFirst = true;
+    const entries = Object.entries(obj);
+
+    for (const [itemKey, itemValue] of entries) {
+      if (itemValue === undefined) {
+        continue;
+      }
+
+      yield `${isFirst ? '' : ','}${JSON.stringify(itemKey)}: `;
+      yield* convertObjectToStringGen(itemValue);
+      isFirst = false;
+    }
+
+    yield '}';
+  }
+}

package/lib/utils/pullOrigin.js

@@ -7,20 +7,20 @@ exports.default = void 0;
 
 var _child_process = require("child_process");
 
-var _utils = require("../utils");
+var _log = require("./log");
 
 var _default = (type = 'git', branchName) => new Promise(resolve => {
   if (type === 'git') {
     (0, _child_process.spawnSync)('git', ['pull', 'origin', branchName], {
       encoding: 'utf8'
     });
-    (0, _utils.log)(branchName, 'Branch Pulled!');
+    (0, _log.log)(branchName, 'Branch Pulled!');
     resolve();
   } else if (type === 'hg') {
     (0, _child_process.spawnSync)('hg', ['pull'], {
       encoding: 'utf8'
     });
-    (0, _utils.log)(branchName, 'Branch Pulled!');
+    (0, _log.log)(branchName, 'Branch Pulled!');
     resolve();
   }
 });

package/lib/utils/reinstallDependencies.js

@@ -13,7 +13,7 @@ var _child_process = require("child_process");
 
 var _gitRootDir = _interopRequireDefault(require("git-root-dir"));
 
-var _index = require("./index");
+var _log = require("./log");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -80,7 +80,7 @@ let reinstallDependencies1 = pathToSubProjects => {
       let diffs = packageDiffChecker(prePackageJson, currentPackageJson);
 
       if (Object.keys(diffs).length) {
-        (0, _index.log)(diffs, `package diffs between branches for ${project} project`);
+        (0, _log.log)(diffs, `package diffs between branches for ${project} project`);
         (0, _child_process.spawnSync)('rm', ['-rf', 'package-lock.json'], {
           cwd: projPath,
           stdio: 'inherit'
@@ -93,7 +93,7 @@ let reinstallDependencies1 = pathToSubProjects => {
           dummy.push(`${name}@${version}`);
         }
 
-        (0, _index.log)(`npm ${['install'].concat(dummy).join(' ')}`);
+        (0, _log.log)(`npm ${['install'].concat(dummy).join(' ')}`);
         (0, _child_process.spawnSync)('npm', ['install'].concat(dummy), {
           cwd: projPath,
           stdio: 'inherit'

package/lib/utils/selectorReplacer.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _getOptions = _interopRequireDefault(require("./getOptions"));
+
+var _folderIterator = _interopRequireDefault(require("./folderIterator"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const postcss = require('postcss');
+
+const path = require('path');
+
+const fs = require('fs');
+
+const SelectorReplacePlugin = require('../postcss-plugins/SelectorReplace');
+
+const cwd = process.cwd();
+const src = path.join(cwd, process.argv[2]);
+const dist = path.join(cwd, process.argv[3]);
+const options = (0, _getOptions.default)();
+
+function watchHandler(fromPath, toPath) {
+  const css = fs.readFileSync(fromPath, 'utf-8'); // console.log(css);
+
+  const {
+    css: cssOptions
+  } = options; // console.log(cssOptions, appOptions);
+
+  const {
+    selectorReplace
+  } = cssOptions;
+  postcss([SelectorReplacePlugin(selectorReplace)]).process(css, {
+    from: fromPath,
+    to: toPath
+  }).then(result => {
+    fs.writeFileSync(toPath, result.css);
+  }); // console.log(variableOptions);
+}
+
+(0, _folderIterator.default)(src, dist, ['.css'], false, (fromPath, toPath) => {
+  // console.log(fromPath, toPath);
+  watchHandler(fromPath, toPath);
+}); // if (canWacth) {
+//   useExitCleanup(() => {
+//     fs.unwatchFile(src, watchHandler);
+//   });
+// }

package/lib/utils/switchBranch.js

@@ -9,13 +9,15 @@ var _child_process = require("child_process");
 
 var _utils = require("../utils");
 
+var _log = require("./log");
+
 var _default = (type = 'git', branchName) => new Promise(resolve => {
   if (type === 'git') {
-    (0, _utils.log)((0, _utils.getCurrentBranch)(type, process.cwd()), 'Before the branch switch');
+    (0, _log.log)((0, _utils.getCurrentBranch)(type, process.cwd()), 'Before the branch switch');
     (0, _child_process.spawnSync)('git', ['checkout', branchName, '--force'], {
       encoding: 'utf8'
     });
-    (0, _utils.log)((0, _utils.getCurrentBranch)(type, process.cwd()), 'After the branch switch');
+    (0, _log.log)((0, _utils.getCurrentBranch)(type, process.cwd()), 'After the branch switch');
     (0, _utils.pullOrigin)(type, branchName).then(resolve);
   } else if (type === 'hg') {
     (0, _child_process.spawnSync)('hg', ['update', branchName], {

package/lib/utils/typeCheck.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTypeOf = getTypeOf;
+
+function getTypeOf(value) {
+  return Object.prototype.toString.call(value).split(/\s/)[1].replace(/\]/, '').toLowerCase();
+}

package/lib/utils/variableConverter.js

@@ -16,6 +16,8 @@ const path = require('path');
 
 const fs = require('fs');
 
+const ignore = require('ignore');
+
 const postcssVariableConvertor = require('../postcss-plugins/variableModificationPlugin/index').plugin;
 
 const cwd = process.cwd();
@@ -45,7 +47,8 @@ function watchHandler(fromPath, toPath) {
     // errorsAllowed,
     // strictMode
 
-  } = cssVariableOptions;
+  } = cssVariableOptions; //Variable Webpack Object Generation
+
   rootOriginal.walkRules(rule => {
     rule.walkDecls(decl => {
       decl.value.split(' ').forEach(val => {
@@ -58,23 +61,35 @@ function watchHandler(fromPath, toPath) {
         }
       });
     });
-  });
+  }); // if (
+  //   !isFileNameMatchingPluginPattern({
+  //     filename: fromPath,
+  //     filterArr
+  //   })
+  // ) {
+  //   return;
+  // }
 
-  if (!(0, _fileHandling.isFileNameMatchingPluginPattern)({
-    filename: fromPath,
-    filterArr
-  })) {
+  const ig = ignore({
+    allowRelativePaths: true
+  }).add(filterArr);
+
+  if (ig.ignores(fromPath)) {
+    // console.log(fromPath);
+    // console.log(ig.ignores(fromPath));
+    // console.log(
+    //   '----------------------------------------------------------------'
+    // );
     return;
-  }
+  } // Convert code
 
-  const convertedCode = (0, _variableConvertorUtils.variableConverter)(rootOriginal, variables, settingsObject).toString(); // if (convertedCode.trim() !== '') {
-  //   fs.writeFileSync(fromPath, convertedCode);
-  // }
-  // console.log(convertedCode);
+
+  const convertedCode = (0, _variableConvertorUtils.variableConverter)(rootOriginal, variables, settingsObject).toString(); // run postcss plugin for css code input
 
   postcss([postcssVariableConvertor(cssVariableConfigFilePath)]).process(convertedCode, {
     from: undefined
   }).then(result => {
+    //write new css file data in file
     fs.writeFileSync(toPath, result.css);
   }); // console.log(variableOptions);
 }