@zohodesk/react-cli 1.0.2-exp.2 → 1.0.3

package/lib/schemas/index.js

@@ -92,7 +92,7 @@ var _default = {
   },
   app: {
     moduleResolvePath: {
-      value: '',
+      value: '@zohodesk/client_packages_group',
       cli: 'module_resolve_path'
     },
     // this option only for impact testing
@@ -124,6 +124,13 @@ var _default = {
       filenames: [],
       packages: []
     },
+    customAttributes: {
+      enable: false,
+      attributes: null,
+      jsAttributes: null,
+      cssAttributes: null,
+      i18nAttributes: null
+    },
     server: {
       host: {
         value: (0, _os.hostname)(),
@@ -222,28 +229,12 @@ var _default = {
       cli: 'enable_smaphook'
     },
     plugins: {
-      valueReplacer: false,
-      selectorReplace: false,
       hasRTL: false,
       hoverActive: false,
       combinerMediaQuery: false,
       cssVariableReplacement: false,
-      selectorWeight: false,
-      minifier: false,
-      composeMinification: false
-    },
-    patterns: {
-      valueReplacer: [],
-      selectorReplace: [],
-      hoverActive: [],
-      combinerMediaQuery: [],
-      hasRTL: [],
-      cssVariableReplacement: [],
-      selectorWeight: [],
-      cssUniqueness: [],
-      composeMinification: []
+      selectorWeight: false
     },
-    patternsRootDir: '',
     exclude: {
       rtl: [],
       hoverActive: [],
@@ -251,10 +242,6 @@ var _default = {
       cssVariableReplacement: [],
       selectorWeight: []
     },
-    include: {
-      cssVariableReplacement: [],
-      selectorWeight: []
-    },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {
       defaultSelector: '',
@@ -339,22 +326,11 @@ var _default = {
     hasRTL: false,
     rtlExclude: [],
     plugins: {
-      rtl: false,
+      hasRTL: false,
       hoverActive: false,
       combinerMediaQuery: false,
       cssVariableReplacement: false,
-      selectorWeight: false,
-      minifier: false
-    },
-    patternsRootDir: '',
-    patterns: {
-      valueReplacer: [],
-      selectorReplace: [],
-      hoverActive: [],
-      combinerMediaQuery: [],
-      hasRTL: [],
-      cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: false
     },
     exclude: {
       rtl: [],

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/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;
   }

package/lib/servers/nowatchserver.js

@@ -16,6 +16,8 @@ var _httpsOptions = require("./httpsOptions");
 
 var _devBuild = require("./devBuild");
 
+var _logger = require("../logger");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import webpack from 'webpack';
@@ -128,7 +130,7 @@ if (zipname) {
         throw err;
       }
 
-      console.log(`${zipname}.zip downloaded`);
+      (0, _logger.messageLogger)(`${zipname}.zip downloaded`);
     });
   });
   app.use('/zips/build.zip', (req, res) => {
@@ -137,7 +139,7 @@ if (zipname) {
         throw err;
       }
 
-      console.log('build.zip downloaded');
+      (0, _logger.messageLogger)('build.zip downloaded');
     });
   });
 }
