@zohodesk/react-cli 1.1.14-exp.2 → 1.1.14-kubernetes

package/lib/common/splitChunks.js

@@ -15,53 +15,35 @@ var _testPattern = require("./testPattern");
 
 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 {
+let isWindows = _os.default.platform().toLowerCase() === 'win32';
+let ps = _path.default.sep;
+let options = (0, _utils.getOptions)();
+let {
   app: {
     vendorExclude,
     customChunks,
-    vendorInclude,
-    customChunksBaseConfig
+    vendorInclude
   }
 } = options;
-const reactBundleIncludeList = ['react', 'react-dom', 'react-redux', 'react-transition-group', 'scheduler', 'prop-types'];
-const vendorExcludeList = ['script-loader', 'raw-loader', ...reactBundleIncludeList, ...vendorExclude.map(vendorPath => vendorPath.replace(/[/\\]/g, _path.default.sep))];
-const vendorIncludeList = [...vendorInclude].map(vendorPath => vendorPath.replace(/[/\\]/g, _path.default.sep));
 
-const isVendor = function isVendor(module) {
-  const {
+let isVendor = function isVendor(module) {
+  let {
     userRequest
   } = module;
-  return userRequest && (vendorIncludeList.some(item => userRequest.indexOf(item) !== -1) || userRequest.indexOf('node_modules') >= 0 && userRequest.endsWith('.css') === false && userRequest.endsWith('publicPathConfig.js') === false && vendorExcludeList.every(item => userRequest.indexOf(`node_modules${ps}${item}${ps}`) === -1));
+  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));
 };
 
-const isReact = module => {
-  const {
+let isReact = module => {
+  let {
     userRequest
   } = module;
-  return userRequest && reactBundleIncludeList.some(pkg => userRequest.indexOf(`node_modules${ps}${pkg}${ps}`) >= 0);
+  let reactBundle = ['react', 'react-dom'];
+  return userRequest && reactBundle.some(pkg => userRequest.indexOf(`node_modules${ps}${pkg}${ps}`) >= 0);
 };
 
-function rulesMatcher(pattern) {
-  if (typeof pattern === 'function') {
-    return pattern;
-  }
-
-  if (Array.isArray(pattern)) {
-    return ({
-      userRequest
-    }) => (0, _testPattern.testPattern)(userRequest, pattern);
-  }
-
-  return new RegExp(isWindows ? pattern.replace(/\//g, '\\') : pattern);
-}
-
-const baseSplitChunkConfig = Object.assign({
-  minSize: 15000
-}, customChunksBaseConfig);
-const specificCacheGroupConfig = {
+let defaultChunks = {
   'react.vendor': {
     name: 'react.vendor',
     chunks: 'all',
@@ -81,35 +63,45 @@ const specificCacheGroupConfig = {
     priority: -10
   }
 };
-const customChunksConfig = {};
+let customChunksConfig = {};
 customChunks.map((obj, index) => ({
   name: obj.name,
-  chunks: obj.chunks || 'all',
-  minChunks: obj.minChunks || obj.size || 2,
   pattern: obj.pattern,
+  minChunks: obj.minChunks || obj.size || 2,
+  rules: obj.rules,
+  // includeDepenency: obj.includeDepenency || false,
   priority: obj.priority || -10 * (index + 2),
-  enforce: obj.enforce,
-  minSize: obj.minSize,
-  // || 20000,
+  enforce: obj.enforce || true,
   maxSize: obj.maxSize,
   // || 0,
-  reuseExistingChunk: obj.reuseExistingChunk,
-  cacheGroupName: obj.cacheGroupName || obj.name
-})).forEach(({
+  minSize: obj.minSize,
+  // || 20000,
+  chunks: obj.chunks || 'all'
+})).map(({
   name,
-  chunks = 'all',
-  minChunks,
   pattern,
+  minChunks,
+  rules,
   priority,
+  // includeDepenency,
   enforce,
   minSize,
   maxSize,
-  reuseExistingChunk,
-  cacheGroupName
+  chunks = 'all'
 }) => {
-  const obj = {
-    test: rulesMatcher(pattern),
+  let obj = {
+    name,
+    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,
     minChunks,
     priority
   };
@@ -122,25 +114,13 @@ customChunks.map((obj, index) => ({
     obj.maxSize = maxSize;
   }
 
-  if (enforce !== false) {
-    obj.enforce = true;
-  }
-
-  if (name !== undefined) {
-    obj.name = name;
-  }
-
-  if (reuseExistingChunk !== undefined) {
-    obj.reuseExistingChunk = reuseExistingChunk;
-  }
-
-  customChunksConfig[cacheGroupName] = obj;
+  return customChunksConfig[name] = obj;
 });
-const splitChunkConfig = Object.assign({}, baseSplitChunkConfig, {
+var _default = {
+  minSize: 12000,
   cacheGroups: Object.assign({
     default: false,
     vendors: false
-  }, specificCacheGroupConfig, customChunksConfig)
-});
-var _default = splitChunkConfig;
+  }, defaultChunks, customChunksConfig)
+};
 exports.default = _default;

package/lib/common/testPattern.js

@@ -13,25 +13,25 @@ var _path = require("path");
 const isWindows = _path.sep !== '/'; // this function  will  return true if pattern matched
 
 function _testPattern(req, pattern) {
-  let modifiedPattern = pattern;
+  let modifyedPattern = pattern;
 
-  if (/[*.$^]/.test(modifiedPattern)) {
+  if (/[*.$^]/.test(modifyedPattern)) {
     if (isWindows) {
-      // modifiedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
-      modifiedPattern = modifiedPattern.replace(/\//g, '\\\\');
+      // modifyedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
+      modifyedPattern = modifyedPattern.replace(/\//g, '\\\\');
     }
 
-    modifiedPattern = modifiedPattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
-    const re = new RegExp(modifiedPattern);
+    modifyedPattern = modifyedPattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
+    const re = new RegExp(modifyedPattern);
     return re.test(req);
   }
 
   if (isWindows) {
-    // modifiedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
-    modifiedPattern = modifiedPattern.replace(/\//g, '\\');
+    // modifyedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
+    modifyedPattern = modifyedPattern.replace(/\//g, '\\');
   }
 
-  return req.indexOf(modifiedPattern) !== -1;
+  return req.indexOf(modifyedPattern) !== -1;
 }
 
 function testPattern(req, pattern) {
@@ -62,6 +62,8 @@ const isRelatedPackage = (req, item) => isRelated(req, `node_modules${_path.sep}
 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/common/valueReplacer.js

@@ -32,9 +32,11 @@ if (!_fs.default.existsSync(dist)) {
 }
 
 (0, _folderIterator.default)(src, dist, docopy ? false : ['.css'], false, (fromPath, toPath) => {
-  const css = _fs.default.readFileSync(fromPath);
+  //console.log({ fromPath: fromPath, toPath: toPath });
+  let css = _fs.default.readFileSync(fromPath);
 
   if (docopy && !fromPath.endsWith('.css')) {
+    //console.log(toPath,'....');
     _fs.default.writeFileSync(toPath, css);
 
     return;

package/lib/configs/resolvers.js

@@ -8,10 +8,6 @@ exports.moduleResolver = moduleResolver;
 
 var _constants = require("../constants");
 
-var _logger = require("../logger");
-
-var _requireLocalOrGlobal = require("../servers/requireLocalOrGlobal");
-
 var _libAlias = require("./libAlias");
 
 var _client_packages_group = require("@zohodesk/client_packages_group");
@@ -21,19 +17,12 @@ function moduleResolver(options) {
     moduleResolvePath,
     disableES5Transpile
   } = options.app;
-  let required = moduleResolvePath && (0, _requireLocalOrGlobal.requireLocal)(moduleResolvePath);
-
-  if (!required) {
-    required = (0, _requireLocalOrGlobal.requireGlobal)('@zohodesk/client_packages_group');
-
-    if (required) {
-      (0, _logger.messageLogger)('global `@zohodesk/client_packages_group` package taken as client_packages_group');
-    }
-  }
+  const nodeModulesPath = moduleResolvePath ? require(require.resolve(moduleResolvePath, {
+    paths: [options.cwd]
+  })).nodeModulesPath : _client_packages_group.nodeModulesPath; // const {unstableDepsInverse} = options;
 
-  const nodeModulesPath = required ? required.nodeModulesPath : _client_packages_group.nodeModulesPath;
   return {
-    modules: [nodeModulesPath, _constants.cliNodeModulesPath, 'node_modules'].filter(Boolean),
+    modules: [nodeModulesPath, _constants.cliNodemodulesPath, 'node_modules'].filter(Boolean),
     alias: disableES5Transpile ? _libAlias.libAlias : {} // alias: { ...libAlias, ...clientDependenies }
 
   };
@@ -45,7 +34,7 @@ function loaderResolver(options) {
     unstableDepsInverse
   } = options;
   return {
-    modules: unstableDepsInverse ? ['node_modules', _constants.cliNodeModulesPath] : [_constants.cliNodeModulesPath, 'node_modules'] // alias:  libAlias
+    modules: unstableDepsInverse ? ['node_modules', _constants.cliNodemodulesPath] : [_constants.cliNodemodulesPath, 'node_modules'] // alias:  libAlias
 
   };
 }

package/lib/configs/webpack.css.umd.config.js

@@ -23,8 +23,7 @@ let {
       folder,
       publicPath,
       cssHashSelectors,
-      classNamePrefix,
-      customClassNamePrefix
+      classNamePrefix
     }
   },
   packageVersion
@@ -84,7 +83,7 @@ module.exports = {
         loader: 'css-loader',
         options: {
           modules: {
-            getLocalIdent: (0, _cssClassNameGenerate.default)(cssUniqueness, cssHashSelectors, classNamePrefix, customClassNamePrefix)
+            getLocalIdent: (0, _cssClassNameGenerate.default)(cssUniqueness, cssHashSelectors, classNamePrefix)
           }
         }
       }]

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

@@ -25,12 +25,10 @@ const {
     outputFolder,
     plugins,
     exclude,
-    patterns,
     mediaQueryHoverActiveString,
     cssVariableReplacementConfig,
     selectorWeightConfig,
     cssUniqueness,
-    customClassNamePrefix,
     seperateCssModules,
     changeRuntimeChunkChar,
     // we are going to use this for fonts file name collide in issue in devmode
@@ -40,9 +38,7 @@ const {
     selectorReplace,
     devConsoleExculde,
     sourcemap,
-    crossorigin,
-    postCssPluginOrder,
-    externals
+    crossorigin
   }
 } = options;
 const {
@@ -106,32 +102,26 @@ module.exports = {
       use: (0, _loaderUtils.getCSSLoaders)({
         plugins,
         exclude,
-        patterns,
         mediaQueryHoverActiveString,
         cssVariableReplacementConfig,
         selectorWeightConfig,
-        customClassNamePrefix,
         classNameBlob: '[local]',
         cssUniqueness: false,
-        selectorReplace: null,
-        postCssPluginOrder
+        selectorReplace: null
       })
     } : null, {
       test: seperateCssModules ? /\.module\.css$/ : /(\.module)?\.css$/,
       use: (0, _loaderUtils.getCSSLoaders)({
         plugins,
         exclude,
-        patterns,
         mediaQueryHoverActiveString,
         cssVariableReplacementConfig,
         selectorWeightConfig,
         classNameBlob: null,
         cssUniqueness,
-        customClassNamePrefix,
         selectorReplace,
         cssHashSelectors,
-        classNamePrefix,
-        postCssPluginOrder
+        classNamePrefix
       })
     }, (0, _configsAssetsLoaders.configImageLoader)(nameTemplate), (0, _configsAssetsLoaders.configFontLoader)(nameTemplate), (0, _configsAssetsLoaders.configSVGLoader)(nameTemplate), (0, _configsAssetsLoaders.configVideoLoader)(nameTemplate), (0, _configsAssetsLoaders.configAudioLoader)(nameTemplate), {
       test: /\.tmpl$/,
@@ -152,9 +142,9 @@ module.exports = {
       }
     }].filter(Boolean)
   },
-  externals: Object.assign({
+  externals: {
     ZC: '$ZC'
-  }, externals),
+  },
   resolve: (0, _resolvers.moduleResolver)(options),
   resolveLoader: (0, _resolvers.loaderResolver)(options)
 };

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

@@ -20,17 +20,13 @@ const {
     componentFolder,
     enableChunkHash,
     cssUniqueness,
-    customClassNamePrefix,
     plugins,
     exclude,
-    patterns,
     mediaQueryHoverActiveString,
     cssVariableReplacementConfig,
     selectorWeightConfig,
     cssHashSelectors,
-    classNamePrefix,
-    selectorReplace,
-    postCssPluginOrder
+    classNamePrefix
   },
   app: {
     folder
@@ -81,17 +77,14 @@ module.exports = isSSTest => ({
       use: (0, _loaderUtils.getCSSLoaders)({
         plugins,
         exclude,
-        patterns,
         mediaQueryHoverActiveString,
         cssVariableReplacementConfig,
         selectorWeightConfig,
         classNameBlob: false,
         cssUniqueness,
-        customClassNamePrefix,
-        selectorReplace,
+        selectorReplace: null,
         cssHashSelectors,
-        classNamePrefix,
-        postCssPluginOrder
+        classNamePrefix
       })
     }, (0, _configsAssetsLoaders.configImageLoader)(nameTemplate), (0, _configsAssetsLoaders.configFontLoader)(nameTemplate), (0, _configsAssetsLoaders.configSVGLoader)(nameTemplate), (0, _configsAssetsLoaders.configAudioLoader)(nameTemplate), (0, _configsAssetsLoaders.configVideoLoader)(nameTemplate), {
       test: /\.html$/,
@@ -102,10 +95,6 @@ module.exports = isSSTest => ({
           interpolate: 'require'
         }
       }
-    }, {
-      test: /\.mjs$/,
-      include: /node_modules/,
-      type: 'javascript/auto'
     }, {
       test: /\.tmpl$/,
       use: [{

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

@@ -19,17 +19,14 @@ const {
   docs: {
     componentFolder,
     cssUniqueness,
-    customClassNamePrefix,
     plugins,
     exclude,
-    patterns,
     mediaQueryHoverActiveString,
     cssVariableReplacementConfig,
     selectorWeightConfig,
     cssHashSelectors,
     enableChunkHash,
-    classNamePrefix,
-    postCssPluginOrder
+    classNamePrefix
   },
   app: {
     folder
@@ -80,17 +77,14 @@ module.exports = {
       use: (0, _loaderUtils.getCSSLoaders)({
         plugins,
         exclude,
-        patterns,
         mediaQueryHoverActiveString,
         cssVariableReplacementConfig,
         selectorWeightConfig,
         classNameBlob: false,
         cssUniqueness,
-        customClassNamePrefix,
         selectorReplace: null,
         cssHashSelectors,
-        classNamePrefix,
-        postCssPluginOrder
+        classNamePrefix
       })
     }, (0, _configsAssetsLoaders.configImageLoader)(nameTemplate), (0, _configsAssetsLoaders.configFontLoader)(nameTemplate), (0, _configsAssetsLoaders.configSVGLoader)(nameTemplate), (0, _configsAssetsLoaders.configAudioLoader)(nameTemplate), (0, _configsAssetsLoaders.configVideoLoader)(nameTemplate), {
       test: /\.html$/,

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

@@ -29,12 +29,10 @@ const {
     server,
     plugins,
     exclude,
-    patterns,
     mediaQueryHoverActiveString,
     cssVariableReplacementConfig,
     selectorWeightConfig,
     cssUniqueness,
-    customClassNamePrefix,
     server: {
       mode
     },
@@ -45,9 +43,7 @@ const {
     selectorReplace,
     removePropTypes,
     devConsoleExculde,
-    crossorigin,
-    postCssPluginOrder,
-    externals
+    crossorigin
   }
 } = options;
 let {
@@ -157,32 +153,26 @@ module.exports = {
       use: (0, _loaderUtils.getCSSLoaders)({
         plugins,
         exclude,
-        patterns,
         cssVariableReplacementConfig,
         selectorWeightConfig,
         mediaQueryHoverActiveString,
         classNameBlob: '[local]',
         cssUniqueness: false,
-        customClassNamePrefix,
-        selectorReplace: null,
-        postCssPluginOrder
+        selectorReplace: null
       })
     } : null, {
       test: seperateCssModules ? /\.module\.css$/ : /\.css$/,
       use: (0, _loaderUtils.getCSSLoaders)({
         plugins,
         exclude,
-        patterns,
         mediaQueryHoverActiveString,
         cssVariableReplacementConfig,
         selectorWeightConfig,
         classNameBlob: false,
         cssUniqueness,
-        customClassNamePrefix,
         selectorReplace,
         cssHashSelectors,
-        classNamePrefix,
-        postCssPluginOrder
+        classNamePrefix
       })
     }, {
       test: /\.jpe?g$|\.gif$|\.png$/,
@@ -241,9 +231,9 @@ module.exports = {
       }
     }].filter(Boolean)
   },
-  externals: Object.assign(externals, {
+  externals: {
     ZC: '$ZC'
-  }),
+  },
   resolve: (0, _resolvers.moduleResolver)(options),
   resolveLoader: (0, _resolvers.loaderResolver)(options)
 };

package/lib/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.cliRootPath = exports.cliNodeModulesPath = exports.appPath = exports.CONFIG_ROOT = exports.BASE_CONFIG_KEY = void 0;
+exports.cliRootPath = exports.cliNodemodulesPath = exports.appPath = exports.CONFIG_ROOT = exports.BASE_CONFIG_KEY = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -18,10 +18,10 @@ exports.cliRootPath = cliRootPath;
 const CONFIG_ROOT = 'react-cli';
 exports.CONFIG_ROOT = CONFIG_ROOT;
 
-const cliNodeModulesPath = _path.default.resolve(cliRootPath, 'node_modules'); // export const babelrcPath = join(cliRootPath, '.babelrc');
+const cliNodemodulesPath = _path.default.resolve(cliRootPath, 'node_modules'); // export const babelrcPath = join(cliRootPath, '.babelrc');
 
 
-exports.cliNodeModulesPath = cliNodeModulesPath;
+exports.cliNodemodulesPath = cliNodemodulesPath;
 const appPath = process.cwd(); // export const appInitialHTMLTemplatePath = path.join(
 //   process.cwd(),
 //   'src',