@zohodesk/react-cli 1.1.29-exp.2 → 1.1.29-exp.3

package/lib/loaderUtils/getCSSLoaders.js

@@ -4,25 +4,35 @@ 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");
+
 var _fileHandling = require("../plugins/utils/fileHandling");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 const fs = require('fs');
+
 const options = (0, _utils.getOptions)();
 const defaultPostCssPluginOrder = ['valueReplacer', 'selectorReplace', 'hasRTL', 'hoverActive', 'combinerMediaQuery', 'cssVariableReplacement', 'selectorWeight', 'minifier', 'composeMinification'];
+
 function calculatePostCssPluginOrder(postCssPluginOrder, pluginOrder) {
   // if(typeof postCssPluginOrder === Boolean)
-
   if (Array.isArray(postCssPluginOrder)) {
     return postCssPluginOrder;
   }
+
   if (postCssPluginOrder) {
     return pluginOrder;
   }
+
   return defaultPostCssPluginOrder.filter(value => pluginOrder.includes(value));
 }
+
 const getCSSLoaders = optionsObj => {
   const {
     plugins,
@@ -53,23 +63,24 @@ const getCSSLoaders = optionsObj => {
     modules: {},
     sourceMap: true
   };
+
   if (classNameBlob) {
     cssLoaderOptions.modules.localIdentName = classNameBlob;
   } else {
     cssLoaderOptions.modules.getLocalIdent = (0, _cssClassNameGenerate.default)(cssUniqueness, cssHashSelectors, classNamePrefix, customClassNamePrefix, patterns, displayClassName);
   }
-  const pluginOrder = calculatePostCssPluginOrder(postCssPluginOrder, Object.keys(plugins).filter(x => plugins[x] === true));
 
-  // console.log('selector weight config : ', selectorWeightConfig);
+  const pluginOrder = calculatePostCssPluginOrder(postCssPluginOrder, Object.keys(plugins).filter(x => plugins[x] === true)); // console.log('selector weight config : ', selectorWeightConfig);
+
   const postcssPlugins = [plugins.valueReplacer && require('../postcss-plugins/ValueReplacer')(valueReplacer), plugins.hasRTL && require('@zohodesk/postcss-rtl')({
     addPrefixToSelector: function addPrefixToSelector(selector, prefix) {
       if (prefix === '[dir]') {
         return selector;
       }
+
       return `${prefix} ${selector}`; // Make selectors like [dir=rtl] > .selector
     }
-  }), plugins.selectorReplace && require('../postcss-plugins/SelectorReplace')(selectorReplace), plugins.combinerMediaQuery && require('postcss-combine-media-query')(), plugins.hoverActive && require('../postcss-plugins/hoverActivePlugin')(mediaQueryHoverActiveString), plugins.cssVariableReplacement && fs.existsSync(cssVariableReplacementConfig) && require('../postcss-plugins/variableModificationPlugin/index').plugin(cssVariableReplacementConfig)
-  // ,
+  }), plugins.selectorReplace && require('../postcss-plugins/SelectorReplace')(selectorReplace), plugins.combinerMediaQuery && require('postcss-combine-media-query')(), plugins.hoverActive && require('../postcss-plugins/hoverActivePlugin')(mediaQueryHoverActiveString), plugins.cssVariableReplacement && fs.existsSync(cssVariableReplacementConfig) && require('../postcss-plugins/variableModificationPlugin/index').plugin(cssVariableReplacementConfig) // ,
   // plugins.composeMinification &&
   //   require('../postcss-plugins/composePlugin')()
   ].filter(Boolean);
