@zohodesk/react-cli 0.0.1-beta.161 → 0.0.1-beta.163

package/.eslintrc.js

@@ -108,7 +108,9 @@ let commonConfigs = {
     'comma-dangle': [logLevel],
     'comma-spacing': [logLevel],
     'func-call-spacing': [logLevel],
-    indent: [logLevel, 2, { SwitchCase: 1 }],
+    // reference to this https://stackoverflow.com/questions/56337176/prettier-and-eslint-indents-not-working-together
+    // when using prettier, we should disable eslint's indent rule
+    indent: ['off', 2, { SwitchCase: 1 }],
     'jsx-quotes': [logLevel, 'prefer-single'],
     'key-spacing': [logLevel],
     'keyword-spacing': [logLevel],
@@ -140,8 +142,6 @@ let commonConfigs = {
     'prefer-template': [logLevel],
     'prefer-rest-params': [logLevel],
     'no-useless-constructor': [logLevel],
-    'no-duplicate-imports': [logLevel],
-    'array-callback-return': [logLevel],
     'no-use-before-define': [logLevel],
 
     'react/default-props-match-prop-types': [logLevel],
@@ -152,7 +152,6 @@ let commonConfigs = {
     'react/no-this-in-sfc': [logLevel],
     'react/no-will-update-set-state': [logLevel],
     'react/no-unused-state': [logLevel],
-    'react/no-will-update-set-state': [logLevel],
     // 'react/require-default-props': [logLevel],
     // 'react/require-optimization': [logLevel],
 
@@ -171,9 +170,6 @@ let commonConfigs = {
     'react/jsx-no-duplicate-props': [logLevel],
     'react/no-deprecated': [logLevel],
     'react/no-children-prop': [logLevel],
-    'react/no-unused-state': [logLevel],
-    'react/destructuring-assignment': [logLevel],
-    'react/default-props-match-prop-types': [logLevel],
 
     'css-modules/no-unused-class': [logLevel, { camelCase: true }],
     'css-modules/no-undef-class': [logLevel, { camelCase: 'only' }]

package/README.md

@@ -2,10 +2,46 @@
 
 A CLI tool for build modern web application and libraries
 
+# 0.0.1-beta.163
+
+- **Issue Fix:-**
+
+  - if git not installed react-cli throws error for any command due to `getCurrentBranch` in `shemas/index.js` now fixed
+  - jest test cases not runnig issue fix (typo moduleNameMapper => libAlias)
+
+- **Features :-**
+  - feature added for pre process logic
+    - tailer made requirement for preprocess, just write node js file
+    - mention file in `"react-cli" => "preprocess" => "runner"`
+  - option parse logic added for react-cli (exprimental)
+  - `--stop_nodemon` usally preprocessor run in `nodemon` so to stop it this option is provided
+
+# 0.0.1-exp.162.2
+
+- **Optimazation:-**
+  - double time minimize optimazation
+
+# 0.0.1-beta.162.1
+
+- **Issue Fix:-**
+  - if git not installed react-cli throws error for any command due to `getCurrentBranch` in `shemas/index.js` now fixed
+
+# 0.0.1-beta.161.1
+
+- **Features :-**
+  - feature added for pre process logic
+    - tailer made requirement for preprocess, just write node js file
+    - mention file in `"react-cli" => "preprocess" => "runner"`
+  - option parse logic added for react-cli (exprimental)
+
+# 0.0.1-beta.162
+
+- @zohodesk/datetimejs package updated to beta.8
+
 # 0.0.1-beta.161
 
 - **Features :-**
-  - feature added for efc `templateFilePath` in `paakage.json` option palce is `"react-cli" => "efc" `
+  - feature added for efc `templateFilePath` in `package.json` option palce is `"react-cli" => "efc" => "templateFilePath"`
   - `(('publicPath'))` this placeholder will be replace as publicPath string `publicPath`
   - `(('getInitalAssets'))` this placeholder will be replace as function `getInitalAssets`
   - `getInitalAssets` this function has two arguments `assetsType`, `lang`
@@ -20,7 +56,7 @@ A CLI tool for build modern web application and libraries
 # 0.0.1-exp.161.2
 
 - Features
-  - feature added for efc `templateFilePath` in `paakage.json` option palce is `"react-cli" => "efc" `
+  - feature added for efc `templateFilePath` in `package.json` option palce is `"react-cli" => "efc" `
     - `(('publicPath'))` this placeholder will be replace as publicPath string `publicPath`
     - `(('getInitalAssets'))` this placeholder will be replace as function `getInitalAssets`
     - `getInitalAssets` this function has two arguments `assetsType`, `lang`

package/bin/cli.js

@@ -1,28 +1,30 @@
 #!/usr/bin/env node
 
-let path = require('path');
-let os = require('os');
-let { spawnSync } = require('child_process');
-let { getOptions } = require('../lib/utils/index.js');
+const path = require('path');
+const os = require('os');
+const { existsSync } = require('fs');
+const { spawnSync, spawn } = require('child_process');
+const { getOptions } = require('../lib/utils/index.js');
 
-let { log } = require('../lib/utils');
+const { log } = require('../lib/utils');
 //initPreCommitHook();
 
-let options = getOptions();
+const options = getOptions();
 
-let { esLint: esLintOptions } = options || {};
-let {
+const { esLint: esLintOptions } = options || {};
+const { preprocessor: preprocess } = options;
+const {
   ignoreFilePaths: esLintIgnorePaths,
   fix: esLintFix,
   isCI: isCI,
   reportPath: reportPath
 } = esLintOptions || {};
 
-let isWindows = os.platform().toLowerCase() === 'win32';
+const isWindows = os.platform().toLowerCase() === 'win32';
 
-let [, , option] = process.argv;
-let args = process.argv.slice(3);
-let appPath = process.cwd();
+const [, , option] = process.argv;
+const args = process.argv.slice(3);
+const appPath = process.cwd();
 
 const isNodeModuleUnderAppFolder = __dirname.indexOf(appPath) !== -1;
 
@@ -35,15 +37,55 @@ function getCliPath(libName) {
   return _getCliPath(libName) + suffixExt;
 }
 
-let webpack = getCliPath('webpack');
-
-let nodemon = getCliPath('nodemon');
-let babel = getCliPath('babel');
-let propertyToJson = getCliPath('propertyToJson');
-let esLint = getCliPath('eslint');
+const webpack = getCliPath('webpack');
+
+const nodemon = getCliPath('nodemon');
+const babel = getCliPath('babel');
+const propertyToJson = getCliPath('propertyToJson');
+const esLint = getCliPath('eslint');
+
+const preprocesserPath = preprocess.runner
+  ? path.join(process.cwd(), preprocess.runner)
+  : '';
+const preprocessCli = preprocess.stopNodemon ? 'node' : nodemon;
+if (preprocesserPath && existsSync(preprocesserPath)) {
+  // eslint-disable-next-line default-case
+  switch (option) {
+    case 'start':
+    case 'docs':
+      spawn(preprocessCli, [preprocesserPath], {
+        stdio: 'inherit',
+        cwd: preprocesserPath.slice(0, preprocesserPath.lastIndexOf('/') + 1)
+      });
+      // NOTE:  it's ok if  we  not  close this  here
+      // Because when  node server stops this program willbe closed So this  nodemon  will be killed  as well
+      break;
+    case 'nowatchstart':
+    case 'build:library:es':
+    case 'build:component:es':
+    case 'build:library:cmjs':
+    case 'build:component:cmjs':
+      spawnSync('node', [preprocesserPath], {
+        stdio: 'inherit',
+        cwd: preprocesserPath.slice(0, preprocesserPath.lastIndexOf('/') + 1)
+      });
+      break;
+  }
+}
 
 let result;
 switch (option) {
+  case 'preprocessor':
+    if (preprocesserPath && existsSync(preprocesserPath)) {
+      result = spawnSync(preprocessCli, [preprocesserPath], {
+        stdio: 'inherit',
+        cwd: preprocesserPath.slice(0, preprocesserPath.lastIndexOf('/') + 1)
+      });
+      process.exit(result.status);
+    } else {
+      console.error(`preProcessor not exists ${preprocesserPath}`);
+    }
+    break;
   case 'lint-setup': {
     result = spawnSync(
       'node',
@@ -155,10 +197,11 @@ switch (option) {
     break;
 
   case 'clean':
-    args = args.map(arg => path.join(appPath, arg));
     result = spawnSync(
       'node',
-      [require.resolve('../lib/utils/clean')].concat(args),
+      [require.resolve('../lib/utils/clean')].concat(
+        args.map(arg => path.join(appPath, arg))
+      ),
       { stdio: 'inherit' }
     );
     process.exit(result.status);
@@ -218,12 +261,15 @@ switch (option) {
     result = spawnSync(
       webpack,
       [
+        // '--progress',
+        // '--profile',
         '--config',
-        require.resolve('../lib/configs/webpack.prod.config.js')
+        require.resolve('../lib/configs/webpack.prod.config.js'),
       ].concat(args),
       { stdio: 'inherit' }
     );
 
+    // console.log(result);
     process.exit(result.status);
     break;
 

package/lib/configs/jest.config.js

@@ -10,7 +10,7 @@ let appPath = process.cwd(); //   '^@root(.*)$': '<rootDir>/src$1',
 // '^@components(.*)$': '<rootDir>/src/components$1',
 
 let moduleNameMapper = Object.keys(_libAlias.libAlias).reduce((previousValue, key) => {
-  previousValue[`^${key}(.*)$`] = `${moduleNameMapper[key]}$1`;
+  previousValue[`^${key}(.*)$`] = `${_libAlias.libAlias[key]}$1`;
   return previousValue;
 }, {});
 let commonConfig = {

package/lib/configs/webpack.dev.config.js

@@ -57,6 +57,9 @@ module.exports = {
   entry: (0, _common.getEntries)(options, 'dev'),
   devtool: sourcemap,
   mode: 'development',
+  // watchOptions: {
+  //   ignored: /node_modules.(?!@zohodesk)/
+  // },
   output,
   stats: options.app.disableWatch ? 'errors-only' : {
     children: false

package/lib/configs/webpack.prod.config.js

@@ -14,6 +14,7 @@ var _libAlias = require("./libAlias");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// import TerserPlugin from 'terser-webpack-plugin';
 let options = (0, _utils.getOptions)();
 let {
   app: {
@@ -78,12 +79,23 @@ module.exports = {
     },
     concatenateModules: true,
     minimize: true,
+    // by  default if  minimize: true in webpack minimize then webpack automaticaly add TerserPlugin,
+    //  So we are overrideing it. 
+    // minimizer: [
+    //   new TerserPlugin({
+    //     cache: true,
+    //     parallel: true,
+    //     sourceMap: isDevelopment && enableSMap,
+    //     exclude: /\/smap/
+    //   })
+    // ],
     moduleIds: 'named'
   },
   stats: {
     children: false,
     colors: true,
     // excludeAssets: /i18n/,
+    // excludeAssets: /./,
     warningsFilter: /\[mini-css-extract-plugin\]/
   },
   plugins: (0, _pluginUtils.getProdPlugins)(options, output.publicPath),
@@ -115,7 +127,8 @@ module.exports = {
           }] : null].filter(Boolean),
           cacheDirectory: true
         }
-      }],
+      }].filter(Boolean),
+      // include: path.join(appPath, folder)
       include: module => {
         let srcPath = _path.default.join(appPath, folder);
 
@@ -132,7 +145,7 @@ module.exports = {
       exclude: /\.module\.css$/,
       use: (0, _loaderUtils.getCSSLoaders)(hasRTL, rtlExclude, '[local]', false, null)
     } : null, {
-      test: seperateCssModules ? /\.module\.css$/ : /(\.module)?\.css$/,
+      test: seperateCssModules ? /\.module\.css$/ : /\.css$/,
       use: (0, _loaderUtils.getCSSLoaders)(hasRTL, rtlExclude, false, cssUniqueness, selectorReplace, cssHashSelectors, classNamePrefix)
     }, {
       test: /\.jpe?g$|\.gif$|\.png$/,

package/lib/schemas/index.js

@@ -18,6 +18,18 @@ var _default = {
     value: null,
     cli: 'ssl_cert_url'
   },
+  preprocess: {
+    // This option is for tell the  react-cli which in preprocessor js file path
+    runner: {
+      value: '',
+      cli: 'preprocessor'
+    },
+    // usally preprocessor run in nodemon for, start and docs , preprocessor
+    stopNodemon: {
+      value: false,
+      cli: 'stop_nodemon'
+    }
+  },
   i18n: {
     chunkSplitEnable: {
       value: false,

package/lib/utils/getCurrentBranch.js

@@ -22,7 +22,7 @@ var _default = (type = 'git', cwd = process.cwd()) => {
     });
   }
 
-  let [currentBranch] = results.output.filter(d => d);
+  let [currentBranch] = results && results.output ? results.output.filter(d => d) : [''];
   return currentBranch.replace(/(\r\n|\n|\r)/gm, '');
 };
 

package/lib/utils/getOptions.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _child_process = require("child_process");
+
 var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
@@ -13,6 +15,9 @@ var _schemas = _interopRequireDefault(require("../schemas"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// import { argv } from 'process';
+const args = process.argv.slice(2); // console.log('argv', argv);
+
 const NPM_CONFIG_PREFIX = 'npm_config_'; // TODO: we have to do option parse logic little better
 // if user use react-cli stritly without using npm scripts options won't work,
 //  So  we have to write our own option parse logic or some other library
@@ -37,6 +42,52 @@ keysWithColon.forEach(key => {
   processEnv[nkey] = processEnv[key];
 });
 
+function getNpmVersion() {
+  // require("child_process").
+  let vers = '6';
+
+  try {
+    [vers] = (0, _child_process.execSync)('npm -v').toString().trim().split('.');
+  } catch (error) {
+    console.log(error);
+  }
+
+  return vers;
+}
+
+function getCWD() {
+  // require("child_process").
+  let cwd = process.cwd();
+
+  try {
+    let ress = (0, _child_process.execSync)('npm bin').toString();
+    let i = ress.lastIndexOf('node_modules');
+    cwd = i === -1 ? cwd : ress.slice(0, i);
+  } catch (error) {
+    console.log(error);
+  }
+
+  return cwd;
+} // experimental argumnet parsing logic
+
+
+args.forEach(option => {
+  if (/^--./.test(option)) {
+    let equIndex = option.indexOf('='); // equIndex = equIndex === -1 ? option.length : equIndex;
+
+    let key = option.slice(2, equIndex);
+    let value = option.slice(equIndex + 1);
+
+    if (equIndex === -1) {
+      key = option.slice(2);
+      value = true;
+    }
+
+    key = key.replace(/-|:/g, '_');
+    processEnv[key] = value;
+  }
+});
+
 let defaulter = (target, source) => {
   let defaultObject = {};
   Object.keys(target).forEach(key => {
@@ -87,7 +138,10 @@ let getOptions = () => {
     userSchemas = require(packagePath)['react-cli'] || {};
   }
 
-  let options = defaulter(_schemas.default, userSchemas || {});
+  let options = defaulter(_schemas.default, userSchemas || {}); // for future may be for npm 8 edge cases
+
+  options.npmVersion = getNpmVersion();
+  options.cwd = getCWD();
   options.packageVersion = process.env.npm_package_version;
   global.reactCLIOptions = options;
   return options;

package/lib/utils/jsonHelper.js

@@ -45,12 +45,21 @@ let fileHandler = {
 };
 exports.fileHandler = fileHandler;
 
+const isObject = obj => obj && obj.constructor === {}.constructor;
+
+const isArray = obj => obj && obj.constructor === [].constructor; // In below funtion 
+//  this function is for concat two json  object like _.extend, 
+//  if botha array we  concat them 
+//  if  both object we use call this  function  recurcively
+//  if both differend data type we will just  assign it  
+
+
 let jsonConcate = (receiverObj, senterObj) => {
   Object.keys(senterObj).map(key => {
     if (Object.prototype.hasOwnProperty.call(receiverObj, key)) {
-      if (receiverObj[key].constructor === {}.constructor && senterObj[key].constructor === {}.constructor) {
+      if (isObject(receiverObj[key]) && isObject(senterObj[key])) {
         jsonConcate(receiverObj[key], senterObj[key]);
-      } else if (receiverObj[key].constructor === [].constructor && senterObj[key].constructor === [].constructor) {
+      } else if (isArray(receiverObj[key]) && isArray(senterObj[key])) {
         receiverObj[key] = receiverObj[key].concat(senterObj[key]);
       } else {
         receiverObj[key] = senterObj[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/react-cli",
-  "version": "0.0.1-beta.161",
+  "version": "0.0.1-beta.163",
   "description": "A CLI tool for build modern web application and libraries",
   "scripts": {
     "init": "node ./lib/utils/init.js",
@@ -35,7 +35,7 @@
     "@babel/preset-env": "7.11.0",
     "@babel/preset-react": "7.10.4",
     "@babel/runtime": "7.11.2",
-    "@zohodesk/datetimejs": "1.0.0-beta.7",
+    "@zohodesk/datetimejs": "1.0.0-beta.8",
     "@zohodesk/eslint-plugin-react-performance": "1.0.3",
     "@zohodesk/eslint-plugin-zsecurity": "0.0.1-beta.4",
     "@zohodesk/normalizer": "1.0.2",