Merge pull request #335 from zuiidea/develop

Develop

src/components/FilterItem/FilterItem.js

@@ -12,7 +12,7 @@ const FilterItem = ({
       {labelArray.length > 0
         ? <div className={styles.labelWrap}>
             {labelArray.map((item, index) => <span className="labelText" key={index}>{item}</span>)}
-          </div>
+        </div>
         : ''}
       <div className={styles.item}>
         {children}

webpack.config.js

@@ -9,8 +9,19 @@ module.exports = (webpackConfig) => {
     localIdentName: '[hash:base64:5]',
   }
   const cssLoaders = webpackConfig.module.loaders[3].loader.split('!')
-  cssLoaders[1] = `css?${JSON.stringify(cssLoaderOption)}`
-  webpackConfig.module.loaders[3].loader = cssLoaders.join('!')
+  webpackConfig.module.loaders[3].loader = cssLoaders.map(item => {
+    if (item.startsWith('css')) {
+      return `css?${JSON.stringify(cssLoaderOption)}`
+    }
+    return item
+  }).join('!')
+
+  // PreLoaders
+  webpackConfig.module.preLoaders = [{
+    test: /\.js$/,
+    enforce: 'pre',
+    loader: 'eslint',
+  }]
 
   return webpackConfig
 }