@zohodesk/react-cli 0.0.1-exp.169.2 → 0.0.1-exp.175.1

package/lib/loaderUtils/getCSSLoaders.js

@@ -4,19 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _miniCssExtractPlugin = _interopRequireDefault(require("mini-css-extract-plugin"));
-
 var _cssClassNameGenerate = _interopRequireDefault(require("../utils/cssClassNameGenerate"));
-
 var _utils = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-let options = (0, _utils.getOptions)();
-let isWin = process.platform === 'win32';
-
-let getCSSLoaders = (plugins, exclude, classNameBlob, cssUniqueness, selectorReplace, cssHashSelectors, classNamePrefix) => {
+const fs = require('fs');
+const options = (0, _utils.getOptions)();
+const isWin = process.platform === 'win32';
+function windowsModification(array) {
+  return isWin ? array.map(r => r.replace(/\//g, '\\')) : array;
+}
+function excludeEmptyCheckPlugin({
+  enable,
+  ignore,
+  plugins
+}) {
+  return enable ? ignore.length === 0 ? plugins : [require('../postcss-plugins/ExcludePlugin')({
+    ignore,
+    plugins
+  })] : [];
+}
+const getCSSLoaders = (plugins, exclude, mediaQueryHoverActiveString, cssVariableReplacementConfig, classNameBlob, cssUniqueness, selectorReplace, cssHashSelectors, classNamePrefix) => {
   // console.log('plugins:')
   // console.log(plugins)
   // console.log('exclude:')
@@ -30,46 +38,52 @@ let getCSSLoaders = (plugins, exclude, classNameBlob, cssUniqueness, selectorRep
   const {
     cssSelectorZipPath
   } = options.impactService;
-
-  function windowsModification(array) {
-    return isWin ? array.map(r => r.replace(/\//g, '\\')) : array;
-  }
-
-  let rtlExcludeLocal = windowsModification(exclude.rtl);
-  let hoverActiveExcludeLocal = windowsModification(exclude.hoverActive);
-  let combinerMediaQueryExcludeLocal = windowsModification(exclude.combinerMediaQuery);
-  let cssLoaderOptions = {
+  fs.writeFileSync('./css_error.log', '');
+  const rtlExcludeLocal = windowsModification(exclude.rtl);
+  const hoverActiveExcludeLocal = windowsModification(exclude.hoverActive);
+  const combinerMediaQueryExcludeLocal = windowsModification(exclude.combinerMediaQuery);
+  const cssVariableReplacementExcludeLocal = windowsModification(exclude.cssVariableReplacement);
+  const cssLoaderOptions = {
     // importLoaders: hasRTL||hoverActive ? 1 : 0,
     importLoaders: 1,
     modules: {},
     sourceMap: true
   };
-
   if (classNameBlob) {
     cssLoaderOptions.modules.localIdentName = classNameBlob;
   } else {
     cssLoaderOptions.modules.getLocalIdent = (0, _cssClassNameGenerate.default)(cssUniqueness, cssHashSelectors, classNamePrefix);
   }
-
-  const postcssPlugins = [valueReplacer && require('../postcss-plugins/ValueReplacer')(valueReplacer), selectorReplace && require('postcss-selector-replace')(selectorReplace), plugins.hasRTL && require('../postcss-plugins/ExcludePlugin')({
+  const postcssPlugins = [valueReplacer && require('../postcss-plugins/ValueReplacer')(valueReplacer), selectorReplace && require('postcss-selector-replace')(selectorReplace),
+  // ...excludeEmptyCheckPlugin({
+  //   enable: true,
+  //   ignore: [],
+  //   plugins: [require('../postcss-plugins/variablePropertiesCollector').default()]
+  // }),
+  ...excludeEmptyCheckPlugin({
+    enable: plugins.hasRTL,
     ignore: rtlExcludeLocal,
     plugins: [require('@zohodesk/postcss-rtl')({
       addPrefixToSelector: function addPrefixToSelector(selector, prefix) {
         if (prefix === '[dir]') {
           return selector;
         }
-
         return `${prefix} ${selector}`; // Make selectors like [dir=rtl] > .selector
       }
     })]
-  }), plugins.combinerMediaQuery && require('../postcss-plugins/ExcludePlugin')({
+  }), ...excludeEmptyCheckPlugin({
+    enable: plugins.combinerMediaQuery,
     ignore: combinerMediaQueryExcludeLocal,
     plugins: [require('postcss-combine-media-query')]
-  }), plugins.hoverActive && require('../postcss-plugins/ExcludePlugin')({
+  }), ...excludeEmptyCheckPlugin({
+    enable: plugins.hoverActive,
     ignore: hoverActiveExcludeLocal,
-    plugins: [require('../postcss-plugins/hoverActivePlugin')]
-  }) // require('../postcss-plugins/variableModifier')()
-  ].filter(Boolean);
+    plugins: [require('../postcss-plugins/hoverActivePlugin')(mediaQueryHoverActiveString)]
+  }), ...excludeEmptyCheckPlugin({
+    enable: plugins.cssVariableReplacement,
+    ignore: cssVariableReplacementExcludeLocal,
+    plugins: [fs.existsSync(cssVariableReplacementConfig) && require('../postcss-plugins/variableModificationPlugin/index')(cssVariableReplacementConfig)]
+  })].filter(Boolean);
   return [cssSelectorZipPath && {
     loader: require.resolve('../loaders/selectorMappingLoader')
   }, {
@@ -95,6 +109,5 @@ let getCSSLoaders = (plugins, exclude, classNameBlob, cssUniqueness, selectorRep
     }
   } : null].filter(Boolean);
 };
-
 var _default = getCSSLoaders;
 exports.default = _default;

package/lib/loaderUtils/getDevJsLoaders.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 let getDevJsLoaders = options => {
   let {
     app: {
@@ -21,13 +18,11 @@ let getDevJsLoaders = options => {
     }
   } = options;
   let loaders = [];
-
   if (instrumentScript) {
     loaders.push({
       loader: require.resolve('../loaders/scriptInstrumentLoader.js')
     });
   }
-
   loaders.push({
     loader: 'babel-loader',
     options: {
@@ -49,7 +44,6 @@ let getDevJsLoaders = options => {
       cacheDirectory: true
     }
   });
-
   if (enableEslint) {
     loaders.push({
       loader: 'eslint-loader',
@@ -60,9 +54,7 @@ let getDevJsLoaders = options => {
       }
     });
   }
-
   return loaders;
 };
-
 var _default = getDevJsLoaders;
 exports.default = _default;

package/lib/loaderUtils/index.js

@@ -15,9 +15,6 @@ Object.defineProperty(exports, "getDevJsLoaders", {
     return _getDevJsLoaders.default;
   }
 });
-
 var _getDevJsLoaders = _interopRequireDefault(require("./getDevJsLoaders"));
-
 var _getCSSLoaders = _interopRequireDefault(require("./getCSSLoaders"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/loaders/docsLoader.js

@@ -1,22 +1,15 @@
 "use strict";
 
 var _fs = _interopRequireDefault(require("fs"));
-
 var _path = _interopRequireDefault(require("path"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 module.exports = function (source) {
   let comNameAry = this.resourcePath.split(_path.default.sep);
   let filePath = this.resourcePath;
-
   let appPath = _fs.default.realpathSync(process.cwd());
-
   let changePath = filePath.replace('/lib/', '/src/');
   let comName = comNameAry[comNameAry.length - 1];
   let name = comName.substring(0, comName.lastIndexOf('.'));
-
   let src = _fs.default.readFileSync(filePath.startsWith(appPath) ? filePath : changePath).toString();
-
   return `${source};${name}.source=${JSON.stringify(src)};${name}.filePath=${JSON.stringify(filePath)}`;
 };

package/lib/loaders/docsPropsLoader.js

@@ -1,25 +1,21 @@
 "use strict";
 
 var _reactDocgen = _interopRequireDefault(require("react-docgen"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // import loaderUtils from 'loader-utils';
+
 module.exports = source => {
-  (void 0).cacheable && (void 0).cacheable(); // let query = loaderUtils.parseQuery(this.query);
+  (void 0).cacheable && (void 0).cacheable();
+  // let query = loaderUtils.parseQuery(this.query);
 
   let value = {};
-
   try {
     value = _reactDocgen.default.parse(source);
   } catch (e) {
     (0, _utils.log)('ERROR in docgen-loader', e);
   }
-
   let comNameAry = (void 0).resourcePath.split(_path.default.sep);
   let comName = comNameAry[comNameAry.length - 1];
   let name = comName.substring(0, comName.lastIndexOf('.'));

package/lib/loaders/fileBountryLoader.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _path = _interopRequireDefault(require("path"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 module.exports = function (source) {
   const {
     rootContext,

package/lib/loaders/fileLoader.js

@@ -1,64 +1,55 @@
 "use strict";
 
 var _path = _interopRequireDefault(require("path"));
-
 var _loaderUtils = _interopRequireDefault(require("loader-utils"));
-
 var _common = require("../common");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 module.exports = function (content) {
   let {
     userRequest
   } = this._module.issuer;
   this.cacheable && this.cacheable();
-
   if (!this.emitFile) {
     throw new Error('emitFile is required from module system');
   }
-
   let options = _loaderUtils.default.getOptions(this) || {};
-  let query = this.resourceQuery ? _loaderUtils.default.parseQuery(this.resourceQuery) : {}; // let configKey = query.config || 'fileLoader';
+  let query = this.resourceQuery ? _loaderUtils.default.parseQuery(this.resourceQuery) : {};
+
+  // let configKey = query.config || 'fileLoader';
 
   let config = {
     // publicPath: false,
     useRelativePath: false,
-    name: '[hash].[ext]' // publicPathStrigify: true
-
-  }; // options takes precedence over config
+    name: '[hash].[ext]'
+    // publicPathStrigify: true
+  };
 
+  // options takes precedence over config
   Object.keys(options).forEach(attr => {
     config[attr] = options[attr];
-  }); // query takes precedence over config and options
+  });
 
+  // query takes precedence over config and options
   Object.keys(query).forEach(attr => {
     config[attr] = query[attr];
   });
   let context = config.context || options.context;
-
   let url = _loaderUtils.default.interpolateName(this, config.name, {
     context: context,
     content: content,
     regExp: config.regExp
   });
-
   let outputPath = '';
   let filePath = this.resourcePath;
-
   if (config.useRelativePath) {
     let issuerContext = this._module && this._module.issuer && this._module.issuer.context || context;
-
     let relativeUrl = issuerContext && _path.default.relative(issuerContext, filePath).split(_path.default.sep).join('/');
-
     let relativePath = relativeUrl && `${_path.default.dirname(relativeUrl)}/`;
-
     if (~relativePath.indexOf('../')) {
       outputPath = _path.default.posix.join(outputPath, relativePath, url);
     } else {
       outputPath = relativePath + url;
     }
-
     url = relativePath + url;
   } else if (config.outputPath) {
     // support functions as outputPath to generate them dynamically
@@ -67,9 +58,9 @@ module.exports = function (content) {
   } else {
     outputPath = url;
   }
-
   let requestFromJS = /\.js$/.test(userRequest);
-  let publicPath = requestFromJS ? (0, _common.getPublicPathConfig)(url) : `__webpack_public_path__ + ${JSON.stringify(url)}`; // if (config.publicPath !== false) {
+  let publicPath = requestFromJS ? (0, _common.getPublicPathConfig)(url) : `__webpack_public_path__ + ${JSON.stringify(url)}`;
+  // if (config.publicPath !== false) {
   //   // support functions as publicPath to generate them dynamically
   //   if (config.publicPathStringify) {
   //     publicPath = JSON.Stringify(
@@ -88,8 +79,6 @@ module.exports = function (content) {
   if (query.emitFile === undefined || query.emitFile) {
     this.emitFile(outputPath, content);
   }
-
   return `module.exports = ${publicPath};`;
 };
-
 module.exports.raw = true;

package/lib/loaders/scriptInstrumentLoader.js

@@ -1,15 +1,10 @@
 "use strict";
 
 var esprima = _interopRequireWildcard(require("esprima"));
-
 var _escodegen = _interopRequireDefault(require("escodegen"));
-
 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; }
-
 let start = {
   type: 'ExpressionStatement',
   expression: {
@@ -53,26 +48,21 @@ let start = {
     }]
   }
 };
-
 let scriptInstrumentLoader = function (source) {
   let parsed = esprima.parseModule(source, {
     jsx: true
   });
-
   for (let i in parsed.body) {
     if (parsed.body[i].type === 'FunctionDeclaration' || parsed.body[i].type === 'ExportDefaultDeclaration' || parsed.body[i].type === 'ExportNamedDeclaration') {
       let ParsedTemp;
-
       if (parsed.body[i].type === 'FunctionDeclaration') {
         ParsedTemp = parsed.body[i];
       } else {
         ParsedTemp = parsed.body[i].declaration;
       }
-
       if (ParsedTemp) {
         if (ParsedTemp.id) {
           let funcname = ParsedTemp.id.name;
-
           if (funcname !== 'mapStateToProps') {
             if (!funcname.includes('_')) {
               let startFunc = JSON.parse(JSON.stringify(start));
@@ -87,8 +77,8 @@ let scriptInstrumentLoader = function (source) {
       }
     }
   }
-
-  return _escodegen.default.generate(parsed); // function removeDuplicates(arr) {
+  return _escodegen.default.generate(parsed);
+  // function removeDuplicates(arr) {
   //   let uniqueArray = [];
   //   for (let i = 0; i < arr.length; i++) {
   //     if (uniqueArray.indexOf(arr[i]) == -1) {
@@ -100,7 +90,9 @@ let scriptInstrumentLoader = function (source) {
   // funcArray = removeDuplicates(funcArray);
 };
 
-module.exports = scriptInstrumentLoader; // let start = {
+module.exports = scriptInstrumentLoader;
+
+// let start = {
 //   type: 'ExpressionStatement',
 //   expression: {
 //     type: 'CallExpression',

package/lib/loaders/selectorMappingLoader.js

@@ -1,75 +1,57 @@
 "use strict";
 
 var _path = _interopRequireDefault(require("path"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _utils = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 let options = (0, _utils.getOptions)();
 const {
   cssSelectorZipPath
 } = options.impactService;
+const zipname = _path.default.parse(cssSelectorZipPath).name;
+// console.log({ cssSelectorZipPath, zipname });
 
-const zipname = _path.default.parse(cssSelectorZipPath).name; // console.log({ cssSelectorZipPath, zipname });
 // TODO:NOTE: need to check about .. path related files creation 
 // for now  no css files have given  form react-cli need to make sure about it.  
 
-
 let zippath = _path.default.join(process.cwd(), cssSelectorZipPath);
-
 if (_fs.default.existsSync(_path.default.join(process.cwd(), cssSelectorZipPath))) {
   _fs.default.rmSync(zippath);
-
-  console.log('zip file deleted', zippath); // fs.rmSync(zippath, {force:true})
+  console.log('zip file deleted', zippath);
+  // fs.rmSync(zippath, {force:true})
   // console.log('created folder ==> ', dpath);
-} // const minicssComment =
-//   '// extracted by mini-css-extract-plugin\n';
-
+}
 
+// const minicssComment =
+//   '// extracted by mini-css-extract-plugin\n';
 const startStr = '// extracted by mini-css-extract-plugin\n' + 'module.exports = ';
-
 module.exports = function (source) {
   const {
     rootContext,
     resourcePath
   } = this;
-
   const relativePath = _path.default.relative(rootContext, resourcePath);
-
   let fpath = _path.default.join(rootContext, zipname, relativePath);
-
   let originalpath = _path.default.join(rootContext, relativePath);
-
   if (relativePath.startsWith('..')) {
     throw `unexpected path ${relativePath}`;
   }
-
   let dpath = fpath.slice(0, fpath.lastIndexOf(_path.default.sep));
-
   if (!_fs.default.existsSync(originalpath)) {
     throw `originalpath not exixt ${originalpath}`;
   }
-
   if (!_fs.default.existsSync(dpath)) {
     _fs.default.mkdirSync(dpath, {
       recursive: true
     });
   }
-
   let jsonStr = '{}';
-
   if (source.startsWith(startStr)) {
     // source will  be  like 
     // `// extracted by mini-css-extract-plugin\nmodule.exports = {"app":"zd-app"};`
     jsonStr = source.slice(startStr.length, -1);
   }
-
   _fs.default.writeFileSync(`${fpath}_map`, jsonStr);
-
   _fs.default.writeFileSync(fpath, _fs.default.readFileSync(originalpath));
-
   return source;
 };

package/lib/loaders/workerLoader.js

@@ -5,19 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = loader;
 exports.pitch = pitch;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _loaderUtils = require("loader-utils");
-
 var _schemaUtils = _interopRequireDefault(require("schema-utils"));
-
 var _SingleEntryPlugin = _interopRequireDefault(require("webpack/lib/SingleEntryPlugin"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* import WebWorkerTemplatePlugin from 'webpack/lib/webworker/WebWorkerTemplatePlugin';
+/* import WebWorkerTemplatePlugin from 'webpack/lib/webworker/WebWorkerTemplatePlugin';
 import ExternalsPlugin from 'webpack/lib/ExternalsPlugin'; */
+
 const schema = {
   'type': 'object',
   'properties': {
@@ -45,22 +40,18 @@ const schema = {
     }
   },
   'additionalProperties': false
-}; // eslint-disable-next-line
-
+};
+// eslint-disable-next-line
 function loader() {}
-
 function getDefaultFilename(filename) {
   if (typeof filename === 'function') {
     return filename;
   }
-
   return filename.replace(/\.([a-z]+)(\?.+)?$/i, '.worker.$1$2');
 }
-
 function getDefaultChunkFilename(chunkFilename) {
   return chunkFilename.replace(/\.([a-z]+)(\?.+)?$/i, '.worker.$1$2');
 }
-
 function pitch(request) {
   this.cacheable(false);
   const options = (0, _loaderUtils.getOptions)(this);
@@ -80,14 +71,15 @@ function pitch(request) {
     globalObject: 'self'
   };
   workerContext.compiler = this._compilation.createChildCompiler(`worker-loader ${request}`, workerContext.options);
-  /* 
-  new WebWorkerTemplatePlugin().apply(workerContext.compiler);
-  
-  if (compilerOptions.externals) {
-    new ExternalsPlugin(
-      getExternalsType(compilerOptions),
-      compilerOptions.externals
-    ).apply(workerContext.compiler);
+
+  /* 
+  new WebWorkerTemplatePlugin().apply(workerContext.compiler);
+  
+  if (compilerOptions.externals) {
+    new ExternalsPlugin(
+      getExternalsType(compilerOptions),
+      compilerOptions.externals
+    ).apply(workerContext.compiler);
   } */
 
   new _SingleEntryPlugin.default(this.context, `!!${request}`, _path.default.parse(this.resourcePath).name).apply(workerContext.compiler);
@@ -95,25 +87,19 @@ function pitch(request) {
   const cb = this.async();
   workerContext.compiler.runAsChild((errorArg, entries, compilation) => {
     let error = errorArg;
-
     if (!error && compilation.errors && compilation.errors.length) {
       // eslint-disable-next-line
       error = compilation.errors[0];
     }
-
     const entry = entries && entries[0] && entries[0].files.values().next().value;
-
     if (!error && !entry) {
       error = Error(`WorkerPlugin: no entry for ${request}`);
     }
-
     if (error) {
       return cb(error);
     }
-
     function workerCode() {
       let blob;
-
       try {
         blob = new Blob([`importScripts('${this.workerUrl}');`], {
           'type': 'application/javascript'
@@ -121,13 +107,11 @@ function pitch(request) {
       } catch (e1) {
         throw new Error(e1);
       }
-
       let url = window.URL || window.webkitURL;
       let blobUrl = url.createObjectURL(blob);
       let worker = new Worker(blobUrl);
       return worker;
     }
-
     return cb(null, `${options.esModule ? 'export default' : 'module.exports ='} {\n
 			workerUrl: __webpack_public_path__ + ${JSON.stringify(entry)}, \n
 			getInstance: ${workerCode} \n