@zohodesk/react-cli 1.1.11-exp.3 → 1.1.11-exp.4

package/packages/client_build_tool/lib/{shared/schemas → schemas}/getNpmVersion.js

@@ -7,14 +7,15 @@ exports.getNpmVersion = getNpmVersion;
 
 var _child_process = require("child_process");
 
+var _logger = require("../logger");
+
 function getNpmVersion() {
-  // require("child_process").
   let vers = '6';
 
   try {
     [vers] = (0, _child_process.execSync)('npm -v').toString().trim().split('.');
   } catch (error) {
-    console.log(error);
+    (0, _logger.messageLogger)(error);
   }
 
   return vers;

package/packages/client_build_tool/lib/schemas/giveDefaultValue.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.giveDefaultValue = giveDefaultValue;
+
+function giveDefaultValue(value) {
+  if (value === true || value === 'true') {
+    return true;
+  }
+
+  if (value === false || value === 'false' || value === '') {
+    return false;
+  }
+
+  return value;
+}

package/packages/client_build_tool/lib/{shared/schemas → schemas}/npmConfigToObject.js

@@ -4,8 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.npmConfigToObject = npmConfigToObject;
+
+var _logger = require("../logger");
+
 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,
+// if user use react-cli strictly without using npm scripts options won't work,
 //  So  we have to write our own option parse logic or some other library
 // console.log('type', process.argv,  process.env.npm_config_check,  process.env.npm_config_clone_type, process.env.npm_config_clone_url);
 // console.log('Object.keys(process.env).filter(s => s.startsWith(\'npm_config_\') && s.includes(\'clone\')', Object.keys(process.env).filter(s => s.startsWith('npm_config_') && s.includes('clone')));
@@ -13,20 +16,20 @@ const NPM_CONFIG_PREFIX = 'npm_config_'; // TODO: we have to do option parse log
 function npmConfigToObject() {
   // // 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);
-    processEnv[nkey] = process.env[key];
-    nkey.includes(':') && keysWithColon.push(nkey);
+    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]) {
-      console.warn('there is some options conflict', key, nkey);
+    if (processEnv[nKey]) {
+      (0, _logger.warnLogger)('there is some options conflict', key, nKey);
     }
 
-    processEnv[nkey] = processEnv[key];
+    processEnv[nKey] = processEnv[key];
   });
   return processEnv;
 }

package/packages/client_build_tool/lib/{shared/schemas → schemas}/readOptions.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getOptions = exports.args = void 0;
 
-var _applyValuesToShema = require("./applyValuesToShema");
+var _applyValuesToSchema = require("./applyValuesToSchema");
 
 var _cliArgsToObject = require("./cliArgsToObject");
 