@@ -94,7 +105,6 @@ const getCSSLoaders = optionsObj => {
       ident: 'postcss',
       plugins: function (params) {
         // console.log('check here : ', params.resourcePath);
-
         // getCSSLoaders for all postcss filtering
 
         /*
@@ -154,8 +164,8 @@ const getCSSLoaders = optionsObj => {
           filterObject: patterns,
           plugins: postcssPlugins,
           order: pluginOrder
-        });
-        // postcssPlugins that are allowed
+        }); // postcssPlugins that are allowed
+
         return finalPostcssPlugins.length > 0 ? finalPostcssPlugins : [require('../postcss-plugins/EmptyPlugin')()];
       }
     }
@@ -163,4 +173,6 @@ const getCSSLoaders = optionsObj => {
     loader: require.resolve('../loaders/composeLoader')
   } : null].filter(Boolean);
 };
-var _default = exports.default = getCSSLoaders;
+
+var _default = getCSSLoaders;
+exports.default = _default;

package/lib/loaderUtils/getDevJsLoaders.js

@@ -4,9 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _path = _interopRequireDefault(require("path"));
+
 var _babelPresetReactOption = _interopRequireDefault(require("../babel/babel-option-utils/babel-preset-react-option"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 let getDevJsLoaders = options => {
   let {
     app: {
@@ -20,11 +24,13 @@ let getDevJsLoaders = options => {
     }
   } = options;
   let loaders = [];
+
   if (instrumentScript) {
     loaders.push({
       loader: require.resolve('../loaders/scriptInstrumentLoader.js')
     });
   }
+
   loaders.push({
     loader: 'babel-loader',
     options: {
@@ -40,8 +46,7 @@ let getDevJsLoaders = options => {
       }], (0, _babelPresetReactOption.default)({
         disableES5Transpile
       }), enableTypeScript ? require.resolve('@babel/preset-typescript') : null].filter(Boolean),
-      plugins: disableES5Transpile ? [require.resolve('@babel/plugin-syntax-dynamic-import'), require.resolve('babel-plugin-lodash'),
-      // require.resolve('@babel/plugin-proposal-object-rest-spread'),
+      plugins: disableES5Transpile ? [require.resolve('@babel/plugin-syntax-dynamic-import'), require.resolve('babel-plugin-lodash'), // require.resolve('@babel/plugin-proposal-object-rest-spread'),
       devConsoleExculde ? [require.resolve('babel-plugin-transform-remove-console'), {
         exclude: ['error', 'log']
       }] : null].filter(Boolean) : [require.resolve('@babel/plugin-syntax-dynamic-import'), require.resolve('babel-plugin-lodash'), require.resolve('@babel/plugin-proposal-object-rest-spread'), devConsoleExculde ? [require.resolve('babel-plugin-transform-remove-console'), {
@@ -50,6 +55,7 @@ let getDevJsLoaders = options => {
       cacheDirectory: true
     }
   });
+
   if (enableEslint) {
     loaders.push({
       loader: 'eslint-loader',
@@ -60,6 +66,9 @@ let getDevJsLoaders = options => {
       }
     });
   }
+
   return loaders;
 };
-var _default = exports.default = getDevJsLoaders;
+
+var _default = getDevJsLoaders;
+exports.default = _default;

package/lib/loaderUtils/index.js

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

package/lib/loaderUtils/tests/windowsModification.test.js

@@ -3,6 +3,7 @@
 const {
   windowsModificationFile
 } = require('../windowsModification');
+
 const tests = ['D:\\MyWork\\React Build\\desk_client_app\\jsapps\\supportapp\\src\\components\\Accessibility\\Accessibility.module.css', 'D:/MyWork/React Build/desk_client_app/jsapps/supportapp/src/components/Accessibility/Accessibility.module.css', 'desk_client_app\\jsapps\\supportapp\\src\\components\\Accessibility\\Accessibility.module.css', 'desk_client_app/jsapps/supportapp/src/components/Accessibility/Accessibility.module.css', 'src\\components\\Accessibility\\Accessibility.module.css', 'src/components/Accessibility/Accessibility.module.css', 'Accessibility.module.css', ''];
 tests.forEach(test => {
   console.log(windowsModificationFile(test));

package/lib/loaderUtils/windowsModification.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.windowsModification = windowsModification;
 exports.windowsModificationFile = windowsModificationFile;
 const isWin = process.platform === 'win32';
+
 function windowsModification(array) {
   return isWin ? array && Array.isArray(array) && array.map(r => r.replace(/\//g, '\\')) : array;
 }
+
 function windowsModificationFile(filename) {
   return isWin ? filename.replace(/\//g, '\\') : filename;
-}
-// module.exports = { windowsModification, windowsModificationFile };
+} // module.exports = { windowsModification, windowsModificationFile };

package/lib/loaders/__test__/markdownLoader.spec.js

@@ -4,6 +4,7 @@ const {
   markdownParser
 } = require('../markdownLoader'); // Replace './your-file' with the correct file path
 
+
 describe('markdownParser', () => {
   test('For {}(braces) case', () => {
     const source = `

package/lib/loaders/composeLoader.js

@@ -1,12 +1,19 @@
 "use strict";
 
 var _path = _interopRequireDefault(require("path"));
+
 var _postcss = _interopRequireDefault(require("postcss"));
+
 var _classHandling = require("../../lib/plugins/utils/classHandling");
+
 var _fileHandling = require("../plugins/utils/fileHandling");
+
 var _utils = require("../utils");
+
 var _ignore = _interopRequireDefault(require("ignore"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 const supportedProps = ['margin-top', 'margin-bottom', 'margin-left', 'margin-right', 'margin', 'padding-top', 'padding-bottom', 'padding-left', 'padding-right', 'padding', 'top', 'bottom', 'left', 'right', 'height', 'width', 'min-height', 'min-width', 'max-height', 'max-width', 'float', 'overflow', 'position', 'display', 'text-align', 'white-space', 'visibility'];
 const renameProps = {
   position: {
@@ -115,37 +122,46 @@ const renameProps = {
     neg: 'maxw_'
   }
 };
+
 function objToClassName(prop, data) {
   return renameProps[prop] ? data < 0 ? renameProps[prop].neg ? `${renameProps[prop].neg}${data * -1}` : `undef${data * -1}` : renameProps[prop].pos ? `${renameProps[prop].pos}${data}` : `undef${data}` : `undef${data}`;
 }
+
 function objtoClassNameString(prop, data) {
   let temp = data.toString().replace(/-/gi, '');
   return `${renameProps[prop].cls}_${temp.replace(/\s*/gi, '')}`;
 }
+
 const multipleClassName = {
   margin: ['margin-top', 'margin-right', 'margin-bottom', 'margin-left'],
   padding: ['padding-top', 'padding-right', 'padding-bottom', 'padding-left']
 };
+
 function objToClassNameMultiple(prop, data) {
   data = data.trim().replace(/\s+/gi, ' ');
   let dataArr = data.split(' ');
+
   if (dataArr.length === 3) {
     dataArr[3] = dataArr[1];
   }
+
   if (dataArr.length === 2) {
     dataArr[3] = dataArr[1];
     dataArr[2] = dataArr[0];
   }
+
   if (dataArr.length === 1) {
     dataArr[3] = dataArr[0];
     dataArr[2] = dataArr[0];
     dataArr[1] = dataArr[0];
   }
+
   let composeClasses = '';
   dataArr.forEach((data, index) => composeClasses += `${objToClassName(multipleClassName[prop][index], parseInt(data, 10))} `);
   composeClasses = composeClasses.substring(0, composeClasses.length - 1);
   return composeClasses;
 }
+
 const commonFilePath = {
   margin: 'src/common/css/margin.css',
   'margin-left': 'src/common/css/margin.css',
@@ -177,11 +193,12 @@ const commonFilePath = {
   'white-space': 'src/common/css/textProps.css',
   visibility: 'src/common/css/textProps.css'
 };
+
 function generateComposeString(resourcePath, prop, value) {
-  let composeString = `from "${_path.default.relative(_path.default.parse(resourcePath).dir,
-  // resourcePath
+  let composeString = `from "${_path.default.relative(_path.default.parse(resourcePath).dir, // resourcePath
   commonFilePath[prop]).replace(/\\/gi, '/')}"`;
   let cls = '';