@@ -188,7 +190,7 @@ if (httpsOptions) {
       }, 'htt' + 'ps')}${contextURL}/`, 'http2 server');
     });
   } else {
-    (0, _utils.log)("Your node version didn't adopted http2 support. Kindly update that to 8 LTS or above you can engage the http2");
+    (0, _utils.log)('Your node version didn\'t adopted http2 support. Kindly update that to 8 LTS or above you can engage the http2');
   }
 }
 

package/lib/servers/requireLocalOrGlobal.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.globalNodeModules = void 0;
+exports.requireGlobal = requireGlobal;
+exports.requireLocal = requireLocal;
+exports.requireLocalOrGlobal = requireLocalOrGlobal;
+
+var _child_process = require("child_process");
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const globalNodeModules = _path.default.join(`${(0, _child_process.execSync)('npm config get prefix')}`.trim(), 'lib');
+
+exports.globalNodeModules = globalNodeModules;
+
+function requireLocalOrGlobal(moduleName, opts = {}) {
+  let {
+    global = true
+  } = opts;
+  const {
+    local = true
+  } = opts;
+  const isRelativePath = moduleName === '.'; // NOTE: if starts with . then it only mean local
+
+  if (isRelativePath) {
+    global = false;
+  }
+
+  try {
+    const paths = [local && process.cwd(), global && globalNodeModules].filter(Boolean); // x({ paths, globalNodeModules, global, local, opts });
+
+    const moduleResolvePath = require.resolve(moduleName, {
+      paths
+    });
+
+    return require(moduleResolvePath);
+  } catch (error) {
+    // NOTE: since we return null we can check out side
+    // console.log('Re validate: ', error);
+    return null;
+  }
+}
+
+function requireLocal(moduleName) {
+  return requireLocalOrGlobal(moduleName, {
+    global: false,
+    local: true
+  });
+}
+
+function requireGlobal(moduleName) {
+  return requireLocalOrGlobal(moduleName, {
+    global: true,
+    local: false
+  });
+}

package/lib/servers/server.js

@@ -70,8 +70,7 @@ if (mode === 'prod') {
   config = require('../configs/webpack.dev.config');
 } else {
   throw new Error('You must configure valid option in mode');
-} // console.log({ contextURL });
-
+}
 
 const compiler = (0, _webpack.default)(config);
 const webpackServerOptions = {
@@ -101,7 +100,6 @@ app.use((0, _HMRMiddleware.default)(compiler, {
   path: '/sockjs-node/info'
 }));
 app.use((req, res, next) => {
-  //console.log('origin', req.get('origin'));
   res.setHeader('Access-Control-Allow-Origin', req.get('origin') || '*'); // res.setHeader('Access-Control-Allow-Origin', req.get('origin'));
 
   res.setHeader('Access-Control-Allow-Private-Network', true);
@@ -204,8 +202,8 @@ if (httpsOptions) {
         port: http2Port
       }, 'htt' + 'ps')}${contextURL}/`, 'http2 server');
     });
-  } else if (httpsOptions) {
-    (0, _utils.log)('Your node version didn\'t adopted http2 support. Kindly update that to 8 LTS or above you can engage the http2');
+  } else {
+    (0, _utils.log)("Your node version didn't adopted http2 support. Kindly update that to 8 LTS or above you can engage the http2");
   }
 }
 

package/lib/sh/pre-commit.sh

@@ -1,34 +1,34 @@
-#!/bin/sh
-
-STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E "\.(js)$") # Get staged files
-
-CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p') # Get branch name
-
-echo "Branch Name - $CURRENT_BRANCH"
-
-if [[ "$STAGED_FILES" = "" ]]; then
-  exit 0
-fi
-
-IS_FAILED=false
-FILES=""
-
-for FILE in $STAGED_FILES # Add files with space separation
-do
-	FILES+="$FILE "
-done
-
-npm run lint --prefix ${PREFIX_PATH} $FILES # Run ESLint
-
-if [[ "$?" != 0 ]]; then
-	IS_FAILED=true
-fi
-
-if $IS_FAILED; then
-  echo "\033[41mCOMMIT FAILED:\033[0m Your commit contains files that should pass ESLint but do not. Please fix the ESLint errors and try again.\n"
-  exit 1
-else
-  echo "\033[42mCOMMIT SUCCEEDED\033[0m\n"
-fi
-
-exit $?
+#!/bin/sh
+
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E "\.(js)$") # Get staged files
+
+CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p') # Get branch name
+
+echo "Branch Name - $CURRENT_BRANCH"
+
+if [[ "$STAGED_FILES" = "" ]]; then
+  exit 0
+fi
+
+IS_FAILED=false
+FILES=""
+
+for FILE in $STAGED_FILES # Add files with space separation
+do
+	FILES+="$FILE "
+done
+
+npm run lint --prefix ${PREFIX_PATH} $FILES # Run ESLint
+
+if [[ "$?" != 0 ]]; then
+	IS_FAILED=true
+fi
+
+if $IS_FAILED; then
+  echo "\033[41mCOMMIT FAILED:\033[0m Your commit contains files that should pass ESLint but do not. Please fix the ESLint errors and try again.\n"
+  exit 1
+else
+  echo "\033[42mCOMMIT SUCCEEDED\033[0m\n"
+fi
+
+exit $?

package/lib/sh/reportPublish.sh

