@zohodesk/react-cli 0.0.1-exp.161.3 → 0.0.1-exp.164.1

package/lib/common/criteriaHandler.js

@@ -0,0 +1,91 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.criteriaHandler = criteriaHandler;
+
+/*
+  root = {
+    a: 1
+    b: 0
+    op = "&"
+  }
+
+  rule = (1 & 2) | 0
+  root = {
+    a: {
+      a: 1
+      b: 2
+      op = "&"
+    }
+    b: 0
+    op = "|"
+  }
+
+   rule = (3 | !(1 & 2)) | 0
+  */
+function parseNumber(rule, _i) {
+  let i = _i;
+  let ans = 0;
+
+  while (/[0-9]/.test(rule[i])) {
+    ans = ans * 10 + Number(rule[i]);
+    i++;
+  }
+
+  return [i, ans];
+}
+
+function criteriaParser(rule, _i = 0) {
+  let openBarceCount = 0; // let root = {};
+
+  let cur = {};
+  let c;
+
+  for (let i = _i; i < rule.length; i++) {
+    c = rule[i];
+
+    if (/[0-9]/.test(c)) {
+      let [_i, num] = parseNumber(rule, i);
+      i = _i - 1;
+
+      if (cur.a === undefined) {
+        cur.a = num; // } else if (cur.b === undefined) {
+      } else {
+        cur.b = num; // if (cur.op && cur.a);
+        // } else {
+      }
+    } else if (/[|&]/.test(c)) {
+      if (cur.op) {
+        // if (cur.b === undefined && cur.op !== '!') {
+        //   throw `Error unexpected charector ${c} in index ${i}`;
+        // }
+        cur = {
+          a: cur,
+          op: c
+        };
+      } else {
+        cur.op = c;
+      }
+    } // if (c === '(' || c === ')') {
+    //   if (openBarceCount) {
+    //     openBarceCount++;
+    //   } else if (c === ')') {
+    //     openBarceCount--;
+    //     cur = { a, b, op };
+    //   }
+    // } else if (/[0-9]/.test(c)) {
+    // } else {
+    // }
+
+  }
+}
+
+function criteriaHandler(criterias, rule) {
+  if (/[(!)0-9&|]/.test(rule) === false) {
+    console.log('rule has  unexpexted charectors');
+  }
+
+  let root = criteriaParser(rule);
+}

