@zohodesk/react-cli 1.1.14-kubernetes → 1.1.15

package/lib/postcss-plugins/variableModificationPlugin/index.js

@@ -10,8 +10,6 @@ const {
   ErrorHandler
 } = require('./ErrorHandler');
 
-const errors = [];
-const errorTable = [];
 const errHandler = new ErrorHandler();
 const convertableProps = {
   'font-size': true,
@@ -94,7 +92,13 @@ function pxToCalc(value) {
   return arr.join(' ');
 }
 
-const singleConvertor = (value, changeVal, details, range) => {
+const singleConvertor = ({
+  value,
+  changeVal,
+  details,
+  range,
+  allowed
+}) => {
   const {
     path,
     filename,
@@ -108,7 +112,15 @@ const singleConvertor = (value, changeVal, details, range) => {
     }
   }
 
+  if (allowed && allowed.includes(decl.value) && decl.value.toString() !== '0') {
+    return decl.value;
+  }
+
   if (getNumericValue(value) >= range.start && getNumericValue(value) <= range.end || getNumericValue(value) === 0) {
+    if (value.trim() === '0px') {
+      return '0';
+    }
+
     let retVal = value.replace(/(\d+)px/gi, changeVal.replace('$$', '$1'));
 
     if (/^-var/.test(retVal)) {
@@ -121,7 +133,7 @@ const singleConvertor = (value, changeVal, details, range) => {
   // console.log(value, 'not within range')
 
 
-  let errObj = {
+  const errObj = {
     decl,
     type: 'RANGE_ERROR',
     filename,
@@ -129,24 +141,8 @@ const singleConvertor = (value, changeVal, details, range) => {
     path: path
   };
   errHandler.errorTable.push(errObj);
-  errHandler.errorFunction(errObj); // errorFunction(
-  //   {
-  //     decl,
-  //     type: 'RANGE_ERROR',
-  //     filename,
-  //     message: `value (${value}) (${typeof value}) not within range (${
-  //       range.start
-  //     },${range.end})\r`,
-  //     path: path
-  //   },
-  //   'RANGE_ERROR'
-  // );
-  // }
-  // addError(` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${path} ,\n line : ${decl.source.start.line} ,\n message : value (${value}) not within range (${range.start},${range.end})\r`)
-  //   return value;
-  // } else {
-  //   console.log('++++++++++++++++++++++rect val!', value);
-  // }
+  errHandler.errorFunction(errObj);
+  return;
 };
 
 module.exports = {
@@ -179,6 +175,7 @@ module.exports = {
     });
     const valRegex = new RegExp(regValStr, 'gi');
     return rootOriginal => {
+      // console.log(rootOriginal.source.input.from, 'passed through variable Plugin');
       rootOriginal.walkRules(rule => {
         // rule.nodes[-1] = {}
         // need map, forEach fine less memory
@@ -189,10 +186,11 @@ module.exports = {
           const fromPath = rootOriginal.source.input.from; // this will be problem for linux and mac use require('path').sep
           // split not need use slice and lastIndexOf less memory
 
-          const filename = fromPath.split(path.sep).pop();
+          const filename = fromPath.split(path.sep).pop(); // if(filename.includes('AddFormResponsive.module.css'){
+          // }
 
           if (prevNode && prevNode.type === 'comment' && prevNode.text.toLowerCase().includes(commentStr)) {
-            let errObj = {
+            const errObj = {
               decl,
               type: 'DECLARATION_IGNORED',
               filename,
@@ -205,8 +203,7 @@ module.exports = {
           }
 
           if (settingsObject[decl.prop] && !decl.value.includes('var(--')) {
-            const settings = settingsObject[decl.prop]; // console.log(settings)
-
+            const settings = settingsObject[decl.prop];
             const {
               allowed,
               range
@@ -217,6 +214,9 @@ module.exports = {
             .replace(/\d+/gi, '').replace('var(--zd_size)', 'px').replace('var(--zd_font_size)', 'px').replace('rect(', '').replace(')', '').replace('px,', 'px').replace(',', '').split(' ').filter(x => x !== ''); // unit = unit.replace(unit, unit.replace('-',''))
             // console.log('unit : ');
             // console.log(unit);
+            // if (decl.prop === 'height') {
+            //   console.log(decl.prop, unit, 'case 1');
+            // }
 
             unit.forEach((val, index) => {
               allowed.forEach(alwdVal => {
@@ -236,26 +236,54 @@ module.exports = {
                   unitErrorVal = val;
                 }
               }
-            }); // console.log(allowed, replacements, range)
+            }); // if (decl.prop === 'height') {
+            //   console.log(decl.prop, unitErrorVal, unitError, unit, 'case 2');
+            // }
+            // console.log(allowed, replacements, range)
 
             if (!unitError) {
-              // use variable decl.value.split(' ')
-              if (range) {
+              let calcValue = false;
+
+              if (decl.value.includes('calc')) {
+                decl.value = pxToCalc(decl.value);
+                calcValue = true;
+              } // use variable decl.value.split(' ')
+
+
+              if (range && !calcValue) {
                 // console.log('multiple :', decl.value)
+                const tempVal = decl.value; // if (decl.prop === 'height') {
+                //   console.log(decl.prop, tempVal, decl.value, allowed, 'case 3');
+                // }
+                // if (decl.prop === 'height') {
+                //   console.log('allowed!', decl.prop, decl.value, allowed);
+                // }
+
                 let newVal = '';
-                decl.value.split(' ').forEach(singleVal => {
-                  newVal += `${singleConvertor(singleVal, settings.replacements.px, {
-                    decl,
-                    filename,
-                    path: fromPath
-                  }, range)} `;
+                let splitValues = decl.value.split(' ');
+                splitValues = splitValues.filter(val => val.trim() !== '');
+                splitValues = splitValues.map(val => val.replace(/\r|\t|\n/gi, ''));
+                splitValues.forEach(singleVal => {
+                  newVal += `${singleConvertor({
+                    value: singleVal,
+                    changeVal: settings.replacements.px,
+                    details: {
+                      decl,
+                      filename,
+                      path: fromPath
+                    },
+                    range,
+                    allowed
+                  })} `;
                 });
-                decl.value = newVal;
+                decl.value = newVal; // if (decl.prop === 'height') {
+                //   console.log(decl.prop, tempVal, newVal, 'case 4');
+                // }
               }
             } else {
               if (!decl.value.includes('calc')) {
                 // addError(` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${path} ,\n line : ${decl.source.start.line} ,\n unit : ${unitErrorVal} ,\n message : ${unitErrorVal} (Unit) Not Allowed \r`);
-                let errObj = {
+                const errObj = {
                   decl,
                   filename,
                   unitErrorVal: unitErrorVal,
@@ -285,8 +313,36 @@ module.exports = {
               }
             }
           } else {
+            if (settingsObject[decl.prop] && decl.value && decl.value.includes('px') && decl.value.includes('var(--')) {
+              const valArr = decl.value.split(' ');
+              const settings = settingsObject[decl.prop];
+              const {
+                range,
+                allowed
+              } = settings;
+              const convertedVals = valArr.map(val => {
+                if (val.includes('px')) {
+                  const convertedVal = singleConvertor({
+                    value: val,
+                    changeVal: settings.replacements.px,
+                    details: {
+                      decl,
+                      filename,
+                      path: fromPath
+                    },
+                    range,
+                    allowed
+                  });
+                  return convertedVal ? convertedVal : val;
+                }
+
+                return val;
+              });
+              decl.value = convertedVals.join(' ');
+            }
+
             if (decl.prop && decl.value && !decl.prop.includes('--') && valRegex.test(decl.value) && (settingsObject[decl.prop] || convertableProps[decl.prop]) && decl.value.includes('var') && !decl.value.includes('calc')) {
-              let errObj = {
+              const errObj = {
                 decl,
                 type: 'VARIABLE_PRESENT',
                 filename,

package/lib/schemas/index.js

@@ -15,7 +15,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // TODO move deprecated options to separate file and manage seperately
 var _default = {
-  cliRootPath: null,
   unstableDepsInverse: {
     value: false,
     cli: 'unstable_deps_inverse'
@@ -36,6 +35,9 @@ var _default = {
       cli: 'stop_nodemon'
     }
   },
+  resourceHints: {
+    allowPrefetchingMultipleChunks: false
+  },
   i18n: {
     chunkSplitEnable: {
       value: false,
@@ -63,7 +65,39 @@ var _default = {
     // ],
     templateLabel: '{{--dir}}',
     disableMiniFiySelector: false,
-    dirVarName: 'document.dir'
+    dirVarName: 'document.dir',
+    selectorReplace: {
+      before: [],
+      after: []
+    },
+    plugins: null,
+    // @type  {Boolean | Array}
+    postCssPluginOrder: null,
+    patterns: {
+      valueReplacer: [],
+      selectorReplace: [],
+      hoverActive: [],
+      combinerMediaQuery: [],
+      hasRTL: [],
+      cssVariableReplacement: [],
+      selectorWeight: [],
+      cssUniqueness: [],
+      composeMinification: []
+    },
+    exclude: {
+      rtl: [],
+      hoverActive: [],
+      combinerMediaQuery: [],
+      cssVariableReplacement: [],
+      selectorWeight: [],
+      hasRTL: []
+    },
+    cssVariableReplacementConfig: '',
+    selectorWeightConfig: {
+      defaultSelector: '',
+      customFileDetails: '',
+      excludeStrings: []
+    }
   },
   efc: {
     hasEFC: {
@@ -92,9 +126,10 @@ var _default = {
   },
   app: {
     moduleResolvePath: {
-      value: '',
+      value: '@zohodesk/client_packages_group',
       cli: 'module_resolve_path'
     },
+    customClassNamePrefix: [],
     // this option only for impact testing
     devCssFileBountry: {
       value: '',
@@ -124,6 +159,13 @@ var _default = {
       filenames: [],
       packages: []
     },
+    customAttributes: {
+      enable: false,
+      attributes: null,
+      jsAttributes: null,
+      cssAttributes: null,
+      i18nAttributes: null
+    },
     server: {
       host: {
         value: (0, _os.hostname)(),
@@ -221,19 +263,26 @@ var _default = {
       value: true,
       cli: 'enable_smaphook'
     },
-    plugins: {
-      hasRTL: false,
-      hoverActive: false,
-      combinerMediaQuery: false,
-      cssVariableReplacement: false,
-      selectorWeight: false
+    plugins: null,
+    postCssPluginOrder: null,
+    patterns: {
+      valueReplacer: [],
+      selectorReplace: [],
+      hoverActive: [],
+      combinerMediaQuery: [],
+      hasRTL: [],
+      cssVariableReplacement: [],
+      selectorWeight: [],
+      cssUniqueness: [],
+      composeMinification: []
     },
     exclude: {
       rtl: [],
       hoverActive: [],
       combinerMediaQuery: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      hasRTL: []
     },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {
@@ -272,6 +321,7 @@ var _default = {
       inject: true
     },
     removePropTypes: false,
+    customChunksBaseConfig: null,
     customChunks: [{
       name: 'styles',
       pattern: '\\.css$'
@@ -287,9 +337,11 @@ var _default = {
     sourcemap: {
       cli: 'source_map',
       value: 'cheap-eval-source-map'
-    }
+    },
+    externals: null
   },
   docs: {
+    externals: null,
     server: {
       iphost: (0, _getIp.default)(),
       host: (0, _os.hostname)(),
@@ -307,6 +359,7 @@ var _default = {
       hover: 'all and (min--moz-device-pixel-ratio:0) and (hover: hover), (hover: hover)',
       none: '(hover: none)'
     },
+    customClassNamePrefix: [],
     componentFolder: 'src',
     cssUniqueness: {
       value: true,
@@ -317,20 +370,35 @@ var _default = {
     disableES5Transpile: false,
     // TODO: Deprecated
     hasRTL: false,
+    enableReactLive: {
+      value: true,
+      cli: 'react_live'
+    },
+    enableMDParser: {
+      value: true,
+      cli: 'markdown_parser'
+    },
     rtlExclude: [],
-    plugins: {
-      hasRTL: false,
-      hoverActive: false,
-      combinerMediaQuery: false,
-      cssVariableReplacement: false,
-      selectorWeight: false
+    selectorReplace: null,
+    plugins: null,
+    postCssPluginOrder: null,
+    patterns: {
+      valueReplacer: [],
+      selectorReplace: [],
+      hoverActive: [],
+      combinerMediaQuery: [],
+      hasRTL: [],
+      cssVariableReplacement: [],
+      selectorWeight: [],
+      cssUniqueness: []
     },
     exclude: {
       rtl: [],
       hoverActive: [],
       combinerMediaQuery: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      hasRTL: []
     },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {
@@ -657,6 +725,15 @@ var _default = {
       cli: 'module_mode'
     },
     disableES5Transpile: true
+  },
+  stats: {
+    enable: {
+      value: false,
+      cli: 'enable_stats'
+    },
+    fileName: null,
+    options: null,
+    excludeKeys: null
   }
 };
 exports.default = _default;

package/lib/servers/devBuild.js

@@ -15,6 +15,8 @@ var _utils = require("../utils");
 
 var _getCliPath = require("./getCliPath");
 
+var _logger = require("../logger");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const options = (0, _utils.getOptions)(); // const args = process.argv.slice(3);
@@ -35,28 +37,28 @@ const zipname = cssSelectorZipPath ? _path.default.parse(cssSelectorZipPath).nam
 const outputFolderLocation = _path.default.join(process.cwd(), outputFolder);
 
 function execSyncDefalut(command) {
-  console.log(' command running ==>', command);
+  (0, _logger.messageLogger)(' command running ==>', command);
   return (0, _child_process.execSync)(command, {
     stdio: 'inherit'
   });
 }
 
 const isQuiet = 'q';
-const webpack = (0, _getCliPath.getCliPath)('webpack'); // console.log('webpack === > ', webpack, fs.existsSync(webpack));
+const webpack = (0, _getCliPath.getCliPath)('webpack'); // messageLogger('webpack === > ', webpack, fs.existsSync(webpack));
 
 if (_fs.default.existsSync(outputFolderLocation)) {
   execSyncDefalut(`rm -rf ${outputFolder}`);
-  console.log(`previous ${outputFolder} removed`);
+  (0, _logger.messageLogger)(`previous ${outputFolder} removed`);
 }
 
 if (_fs.default.existsSync(_path.default.join(process.cwd(), 'build.zip'))) {
   execSyncDefalut('rm build.zip');
-  console.log('previous build.zip removed');
+  (0, _logger.messageLogger)('previous build.zip removed');
 } // execSyncDefalut(`${webpack  } --version`);
 // execSyncDefalut(`${webpack} --config ${require.resolve('../configs/webpack.dev.config.js')}`);
 
 
-console.log('webpack compilation starts...');
+(0, _logger.messageLogger)('webpack compilation starts...');
 const startTime = Date.now(); // const result = spawnSync(
 //   webpack,
 //   ['--config', require.resolve('../configs/webpack.dev.config.js')].concat(
@@ -67,31 +69,31 @@ const startTime = Date.now(); // const result = spawnSync(
 // --disable_watch=true
 
 const result = execSyncDefalut(`${webpack} --config ${require.resolve('../configs/webpack.dev.config.js')} ${process.argv.slice(2).map(o => o.replace(/(.*?)=(.*)/, '$1="$2"')).join(' ')} `);
-result && console.log(result);
+result && (0, _logger.messageLogger)(result);
 
 if (result && result.stderr) {
   throw result.stderr;
 }
 
-console.log(`compailation done in ${Date.now() - startTime}ms`);
+(0, _logger.messageLogger)(`compailation done in ${Date.now() - startTime}ms`);
 
 if (zipname) {
   execSyncDefalut(`zip -r${isQuiet} build.zip ${outputFolder}/*`);
-  console.log('build.zip file created');
+  (0, _logger.messageLogger)('build.zip file created');
   const result = execSyncDefalut(`zip -r${isQuiet} ${cssSelectorZipPath} ${zipname}/*`);
   execSyncDefalut(`rm -rf ${zipname}`);
 
   if (result && result.stderr) {
-    console.log('zip  file not  created', cssSelectorZipPath);
+    (0, _logger.messageLogger)('zip  file not  created', cssSelectorZipPath);
     console.error(result.stderr);
   } else {
-    console.log('zip  file  created', cssSelectorZipPath);
+    (0, _logger.messageLogger)('zip  file  created', cssSelectorZipPath);
   }
 } // npm run start --app:domain=tsi --impact:cssbountry="{$@&&@$}" --disable-watch --dev-cache --cssselector_zip=css-source-map.zip
 // npm run start --app_domain=tsi --impact_cssbountry="{$@&&@$}" --disable-watch --dev-cache --cssselector_zip=css-source-map.zip
 
 
-console.log(`compailation done in ${Date.now() - startTime}ms`);
+(0, _logger.messageLogger)(`compailation done in ${Date.now() - startTime}ms`);
 
 function getPaths() {
   return {

package/lib/servers/getCliPath.js

@@ -5,19 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getCliPath = getCliPath;
 
-var _path = _interopRequireDefault(require("path"));
+var _path = require("path");
 
 var _os = require("os");
 
 var _fs = require("fs");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _constants = require("../constants");
 
-const appPath = process.cwd();
-const isNodeModuleUnderAppFolder = __dirname.indexOf(appPath) !== -1;
 const isWindows = (0, _os.platform)().toLowerCase() === 'win32';
 
-const _getCliPath = !isNodeModuleUnderAppFolder ? libName => _path.default.join(__dirname, '..', '..', 'node_modules', '.bin', libName) : libName => libName;
+const _getCliPath = libName => (0, _path.join)(_constants.cliNodeModulesPath, '.bin', libName);
 
 const suffixExt = isWindows ? '.cmd' : '';
 

package/lib/servers/httpsOptions.js

@@ -6,21 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.httpsOptions = httpsOptions;
 exports.httpsOptionsWithUserFriendlyError = httpsOptionsWithUserFriendlyError;
 
-// import fs from 'fs';
-// import path from 'path';
-// export const httpsOptions = {
-//   key: fs.readFileSync(path.join(__dirname, './cert/Tsicsezwild-22-23.key')),
-//   cert: fs.readFileSync(path.join(__dirname, './cert/Tsicsezwild-22-23.crt'))
-// };
+var _logger = require("../logger");
+
+var _requireLocalOrGlobal = require("./requireLocalOrGlobal");
+
+const globalCertificate = (0, _requireLocalOrGlobal.requireGlobal)('@zohodesk-private/client_dev_cert');
+
 function httpsOptions(options) {
   const {
     httpsCerts
   } = options.app.server;
-
-  const certificate = require(require.resolve(httpsCerts, {
-    paths: [process.cwd()]
-  })); // TODO: in future we may do some version based check. certificate.version
-
+  const certificate = (0, _requireLocalOrGlobal.requireLocalOrGlobal)(httpsCerts); // TODO: in future we may do some version based check. certificate.version
 
   return certificate.httpsOptions;
 }
@@ -36,13 +32,16 @@ function httpsOptionsWithUserFriendlyError(options) {
       return certificate;
     } catch (error) {
       if (error.message.indexOf('Cannot find module') !== -1) {
-        console.error(`You have given react-cli.app.server.httpsCerts as "${httpsCerts}". \n But it seems that file path have some problem.\n we are unable to locate "${httpsCerts}" in "${process.cwd()}"`);
+        (0, _logger.errorLogger)(`You have given react-cli.app.server.httpsCerts as "${httpsCerts}". \n But it seems that file path have some problem.\n we are unable to locate "${httpsCerts}" in "${process.cwd()}"`);
       } else {
-        console.error(error);
+        (0, _logger.errorLogger)(error);
       }
 
       process.exit(0);
     }
+  } else if (globalCertificate) {
+    (0, _logger.messageLogger)('global `@zohodesk-private/client_dev_cert` package taken as https certificate');
+    return globalCertificate.httpsOptions;
   } else {
     return null;
   }