@zohodesk/react-cli 1.1.4-exp.2 → 1.1.5-exp.1

package/README.md

@@ -44,6 +44,19 @@ Now to run app
 
 # Change Logs
 
+# 1.1.5
+
+**Issue Fix**
+
+- include pattern fix for variable converter plugin fixed
+
+# 1.1.4
+
+**Issue Fix**
+- global install react-cli spawnSync Error fix
+- `0px` variable value conversion issue fixed
+- pattern exclude for postcss plugins case fixed
+
 # 1.1.2
 
 **Issue Fix**

package/lib/common/splitChunks.js

@@ -22,15 +22,20 @@ let {
   app: {
     vendorExclude,
     customChunks,
-    vendorInclude
+    vendorInclude,
+    effectiveChunkSplitting
   }
 } = options;
+let reactBundle = ['react', 'react-dom', 'react-redux', 'react-transition-group', 'scheduler', // what is scheduler
+'prop-types', // why protypes needed
+'use-subscription' // 'what is it'
+];
 
 let isVendor = function isVendor(module) {
   let {
     userRequest
   } = module;
-  let excludeList = ['script-loader', 'raw-loader', 'react', 'react-dom'];
+  let excludeList = ['script-loader', 'raw-loader', ...reactBundle];
   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));
 };