package/lib/common/index.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "splitChunks", {
-  enumerable: true,
-  get: function () {
-    return _splitChunks.default;
-  }
-});
 Object.defineProperty(exports, "getEntries", {
   enumerable: true,
   get: function () {
@@ -21,6 +15,12 @@ Object.defineProperty(exports, "getPublicPathConfig", {
     return _getPublicPathConfig.default;
   }
 });
+Object.defineProperty(exports, "splitChunks", {
+  enumerable: true,
+  get: function () {
+    return _splitChunks.default;
+  }
+});
 Object.defineProperty(exports, "templateParameters", {
   enumerable: true,
   get: function () {

package/lib/common/splitChunks.js

@@ -7,9 +7,11 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
+var _os = _interopRequireDefault(require("os"));
+
 var _utils = require("../utils");
 
-var _os = _interopRequireDefault(require("os"));
+var _testPattern = require("./testPattern");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -42,35 +44,69 @@ let isReact = module => {
 };
 
 let defaultChunks = {
-  'react.vendor': {
+  vendors: {
+    // picks up everything from node_modules as long as the sum of node modules is larger than minSize
+    //test: /[\\/]node_modules[\\/]((?!react).*)[\\/]/,
+    test: isVendor,
+    chunks: 'initial',
+    // chunks: 'all',
+    name: 'vendors',
+    priority: 19,
+    enforce: true // causes maxInitialRequests to be ignored, minSize still respected if specified in cacheGroup
+    // minSize: 30000 // use the default minSize
+
+  },
+  react: {
     name: 'react.vendor',
-    chunks: 'all',
-    minChunks: 1,
     test: isReact,
-    priority: -10
-  },
-  vendor: {
-    name: 'vendor',
     chunks: 'all',
     minChunks: 1,
-    test: isVendor,
-    priority: -10
+    priority: 10
   }
 };
 let customChunksConfig = {};
-customChunks.map(({
+customChunks.map((obj, index) => ({
+  name: obj.name,
+  pattern: obj.pattern,
+  minChunks: obj.minChunks || obj.size || 2,
+  rules: obj.rules,
+  chunks: obj.chunks || 'all',
+  priority: obj.priority || -10 * (index + 2),
+  enforce: obj.enforce || true,
+  maxSize: obj.maxSize || 0,
+  minSize: obj.minSize || 20000,
+  includeDepenency: obj.includeDepenency || false
+})).map(({
   name,
   pattern,
-  size = 2
-}, index) => customChunksConfig[name] = {
+  minChunks,
+  rules,
+  priority,
+  chunks = 'all',
+  enforce,
+  minSize,
+  maxSize,
+  includeDepenency
+}) => customChunksConfig[name] = {
   name,
-  test: new RegExp(isWindows ? pattern.replace(/\//g, '\\') : pattern),
-  chunks: 'all',
-  enforce: true,
-  minChunks: size,
-  priority: -10 * (index + 2)
+  test: rules ? m => {
+    const {
+      userRequest
+    } = m;
+    return (0, _testPattern.testPattern)(userRequest, rules); // return (
+    //   pkgs.some(p => isRelated(userRequest, p)) ||
+    //   (includeDepenency && isDependency(m, pkgs))
+    // );
+  } : new RegExp(isWindows ? pattern.replace(/\//g, '\\') : pattern),
+  chunks,
+  enforce,
+  minSize,
+  maxSize,
+  minChunks,
+  priority
 });
 var _default = {
+  minSize: 12000,
   cacheGroups: Object.assign({
     default: false,
     vendors: false

package/lib/common/splitChunks1.js

@@ -0,0 +1,95 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _os = _interopRequireDefault(require("os"));
+
+var _utils = require("../utils");
+
+var _testPattern = require("./testPattern");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+let isWindows = _os.default.platform().toLowerCase() === 'win32';
+let ps = _path.default.sep;
+let options = (0, _utils.getOptions)();
+let {
+  app: {
+    vendorExclude,
+    customChunks,
+    vendorInclude
+  }
+} = options;
+
+let isVendor = function isVendor(module) {
+  let {
+    userRequest
+  } = module;
+  let excludeList = ['script-loader', 'raw-loader', 'react', 'react-dom'];
+  excludeList = [...excludeList, ...vendorExclude];
+  return userRequest && (vendorInclude.some(item => userRequest.indexOf(item) !== -1) || userRequest.indexOf('node_modules') >= 0 && userRequest.endsWith('.css') === false && userRequest.endsWith('publicPathConfig.js') === false && excludeList.every(item => userRequest.indexOf(`node_modules${ps}${item}${ps}`) === -1));
+};
+
+let isReact = module => {
+  let {
+    userRequest
+  } = module;
+  let reactBundle = ['react', 'react-dom'];
+  return userRequest && reactBundle.some(pkg => userRequest.indexOf(`node_modules${ps}${pkg}${ps}`) >= 0);
+};
+
+let defaultChunks = {
+  'react.vendor': {
+    name: 'react.vendor',
+    chunks: 'all',
+    minChunks: 1,
+    test: isReact,
+    priority: -10
+  },
+  vendor: {
+    name: 'vendor',
+    chunks: 'initial',
+    minChunks: 1,
+    test: isVendor,
+    priority: -10
+  }
+};
+let customChunksConfig = {};
+customChunks.map(({
+  name,
+  pattern,
+  size = 2,
+  rules,
+  chunks = 'all',
+  includeDepenency
+}, index) => customChunksConfig[name] = {
+  name,
+  test: rules ? m => {
+    let {
+      userRequest
+    } = m;
+    let pkgs = rules;
+
+    if (!Array.isArray(rules)) {
+      pkgs = [rules];
+    }
+
+    return pkgs.some(p => (0, _testPattern.isRelated)(userRequest, p)) || includeDepenency && (0, _testPattern.isDependency)(m, pkgs);
+  } : new RegExp(isWindows ? pattern.replace(/\//g, '\\') : pattern),
+  chunks,
+  enforce: true,
+  minChunks: size,
+  priority: -10 * (index + 2)
+});
+var _default = {
+  cacheGroups: Object.assign({
+    default: false,
+    vendors: false
+  }, defaultChunks, customChunksConfig)
+};
+exports.default = _default;

package/lib/common/splitChunksNew.js

@@ -0,0 +1,129 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _os = _interopRequireDefault(require("os"));
+
+var _utils = require("../utils");
+
+var _testPattern = require("./testPattern");
+
+var _criteriaHandler = require("./criteriaHandler");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const isWindows = _os.default.platform().toLowerCase() === 'win32';
+const ps = _path.default.sep;
+const options = (0, _utils.getOptions)();
+const {
+  app: {
+    vendorExclude,
+    customChunks,
+    vendorInclude
+  }
+} = options;
+
+const canExclude = (m, excludeList) => {
+  let {
+    userRequest
+  } = m;
+  (0, _criteriaHandler.criteriaHandler)();
+  return (// if node_modules not  in path  then it is obviously not vendor
+    userRequest.indexOf('node_modules') === -1 || // for css currnetly  we use style so it is not vendor
+    userRequest.endsWith('.css') || //I don't know what  it is but not vendor (due to previous code)
+    userRequest.endsWith('publicPathConfig.js') || // this list given by user, So we need to exclude them
+    excludeList.some(item => (0, _testPattern.isRelatedPackage)(userRequest, item)) || // this is for exclude dependency module by excluded user
+    (0, _testPattern.isDependency)(m, excludeList)
+  );
+};
+
+let isVendor = function isVendor(module) {
+  let {
+    userRequest
+  } = module;
+  let excludeList = ['script-loader', 'raw-loader', 'react', 'react-dom'];
+  excludeList = [...excludeList, ...vendorExclude];
+  return userRequest && (vendorInclude.some(item => userRequest.indexOf(item) !== -1) || // (userRequest.indexOf('node_modules') >= 0 &&
+  //   userRequest.endsWith('.css') === false &&
+  //   userRequest.endsWith('publicPathConfig.js') === false &&
+  //   excludeList.every(
+  //     item => userRequest.indexOf(`node_modules${ps}${item}${ps}`) === -1
+  //   )))
+  !canExclude(module, excludeList));
+};
+
+let isReact = module => {
+  let {
+    userRequest
+  } = module;
+  let reactBundle = ['react', 'react-dom'];
+  return userRequest && reactBundle.some(pkg => userRequest.indexOf(`node_modules${ps}${pkg}${ps}`) >= 0);
+};
+
+let defaultChunks = {
+  'react.vendor': {
+    name: 'react.vendor',
+    chunks: 'all',
+    minChunks: 1,
+    test: isReact,
+    priority: -10
+  },
+  vendor: {
+    name: 'vendor',
+    chunks: 'all',
+    minChunks: 1,
+    test: isVendor,
+    priority: -10
+  }
+};
+let customChunksConfig = {};
+console.log(customChunks, 'hi');
+customChunks.map(({
+  name,
+  pattern,
+  size = 2,
+  rules,
+  chunks = 'all',
+  includeDepenency
+}, index) => customChunksConfig[name] = {
+  name,
+  test: rules ? m => {
+    let {
+      userRequest
+    } = m;
+    let pkgs = rules;
+
+    if (!Array.isArray(rules)) {
+      pkgs = [rules];
+    }
+
+    return pkgs.some(p => (0, _testPattern.isRelated)(userRequest, p)) || includeDepenency && (0, _testPattern.isDependency)(m, pkgs);
+  } : new RegExp(isWindows ? pattern.replace(/\//g, '\\') : pattern),
+  chunks,
+  enforce: true,
+  minChunks: size,
+  priority: -10 * (index + 2)
+});
+var _default = {
+  cacheGroups: Object.assign({
+    default: false,
+    vendors: false
+  }, defaultChunks, customChunksConfig)
+}; // supportapp / src / analytics / utils / dashboards / chartUI.js;
+// supportapp / src / modules / analytics / utils / chartTheme.js;
+// a = [
+//   'supportapp/src/analytics/utils/dashboards/chartUI.js',
+//   'supportapp/src/components/analytics/dashboarddetail/Chart/Chart.js',
+//   'supportapp/src/modules/analytics/utils/chartTheme.js',
+//   'supportapp/src/modules/analytics/utils/ChartUI.js',
+//   'supportapp/src/components/zia/zianotifications/ZiaNotificationDashBoard/ZiaNotificationChart.js',
+//   'supportapp/src/components/analytics/dashboarddetail/SegmentAudience/DayoftheWeek/DayoftheWeek.js',
+//   'supportapp/src/components/analytics/dashboarddetail/SegmentAudience/HouroftheDay/HouroftheDay.js'
+// ];
+
+exports.default = _default;

package/lib/common/testPattern.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isDependency = isDependency;
+exports.isRelatedPackage = exports.isRelated = void 0;
+exports.testPattern = testPattern;
+
+var _express = require("express");
+
+var _path = require("path");
+
+// in our development we only use windows, mac and linux
+const isWindows = _path.sep !== '/'; // this function  will  return true if pattern matched
+
+function _testPattern(req, pattern) {
+  let modifyedPattern = pattern;
+
+  if (/[*.$^]/.test(modifyedPattern)) {
+    if (isWindows) {
+      // modifyedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
+      modifyedPattern = modifyedPattern.replace(/\//g, '\\\\');
+    }
+
+    modifyedPattern = modifyedPattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
+    const re = new RegExp(modifyedPattern);
+    return re.test(req);
+  }
+
+  if (isWindows) {
+    // modifyedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
+    modifyedPattern = modifyedPattern.replace(/\//g, '\\');
+  }
+
+  return req.indexOf(modifyedPattern) !== -1;
+}
+
+function testPattern(req, pattern) {
+  if (!req || !pattern) {
+    return false;
+  }
+
+  if (Array.isArray(pattern)) {
+    // eslint-disable-next-line no-unused-vars
+    return pattern.every(p => testPattern(req, p));
+  }
+
+  if (pattern[0] === '!') {
+    return !_testPattern(req, pattern.slice(1));
+  }
+
+  return _testPattern(req, pattern);
+}
+
+const isRelated = (req, item) => req && req.indexOf(item) !== -1; // export const isRelated = (req, item) => testPattern(req, item);
+
+
+exports.isRelated = isRelated;
+
+const isRelatedPackage = (req, item) => isRelated(req, `node_modules${_path.sep}${item}${_path.sep}`) !== -1; // export const isRelated = (req, item) => testPattern(req, item);
+
+
+exports.isRelatedPackage = isRelatedPackage;
+
+function isDependency(m, excludeList) {
+  // let reasons = m.reasons.map(r => r.module.userRequest);
+  // m.reasons.some(r => !r.module || !r.module.userRequest) && console.log(m.reasons);
+  return m.reasons.some(r => excludeList.some(item => r.module && isRelated(r.module.userRequest, item)));
+} // export function queryHandler(conditions, pattern) {
+// }

package/lib/configs/jest.config.js

@@ -2,9 +2,17 @@
 
 var _path = _interopRequireDefault(require("path"));
 
+var _libAlias = require("./libAlias");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-let appPath = process.cwd();
+let appPath = process.cwd(); //   '^@root(.*)$': '<rootDir>/src$1',
+// '^@components(.*)$': '<rootDir>/src/components$1',
+
+let moduleNameMapper = Object.keys(_libAlias.libAlias).reduce((previousValue, key) => {
+  previousValue[`^${key}(.*)$`] = `${_libAlias.libAlias[key]}$1`;
+  return previousValue;
+}, {});
 let commonConfig = {
   coverageReporters: ['json', 'html', 'json-summary', 'text'],
   collectCoverage: true,
@@ -14,10 +22,11 @@ let commonConfig = {
     '^.+\\.css$': _path.default.resolve(__dirname, '..', 'jest', 'preProcessors', 'cssPreprocessor.js'),
     '^(?!.*\\.(js|jsx|css|json)$)': _path.default.resolve(__dirname, '..', 'jest', 'preProcessors', 'otherFilesPreprocessor.js')
   },
-  moduleNameMapper: {
+  moduleNameMapper: { ...moduleNameMapper,
     '\\.(css|less)$': 'identity-obj-proxy'
   },
-  transformIgnorePatterns: ['/node_modules.*?.js$'],
+  transformIgnorePatterns: ['/node_modules/(?!(@zohodesk)/)'],
+  // transformIgnorePatterns: ['/node_modules.*?.js$'],
   moduleFileExtensions: ['js'],
   setupFiles: [_path.default.resolve(appPath, '__testUtils__', 'globals.js'), _path.default.resolve(__dirname, '..', 'jest', 'setup.js')],
   globals: {

package/lib/configs/libAlias.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.libAlias = void 0;
+// the reason for alias at the time was code tree shaking
+// tree shaking was most compactable with ES module system
+// FIXME: But there is a posiblity when these  package  does not have lib,
+//  app will work because of alias, But may be jest won't work because of not alais
+//  So need to think about use alais in jest 
+const libAlias = {
+  '@zohodesk/components/lib': '@zohodesk/components/es',
+  // '@zohodesk/zc-custom/lib': '@zohodesk/zc-custom/es',
+  '@zohodesk/dot/lib': '@zohodesk/dot/es',
+  '@zohodesk/i18n/lib': '@zohodesk/i18n/es',
+  '@zohodesk/icons/lib': '@zohodesk/icons/es',
+  '@zohodesk/normalizer/lib': '@zohodesk/normalizer/es',
+  '@zohodesk/perf-components/lib': '@zohodesk/perf-components/es',
+  '@zohodesk/perf-middleware/lib': '@zohodesk/perf-middleware/es',
+  '@zohodesk/permissions/lib': '@zohodesk/permissions/es',
+  '@zohodesk/platform-middleware/lib': '@zohodesk/platform-middleware/es',
+  '@zohodesk/react-dnd/lib': '@zohodesk/react-dnd/es',
+  '@zohodesk/router-middleware/lib': '@zohodesk/router-middleware/es',
+  '@zohodesk/storage/lib': '@zohodesk/storage/es',
+  '@zohodesk/svg/lib': '@zohodesk/svg/es',
+  '@zohodesk/timetracker/lib': '@zohodesk/timetracker/es',
+  '@zohodesk/variables/lib': '@zohodesk/variables/es',
+  '@zohodesk/virtualizer/lib': '@zohodesk/virtualizer/es'
+};
+exports.libAlias = libAlias;

package/lib/configs/webpack.dev.config.js

@@ -10,6 +10,8 @@ var _pluginUtils = require("../pluginUtils");
 
 var _loaderUtils = require("../loaderUtils");
 
+var _libAlias = require("./libAlias");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 let options = (0, _utils.getOptions)();
@@ -55,6 +57,9 @@ module.exports = {
   entry: (0, _common.getEntries)(options, 'dev'),
   devtool: sourcemap,
   mode: 'development',
+  // watchOptions: {
+  //   ignored: /node_modules.(?!@zohodesk)/
+  // },
   output,
   stats: options.app.disableWatch ? 'errors-only' : {
     children: false
@@ -127,25 +132,7 @@ module.exports = {
   },
   resolve: {
     modules: [_path.default.resolve(__dirname, '..', '..', 'node_modules'), 'node_modules'],
-    alias: disableES5Transpile ? {
-      '@zohodesk/components/lib': '@zohodesk/components/es',
-      // "@zohodesk/zc-custom/lib": "@zohodesk/zc-custom/es",
-      '@zohodesk/dot/lib': '@zohodesk/dot/es',
-      '@zohodesk/i18n/lib': '@zohodesk/i18n/es',
-      '@zohodesk/icons/lib': '@zohodesk/icons/es',
-      '@zohodesk/normalizer/lib': '@zohodesk/normalizer/es',
-      '@zohodesk/perf-components/lib': '@zohodesk/perf-components/es',
-      '@zohodesk/perf-middleware/lib': '@zohodesk/perf-middleware/es',
-      '@zohodesk/permissions/lib': '@zohodesk/permissions/es',
-      '@zohodesk/platform-middleware/lib': '@zohodesk/platform-middleware/es',
-      '@zohodesk/react-dnd/lib': '@zohodesk/react-dnd/es',
-      '@zohodesk/router-middleware/lib': '@zohodesk/router-middleware/es',
-      '@zohodesk/storage/lib': '@zohodesk/storage/es',
-      '@zohodesk/svg/lib': '@zohodesk/svg/es',
-      '@zohodesk/timetracker/lib': '@zohodesk/timetracker/es',
-      '@zohodesk/variables/lib': '@zohodesk/variables/es',
-      '@zohodesk/virtualizer/lib': '@zohodesk/virtualizer/es'
-    } : {}
+    alias: disableES5Transpile ? _libAlias.libAlias : {}
   },
   resolveLoader: {
     modules: [_path.default.resolve(__dirname, '..', '..', 'node_modules'), 'node_modules']