@@ -1,45 +1,45 @@
-#!/bin/bash
-branchName=$2
-url=$1
-zipUrl=$3
-unique=$(date +"%d_%m_%y_Time_%H_%M_%S")
-publishFolder=$branchName"_"$unique
-
-rm -rf ./reports
-rm -rf ./scrTemplate
-rm -rf ./errTemplate
-rm -rf ./css
-rm -rf ./js
-rm -rf ./index.html
-
-curl $zipUrl | tar xz
-
-cp -rf ./reports/css ./css
-cp -rf ./reports/js ./js
-cp -rf ./reports/index.html ./index.html
-if [ -d "./screenShots" ] ; then
-  cp -rf ./scrTemplate/* ./screenShots/
-else
-  mkdir ./screenShots
-  cp -rf ./scrTemplate/* ./screenShots/
-fi
-
-[ ! -f "./result.json" ] && touch result.json && cp -rf ./errTemplate/* ./result.json
-[ ! -d "./commitCoverage" ] && mkdir commitCoverage && cp -rf ./errTemplate/* ./commitCoverage/
-[ ! -d "./unittest" ] && mkdir unittest && cp -rf ./errTemplate/* ./unittest/
-[ ! -d "./coverageTest" ] && mkdir coverageTest && cp -rf ./errTemplate/* ./coverageTest/
-[ ! -d "./coverage" ] && mkdir coverage && cp -rf ./errTemplate/* ./coverage/
-
-tar -czvf $publishFolder.tar.gz coverage screenShots unittest coverageTest commitCoverage ./css ./js ./index.html ./result.json
-
-curl -i -F name=file -F file=@$publishFolder.tar.gz $url"/cgi-bin/upload.py"
-replace=$publishFolder
-reportUrl=$url"/"$replace
-subject="Client Report - React - $publishFolder"
-msg="<p><b>Report URL - <a href='$reportUrl'>Link</a></b></p>
-<p><b>Report Branchname - $branchName</b></p>
-<p><b>Report Unique ID - $unique</b></p>
-<p><b>Report Developer - $6</b></p>"
-#node mailSender.js <from> <pass> <to> <subject> <text>
-BASEDIR=$(dirname "$0")
-node $BASEDIR"/../utils/mailSender" $4 $5 $6 "$subject" "$msg" $7 $8 "$reportUrl"
+#!/bin/bash
+branchName=$2
+url=$1
+zipUrl=$3
+unique=$(date +"%d_%m_%y_Time_%H_%M_%S")
+publishFolder=$branchName"_"$unique
+
+rm -rf ./reports
+rm -rf ./scrTemplate
+rm -rf ./errTemplate
+rm -rf ./css
+rm -rf ./js
+rm -rf ./index.html
+
+curl $zipUrl | tar xz
+
+cp -rf ./reports/css ./css
+cp -rf ./reports/js ./js
+cp -rf ./reports/index.html ./index.html
+if [ -d "./screenShots" ] ; then
+  cp -rf ./scrTemplate/* ./screenShots/
+else
+  mkdir ./screenShots
+  cp -rf ./scrTemplate/* ./screenShots/
+fi
+
+[ ! -f "./result.json" ] && touch result.json && cp -rf ./errTemplate/* ./result.json
+[ ! -d "./commitCoverage" ] && mkdir commitCoverage && cp -rf ./errTemplate/* ./commitCoverage/
+[ ! -d "./unittest" ] && mkdir unittest && cp -rf ./errTemplate/* ./unittest/
+[ ! -d "./coverageTest" ] && mkdir coverageTest && cp -rf ./errTemplate/* ./coverageTest/
+[ ! -d "./coverage" ] && mkdir coverage && cp -rf ./errTemplate/* ./coverage/
+
+tar -czvf $publishFolder.tar.gz coverage screenShots unittest coverageTest commitCoverage ./css ./js ./index.html ./result.json
+
+curl -i -F name=file -F file=@$publishFolder.tar.gz $url"/cgi-bin/upload.py"
+replace=$publishFolder
+reportUrl=$url"/"$replace
+subject="Client Report - React - $publishFolder"
+msg="<p><b>Report URL - <a href='$reportUrl'>Link</a></b></p>
+<p><b>Report Branchname - $branchName</b></p>
+<p><b>Report Unique ID - $unique</b></p>
+<p><b>Report Developer - $6</b></p>"
+#node mailSender.js <from> <pass> <to> <subject> <text>
+BASEDIR=$(dirname "$0")
+node $BASEDIR"/../utils/mailSender" $4 $5 $6 "$subject" "$msg" $7 $8 "$reportUrl"