@zohodesk/react-cli 1.0.2-exp.1 → 1.0.2-exp.3

package/lib/plugins/index.js

@@ -15,12 +15,6 @@ Object.defineProperty(exports, "CleanUpStatsPlugin", {
     return _CleanupStatsPlugin.default;
   }
 });
-Object.defineProperty(exports, "ComposeMinificationPlugin", {
-  enumerable: true,
-  get: function () {
-    return _ComposeMinification.default;
-  }
-});
 Object.defineProperty(exports, "EFCPlugin", {
   enumerable: true,
   get: function () {
@@ -136,8 +130,6 @@ var _MinifyPlugin = _interopRequireDefault(require("./MinifyPlugin"));
 
 var _ManifestPlugin = _interopRequireDefault(require("./ManifestPlugin"));
 
-var _ComposeMinification = _interopRequireDefault(require("./ComposeMinification"));
-
 var _CleanupStatsPlugin = _interopRequireDefault(require("./CleanupStatsPlugin"));
 
 var _EFCPlugin = _interopRequireDefault(require("./EFCPlugin"));

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.1",
+  "version": "1.0.2-exp.3",
   "description": "A CLI tool for build modern web application and libraries",
   "scripts": {
     "init": "node ./lib/utils/init.js",