Clean up loader configurations

bebcovi · Jan 23, 2016 · 18d1e6a · 18d1e6a
1 parent e866f72
commit 18d1e6a
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 49 deletions.
diff --git a/config/_base.js b/config/_base.js
@@ -25,10 +25,20 @@ export default {
     new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /hr$/),
   ],
   module: {
-    loaders: [{
-      test: /\.json$/,
-      loaders: ['json'],
-    }],
+    loaders: [
+      {
+        test: /\.js$/,
+        loaders: ['babel'],
+        include: [
+          resolve(__dirname, '../src'),
+          resolve(__dirname, '../test'),
+        ],
+      },
+      {
+        test: /\.json$/,
+        loaders: ['json'],
+      },
+    ],
   },
   postcss() {
     return [

diff --git a/config/_development.js b/config/_development.js
@@ -16,22 +16,21 @@ export default {
     new webpack.NoErrorsPlugin(),
   ],
   module: {
-    loaders: [{
-      test: /\.js$/,
-      loaders: ['babel'],
-      include: resolve(__dirname, '../src'),
-    }, {
-      test: /\.s?css$/,
-      // https://github.com/webpack/css-loader/tree/1298d2b38c4770dbf853ff1eed632fe239881cc2#css-modules
-      loaders: ['style', 'css?modules', 'postcss', 'sass'],
-      include: resolve(__dirname, '../src/styles'),
-    }, {
-      test: /\.s?css$/,
-      loaders: ['style', 'css', 'sass'],
-      include: resolve(__dirname, '../node_modules'),
-    }, {
-      test: /\.(jpe?g|png|gif|svg)$/i,
-      loaders: ['url?limit=10000&name=[name].[ext]'],
-    }],
+    loaders: [
+      {
+        test: /\.s?css$/,
+        loaders: ['style', 'css?modules', 'postcss', 'sass'],
+        include: resolve(__dirname, '../src/styles'),
+      },
+      {
+        test: /\.s?css$/,
+        loaders: ['style', 'css', 'sass'],
+        include: resolve(__dirname, '../node_modules'),
+      },
+      {
+        test: /\.(jpe?g|png|gif|svg)$/i,
+        loaders: ['url?limit=10000&name=[name].[ext]'],
+      },
+    ],
   },
 };
diff --git a/config/_production.js b/config/_production.js
@@ -22,22 +22,19 @@ module.exports = {
     }),
   ],
   module: {
-    loaders: [{
-      test: /\.js$/,
-      loaders: ['babel'],
-      include: resolve(__dirname, '../src'),
-    }, {
-      test: /\.s?css$/,
-      // https://github.com/webpack/css-loader/tree/1298d2b38c4770dbf853ff1eed632fe239881cc2#css-modules
-      loaders: ['style', 'css?modules', 'postcss', 'sass'],
-      include: resolve(__dirname, '../src/styles'),
-    }, {
-      test: /\.s?css$/,
-      loaders: ['style', 'css', 'sass'],
-      exclude: resolve(__dirname, '../src/styles'),
-    }, {
-      test: /\.(jpe?g|png|gif|svg)$/i,
-      loaders: ['url?limit=10000&name=[name].[ext]', 'image-webpack'],
-    }],
+    loaders: [
+      {
+        test: /\.s?css$/,
+        loaders: ['style', 'css?modules', 'postcss', 'sass'],
+        include: resolve(__dirname, '../src/styles'),
+      }, {
+        test: /\.s?css$/,
+        loaders: ['style', 'css', 'sass'],
+        include: resolve(__dirname, '../node_modules'),
+      }, {
+        test: /\.(jpe?g|png|gif|svg)$/i,
+        loaders: ['url?limit=10000&name=[name].[ext]', 'image-webpack'],
+      },
+    ],
   },
 };
diff --git a/config/_test.js b/config/_test.js
@@ -20,16 +20,11 @@ export default {
     // require(expr)
     exprContextRegExp: /$^/,
     exprContextCritical: false,
-    loaders: [{
-      test: /\.js$/,
-      loaders: ['babel'],
-      include: [
-        resolve(__dirname, '../src'),
-        resolve(__dirname, '../test'),
-      ],
-    }, {
-      test: /\.(s?css|jpe?g|png|gif|svg)$/,
-      loaders: ['null'],
-    }],
+    loaders: [
+      {
+        test: /\.(s?css|jpe?g|png|gif|svg)$/,
+        loaders: ['null'],
+      },
+    ],
   },
 };