@@ -13,41 +13,40 @@ var _defaultConfigValues = _interopRequireDefault(require("./defaultConfigValues
 
 var _deprecatedOptionsHandler = require("./deprecatedOptionsHandler");
 
-var _getCWD = require("./getCWD");
-
 var _getNpmVersion = require("./getNpmVersion");
 
 var _npmConfigToObject = require("./npmConfigToObject");
 
-var _readOptionsForPackageJson = require("./readOptionsForPackageJson");
+var _readOptionsForConfigFile = require("./readOptionsForConfigFile");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// import schemas from './oldDefaultConfigValues';
 const args = process.argv.slice(2);
 exports.args = args;
 const processEnv = (0, _npmConfigToObject.npmConfigToObject)();
 const cliArgsObject = (0, _cliArgsToObject.cliArgsToObject)(args);
 Object.assign(processEnv, cliArgsObject);
-global.reactCLIOptions = null;
+let reactCLIOptions = null;
 
 const getOptions = () => {
-  if (global.reactCLIOptions) {
-    return global.reactCLIOptions;
+  if (reactCLIOptions) {
+    return reactCLIOptions;
   }
 
   const appPath = process.cwd();
-  const userSchemas = (0, _readOptionsForPackageJson.readOptionsForPackageJson)(appPath);
-  const options = (0, _applyValuesToShema.applyValuesToShema)(_defaultConfigValues.default, userSchemas || {}, processEnv);
+  const userSchemas = (0, _readOptionsForConfigFile.readOptionsForPackageJson)(appPath); // NOTE: Only config File option will with cli option  config_file
+
+  const configFileSchemas = (0, _readOptionsForConfigFile.readOptionsForConfigFile)(appPath, cliArgsObject.config_file || 'build.config.js');
+  const options = (0, _applyValuesToSchema.applyValuesToSchema)(_defaultConfigValues.default, configFileSchemas || userSchemas || {}, processEnv);
   (0, _deprecatedOptionsHandler.deprecatedOptionsHandler)(options); // for future may be for npm 8 edge cases
 
   options.npmVersion = (0, _getNpmVersion.getNpmVersion)();
-  options.cwd = (0, _getCWD.getCWD)();
+  options.cwd = appPath;
   options.packageVersion = process.env.npm_package_version;
   options.extraArgs = process.argv.slice(3); // eslint-disable-next-line prefer-destructuring
 
   options.commandOption = process.argv[2];
-  global.reactCLIOptions = options; // console.log({ options });
+  reactCLIOptions = options; // console.log({ options });
 
   return options;
 };

package/packages/client_build_tool/lib/{shared/schemas/readOptionsForPackageJson.js → schemas/readOptionsForConfigFile.js}

@@ -3,19 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.readOptionsForConfigFile = readOptionsForConfigFile;
 exports.readOptionsForPackageJson = readOptionsForPackageJson;
 
 var _fs = require("fs");
 
 var _path = _interopRequireDefault(require("path"));
 
-var _constants = require("../constants");
+var _constants = require("../shared/constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import { CONFIG_ROOT } from "../constants";
 function readOptionsForPackageJson(appPath) {
-  const packagePath = _path.default.join(appPath, "package.json");
+  const packagePath = _path.default.join(appPath, 'package.json');
 
   if ((0, _fs.existsSync)(packagePath)) {
     // eslint-disable-next-line import/no-dynamic-require, global-require
@@ -23,4 +24,19 @@ function readOptionsForPackageJson(appPath) {
   }
 
   return {};
+}
+
+function readOptionsForConfigFile(appPath, configFile) {
+  if (!configFile) {
+    return null;
+  }
+
+  const packagePath = _path.default.join(appPath, configFile);
+
+  if ((0, _fs.existsSync)(packagePath)) {
+    // eslint-disable-next-line import/no-dynamic-require, global-require
+    return require(packagePath).config;
+  }
+
+  return null;
 }

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/Map.test.js

@@ -0,0 +1,15 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('Map', () => {
+  const inputCode = `const fruits = new Map([
+["apples", 500],
+["bananas", 300],
+["oranges", 200]
+]);`;
+  const outputCode = 'const fruits = new Map([["apples", 500], ["bananas", 300], ["oranges", 200]]);';
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/MathAndNumberMethod.test.js

@@ -0,0 +1,30 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('Math methods', () => {
+  const inputCode = `Math.trunc(4.9);
+Math.sign(4);
+Math.cbrt(125);
+Math.log2(2);
+Math.log10(10);`;
+  const outputCode = `Math.trunc(4.9);
+Math.sign(4);
+Math.cbrt(125);
+Math.log2(2);
+Math.log10(10);`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('Number methods', () => {
+  const inputCode = `Number.isInteger(10); 
+Number.isSafeInteger(10);
+isFinite(10/0);
+isNaN("Hello");`;
+  const outputCode = `Number.isInteger(10);
+Number.isSafeInteger(10);
+isFinite(10 / 0);
+isNaN("Hello");`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/ObjectAndModules.test.js

@@ -0,0 +1,47 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('Object entries', () => {
+  const inputCode = `const fruits = ["Banana", "Orange", "Apple", "Mango"];
+const f = fruits.entries();`;
+  const outputCode = `const fruits = ["Banana", "Orange", "Apple", "Mango"];
+const f = fruits.entries();`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('Import from named exports', () => {
+  const inputCode = 'import { name, age } from "./person.js"; ';
+  const outputCode = 'import { name, age } from "./person.js";';
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('Import from default exports', () => {
+  const inputCode = 'import message from "./message.js"; ';
+  const outputCode = 'import message from "./message.js";';
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('super method', () => {
+  const inputCode = `let obj = {
+  say() {
+    return "Hello";
+  },
+};
+
+let obj2 = {
+  say() {
+    return super.say() + "World!";
+  },
+};`;
+  const outputCode = `let obj = {
+  say() {
+    return "Hello";
+  }
+};
+let obj2 = {
+  say() {
+    return super.say() + "World!";
+  }
+};`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/Sets.test.js

@@ -0,0 +1,18 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('Sets', () => {
+  const inputCode = `const letters = new Set();
+
+letters.add("a");
+letters.add("b");
+letters.add("c");`;
+  const outputCode = `const letters = new Set();
+letters.add("a");
+letters.add("b");
+letters.add("c");`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/Symbol.test.js

@@ -0,0 +1,25 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('Symbol', () => {
+  const inputCode = `const person = {
+  firstName: "John",
+  lastName: "Doe",
+  age: 50,
+  eyeColor: "blue"
+};
+let id = Symbol('id');
+person[id] = 140353;`;
+  const outputCode = `const person = {
+  firstName: "John",
+  lastName: "Doe",
+  age: 50,
+  eyeColor: "blue"
+};
+let id = Symbol('id');
+person[id] = 140353;`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/arrowFunction.test.js

@@ -0,0 +1,34 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('arrow function', () => {
+  const inputCode = 'const x = (x, y) => x * y;';
+  const outputCode = 'const x = (x, y) => x * y;';
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('array.map method', () => {
+  const inputCode = 'const double = [1, 2, 3].map(num => num * 2);';
+  const outputCode = 'const double = [1, 2, 3].map(num => num * 2);';
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('for each', () => {
+  const inputCode = `
+var bob = {
+    _name: "Bob",
+    _friends: ["Sally", "Tom"],
+    printFriends() {
+       this._friends.forEach(f => console.log(this._name + " knows " + f));
+    },
+};`;
+  const outputCode = `var bob = {
+  _name: "Bob",
+  _friends: ["Sally", "Tom"],
+  printFriends() {
+    this._friends.forEach(f => console.log(this._name + " knows " + f));
+  }
+};`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/block-scoping.test.js

@@ -0,0 +1,18 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('block', () => {
+  const inputCode = `{
+   let i = 0;
+}
+let i = 0;
+`;
+  const outputCode = `{
+  let i = 0;
+}
+let i = 0;`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/classes.test.js

@@ -0,0 +1,55 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('class object', () => {
+  const inputCode = `class Car {
+    constructor(name, year) {
+    this.name = name;
+    this.year = year;
+    }
+}`;
+  const outputCode = `class Car {
+  constructor(name, year) {
+    this.name = name;
+    this.year = year;
+  }
+}`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('using class extends', () => {
+  const inputCode = `class Foo extends mixin(Array) { }
+    function mixin(Super) {
+       return class extends Super {
+        mix() { }
+    };
+}`;
+  const outputCode = `class Foo extends mixin(Array) {}
+function mixin(Super) {
+  return class extends Super {
+    mix() {}
+  };
+}`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('new target method', () => {
+  const inputCode = `class Foo {
+  constructor() {
+    console.log(new.target);
+  }
+}
+class Bar extends Foo {}
+new Foo();
+new Bar()`;
+  const outputCode = `class Foo {
+  constructor() {
+    console.log(new.target);
+  }
+}
+class Bar extends Foo {}
+new Foo();
+new Bar();`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/defaultParameterValues.test.js

@@ -0,0 +1,18 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('default values as params', () => {
+  const inputCode = `function myFunction(x, y = 10) {
+  return x + y;
+}
+myFunction(5);`;
+  const outputCode = `function myFunction(x) {
+  let y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
+  return x + y;
+}
+myFunction(5);`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/extraFeatures.test.js

@@ -0,0 +1,82 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('computed-properties', () => {
+  const inputCode = `var obj = {
+  ["x" + foo]: "heh",
+  ["y" + bar]: "noo",
+  foo: "foo",
+  bar: "bar",
+};`;
+  const outputCode = `var obj = {
+  ["x" + foo]: "heh",
+  ["y" + bar]: "noo",
+  foo: "foo",
+  bar: "bar"
+};`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('unicode', () => {
+  const inputCode = `var string = "foo💩bar";
+var match = string.match(/foo(.)bar/u);`;
+  const outputCode = `var string = "foo💩bar";
+var match = string.match(/foo(.)bar/u);`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('destructuring', () => {
+  const inputCode = `let { x, y } = obj;
+let [a, b, ...rest] = arr;`;
+  const outputCode = `let {
+  x,
+  y
+} = obj;
+let [a, b, ...rest] = arr;`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('duplicate-keys', () => {
+  const inputCode = `var x = { a: 5, a: 6};
+var y = {
+  get a() {},
+  set a(x) {},
+  a: 3,
+};`;
+  const outputCode = `var x = {
+  a: 5,
+  a: 6
+};
+var y = {
+  get a() {},
+  set a(x) {},
+  a: 3
+};`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('instance of', () => {
+  const inputCode = 'foo instanceof Bar;';
+  const outputCode = 'foo instanceof Bar;';
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('function name', () => {
+  const inputCode = 'let number = x => x;';
+  const outputCode = 'let number = x => x;';
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('template literals', () => {
+  // eslint-disable-next-line no-template-curly-in-string
+  const inputCode = '`foo${bar}`'; // eslint-disable-next-line no-template-curly-in-string
+
+  const outputCode = '`foo${bar}`;';
+  expect(convertCode(inputCode)).toBe(outputCode);
+});
+test('shorthand properties', () => {
+  const inputCode = 'var o = { a, b, c };';
+  const outputCode = `var o = {
+  a,
+  b,
+  c
+};`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/forOf.test.js

@@ -0,0 +1,20 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('for of loop', () => {
+  const inputCode = `const cars = ["BMW", "Volvo", "Mini"];
+let text = "";
+
+for (let x of cars) {
+  text += x + " ";
+}`;
+  const outputCode = `const cars = ["BMW", "Volvo", "Mini"];
+let text = "";
+for (let x of cars) {
+  text += x + " ";
+}`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/promise.test.js

@@ -0,0 +1,22 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('Promises', () => {
+  const inputCode = `const myPromise = new Promise(function(myResolve, myReject) {
+  myResolve();
+  myReject(); 
+});
+myPromise.then(
+  function(value) { /* code if successful */ },
+  function(error) { /* code if some error */ }
+);`;
+  const outputCode = `const myPromise = new Promise(function (myResolve, myReject) {
+  myResolve();
+  myReject();
+});
+myPromise.then(function (value) {/* code if successful */}, function (error) {/* code if some error */});`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/spreadOperator.test.js

@@ -0,0 +1,20 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('spread Ooperator', () => {
+  const inputCode = `const q1 = ["Jan", "Feb", "Mar"];
+const q2 = ["Apr", "May", "Jun"];
+const q3 = ["Jul", "Aug", "Sep"];
+const q4 = ["Oct", "Nov", "May"];
+
+const year = [...q1, ...q2, ...q3, ...q4];`;
+  const outputCode = `const q1 = ["Jan", "Feb", "Mar"];
+const q2 = ["Apr", "May", "Jun"];
+const q3 = ["Jul", "Aug", "Sep"];
+const q4 = ["Oct", "Nov", "May"];
+const year = [...q1, ...q2, ...q3, ...q4];`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});

package/packages/client_build_tool/lib/shared/babel/__test__/es2015/spreadParams.test.js

@@ -0,0 +1,24 @@
+"use strict";
+
+const {
+  convertCode
+} = require('../utilities');
+
+test('Function Rest Parameter', () => {
+  const inputCode = `function sum(...args) {
+  let sum = 0;
+  for (let arg of args) sum += arg;
+  return sum;
+}
+let x = sum(4, 9, 16, 25, 29, 100, 66, 77);`;
+  const outputCode = `function sum() {
+  let sum = 0;
+  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+  for (let arg of args) sum += arg;
+  return sum;
+}
+let x = sum(4, 9, 16, 25, 29, 100, 66, 77);`;
+  expect(convertCode(inputCode)).toBe(outputCode);
+});