+
   if (/^position|^overflow|^display|^float|^text-align|^white-space|^visibility/gi.test(prop)) {
     console.log(prop, value, 'textvals');
     cls = objtoClassNameString(prop, value);
@@ -192,10 +209,10 @@ function generateComposeString(resourcePath, prop, value) {
     // console.log(prop, value, 'common');
     cls = objToClassName(prop, parseInt(value));
   }
+
   composeString = `${cls} ${composeString}`;
   return composeString;
-}
-// const preNames = {
+} // const preNames = {
 //   height: 'zd-height-',
 //   'max-height': 'zd-height-',
 //   'min-height': 'zd-height-',
@@ -215,60 +232,67 @@ function generateComposeString(resourcePath, prop, value) {
 //   'margin-left': 'zd-margin-',
 //   'margin-right': 'zd-margin-'
 // };
+
+
 function allowParent(rule) {
   return rule.parent.type === 'root' || rule.parent.type === 'atrule' && rule.parent.name === 'media';
 }
+
 module.exports = function (source) {
   const {
     resourcePath
   } = this;
-  const options = (0, _utils.getOptions)();
-  // console.log(options.app.patterns.composeMinification);
+  const options = (0, _utils.getOptions)(); // console.log(options.app.patterns.composeMinification);
   // const ig = ignore({ allowRelativePaths: true }).add(options.app.patterns.composeMinification);
   // const newFilename = path.relative(path.parse(process.cwd()).base, resourcePath);
   // console.log(newFilename, ig.ignores(newFilename));
 
   let root = _postcss.default.parse(source);
+
   if (!(0, _fileHandling.isFileNameMatchingPluginPattern)({
     filename: resourcePath,
     filterArr: options.app.patterns.composeMinification
   })) {
     return root.toString();
   }
+
   root.walkRules(rule => {
     rule.walkDecls(decl => {
       if (/^-ms|^-webkit|^moz/gi.test(decl.prop)) {
         return;
       }
+
       if (!allowParent(rule)) {
         return;
       }
+
       if ((0, _classHandling.isInsideMediaQuery)(rule)) {
         console.log('inside media query', rule.selector);
         return;
       }
+
       if (supportedProps.includes(decl.prop) && /^position$|^overflow|^float|^display|^text-align|^white-space|^visibility/gi.test(decl.prop) && !/[,\s+]+|(\w+)\.|:|::|body|(\d+)%|>/gi.test(rule.selector) && commonFilePath[decl.prop] && !decl.value.includes('var(--')) {
         decl.value = generateComposeString(resourcePath, decl.prop, decl.value);
         decl.prop = 'composes';
         return;
       }
+
       if (supportedProps.includes(decl.prop) && /px$/gi.test(decl.value) && !/^--/gi.test(decl.prop) && commonFilePath[decl.prop] && !decl.value.includes('calc') && !/[,\s+]+|(\w+)\.|:|(\d+)%/gi.test(rule.selector)) {
         // n++ < 10 && console.log(composeString);
         // if (!composeString.includes('src')) {
         // if (/px$/gi.test(decl.value)) {
-        decl.value = generateComposeString(resourcePath, decl.prop, decl.value);
-        // }
+        decl.value = generateComposeString(resourcePath, decl.prop, decl.value); // }
         // if (/^position$|^display$|^overflow$|^float$/gi.test(decl.prop)) {
         //   console.log(decl.prop);
         // }
-        decl.prop = 'composes';
-        // console.log(decl.prop, decl.value);
+
+        decl.prop = 'composes'; // console.log(decl.prop, decl.value);
         // n < 10 && console.log(rule.selector, decl.prop, decl.value);
         // }
       }
     });
   });
-  const output = root.toString();
-  // console.log(output);
+  const output = root.toString(); // console.log(output);
+
   return output;
 };

package/lib/loaders/docsLoader.js

@@ -1,22 +1,33 @@
 "use strict";
 
 var _fs = _interopRequireDefault(require("fs"));
+
 var _getOptions = _interopRequireDefault(require("../utils/getOptions.js"));
+
 var _path = _interopRequireDefault(require("path"));
+
 var _enhancedReactLiveConverter = require("./enhancedReactLiveConverter.js");
+
 var _markdownLoader = require("./markdownLoader.js");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 module.exports = function (source) {
   const comNameAry = this.resourcePath.split(_path.default.sep);
   const filePath = this.resourcePath;
+
   const appPath = _fs.default.realpathSync(process.cwd());
+
   const changePath = filePath.replace('/lib/', '/src/');
   const comName = comNameAry[comNameAry.length - 1];
   const name = comName.substring(0, comName.lastIndexOf('.'));
   const options = (0, _getOptions.default)();
   const originalFilePath = filePath.startsWith(appPath) ? filePath : changePath;
+
   const src = _fs.default.readFileSync(originalFilePath).toString();
+
   options.docs.enableMDParser && (source = (0, _markdownLoader.markdownParser)(source));
   options.docs.enableReactLive && (source = (0, _enhancedReactLiveConverter.enhancedReactLiveConverter)(source, originalFilePath)); //to Enable the ReactLive Converter
+
   return `${source};${name}.source=${JSON.stringify(src)};${name}.filePath=${JSON.stringify(filePath)}`;
 };

package/lib/loaders/docsPropsLoader.js

@@ -1,21 +1,25 @@
 "use strict";
 
 var _reactDocgen = _interopRequireDefault(require("react-docgen"));
+
 var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("../utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// import loaderUtils from 'loader-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/enhancedReactLiveConverter.js

@@ -4,14 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.enhancedReactLiveConverter = enhancedReactLiveConverter;
+
 const parser = require('@babel/parser');
+
 const traverse = require('@babel/traverse').default;
+
 const t = require("@babel/types");
+
 const path = require('path');
+
 function getFilename(originalFilePath) {
   const [fileName] = path.basename(originalFilePath).split('.');
   return fileName;
 }
+
 function convertKeyToValue(object = {}) {
   let keys = Object.keys(object);
   let values = Object.values(object);
@@ -20,16 +26,20 @@ function convertKeyToValue(object = {}) {
       item = item.replace(/{|}/g, "");
       item = '{ ' + item + ' }';
     }
+
     value = value + "'" + values[i] + "'" + ": " + item + ",";
     return value;
   }, '');
 }
