@zohodesk/react-cli 1.1.27-exp.2 → 1.1.27-exp.3

package/lib/configs/libAlias.js

@@ -23,7 +23,7 @@ const {
   app
 } = (0, _utils.getOptions)();
 const {
-  disableES5Transpile
+  disableES5Import
 } = app;
 
 function aliasPathCreation(customAlias) {
@@ -64,7 +64,7 @@ const libAlias = {
 // '^@components(.*)$': '<rootDir>/src/components$1',
 
 exports.libAlias = libAlias;
-const totalAlias = disableES5Transpile ? Object.assign({}, libAlias, aliasPathCreation(alias)) : aliasPathCreation(alias);
+const totalAlias = disableES5Import ? Object.assign({}, libAlias, aliasPathCreation(alias)) : aliasPathCreation(alias);
 const jestModuleNameMapper = Object.keys(totalAlias).reduce((previousValue, key) => {
   previousValue[`^${key}(.*)$`] = `${totalAlias[key]}$1`;
   return previousValue;

package/lib/configs/resolvers.js

@@ -19,7 +19,7 @@ var _client_packages_group = require("@zohodesk/client_packages_group");
 function moduleResolver(options) {
   const {
     moduleResolvePath,
-    disableES5Transpile
+    disableES5Import
   } = options.app;
   const customAlias = options.alias;
   let required = moduleResolvePath && (0, _requireLocalOrGlobal.requireLocal)(moduleResolvePath);
@@ -33,7 +33,7 @@ function moduleResolver(options) {
   }
 
   const nodeModulesPath = required ? required.nodeModulesPath : _client_packages_group.nodeModulesPath;
-  const totalAlias = disableES5Transpile ? Object.assign({}, _libAlias.libAlias, (0, _libAlias.aliasPathCreation)(customAlias)) : (0, _libAlias.aliasPathCreation)(customAlias);
+  const totalAlias = disableES5Import ? Object.assign({}, _libAlias.libAlias, (0, _libAlias.aliasPathCreation)(customAlias)) : (0, _libAlias.aliasPathCreation)(customAlias);
   return {
     extensions: ['.js', '.jsx', '.ts', '.tsx'],
     modules: [nodeModulesPath, _constants.cliNodeModulesPath, 'node_modules'].filter(Boolean),

package/lib/plugins/I18nSplitPlugin/I18nFilesEmitter.js

@@ -11,6 +11,8 @@ var _utils = require("./utils");
 
 var _getI18nKeysFormModules = _interopRequireDefault(require("./utils/getI18nKeysFormModules"));
 
+var _unicodeConversion = require("./utils/unicodeConversion");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -58,8 +60,9 @@ class I18nFilesEmitter {
   }
 
   getTemplateString(i18nKeys, locale) {
-    let i18nObject = this.getI18nObjectByLocale(i18nKeys, locale);
-    return `${this.jsonpFunc}(${(0, _utils.jsonToString)(i18nObject)});`; // return `${this.jsonpFunc}(JSON.parse(${JSON.stringify(jsonToString(i18nObject))}));`;
+    const i18nObject = this.getI18nObjectByLocale(i18nKeys, locale);
+    const convertedI18nObject = (0, _unicodeConversion.convertUnicode)(JSON.stringify(i18nObject, null, 0));
+    return `${this.jsonpFunc}(${convertedI18nObject});`; // return `${this.jsonpFunc}(JSON.parse(${JSON.stringify(jsonToString(i18nObject))}));`;
   }
 
   renderI18nLocaleChunk(chunk, locale, i18nKeys) {

package/lib/plugins/I18nSplitPlugin/utils/propertiesUtils.js

@@ -13,8 +13,6 @@ var _path = require("path");
 
 var _logger = require("../../../logger");
 
-var _unicodeConversion = require("./unicodeConversion");
-
 function isComment(line) {
   return line[0] === '#';
 }
@@ -33,8 +31,7 @@ function getPropertiesAsJSON(filePath) {
 
       const ind = line.indexOf('=');
       const key = line.slice(0, ind).replace(/\\ /g, ' ');
-      let value = line.slice(ind + 1);
-      value = (0, _unicodeConversion.convertUnicode)(value);
+      const value = line.slice(ind + 1);
 
       if (key && value) {
         i18nObj[key] = value;

package/lib/plugins/I18nSplitPlugin/utils/unicodeConversion.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.convertUnicode = convertUnicode;
+const UNICODE_PATTERN = /\\+u([0-9a-fA-F]{4})/g;
 
-function convertUnicode(str) {
-  const unicodeRegex = /\\u([a-fA-F0-9]{4})/g;
-  const converted = str.replace(unicodeRegex, (match, hex) => {
-    return String.fromCharCode(parseInt(hex, 16));
-  });
-  return converted;
+function convertUnicode(jsonStr) {
+  if (!jsonStr.includes('\\u')) {
+    return jsonStr;
+  }
+
+  UNICODE_PATTERN.lastIndex = 0;
+  return jsonStr.replace(UNICODE_PATTERN, (_, hex) => String.fromCharCode(Number.parseInt(hex, 16)));
 }

package/lib/schemas/index.js

@@ -232,6 +232,7 @@ var _default = {
       none: '(hover: none)'
     },
     disableES5Transpile: false,
+    disableES5Import: false,
     isReactMig: false,
     hasWidget: false,
     hasEFC: {

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/react-cli",
-  "version": "1.1.27-exp.2",
+  "version": "1.1.27-exp.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -12874,7 +12874,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
     "sshpk": {
       "version": "1.17.0",
@@ -13312,7 +13312,7 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
     "throat": {
       "version": "5.0.0",
@@ -14834,7 +14834,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "write": {
       "version": "1.0.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/react-cli",
-  "version": "1.1.27-exp.2",
+  "version": "1.1.27-exp.3",
   "description": "A CLI tool for build modern web application and libraries",
   "scripts": {
     "init": "node ./lib/utils/init.js",

package/packages/client_build_tool/lib/shared/bundler/webpack/custom_plugins/SelectorWeightPlugin/index.js

@@ -43,10 +43,6 @@ class SelectorWeightPlugin {
         mods.forEach(module => {
           const filename = module.issuer.resource;
 
-          if (filename == '/Users/zt375-t/work/desk_client_app/jsapps/supportapp/src/components/Subtab/chatGPT/chatGptCard/css/ChatGptCard.module.css') {
-            console.log(module.content.toString());
-          }
-
           if (!(0, _checkIsPatternsMatchFilename.checkIsPatternsMatchFilename)(patterns, filename)) {
             return;
           }

package/packages/client_build_tool/lib/shared/postcss/custom_postcss_plugins/VariableModificationPlugin/index.js

@@ -108,6 +108,10 @@ const singleConvertor = (value, changeVal, details, range) => {
     }
   }
 
+  if (value == '0px') {
+    value = value.replace('px', '');
+  }
+
   if (getNumericValue(value) >= range.start && getNumericValue(value) <= range.end || getNumericValue(value) === 0) {
     let retVal = value.replace(/(\d+)px/gi, changeVal.replace('$$', '$1'));
 
@@ -216,7 +220,7 @@ var _default = ({
             return;
           }
 
-          if (settingsObject[decl.prop] && !decl.value.includes('var(--') && decl.value.toString() !== '0') {
+          if (settingsObject[decl.prop] && !decl.value.includes('var(--')) {
             const settings = settingsObject[decl.prop]; // console.log(settings)
 
             const {
@@ -306,7 +310,7 @@ var _default = ({
                 range
               } = settings;
               const convertedVals = valArr.map(val => {
-                if (val.includes('px') && val.toString() !== '0') {
+                if (val.includes('px')) {
                   const convertedVal = singleConvertor(val, settings.replacements.px, {
                     decl,
                     filename,