@zohodesk/react-cli 1.1.19-exp.15 → 1.1.19-exp.16

package/docs/ReactLive.md

@@ -11,4 +11,8 @@
 
 # v1.1.2 update:
 
-* ReactLiveConverter filepath changed to 'reactLiveConverter.js' in docLoader file
+* ReactLiveConverter filepath changed to 'reactLiveConverter.js' in docLoader file
+
+# v1.1.20 update:
+
+* enhancedReactLiveConverter.js added and imported in  docLoader file

package/lib/loaders/docsLoader.js

@@ -6,7 +6,7 @@ var _getOptions = _interopRequireDefault(require("../utils/getOptions.js"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _reactLiveConvertor = require("./reactLiveConvertor");
+var _enhancedReactLiveConverter = require("./enhancedReactLiveConverter.js");
 
 var _markdownLoader = require("./markdownLoader.js");
 
@@ -27,7 +27,7 @@ module.exports = function (source) {
   const src = _fs.default.readFileSync(originalFilePath).toString();
 
   options.docs.enableMDParser && (source = (0, _markdownLoader.markdownParser)(source));
-  options.docs.enableReactLive && (source = (0, _reactLiveConvertor.reactLiveConvertor)(source, originalFilePath)); //to Enable the ReactLive Converter
+  options.docs.enableReactLive && (source = (0, _enhancedReactLiveConverter.enhancedReactLiveConverter)(source, originalFilePath)); //to Enable the ReactLive Converter
 
   return `${source};${name}.source=${JSON.stringify(src)};${name}.filePath=${JSON.stringify(filePath)}`;
 };

package/lib/loaders/enhancedReactLiveConverter.js

@@ -0,0 +1,151 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.enhancedReactLiveConverter = enhancedReactLiveConverter;
+
+const parser = require('@babel/parser');
+
+const traverse = require('@babel/traverse').default;
+
+const t = require("@babel/types");
+
+const path = require('path');
+
+function getFilename(originalFilePath) {
+  const [fileName] = path.basename(originalFilePath).split('.');
+  return fileName;
+}
+
+function convertKeyToValue(object = {}) {
+  let keys = Object.keys(object);
+  let values = Object.values(object);
+  return keys.reduce((value, item, i) => {
+    if (item.includes(',')) {
+      item = item.replace(/{|}/g, "");
+      item = '{ ' + item + ' }';
+    }
+
+    value = value + "'" + values[i] + "'" + ": " + item + ",";
+    return value;
+  }, '');
+}
+
+function mergeDuplicateValues(obj) {
+  let mergedObj = {};
+
+  for (let key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      let value = obj[key];
+      let existingKey = Object.keys(mergedObj).find(k => mergedObj[k] === value);
+
+      if (existingKey) {
+        mergedObj[existingKey + ' , ' + key] = value;
+        delete mergedObj[existingKey];
+      } else {
+        mergedObj[key] = value;
+      }
+    }
+  }
+
+  return mergedObj;
+}
+
+function enhancedReactLiveConverter(source, originalFilePath) {
+  const fileName = getFilename(originalFilePath);
+
+  if (!source) {
+    return '';
+  }
+
+  let docCode = '';
+  const fileContent = source.replace(/[\s\r\n]*$/, '');
+  const ast = parser.parse(fileContent, {
+    sourceType: 'module',
+    plugins: ['jsx', 'classProperties']
+  });
+
+  function createImportStatements(input) {
+    let output = '';
+
+    for (const key in input) {
+      if (input.hasOwnProperty(key) && key !== 'React') {
+        output += `import ${key} from '${input[key]}';\n`;
+      }
+    }
+
+    return output;
+  }
+
+  const importBlock = {};
+  const printableCode = {};
+  let remainingBlock = ''; // Traverse the AST and find the import and export blocks
+
+  let remainingCode = ast.program.body.filter(node => node.type !== 'ImportDeclaration').filter(node => node.type !== 'ExpressionStatement').map(node => fileContent.substring(node.start, node.end)).join('').trim();
+  traverse(ast, {
+    ImportDeclaration(path) {
+      path.node.specifiers.map(specifier => {
+        if (t.isImportSpecifier(specifier)) {
+          importBlock[`{ ${specifier.local.name} }`] = path.node.source.value;
+          printableCode[`{ ${specifier.local.name} }`] = path.node.source.value;
+          return `{'${specifier.imported.name}': ${specifier.local.name}}`;
+        } else if (t.isImportDefaultSpecifier(specifier)) {
+          importBlock[`${specifier.local.name}`] = `${path.node.source.value}`;
+          printableCode[`${specifier.local.name}`] = `${path.node.source.value} `;
+          return specifier.local.name;
+        }
+      }).join(", ");
+    },
+
+    ExpressionStatement(path) {
+      const expression = path.get('expression');
+      const expressionLeft = expression.get('left');
+
+      if (path.isExpressionStatement() && expression.isAssignmentExpression() && expressionLeft.isMemberExpression()) {
+        const docCheck = expressionLeft.toString();
+
+        if (docCheck === `${fileName}.docs`) {
+          docCode = expression.toString();
+        } else if (docCheck.includes(fileName)) {
+          const startIndex = path.node.start;
+          const endIndex = path.node.end;
+          remainingBlock += fileContent.slice(startIndex, endIndex);
+        }
+      }
+    }
+
+  });
+  remainingCode = remainingCode.replace(/__DOCS__/, true);
+  remainingCode = remainingCode.replace(/`/g, '\\`').replace(/\$\{/g, '$\\{');
+  remainingBlock = remainingBlock.replace(/`/g, '\\`').replace(/\$\{/g, '$\\{');
+  const addBractick = `\`
+  ${createImportStatements(printableCode)}
+  ${remainingCode}
+
+  ${remainingBlock}\`
+  `;
+  const template = `
+  
+    ${createImportStatements(importBlock)}
+  
+    import { LiveProviderv3, LiveEditorv3, LiveErrorv3, LivePreviewv3, Wrapper, EditorWrapper , ErrorWrapper, PreviewWrapper } from '@zohodesk-private/react-live/es/index'
+
+    export default class ${fileName} extends React.Component{
+      render(){
+        return(
+          <LiveProviderv3 needToolBox scope={{import: {${convertKeyToValue(mergeDuplicateValues(printableCode))}}}} code={${addBractick}}>
+            <Wrapper>
+                <EditorWrapper><LiveEditorv3 /></EditorWrapper>
+                <PreviewWrapper><LivePreviewv3 /></PreviewWrapper>
+                <LiveErrorv3 needStyle />
+            </Wrapper>
+          </LiveProviderv3>
+        )
+      }
+    }
+  
+    ${docCode}
+    `;
+  return template;
+}

package/lib/pluginUtils/getProdPlugins.js

@@ -237,7 +237,7 @@ const getProdPlugins = (options, publicPath = '') => {
     if (bundleAnalyze) {
       pluginsArr.push(new _webpackBundleAnalyzer.BundleAnalyzerPlugin({
         analyzerMode: 'static',
-        generateStatsFile: !enableStats,
+        generateStatsFile: false,
         openAnalyzer: false,
         statsOptions: enableStats ? null : {
           source: false,

package/lib/plugins/I18nSplitPlugin/I18nDownlodLogic.js

@@ -228,10 +228,7 @@ class I18nDownlodLogic {
         if(dataSrc === srcPath || dataSrc === fullsrcPath){ return resolve();}
       }
       var scriptTag = document.createElement("script");
-      scriptTag.onload = () => {
-        resolve();
-        scriptTag.onerror = scriptTag.onload = null;
-    };
+      scriptTag.onload = resolve;
       scriptTag.onerror = function(event) {
         var request = event && event.target && event.target.src || fullsrcPath;
         var err = new Error("Loading I18N chunk " + chunkId + " failed.\\n(" + request + ")");
@@ -240,7 +237,6 @@ class I18nDownlodLogic {
         delete installedI18nChunks[chunkId];
         scriptTag.parentNode.removeChild(scriptTag);
         reject(err);
-        scriptTag.onerror = scriptTag.onload = null;
       };
       ${mainTemplate.requireFn}.nc && scriptTag.setAttribute("nonce", ${mainTemplate.requireFn}.nc);
       scriptTag.src = fullsrcPath;

package/package.json

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