ing

config/webpack/webpack.config.base.js

@@ -26,18 +26,42 @@ module.exports = {
   },
 
   module: {
-    loaders: [
+    rules:[
       {
-        enforce: 'pre',
         test: /\.tsx?$/,
         exclude: [
           Path.resolve(__dirname, '../../node_modules/')
         ],
+        enforce: 'pre',
         use: [
           {
             loader: 'tslint-loader'
           }
-        ],    
+        ]
+      },
+      {
+        test: /\.html$/,
+        use: [
+          {
+            loader: 'html-loader'
+          }
+        ]
+      },
+      {
+        test: /\.png$/,
+        use: [
+          {
+            loader: 'url-loader?limit=10000'
+          }
+        ]
+      },
+      {
+        test: /\.jpg$/,
+        use: [
+          {
+            loader: 'file-loader'
+          }
+        ]
       }
     ]
   },

config/webpack/webpack.config.dev.js

@@ -34,61 +34,54 @@ module.exports = WebpackMerge(configBase, {
   },
 
   module: {
-    loaders: [
-      // source-map
+    rules: [
       {
-        enforce: 'pre',
         test: /\.js$/,
-        use: [
-          {
-            loader: 'source-map-loader'
-          }
-        ],
         exclude: [
           Path.resolve(__dirname, '../../node_modules/')
-        ]
-      },
-      {
+        ],
         enforce: 'pre',
-        test: /\.tsx?$/,
         use: [
           {
             loader: 'source-map-loader'
           }
-        ],
-        exclude: [
-          Path.resolve(__dirname, '../../node_modules/')
         ]
       },
-      // .ts, .tsx
       {
         test: /\.tsx?$/,
         exclude: [
           Path.resolve(__dirname, '../../node_modules/')
         ],
+        enforce: 'pre',
+        use: [
+          {
+            loader: 'source-map-loader'
+          }
+        ]
+      },
+      {
+        test: /\.tsx?$/,
         include: [
-            Path.resolve(__dirname, '../../src/')
+          Path.resolve(__dirname, '../../src/')
+        ],
+        exclude: [
+          Path.resolve(__dirname, '../../node_modules/')
         ],
         use: [
           {
-            loader: 'react-hot-loader/webpack' 
+            loader: 'react-hot-loader/webpack'
           },
           {
-              loader: 'awesome-typescript-loader',
-              options: {
-                  transpileOnly: true,
-                  useTranspileModule: false,
-                  sourceMap: true,
-              },
+            loader: 'awesome-typescript-loader',
+            options: {
+                transpileOnly: true,
+                useTranspileModule: false,
+                sourceMap: true,
+            }
           },
         ]
-      },
-
-      // static assets
-      { test: /\.html$/, use: 'html-loader' },
-      { test: /\.png$/, use: 'url-loader?limit=10000' },
-      { test: /\.jpg$/, use: 'file-loader' },
-    ],
+      }
+    ]
   },
 
   plugins: [

config/webpack/webpack.config.prod.js

@@ -16,29 +16,24 @@ module.exports = WebpackMerge(configBase, {
   devtool: 'source-map',
 
   module: {
-    loaders: [
-      // .ts, .tsx
+    rules: [
       {
         test: /\.tsx?$/,
-        exclude: [
-          Path.resolve(__dirname, '../../node_modules/')
-        ],
         include: [
           Path.resolve(__dirname, '../../src/')
         ],
+        exclude: [
+          Path.resolve(__dirname, '../../node_modules/')
+        ],
         use: [
           {
             loader: 'awesome-typescript-loader?module=es6'
-          },
+          }
         ]
-      },
-
-      // static assets
-      { test: /\.html$/, use: 'html-loader' },
-      { test: /\.png$/, use: 'url-loader?limit=10000' },
-      { test: /\.jpg$/, use: 'file-loader' },
-    ],
+      }
+    ]
   },
+
   plugins: [
     new Webpack.DefinePlugin({
       'process.env': {