@@ -39,11 +44,13 @@ 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 = {
+let baseSplitChunkConfig = {
+  minSize: 12000
+};
+let specificCacheGroupConfig = {
   'react.vendor': {
     name: 'react.vendor',
     chunks: 'all',
@@ -116,11 +123,21 @@ customChunks.map((obj, index) => ({
 
   return customChunksConfig[name] = obj;
 });
-var _default = {
-  minSize: 12000,
+const isEnableChunkSplitting = effectiveChunkSplitting.enable;
+
+if (isEnableChunkSplitting) {
+  const config = require(_path.default.join(process.cwd(), effectiveChunkSplitting.configFilePath));
+
+  console.log('config', config);
+  specificCacheGroupConfig = Object.assign(specificCacheGroupConfig, config.getAdditionalCacheGroupConfig());
+  baseSplitChunkConfig = Object.assign(baseSplitChunkConfig, config.getAdditionalBaseChunkSplitConfig());
+}
+
+const splitChunkConfig = { ...baseSplitChunkConfig,
   cacheGroups: Object.assign({
     default: false,
     vendors: false
-  }, defaultChunks, customChunksConfig)
+  }, specificCacheGroupConfig, customChunksConfig)
 };
+var _default = splitChunkConfig;
 exports.default = _default;

package/lib/configs/resolvers.js

@@ -33,7 +33,7 @@ function moduleResolver(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 +45,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/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',

package/lib/loaderUtils/getCSSLoaders.js

@@ -139,13 +139,15 @@ const getCSSLoaders = optionsObj => {
         
         [ postcssPlugins that are implemented ]
             */
-        postcssPlugins = (0, _fileHandling.isFileNameMatchingPattern)({
+        //  console.log(params.resourcePath);
+        //  console.log(postcssPlugins);
+        const finalpostcssPlugins = (0, _fileHandling.isFileNameMatchingPattern)({
           filename: params.resourcePath,
           filterObject: patterns,
           plugins: postcssPlugins
         }); // postcssPlugins that are allowed
 
-        return postcssPlugins.length > 0 ? postcssPlugins : [require('../postcss-plugins/EmptyPlugin')()];
+        return finalpostcssPlugins.length > 0 ? finalpostcssPlugins : [require('../postcss-plugins/EmptyPlugin')()];
       }
     }
   } : null, plugins.composeMinification ? {

package/lib/plugins/utils/fileHandling.js

@@ -50,34 +50,20 @@ function isFileNameMatchingPattern({
   filterObject,
   plugins
 }) {
-  const finalPlugins = []; // console.log(rootDir);
-  // const regex = `^(.+?)${rootDir}?\\\\`;
-
-  const newFilename = path.relative(path.parse(process.cwd()).base, filename); //windowsModificationFile(filename).replace(
-  //   new RegExp(regex, 'gi'),
-  //   ''
-  // );
-  // path.relative('supportapp', 'd:\')
-
+  const finalPlugins = [];
   Object.keys(filterObject).forEach(key => {
     plugins.forEach(x => {
-      // console.log(key, x.postcssPlugin);
       if (aliasNames[key] === x.postcssPlugin) {
         const ig = (0, _ignore.default)({
           allowRelativePaths: true
-        }).add(filterObject[key]); // console.log(key, filterObject[key], ig);
+        }).add(filterObject[key]);
 
-        if (ig.ignores(newFilename)) {
-          // console.log(newFilename);
+        if (ig.ignores(filename)) {
           finalPlugins.push(x);
         }
       }
     });
   }); // console.log(filename);
-  // console.log(finalPlugins);
-  // console.log(
-  //   '----------------------------------------------------------------------'
-  // );
 
   return finalPlugins; // console.log(filename, filterObject);
 }

package/lib/postcss-plugins/variableModificationPlugin/index.js

@@ -107,6 +107,10 @@ const singleConvertor = (value, changeVal, details, range) => {
   }
 
   if (getNumericValue(value) >= range.start && getNumericValue(value) <= range.end || getNumericValue(value) === 0) {
+    if (value.trim() === '0px') {
+      return '0';
+    }
+
     let retVal = value.replace(/(\d+)px/gi, changeVal.replace('$$', '$1'));
 
     if (/^-var/.test(retVal)) {
@@ -161,6 +165,7 @@ module.exports = {
     });
     const valRegex = new RegExp(regValStr, 'gi');
     return rootOriginal => {
+      // console.log(rootOriginal.source.input.from, 'passed through variable Plugin');
       rootOriginal.walkRules(rule => {
         // rule.nodes[-1] = {}
         // need map, forEach fine less memory

package/lib/schemas/index.js

@@ -348,6 +348,10 @@ var _default = {
     sourcemap: {
       cli: 'source_map',
       value: 'cheap-eval-source-map'
+    },
+    effectiveChunkSplitting: {
+      enable: false,
+      configFilePath: ''
     }
   },
   docs: {

package/lib/servers/getCliPath.js

@@ -5,19 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getCliPath = getCliPath;
 
-var _path = _interopRequireDefault(require("path"));
+var _path = require("path");
 
 var _os = require("os");
 
 var _fs = require("fs");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _constants = require("../constants");
 
-const appPath = process.cwd();
-const isNodeModuleUnderAppFolder = __dirname.indexOf(appPath) !== -1;
 const isWindows = (0, _os.platform)().toLowerCase() === 'win32';
 
-const _getCliPath = !isNodeModuleUnderAppFolder ? libName => _path.default.join(__dirname, '..', '..', 'node_modules', '.bin', libName) : libName => libName;
+const _getCliPath = libName => (0, _path.join)(_constants.cliNodeModulesPath, '.bin', libName);
 
 const suffixExt = isWindows ? '.cmd' : '';
 

package/lib/servers/requireLocalOrGlobal.js

@@ -25,7 +25,7 @@ function requireLocalOrGlobal(moduleName, opts = {}) {
   const {
     local = true
   } = opts;
-  const isRelativePath = moduleName === '.'; // NOTE: if starts with . then it only mean local
+  const isRelativePath = moduleName[0] === '.'; // NOTE: if starts with . then it only mean local
 
   if (isRelativePath) {
     global = false;

package/lib/utils/getOptions.js

@@ -183,14 +183,20 @@ function deprecationSupport(options) {
   Object.keys(options.app.patterns).forEach(key => {
     if (options.app.exclude[key] && options.app.patterns[key].length === 0) {
       let tempArr = options.app.exclude[key];
-      tempArr = tempArr.map(x => `!${x}`);
+      tempArr = tempArr.map(x => {
+        x = x.replace(/\//gi, _path.default.sep);
+        return `!**${x[0] === _path.default.sep || x[0] === '@' ? '' : _path.default.sep}${x}${x[x.length - 1] === _path.default.sep ? '' : _path.default.sep}**`;
+      });
       options.app.patterns[key] = tempArr;
     }
   });
   Object.keys(options.docs.patterns).forEach(key => {
     if (options.docs.exclude[key] && options.docs.patterns[key].length === 0) {
       let tempArr = options.docs.exclude[key];
-      tempArr = tempArr.map(x => `!${x}`);
+      tempArr = tempArr.map(x => {
+        x = x.replace(/\//gi, _path.default.sep);
+        return `!**${x[0] === _path.default.sep || x[0] === '@' ? '' : _path.default.sep}${x}${x[x.length - 1] === _path.default.sep ? '' : _path.default.sep}**`;
+      });
       options.docs.patterns[key] = tempArr;
     }
   });

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/react-cli",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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