@zohodesk/react-cli 1.1.11-exp.6 → 1.1.11-exp.8

package/README.md

@@ -44,6 +44,18 @@ Now to run app
 
 # Change Logs
 
+
+# 1.1.11-exp.8 (4-9-2023)
+
+**Changes**
+- Re-factoring related changes
+
+
+# 1.1.11-exp.7 (1-9-2023)
+
+**Changes**
+- Fixed the unInsall variable not available via window varaible issue with resource cleanup plugin
+
 # 1.1.11-exp.6 (31-8-2023)
 
 **Features**

package/lib/pluginUtils/getDevPlugins.js

@@ -193,7 +193,9 @@ const getDevPlugins = (options, publicPath) => {
   }));
   instrumentScript && pluginsArr.push(new _plugins.ScriptInstrumentPlugin());
   customAttributes.enable && pluginsArr.push(new _CustomAttributePlugin.CustomAttributePlugin(customAttributes));
-  customAttributes.enable && pluginsArr.push(new _EfcResourceCleanupPlugin.default(customAttributes));
+  customAttributes.enable && pluginsArr.push(new _EfcResourceCleanupPlugin.default(Object.assign({}, customAttributes, {
+    globalCacheObj: context
+  })));
   hasShadowDOM && pluginsArr.push(new _plugins.ShadowDOMSupportPlugin());
 
   if (devCssFileBountry) {

package/lib/pluginUtils/getProdPlugins.js

@@ -298,7 +298,9 @@ const getProdPlugins = (options, publicPath = '') => {
 
 
   customAttributes.enable && pluginsArr.push(new _CustomAttributePlugin.CustomAttributePlugin(customAttributes));
-  customAttributes.enable && pluginsArr.push(new _EfcResourceCleanupPlugin.default(customAttributes));
+  customAttributes.enable && pluginsArr.push(new _EfcResourceCleanupPlugin.default(Object.assign({}, customAttributes, {
+    globalCacheObj: context
+  })));
   enableStats && pluginsArr.push(new _StatsPlugin.default({
     statsOptions,
     statsOutputExcludeKeys,

package/lib/plugins/EfcResourceCleanupPlugin.js

@@ -15,10 +15,14 @@ module.exports = class EfcResouceCleanupPlugin {
       mainTemplate
     }) => {
       mainTemplate.hooks.afterStartup.tap(plugInName, source => {
-        const attributesArr = Object.entries(this.options.attributes);
+        const {
+          attributes,
+          globalCacheObj
+        } = this.options;
+        const attributesArr = Object.entries(attributes);
         const [[attributekey, attributeValue]] = attributesArr;
         const resourceSelector = `[${attributekey}="${attributeValue}"]`;
-        return Template.asString([source, Template.indent([`     jsonpArray.unInstall = function() {
+        return Template.asString([source, Template.indent([`     window['${globalCacheObj}Jsonp'].unInstall = function() {
                   Object.keys(installedModules).forEach(installedModulesKey => installedModules[installedModulesKey] = null);
                   Object.keys(modules).forEach(moduleKey => modules[moduleKey] = null);
                  `, `
@@ -27,11 +31,11 @@ module.exports = class EfcResouceCleanupPlugin {
                  __webpack_require__.m = null;
                  __webpack_require__.c = null;
               
-                 `, `   
-                const addedResources = document.querySelectorAll('${resourceSelector}');
-                addedResources.forEach(addedResource => addedResource.remove());
-            }
-                `])]);
+                 `, attributekey && attributeValue ? `    
+          const addedResources = document.querySelectorAll('${resourceSelector}');
+          addedResources.forEach(addedResource => addedResource.remove());
+      }
+          ` : ''])]);
       });
     });
   }

package/lib/plugins/StatsPlugin.js

@@ -9,7 +9,8 @@ const {
 } = require('stream');
 
 const {
-  removeKeysFromObject
+  removeKeysFromObject,
+  convertObjectToStringGen
 } = require('../utils/object-manipulation');
 
 const pluginName = 'stats-plugin';
@@ -17,52 +18,15 @@ const statsSchema = {
   all: true
 };
 
-function* convertObjectToStringGen(obj) {
-  if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || obj === null) {
-    yield JSON.stringify(obj);
-  } else if (Array.isArray(obj)) {
-    yield '[';
-    let isFirst = true;
-
-    for (let item of obj) {
-      if (item === undefined) {
-        item = null;
-      }
-
-      yield `${isFirst ? '' : ','}`;
-      yield* convertObjectToStringGen(item);
-      isFirst = false;
-    }
-
-    yield ']';
-  } else {
-    yield '{';
-    let isFirst = true;
-    const entries = Object.entries(obj);
-
-    for (const [itemKey, itemValue] of entries) {
-      if (itemValue === undefined) {
-        continue;
-      }
-
-      yield `${isFirst ? '' : ','}${JSON.stringify(itemKey)}: `;
-      yield* convertObjectToStringGen(itemValue);
-      isFirst = false;
-    }
-
-    yield '}';
-  }
-}
-
 class StatsPlugin {
   constructor({
-    statsOptions = {},
-    statsOutputExcludeKeys = [],
-    statsFileName = 'bundle-report-integrity.json'
+    statsOptions,
+    statsOutputExcludeKeys,
+    statsFileName
   }) {
-    this.excludeKeysInStat = statsOutputExcludeKeys;
-    this.statsOptions = Object.assign({}, statsSchema, statsOptions);
-    this.statsFileName = statsFileName;
+    this.excludeKeysInStat = statsOutputExcludeKeys || [];
+    this.statsFileName = statsFileName || 'bundle-report-integrity.json';
+    this.statsOptions = Object.assign({}, statsSchema, statsOptions || {});
   }
 
   apply(compiler) {

package/lib/schemas/index.js

@@ -729,9 +729,9 @@ var _default = {
       value: false,
       cli: 'enable_stats'
     },
-    fileName: undefined,
-    options: undefined,
-    excludeKeys: undefined
+    fileName: null,
+    options: null,
+    excludeKeys: null
   }
 };
 exports.default = _default;

package/lib/utils/object-manipulation.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.convertObjectToStringGen = convertObjectToStringGen;
 exports.removeKeysFromObject = removeKeysFromObject;
 
 function objectPathMatcher(currentKey, objHierarchy = [], keysToBeRemoved = []) {
@@ -20,7 +21,9 @@ function objectPathMatcher(currentKey, objHierarchy = [], keysToBeRemoved = [])
 }
 /*
     1) *.keyTobeRemoved -> means match every object path, this key will be removed
-    2) don't need to account for object iteration, just object key path is enough in the key to be removed.
+    2) keyToBeremoved -> means root object key
+    3) nestedPath.keyToBeRemoved -> means only that nested path key
+    4) don't need to account for array iteration, just object key path is enough in the key to be removed.
 */
 
 
@@ -45,4 +48,41 @@ function removeKeysFromObject(obj, keysToBeRemoved, prevKeys = []) {
   }
 
   return obj;
+}
+
+function* convertObjectToStringGen(obj) {
+  if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || obj === null) {
+    yield JSON.stringify(obj);
+  } else if (Array.isArray(obj)) {
+    yield '[';
+    let isFirst = true;
+
+    for (let item of obj) {
+      if (item === undefined) {
+        item = null;
+      }
+
+      yield `${isFirst ? '' : ','}`;
+      yield* convertObjectToStringGen(item);
+      isFirst = false;
+    }
+
+    yield ']';
+  } else {
+    yield '{';
+    let isFirst = true;
+    const entries = Object.entries(obj);
+
+    for (const [itemKey, itemValue] of entries) {
+      if (itemValue === undefined) {
+        continue;
+      }
+
+      yield `${isFirst ? '' : ','}${JSON.stringify(itemKey)}: `;
+      yield* convertObjectToStringGen(itemValue);
+      isFirst = false;
+    }
+
+    yield '}';
+  }
 }

package/package.json

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