@zohodesk/react-cli 1.0.2-exp.2 → 1.0.2-exp.4

package/lib/pluginUtils/getDevPlugins.js

@@ -209,12 +209,11 @@ const getDevPlugins = (options, publicPath) => {
       patterns,
       patternsRootDir
     }));
-  }
+  } // if (pluginObject.minifier) {
+  //   // console.log('minifier active');
+  //   pluginsArr.push(new MinifierPlugin());
+  // }
 
-  if (pluginObject.minifier) {
-    // console.log('minifier active');
-    pluginsArr.push(new _plugins.MinifierPlugin());
-  }
 
   return pluginsArr.filter(Boolean);
 };

package/lib/pluginUtils/getProdPlugins.js

@@ -45,12 +45,15 @@ const getProdPlugins = (options, publicPath = '') => {
     bundleAnalyze,
     optimize,
     publicPaths,
+    patterns,
+    patternsRootDir,
     hasEFC: prevOptionForEnableEFC,
     enableSMapHook,
     tpFolder,
     folder,
     outputFolder,
     context,
+    exclude,
     enableSMap,
     server: {
       mode
@@ -268,13 +271,18 @@ const getProdPlugins = (options, publicPath = '') => {
 
   if (pluginObject.cssVariableReplacement) {
     pluginsArr.push(new _VariableConversionCollector.default({
-      cssVariableReplacementConfig
+      cssVariableReplacementConfig,
+      patterns,
+      patternsRootDir
     }));
   }
 
   if (pluginObject.selectorWeight) {
     pluginsArr.push(new _SelectorPlugin.default({
-      selectorWeightConfig
+      selectorWeightConfig,
+      exclude: exclude.selectorWeight,
+      patterns,
+      patternsRootDir
     }));
   } // plugins.push(new VariableConversionCollector({}));
 

package/lib/plugins/VariableConversionCollector.js

@@ -121,7 +121,8 @@ class VariableConversionCollector {
     this.optimize = options.optimize;
     this.filename = options.cssVariableReplacementConfig;
     this.patterns = options.patterns;
-    this.rootDir = options.patternsRootDir;
+    this.rootDir = options.patternsRootDir; // console.log(options.patterns, this.patterns);
+
     this.initializeFiles();
   }
 

package/lib/plugins/utils/fileHandling.js

@@ -12,6 +12,8 @@ var _ignore = _interopRequireDefault(require("ignore"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const path = require('path');
+
 let aliasNames = {
   valueReplacer: 'postcss-value-replacer',
   selectorReplace: 'postcss-selector-replace-new',
@@ -50,14 +52,21 @@ function isFileNameMatchingPattern({
   rootDir
 }) {
   const finalPlugins = []; // console.log(rootDir);
+  // const regex = `^(.+?)${rootDir}?\\\\`;
+
+  const newFilename = path.relative(rootDir, filename); //windowsModificationFile(filename).replace(
+  //   new RegExp(regex, 'gi'),
+  //   ''
+  // );
+  // path.relative('supportapp', 'd:\')
 
-  const regex = `^(.+?)${rootDir}?\\\\`;
-  const newFilename = (0, _windowsModification.windowsModificationFile)(filename).replace(new RegExp(regex, 'gi'), '');
   Object.keys(filterObject).forEach(key => {
     plugins.forEach(x => {
       // console.log(key, x.postcssPlugin);
       if (aliasNames[key] === x.postcssPlugin) {
-        const ig = (0, _ignore.default)().add(filterObject[key]);
+        const ig = (0, _ignore.default)({
+          allowRelativePaths: true
+        }).add(filterObject[key]);
 
         if (ig.ignores(newFilename)) {
           // console.log(newFilename);
@@ -78,11 +87,17 @@ function isFileNameMatchingPluginPattern({
   rootDir
 }) {
   let include = true; // console.log(rootDir);
+  // const regex = `^(.+?)${rootDir}?\\\\`;
+  // console.log(plugin);
 
-  const regex = `^(.+?)${rootDir}?\\\\`; // console.log(plugin);
+  const newFilename = path.relative(rootDir, filename); // const newFilename = windowsModificationFile(filename).replace(
+  //   new RegExp(regex, 'gi'),
+  //   ''
+  // );
 
-  const newFilename = (0, _windowsModification.windowsModificationFile)(filename).replace(new RegExp(regex, 'gi'), '');
-  const ig = (0, _ignore.default)().add(filterArr);
+  const ig = (0, _ignore.default)({
+    allowRelativePaths: true
+  }).add(filterArr);
 
   if (!ig.ignores(newFilename)) {
     include = false;

package/package.json

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