@zohodesk/react-cli 0.0.1-beta.177 → 0.0.1-beta.179

package/lib/utils/getOptions.js

@@ -26,14 +26,14 @@ const NPM_CONFIG_PREFIX = 'npm_config_'; // TODO: we have to do option parse log
 // // clone:type
 
 const processEnv = {};
-let keysWithColon = [];
+const keysWithColon = [];
 Object.keys(process.env).filter(key => key.startsWith(NPM_CONFIG_PREFIX)).forEach(key => {
-  let nkey = key.slice(NPM_CONFIG_PREFIX.length);
+  const nkey = key.slice(NPM_CONFIG_PREFIX.length);
   processEnv[nkey] = process.env[key];
   nkey.includes(':') && keysWithColon.push(nkey);
 });
 keysWithColon.forEach(key => {
-  let nkey = key.replace(/:/g, '_');
+  const nkey = key.replace(/:/g, '_');
 
   if (processEnv[nkey]) {
     throw Error('there is some options conflict', key, nkey);
@@ -60,8 +60,8 @@ function getCWD() {
   let cwd = process.cwd();
 
   try {
-    let ress = (0, _child_process.execSync)('npm bin').toString();
-    let i = ress.lastIndexOf('node_modules');
+    const ress = (0, _child_process.execSync)('npm bin').toString();
+    const i = ress.lastIndexOf('node_modules');
     cwd = i === -1 ? cwd : ress.slice(0, i);
   } catch (error) {
     console.log(error);
@@ -73,7 +73,7 @@ function getCWD() {
 
 args.forEach(option => {
   if (/^--./.test(option)) {
-    let equIndex = option.indexOf('='); // equIndex = equIndex === -1 ? option.length : equIndex;
+    const equIndex = option.indexOf('='); // equIndex = equIndex === -1 ? option.length : equIndex;
 
     let key = option.slice(2, equIndex);
     let value = option.slice(equIndex + 1);
@@ -88,10 +88,10 @@ args.forEach(option => {
   }
 });
 
-let defaulter = (target, source) => {
-  let defaultObject = {};
+const defaulter = (target, source) => {
+  const defaultObject = {};
   Object.keys(target).forEach(key => {
-    let data = target[key];
+    const data = target[key];
 
     if (data && typeof data === 'object') {
       if (Array.isArray(data)) {
@@ -151,21 +151,21 @@ function deprecationSupport(options) {
   }
 }
 
-let getOptions = () => {
+const getOptions = () => {
   if (global.reactCLIOptions) {
     return global.reactCLIOptions;
   }
 
-  let appPath = process.cwd();
+  const appPath = process.cwd();
   let userSchemas;
 
-  let packagePath = _path.default.join(appPath, 'package.json');
+  const packagePath = _path.default.join(appPath, 'package.json');
 
   if (_fs.default.existsSync(packagePath)) {
     userSchemas = require(packagePath)['react-cli'] || {};
   }
 
-  let options = defaulter(_schemas.default, userSchemas || {}); // for future may be for npm 8 edge cases
+  const options = defaulter(_schemas.default, userSchemas || {}); // for future may be for npm 8 edge cases
 
   options.npmVersion = getNpmVersion();
   options.cwd = getCWD();

package/lib/utils/getServerURL.js

@@ -5,7 +5,8 @@ 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,
@@ -13,6 +14,10 @@ let getServerURL = (serverInfo, protocol) => {
   } = serverInfo;
 
   if (protocol) {
+    if (domain === 'kubernetes') {
+      return `${protocol ? `${protocol}:` : ''}//${host}`;
+    }
+
     if (protocol === 'ht' + 'tp') {
       port = Number(port) + 1;
 
@@ -20,12 +25,16 @@ 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}`;
     }
   }
 
+  if (domain === 'kubernetes') {
+    return `${protocol ? `${protocol}:` : ''}//${host}`;
+  }
+
   if (domain) {
-    return `${protocol ? `${protocol}:` : ''}//${host}.${domain}.zohocorpin.com:${port}`;
+    return `${protocol ? `${protocol}:` : ''}//${host}.${domain}.zohocorpin.com:  ${port}`;
   }
 
   return `${protocol ? `${protocol}:` : ''}//${host}:${port}`;

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": []
+      }
+    }
+  }
+}

package/npm8.md

@@ -1,9 +1,9 @@
-# npm 8 change related things
-
-1. in npm run script config options `:` not working (properly|correctly), So we need to use `_` in the place of `:`
-   For Example:
-   - `--app:port` wouldn't work we have to do like this `--app_port`
-   - `--clone:proj:name` wouldn't work we have to do like this `----clone_proj_name`
-
-@zohodes/react-cli or fz-react-cli regardless of what cli you use.
-So, we need to change all package.json script which is using this (`:`) we need to change as (`_`)
+# npm 8 change related things
+
+1. in npm run script config options `:` not working (properly|correctly), So we need to use `_` in the place of `:`
+   For Example:
+   - `--app:port` wouldn't work we have to do like this `--app_port`
+   - `--clone:proj:name` wouldn't work we have to do like this `----clone_proj_name`
+
+@zohodes/react-cli or fz-react-cli regardless of what cli you use.
+So, we need to change all package.json script which is using this (`:`) we need to change as (`_`)

package/package.json

@@ -1,147 +1,121 @@
-{
-  "name": "@zohodesk/react-cli",
-  "version": "0.0.1-beta.177",
-  "description": "A CLI tool for build modern web application and libraries",
-  "scripts": {
-    "init": "node ./lib/utils/init.js",
-    "clean": "rimraf lib coverage",
-    "test": "jest",
-    "start": "babel src -d lib -w --copy-files",
-    "build": "babel src -d lib --copy-files",
-    "prepare": "npm run clean && npm run build",
-    "prepublish": "npm prune now",
-    "lint": "eslint src ./bin/cli.js",
-    "postpublish": "node postpublish.js",
-    "expublish": "npm publish --tag experimental-version"
-  },
-  "engines": {
-    "node": ">=8.15.1"
-  },
-  "private": false,
-  "repository": {
-    "type": "git",
-    "url": "git+https://git.csez.zohocorpin.com/zohodesk/react-cli.git"
-  },
-  "author": "zohodesk",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://git.csez.zohocorpin.com/zohodesk/react-cli/issues"
-  },
-  "homepage": "https://git.csez.zohocorpin.com/zohodesk/react-cli/blob/2.0.0/README.md",
-  "dependencies": {
-    "@babel/cli": "7.10.5",
-    "@babel/core": "7.11.1",
-    "@babel/plugin-proposal-object-rest-spread": "7.11.0",
-    "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-transform-runtime": "7.11.0",
-    "@babel/preset-env": "7.11.0",
-    "@babel/preset-react": "7.10.4",
-    "@babel/runtime": "7.11.2",
-    "@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",
-    "@zohodesk/postcss-rtl": "1.5.2",
-    "@zohodesk/propertytojson": "1.0.1",
-    "@zohodesk/screenshot-test": "0.0.1-beta.20",
-    "babel-eslint": "10.1.0",
-    "babel-jest": "26.3.0",
-    "babel-loader": "8.1.0",
-    "babel-plugin-lodash": "3.3.4",
-    "babel-plugin-transform-define": "2.0.0",
-    "babel-plugin-transform-dynamic-import": "2.1.0",
-    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "babel-plugin-transform-remove-console": "6.9.4",
-    "case-sensitive-paths-webpack-plugin": "2.3.0",
-    "compression": "1.7.4",
-    "copy-webpack-plugin": "5.1.2",
-    "core-js": "3.6.5",
-    "css-loader": "4.2.1",
-    "debug": "4.3.3",
-    "escodegen": "2.0.0",
-    "eslint": "7.6.0",
-    "eslint-html-reporter": "0.7.4",
-    "eslint-loader": "4.0.2",
-    "eslint-plugin-css-modules": "2.11.0",
-    "eslint-plugin-react": "7.20.6",
-    "esprima": "4.0.1",
-    "expect": "26.4.0",
-    "express": "4.17.1",
-    "file-loader": "6.0.0",
-    "fz-i18n": "1.2.0-beta.15",
-    "fz-layout": "1.0.0-beta.8",
-    "fz-permission": "0.0.2",
-    "git-root-dir": "1.0.2",
-    "gitlab": "14.2.2",
-    "history": "4.9.0",
-    "hoist-non-react-statics": "3.3.2",
-    "html-loader": "1.1.0",
-    "html-webpack-inject-attributes-plugin": "1.0.6",
-    "html-webpack-plugin": "4.3.0",
-    "http-proxy-middleware": "1.0.5",
-    "jest": "26.4.0",
-    "jsdom": "16.4.0",
-    "loader-utils": "2.0.0",
-    "lodash-webpack-plugin": "0.11.5",
-    "mini-css-extract-plugin": "0.10.0",
-    "moment": "2.29.1",
-    "moment-timezone": "0.5.32",
-    "nock": "13.0.4",
-    "nodemailer": "6.4.11",
-    "nodemon": "2.0.4",
-    "optimize-js": "1.0.3",
-    "postcss": "7.0.32",
-    "postcss-combine-media-query": "1.0.1",
-    "postcss-hash-classname": "0.4.0",
-    "postcss-loader": "3.0.0",
-    "postcss-mobile-hover": "1.0.2",
-    "postcss-selector-replace": "1.0.2",
-    "prop-types": "15.7.2",
-    "react": "16.13.1",
-    "react-dom": "16.13.1",
-    "react-error-overlay": "6.0.7",
-    "react-redux": "7.2.1",
-    "react-router": "5.2.0",
-    "react-router-redux": "4.0.8",
-    "react-test-renderer": "16.13.1",
-    "react-transition-group": "2.7.1",
-    "redis": "3.0.2",
-    "redux": "4.0.5",
-    "redux-logger": "3.0.6",
-    "redux-mock-store": "1.5.4",
-    "redux-router-middleware": "1.0.0-beta.22",
-    "redux-thunk": "2.3.0",
-    "reselect": "4.0.0",
-    "rimraf": "3.0.2",
-    "script-loader": "0.7.2",
-    "selectn": "1.1.2",
-    "simple-normalizr": "1.2.5",
-    "uglifycss": "0.0.29",
-    "url-loader": "4.1.0",
-    "velocity-react": "1.4.3",
-    "webpack": "4.44.1",
-    "webpack-bundle-analyzer": "4.5.0",
-    "webpack-cli": "3.3.12",
-    "webpack-core": "0.6.9",
-    "webpack-dev-middleware": "3.7.2",
-    "ws": "7.3.1",
-    "xhr2": "0.2.0",
-    "xmlhttprequest": "1.8.0"
-  },
-  "bin": {
-    "react-cli": "bin/cli.js"
-  },
-  "babel": {
-    "presets": [
-      [
-        "@babel/env",
-        {
-          "targets": {
-            "node": "8.15.1"
-          }
-        }
-      ],
-      "@babel/react"
-    ]
-  }
-}
+{
+  "name": "@zohodesk/react-cli",
+  "version": "0.0.1-beta.179",
+  "description": "A CLI tool for build modern web application and libraries",
+  "scripts": {
+    "init": "node ./lib/utils/init.js",
+    "clean": "rimraf lib coverage",
+    "test": "jest",
+    "start": "babel src -d lib -w --copy-files",
+    "build": "babel src -d lib --copy-files",
+    "prepare": "npm run clean && npm run build",
+    "prepublishOnly": "npm prune --production",
+    "lint": "eslint src ./bin/cli.js",
+    "postpublish": "node postpublish.js",
+    "expublish": "npm publish --tag experimental-version"
+  },
+  "engines": {
+    "node": ">=8.15.1"
+  },
+  "private": false,
+  "repository": {
+    "type": "git",
+    "url": "git+https://git.csez.zohocorpin.com/zohodesk/react-cli.git"
+  },
+  "author": "zohodesk",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://git.csez.zohocorpin.com/zohodesk/react-cli/issues"
+  },
+  "homepage": "https://git.csez.zohocorpin.com/zohodesk/react-cli/blob/2.0.0/README.md",
+  "bin": {
+    "react-cli": "bin/cli.js"
+  },
+  "dependencies": {
+    "@babel/cli": "7.10.5",
+    "@babel/core": "7.11.1",
+    "@babel/plugin-proposal-object-rest-spread": "7.11.0",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-transform-runtime": "7.11.0",
+    "@babel/preset-env": "7.11.0",
+    "@babel/preset-react": "7.10.4",
+    "@babel/runtime": "7.11.2",
+    "@zohodesk/client_packages_group": "1.0.1",
+    "@zohodesk/eslint-plugin-react-performance": "1.0.3",
+    "@zohodesk/eslint-plugin-zsecurity": "0.0.1-beta.4",
+    "@zohodesk/postcss-rtl": "1.5.2",
+    "@zohodesk/propertytojson": "1.0.1",
+    "@zohodesk/screenshot-test": "0.0.1-beta.20",
+    "babel-eslint": "10.1.0",
+    "babel-jest": "26.3.0",
+    "babel-loader": "8.1.0",
+    "babel-plugin-lodash": "3.3.4",
+    "babel-plugin-transform-define": "2.0.0",
+    "babel-plugin-transform-dynamic-import": "2.1.0",
+    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
+    "babel-plugin-transform-remove-console": "6.9.4",
+    "case-sensitive-paths-webpack-plugin": "2.3.0",
+    "compression": "1.7.4",
+    "copy-webpack-plugin": "5.1.2",
+    "css-loader": "4.2.1",
+    "escodegen": "2.0.0",
+    "eslint": "7.6.0",
+    "eslint-html-reporter": "0.7.4",
+    "eslint-loader": "4.0.2",
+    "eslint-plugin-css-modules": "2.11.0",
+    "eslint-plugin-react": "7.20.6",
+    "esprima": "4.0.1",
+    "expect": "26.4.0",
+    "express": "4.17.1",
+    "file-loader": "6.0.0",
+    "git-root-dir": "1.0.2",
+    "gitlab": "14.2.2",
+    "html-loader": "1.1.0",
+    "html-webpack-inject-attributes-plugin": "1.0.6",
+    "html-webpack-plugin": "4.3.0",
+    "http-proxy-middleware": "1.0.5",
+    "jest": "26.4.0",
+    "jsdom": "16.4.0",
+    "loader-utils": "2.0.0",
+    "lodash-webpack-plugin": "0.11.5",
+    "mini-css-extract-plugin": "0.10.0",
+    "nock": "13.2.9",
+    "nodemailer": "6.4.11",
+    "nodemon": "2.0.4",
+    "optimize-js": "1.0.3",
+    "postcss": "7.0.32",
+    "postcss-combine-media-query": "1.0.1",
+    "postcss-hash-classname": "0.4.0",
+    "postcss-loader": "3.0.0",
+    "postcss-mobile-hover": "1.0.2",
+    "postcss-selector-replace": "1.0.2",
+    "react-test-renderer": "16.13.1",
+    "redis": "3.0.2",
+    "redux-mock-store": "1.5.4",
+    "rimraf": "3.0.2",
+    "script-loader": "0.7.2",
+    "uglifycss": "0.0.29",
+    "url-loader": "4.1.0",
+    "webpack": "4.44.1",
+    "webpack-bundle-analyzer": "4.5.0",
+    "webpack-cli": "3.3.12",
+    "webpack-core": "0.6.9",
+    "webpack-dev-middleware": "3.7.2",
+    "ws": "7.3.1",
+    "xhr2": "0.2.0",
+    "xmlhttprequest": "1.8.0"
+  },
+  "babel": {
+    "presets": [
+      [
+        "@babel/env",
+        {
+          "targets": {
+            "node": "8.15.1"
+          }
+        }
+      ],
+      "@babel/react"
+    ]
+  }
+}

package/postpublish.js

@@ -1,6 +1,8 @@
-const { execSync } = require('child_process');
-const { version } = require('./package.json');
-console.log(`going to add git tag...  v${version}`);
-
-execSync(`git tag -a v${version}`, { stdio: 'inherit' });
-execSync(`git push origin v${version}`, { stdio: 'inherit' });
+const { execSync } = require('child_process');
+const { version, name } = require('./package.json');
+const tagName = `${name}@${version}`;
+// const tagName = `${name.replace(/^@/g, "").replace(/\//g, "-")}-v-${version}}@${version}`;
+console.log(`going to add git tag...  ${tagName}`);
+
+execSync(`git tag -a ${tagName}`, { stdio: 'inherit' });
+execSync(`git push origin ${tagName}`, { stdio: 'inherit' });