@zohodesk/react-cli 1.1.8 → 1.1.9

package/lib/plugins/ResourceHintsPlugin.js

@@ -12,14 +12,21 @@ const {
 const pluginName = 'prefetch-preload-chunk-plugin';
 
 class ResourceHintsPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+
   apply(compiler) {
     compiler.hooks.thisCompilation.tap(pluginName, ({
       mainTemplate
     }) => {
       mainTemplate.hooks.requireExtensions.tap(pluginName, (source, chunk, hash) => {
+        const {
+          allowPrefetchingMultipleChunks
+        } = this.options;
         const idNameMap = chunk.getChunkMaps().name;
         const nameIdMap = {};
-        let needsMap = false;
+        let needsMap = allowPrefetchingMultipleChunks;
 
         for (const key in idNameMap) {
           if (Object.prototype.hasOwnProperty.call(idNameMap, key)) {
@@ -32,7 +39,10 @@ class ResourceHintsPlugin {
           }
         }
 
-        return Template.asString([source, '', `${mainTemplate.requireFn}.getChunkId = function getChunkId(chunkId) {`, Template.indent((needsMap ? [`chunkId = ${JSON.stringify(nameIdMap)}[chunkId]||chunkId;`] : []).concat(['return chunkId;'])), '}', `// Prefetch a chunk (${pluginName})`, `${mainTemplate.requireFn}.pfc = function prefetchChunk(chunkId) {`, Template.indent([`chunkId = ${mainTemplate.requireFn}.getChunkId(chunkId)`, `${mainTemplate.requireFn}.e(chunkId);`]), '};',
+        return Template.asString([source, Template.indent([`const nameToChunkIdMap = ${JSON.stringify(needsMap ? nameIdMap : {})};`, 'const chunkNames = Object.keys(nameToChunkIdMap);']), `${mainTemplate.requireFn}.getChunkIds = function getChunkIds(chunkId) {`, Template.indent([allowPrefetchingMultipleChunks ? `const isRegExAsChunkId = chunkId instanceof RegExp; 
+                return isRegExAsChunkId ? chunkNames.filter(chunkName => chunkId.test(chunkName)).map(chunkName => nameToChunkIdMap[chunkName]) : [nameToChunkIdMap[chunkId] || chunkId];` : needsMap ? 'return [nameToChunkIdMap[chunkId] || chunkId];' : 'return [chunkId];']), '}', `// Prefetch a chunk (${pluginName})`, `${mainTemplate.requireFn}.pfc = function prefetchChunk(chunkId) {`, Template.indent([`let chunkIds = ${mainTemplate.requireFn}.getChunkIds(chunkId)`, `chunkIds.forEach(idOfAChunk => {
+                ${mainTemplate.requireFn}.e(idOfAChunk);
+              })`]), '};',
         /*
           (needsMap
             ? [`chunkId = ${JSON.stringify(nameIdMap)}[chunkId]||chunkId;`]
@@ -53,7 +63,7 @@ class ResourceHintsPlugin {
         ),
         '}',
         */
-        `// Preload a chunk (${pluginName})`, `${mainTemplate.requireFn}.plc = function preloadChunk(chunkId) {`, Template.indent([`chunkId = ${mainTemplate.requireFn}.getChunkId(chunkId)`, 'if(installedChunks[chunkId] === undefined) {', Template.indent(['installedChunks[chunkId] = null;', mainTemplate.hooks.linkPreload.call('', chunk, hash), 'document.head.appendChild(link);', `${mainTemplate.requireFn}.e(chunkId);` // 'var head = document.getElementsByTagName(\'head\')[0];',
+        `// Preload a chunk (${pluginName})`, `${mainTemplate.requireFn}.plc = function preloadChunk(chunkId) {`, Template.indent([`chunkId = ${mainTemplate.requireFn}.getChunkIds(chunkId)[0]`, 'if(installedChunks[chunkId] === undefined) {', Template.indent(['installedChunks[chunkId] = null;', mainTemplate.hooks.linkPreload.call('', chunk, hash), 'document.head.appendChild(link);', `${mainTemplate.requireFn}.e(chunkId);` // 'var head = document.getElementsByTagName(\'head\')[0];',
         // mainTemplate.hooks.jsonpScript.call('', chunk, hash),
         // 'head.appendChild(script);'
         ]), '}']), '};']);

package/lib/plugins/UnusedFilesFindPlugin.js

@@ -11,6 +11,8 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _utils = require("../utils");
 
+var _log = require("../utils/log");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 let excludeDocsJSON = '{}';
@@ -97,10 +99,10 @@ class UnusedFilesFindPlugin {
       Object.keys(unDocsCompObj).forEach(key => {
         if (unDocsCompObj[key].length > 0) {
           if (key === 'withoutDocs') {
-            (0, _utils.log)('\x1b[36m%s\x1b[0m', '\nPlease write docs file for below componenst :- \n');
+            (0, _log.log)('\x1b[36m%s\x1b[0m', '\nPlease write docs file for below componenst :- \n');
             unDocsCompObj[key].forEach(value => {
               if (!excludeDocsArray.docs.exclude.includes(value)) {
-                (0, _utils.log)('\x1b[33m%s\x1b[0m', `${value}`);
+                (0, _log.log)('\x1b[33m%s\x1b[0m', `${value}`);
               }
             });
           }
@@ -162,10 +164,10 @@ class UnusedFilesFindPlugin {
       });
 
       if (!unusedFiles.length) {
-        (0, _utils.log)('There is no unused files');
+        (0, _log.log)('There is no unused files');
       } else {
         if (this.outputFileName) {
-          (0, _utils.log)(`You can see unused files info from ${_path.default.join(outputPath, this.outputFileName)} path`);
+          (0, _log.log)(`You can see unused files info from ${_path.default.join(outputPath, this.outputFileName)} path`);
           (0, _utils.makeDir)(outputPath);
           (0, _utils.writeFile)(_path.default.join(outputPath, this.outputFileName), JSON.stringify(unusedFiles)).then(() => {
             if (this.sstest) {
@@ -179,7 +181,7 @@ class UnusedFilesFindPlugin {
         unusedFiles.forEach(file => {
           _fs.default.unlinkSync(file);
 
-          (0, _utils.log)(`Deleted - ${file}`);
+          (0, _log.log)(`Deleted - ${file}`);
         });
       }
     });

package/lib/plugins/utils/fileHandling.js

@@ -6,15 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.isFileNameMatchingPattern = isFileNameMatchingPattern;
 exports.isFileNameMatchingPluginPattern = isFileNameMatchingPluginPattern;
 
-var _windowsModification = require("../../loaderUtils/windowsModification");
-
 var _ignore = _interopRequireDefault(require("ignore"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const path = require('path');
 
-let aliasNames = {
+const aliasNames = {
   valueReplacer: 'postcss-value-replacer',
   selectorReplace: 'postcss-selector-replace-new',
   hasRTL: 'postcss-rtl',
@@ -48,48 +46,47 @@ unique scenario
 function isFileNameMatchingPattern({
   filename,
   filterObject,
-  plugins
+  plugins,
+  order
 }) {
+  const pluginObj = {};
+  plugins.forEach(p => {
+    pluginObj[p.postcssPlugin] = p;
+  });
   const finalPlugins = [];
-  Object.keys(filterObject).forEach(key => {
-    plugins.forEach(x => {
-      if (aliasNames[key] === x.postcssPlugin) {
-        const ig = (0, _ignore.default)({
-          allowRelativePaths: true
-        }).add(filterObject[key]);
-
-        if (ig.ignores(filename)) {
-          finalPlugins.push(x);
-        }
+  order.forEach(key => {
+    const p = pluginObj[aliasNames[key]];
+    const pluginSpecificFilter = filterObject[key];
+
+    if (!pluginSpecificFilter || pluginSpecificFilter.length === 0) {
+      finalPlugins.push(p);
+    } else {
+      // eslint-disable-next-line no-use-before-define
+      const isMatching = isFilePathMatchingPattern(filename, pluginSpecificFilter);
+
+      if (isMatching) {
+        finalPlugins.push(p);
       }
-    });
-  }); // console.log(filename);
-
-  return finalPlugins; // console.log(filename, filterObject);
+    }
+  });
+  return finalPlugins;
 }
 
-function isFileNameMatchingPluginPattern({
-  filename,
-  filterArr // =process.cwd()
-
-}) {
-  // console.log(rootDir);
-  let include = true; // console.log(rootDir);
-  // const regex = `^(.+?)${rootDir}?\\\\`;
-  // console.log(plugin);
-
-  const newFilename = path.relative(path.parse(process.cwd()).base, filename); // const newFilename = windowsModificationFile(filename).replace(
-  //   new RegExp(regex, 'gi'),
-  //   ''
-  // );
+function isFilePathMatchingPattern(filePath, patterns) {
+  if (patterns.length === 0) {
+    return true;
+  }
 
   const ig = (0, _ignore.default)({
     allowRelativePaths: true
-  }).add(filterArr);
-
-  if (!ig.ignores(newFilename)) {
-    include = false;
-  }
+  }).add(patterns);
+  return ig.ignores(filePath);
+}
 
-  return include;
+function isFileNameMatchingPluginPattern({
+  filename,
+  filterArr
+}) {
+  const newFilename = path.relative(path.parse(process.cwd()).base, filename);
+  return isFilePathMatchingPattern(newFilename, filterArr);
 }

package/lib/schemas/index.js

@@ -36,6 +36,9 @@ var _default = {
       cli: 'stop_nodemon'
     }
   },
+  resourceHints: {
+    allowPrefetchingMultipleChunks: false
+  },
   i18n: {
     chunkSplitEnable: {
       value: false,
@@ -68,17 +71,9 @@ var _default = {
       before: [],
       after: []
     },
-    plugins: {
-      valueReplacer: false,
-      selectorReplace: false,
-      hasRTL: false,
-      hoverActive: false,
-      combinerMediaQuery: false,
-      cssVariableReplacement: false,
-      selectorWeight: false,
-      minifier: false,
-      composeMinification: false
-    },
+    plugins: null,
+    // @type  {Boolean | Array}
+    postCssPluginOrder: null,
     patterns: {
       valueReplacer: [],
       selectorReplace: [],
@@ -95,7 +90,8 @@ var _default = {
       hoverActive: [],
       combinerMediaQuery: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      hasRTL: []
     },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {
@@ -267,17 +263,8 @@ var _default = {
       value: true,
       cli: 'enable_smaphook'
     },
-    plugins: {
-      valueReplacer: false,
-      selectorReplace: false,
-      hasRTL: false,
-      hoverActive: false,
-      combinerMediaQuery: false,
-      cssVariableReplacement: false,
-      selectorWeight: false,
-      minifier: false,
-      composeMinification: false
-    },
+    plugins: null,
+    postCssPluginOrder: null,
     patterns: {
       valueReplacer: [],
       selectorReplace: [],
@@ -294,7 +281,8 @@ var _default = {
       hoverActive: [],
       combinerMediaQuery: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      hasRTL: []
     },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {
@@ -333,6 +321,7 @@ var _default = {
       inject: true
     },
     removePropTypes: false,
+    customChunksBaseConfig: null,
     customChunks: [{
       name: 'styles',
       pattern: '\\.css$'
@@ -388,16 +377,8 @@ var _default = {
     },
     rtlExclude: [],
     selectorReplace: null,
-    plugins: {
-      rtl: false,
-      hoverActive: false,
-      combinerMediaQuery: false,
-      cssVariableReplacement: false,
-      selectorWeight: false,
-      minifier: false,
-      composeMinification: false,
-      selectorReplace: false
-    },
+    plugins: null,
+    postCssPluginOrder: null,
     patterns: {
       valueReplacer: [],
       selectorReplace: [],
@@ -405,14 +386,16 @@ var _default = {
       combinerMediaQuery: [],
       hasRTL: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      cssUniqueness: []
     },
     exclude: {
       rtl: [],
       hoverActive: [],
       combinerMediaQuery: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      hasRTL: []
     },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {

package/lib/utils/deprecationSupport.js

@@ -0,0 +1,128 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deprecationSupport = deprecationSupport;
+
+var _path = _interopRequireDefault(require("path"));
+
+var deprecationHandlers = _interopRequireWildcard(require("../deprecationLogger"));
+
+var _windowsModification = require("../loaderUtils/windowsModification");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+let {
+  deprecateMessage,
+  deprecateOption,
+  deprecationLoggerEnd
+} = deprecationHandlers;
+
+function modifyCssArr(arr) {
+  return arr.map(x => {
+    const includeCss = !x.startsWith('!');
+    const modifier = includeCss ? '/*.css' : '';
+    const filePath = x.replace(/^!/, ''); // Remove the "!" symbol if present
+
+    return (0, _windowsModification.windowsModificationFile)(_path.default.join(includeCss ? '**' : '!**', filePath, '**', modifier));
+  });
+}
+
+const defaultPostCssPluginOptions = {
+  valueReplacer: null,
+  hasRTL: false,
+  selectorReplace: null,
+  hoverActive: false,
+  combinerMediaQuery: false,
+  cssVariableReplacement: false,
+  selectorWeight: false,
+  minifier: false,
+  composeMinification: false
+};
+
+function deprecationSupport(options, disableDeprecationWarning) {
+  if (disableDeprecationWarning) {
+    /* eslint-disable no-empty-function */
+    deprecateMessage = () => {};
+
+    deprecateOption = () => {};
+
+    deprecationLoggerEnd = () => {};
+    /* eslint-enable no-empty-function */
+
+  }
+
+  options.app.plugins = options.app.plugins || defaultPostCssPluginOptions;
+  options.docs.plugins = options.docs.plugins || defaultPostCssPluginOptions;
+  options.css.plugins = options.css.plugins || defaultPostCssPluginOptions; // if (selectn(options, ".app.hasRTL") === true) {
+
+  if (options.app.hasRTL === true) {
+    deprecateOption('app.hasRTL', 'app.plugins.hasRTL');
+    options.app.plugins.hasRTL = true;
+  }
+
+  if (options.docs.hasRTL === true) {
+    deprecateOption('docs.hasRTL', 'docs.plugins.hasRTL');
+    options.docs.plugins.hasRTL = true;
+  }
+
+  if (options.app.selectorReplace !== null && options.app.plugins && (options.app.plugins.selectorReplace === null || options.app.plugins.selectorReplace === undefined)) {
+    deprecateMessage('when you use app.selectorReplace mention enable or disable app.plugins.selectorReplace by setting value to true or false');
+    options.app.plugins.selectorReplace = true;
+  }
+
+  if (options.docs.selectorReplace !== null && options.docs.plugins && (options.docs.plugins.selectorReplace === null || options.docs.plugins.selectorReplace === undefined)) {
+    deprecateMessage('when you use docs.selectorReplace mention enable or disable docs.plugins.selectorReplace by setting value to true or false');
+    options.docs.plugins.selectorReplace = true;
+  }
+
+  if (options.css.valueReplacer !== null && options.css.plugins && (options.app.plugins.valueReplacer === null || options.app.plugins.valueReplacer === undefined)) {
+    deprecateMessage('when you use app.valueReplacer mention enable or disable app.plugins.valueReplacer by setting value to true or false');
+    options.app.plugins.valueReplacer = true;
+  }
+
+  if (!options.app.patterns) {
+    options.app.patterns = {};
+  }
+
+  function handleRTL(rtlExclude, rtl, hasRTL, type) {
+    if (rtlExclude && rtlExclude.length > 0) {
+      options[type].patterns.hasRTL = modifyCssArr(rtlExclude);
+      deprecateOption(`${type}.rtlExclude`, `${type}.patterns.hasRTL`);
+    }
+
+    if (rtl && rtl.length > 0) {
+      options[type].patterns.hasRTL = modifyCssArr(rtl);
+      deprecateOption(`${type}.exclude.rtl`, `${type}.patterns.hasRTL`);
+    }
+
+    if (hasRTL && hasRTL.length > 0) {
+      options[type].patterns.hasRTL = modifyCssArr(hasRTL);
+      deprecateOption(`${type}.exclude.hasRTL`, `${type}.patterns.hasRTL`);
+    }
+  }
+
+  function addExcludesToPattern(patterns, exclude, type) {
+    Object.keys(defaultPostCssPluginOptions).forEach(key => {
+      if (exclude[key] && patterns[key].length === 0) {
+        deprecateOption(`${type}.exclude.${key}`, `${type}.patterns.${key}`);
+        let tempArr = exclude[key];
+        tempArr = tempArr.map(x => _path.default.join('!**', x, '**')); // Since patterns[key] is empty we need to wildcard for allow all others.
+
+        tempArr.unshift('*');
+        patterns[key] = tempArr;
+      }
+    });
+  }
+
+  handleRTL(options.app.rtlExclude, options.app.exclude.rtl, options.app.exclude.hasRTL, 'app');
+  handleRTL(options.docs.rtlExclude, options.docs.exclude.rtl, options.docs.exclude.hasRTL, 'docs');
+  addExcludesToPattern(options.app.patterns, options.app.exclude, 'app');
+  addExcludesToPattern(options.docs.patterns, options.docs.exclude, 'docs');
+  deprecationLoggerEnd();
+}

package/lib/utils/getOptions.js

@@ -7,14 +7,20 @@ exports.default = void 0;
 
 var _child_process = require("child_process");
 
-var _fs = _interopRequireDefault(require("fs"));
+var _fs = _interopRequireWildcard(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
 var _schemas = _interopRequireDefault(require("../schemas"));
 
+var _deprecationSupport = require("./deprecationSupport");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 // import { argv } from 'process';
 const args = process.argv.slice(2); // console.log('argv', argv);
 
@@ -122,105 +128,39 @@ const defaulter = (target, source) => {
   return defaultObject;
 };
 
-global.reactCLIOptions = null; // function selectn(obj, key) {
-//   let temp = obj;
-//   let keys = key.split('.');
-//   for (let i = 0; i < keys.length; i++) {
-//     const element = keys[i];
-//     temp = temp && temp[element];
-//   }
-//   return temp;
-// }
-
-function deprecationSupport(options) {
-  // if (selectn(options, ".app.hasRTL") === true) {
-  if (options.app.hasRTL === true) {
-    options.app.plugins.hasRTL = true;
-  }
-
-  if (options.docs.hasRTL === true) {
-    options.docs.plugins.hasRTL = true;
-  }
-
-  if (options.app.rtlExclude.length > 0) {
-    options.app.exclude.rtl = options.app.rtlExclude;
-  }
+global.reactCLIOptions = null;
 
-  if (options.docs.rtlExclude.length > 0) {
-    options.docs.exclude.rtl = options.docs.rtlExclude;
-  }
+const getOptionsFromConfigFile = (appPath, configFileName) => {
+  const fileName = configFileName || 'build.config.js';
 
-  if (options.app.selectorReplace !== null) {
-    options.app.plugins.selectorReplace = true;
-  }
+  const packagePath = _path.default.join(appPath, fileName);
 
-  if (options.docs.selectorReplace !== null) {
-    options.docs.plugins.selectorReplace = true;
+  if ((0, _fs.existsSync)(packagePath)) {
+    return require(packagePath).config;
   }
 
-  if (options.css.valueReplacer !== null) {
-    options.app.plugins.valueReplacer = true;
-  }
-
-  options.app.exclude.hasRTL = options.app.exclude.rtl;
-
-  if (!options.app.patterns) {
-    options.app.patterns = {};
-  }
-
-  if (options.app.patterns.valueReplacer.length === 0) {
-    options.app.patterns.valueReplacer = ['*'];
-  }
-
-  if (options.app.patterns.selectorReplace.length === 0) {
-    options.app.patterns.selectorReplace = ['*'];
-  }
-
-  if (options.docs.patterns.selectorReplace.length === 0) {
-    options.docs.patterns.selectorReplace = ['*'];
-  }
-
-  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 = 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 = 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;
-    }
-  });
-}
+  return null;
+};
 
-const getOptions = () => {
+const getOptions = fromRoot => {
   if (global.reactCLIOptions) {
     return global.reactCLIOptions;
   }
 
   const appPath = process.cwd();
-  let userSchemas;
+  let userSchemas = getOptionsFromConfigFile(appPath, processEnv.config_file);
 
   const packagePath = _path.default.join(appPath, 'package.json');
 
   if (_fs.default.existsSync(packagePath)) {
-    userSchemas = require(packagePath)['react-cli'] || {};
+    userSchemas = userSchemas || require(packagePath)['react-cli'] || {};
   }
 
   const options = defaulter(_schemas.default, userSchemas || {}); // for future may be for npm 8 edge cases
 
   options.npmVersion = getNpmVersion();
   options.cwd = getCWD();
-  deprecationSupport(options);
+  (0, _deprecationSupport.deprecationSupport)(options, options.disableDeprecationWarning || !fromRoot);
   options.packageVersion = process.env.npm_package_version;
   global.reactCLIOptions = options;
   return options;

package/lib/utils/index.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  log: true,
   writeFile: true,
   makeDir: true,
   getInfoFromPublicPaths: true,
   getLibraryConflict: true,
+  log: true,
   getOptions: true,
   createEventStream: true,
   getServerURL: true,
@@ -64,7 +64,13 @@ Object.defineProperty(exports, "jsonHelper", {
     return _jsonHelper.default;
   }
 });
-exports.makeDir = exports.log = void 0;
+Object.defineProperty(exports, "log", {
+  enumerable: true,
+  get: function () {
+    return _log.log;
+  }
+});
+exports.makeDir = void 0;
 Object.defineProperty(exports, "pullOrigin", {
   enumerable: true,
   get: function () {
@@ -95,6 +101,8 @@ var _stream = require("stream");
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _log = require("./log");
+
 var _getOptions = _interopRequireDefault(require("./getOptions"));
 
 var _createEventStream = _interopRequireDefault(require("./createEventStream"));
@@ -161,13 +169,7 @@ var _ssTestHack = _interopRequireDefault(require("./ssTestHack"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-let log = (...info) => {
-  let print = console;
-  print.log(...info);
-};
-
-exports.log = log;
-
+// eslint-disable-next-line no-duplicate-imports
 let writeFile = (outputPath, src, isPath = false) => new Promise((resolve, reject) => {
   let inStr;
 
@@ -314,9 +316,9 @@ let getLibraryConflict = (moduleObject, impactObj, changesOnly) => {
     whichLibrary = "No component file changes!";
   }
 
-  log('\n');
-  log('You can see the HTML out at coverageTest/impactLibrary.html!');
-  log('\x1b[33m%s\x1b[0m', '************************************************************ \n ');
+  (0, _log.log)('\n');
+  (0, _log.log)('You can see the HTML out at coverageTest/impactLibrary.html!');
+  (0, _log.log)('\x1b[33m%s\x1b[0m', '************************************************************ \n ');
   return {
     response: allImpactArray,
     result: {

package/lib/utils/initPreCommitHook.js

@@ -11,7 +11,7 @@ var _path = _interopRequireDefault(require("path"));
 
 var _child_process = require("child_process");
 
-var _index = require("./index");
+var _log = require("./log");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -38,7 +38,7 @@ let copyEslintConfig = rootDir => {
 
     _fs.default.writeFileSync(targetPath, src);
 
-    (0, _index.log)('Eslint config added in project root path');
+    (0, _log.log)('Eslint config added in project root path');
   }
 };
 
@@ -58,7 +58,7 @@ let initPreCommitHook = (forReactCLI = false) => {
 
       _fs.default.writeFileSync(targetPath, precommit);
 
-      (0, _index.log)('pre-commit hook added');
+      (0, _log.log)('pre-commit hook added');
     }
 
     let packagePath = _path.default.join(process.cwd(), 'package.json');
@@ -71,10 +71,10 @@ let initPreCommitHook = (forReactCLI = false) => {
 
         _fs.default.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));
 
-        (0, _index.log)('lint script added in your package.json');
+        (0, _log.log)('lint script added in your package.json');
       }
     } catch (e) {
-      (0, _index.log)('package.json not found');
+      (0, _log.log)('package.json not found');
     }
   }
 };