merging

1 files changed, 21 insertions, 5 deletions

diff --git a/webpack.config.js b/webpack.config.js
index 478c900b2..815e2b477 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,15 +4,23 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 
 module.exports = {
   mode: 'development',
-  entry: ["./src/client/views/Main.tsx", 'webpack-hot-middleware/client?reload=true'],
+  entry: {
+    bundle: ["./src/client/views/Main.tsx", 'webpack-hot-middleware/client?reload=true'],
+    viewer: ["./src/debug/Viewer.tsx", 'webpack-hot-middleware/client?reload=true'],
+    test: ["./src/debug/Test.tsx", 'webpack-hot-middleware/client?reload=true'],
+  },
   devtool: "source-map",
   node: {
     fs: 'empty',
-    module: 'empty'
+    module: 'empty',
+    dns: 'mock',
+    tls: 'mock',
+    net: 'mock'
   },
   output: {
-    filename: "./bundle.js",
-    path: path.resolve(__dirname, "build")
+    filename: "[name].js",
+    path: path.resolve(__dirname, "build"),
+    publicPath: "/"
   },
   resolve: {
     extensions: ['.js', '.ts', '.tsx']
@@ -38,6 +46,14 @@ module.exports = {
       ]
     },
     {
+      test: /\.(jpg|png|pdf)$/,
+      use: [
+        {
+          loader: 'file-loader'
+        }
+      ]
+    },
+    {
       test: /\.(png|jpg|gif)$/i,
       use: [
         {
@@ -59,7 +75,7 @@ module.exports = {
     compress: false,
     host: "localhost",
     contentBase: path.join(__dirname, 'deploy'),
-    port: 1050,
+    port: 1234,
     hot: true,
     https: false,
     overlay: {