diff --git a/webpack.common.js b/webpack.common.js
deleted file mode 100644
index d77af62..0000000
--- a/webpack.common.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const path = require('path')
-//const CleanWebpackPlugin = require('clean-webpack-plugin')
-//const HtmlWebpackPlugin = require('html-webpack-plugin')
-
-module.exports = {
-  entry: { app: ['@babel/polyfill', './src/index.js'] },
-
-  module: {
-    rules: [
-      {
-        test: /\.jsx?$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader'
-      }
-    ]
-  },
-
-  output: {
-    filename: 'bundle.js',
-    path: path.resolve(__dirname, 'dist')
-  }
-}
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 0000000..fff9c80
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,38 @@
+const webpack = require('webpack')
+const path = require('path')
+
+const isDev = process.env.NODE_ENV === 'development'
+
+module.exports = {
+  mode: isDev? 'development' : 'production',
+  entry: ['@babel/polyfill', './src/index.js'],
+  module: {
+    rules: [
+      {
+        test: /\.(js|jsx)$/,
+        exclude: /node_modules/,
+        use: ['babel-loader'],
+      },
+    ],
+  },
+  resolve: {
+    extensions: ['*', '.js', '.jsx'],
+  },
+  output: {
+    path: __dirname + '/dist',
+    filename: 'bundle.js',
+  },
+  plugins: [new webpack.HotModuleReplacementPlugin()],
+  devServer: {
+    contentBase: path.join(__dirname, 'dist'),
+    hot: false,
+    port: 3001,
+    historyApiFallback: true,
+    allowedHosts: [
+      'localhost',
+    ],
+    proxy: {
+      '/api': 'http://localhost:1337',
+    },
+  },
+}
diff --git a/webpack.dev.js b/webpack.dev.js
deleted file mode 100644
index f6cc1f3..0000000
--- a/webpack.dev.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const merge = require('webpack-merge')
-const common = require('./webpack.common.js')
-
-module.exports = merge(common, {
-  mode: 'development',
-  devtool: 'inline-source-map',
-  devServer: {
-    contentBase: './dist'
-  }
-})
diff --git a/webpack.prod.js b/webpack.prod.js
deleted file mode 100644
index 47eaaa7..0000000
--- a/webpack.prod.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const merge = require('webpack-merge')
-const common = require('./webpack.common.js')
-
-module.exports = merge(common, {
-  mode: 'production'
-})