+
 function mergeDuplicateValues(obj) {
   let mergedObj = {};
+
   for (let key in obj) {
     if (obj.hasOwnProperty(key)) {
       let value = obj[key];
       let existingKey = Object.keys(mergedObj).find(k => mergedObj[k] === value);
+
       if (existingKey) {
         mergedObj[existingKey + ' , ' + key] = value;
         delete mergedObj[existingKey];
@@ -38,33 +48,40 @@ function mergeDuplicateValues(obj) {
       }
     }
   }
+
   return mergedObj;
 }
+
 function enhancedReactLiveConverter(source, originalFilePath) {
   const fileName = getFilename(originalFilePath);
+
   if (!source) {
     return '';
   }
+
   let docCode = '';
   const fileContent = source.replace(/[\s\r\n]*$/, '');
   const ast = parser.parse(fileContent, {
     sourceType: 'module',
     plugins: ['jsx', 'classProperties']
   });
+
   function createImportStatements(input) {
     let output = '';
+
     for (const key in input) {
       if (input.hasOwnProperty(key) && key !== 'React') {
         output += `import ${key} from '${input[key]}';\n`;
       }
     }
+
     return output;
   }
+
   const importBlock = {};
   const printableCode = {};
-  let remainingBlock = '';
+  let remainingBlock = ''; // Traverse the AST and find the import and export blocks
 
-  // Traverse the AST and find the import and export blocks
   let remainingCode = ast.program.body.filter(node => node.type !== 'ImportDeclaration').filter(node => node.type !== 'ExpressionStatement').map(node => fileContent.substring(node.start, node.end)).join('').trim();
   traverse(ast, {
     ImportDeclaration(path) {
@@ -80,11 +97,14 @@ function enhancedReactLiveConverter(source, originalFilePath) {
         }
       }).join(", ");
     },
+
     ExpressionStatement(path) {
       const expression = path.get('expression');
       const expressionLeft = expression.get('left');
+
       if (path.isExpressionStatement() && expression.isAssignmentExpression() && expressionLeft.isMemberExpression()) {
         const docCheck = expressionLeft.toString();
+
         if (docCheck === `${fileName}.docs`) {
           docCode = expression.toString();
         } else if (docCheck.includes(fileName)) {
@@ -94,6 +114,7 @@ function enhancedReactLiveConverter(source, originalFilePath) {
         }
       }
     }
+
   });
   remainingCode = remainingCode.replace(/__DOCS__/, true);
   remainingCode = remainingCode.replace(/`/g, '\\`').replace(/\$\{/g, '$\\{');

package/lib/loaders/fileBountryLoader.js

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

package/lib/loaders/fileLoader.js

@@ -1,55 +1,64 @@
 "use strict";
 
 var _path = _interopRequireDefault(require("path"));
+
 var _loaderUtils = _interopRequireDefault(require("loader-utils"));
+
 var _common = require("../common");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+
+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 options = _loaderUtils.default.getOptions(this) || {};
+  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
-  };
+    name: '[hash].[ext]' // publicPathStrigify: true
+
+  }; // options takes precedence over config
 
-  // 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
@@ -58,9 +67,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(
@@ -79,6 +88,8 @@ module.exports = function (content) {
   if (query.emitFile === undefined || query.emitFile) {
     this.emitFile(outputPath, content);
   }
+
   return `module.exports = ${publicPath};`;
 };
+
 module.exports.raw = true;