fix(webpack): fix webpack2 dev breakage

Calmio-Y · Feb 23, 2017 · 3dde3be · 3dde3be
1 parent 03b64c9
commit 3dde3be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -18,8 +18,7 @@ clean:
 	rm -rf $(BUILD) $(DIST)
 
 dev:
-	echo 'Open http://localhost:4002'
-	@$(BIN)/webpack-dev-server --config webpack-dev-server.config.js --hot --progress --colors --port 4002 --content-base .
+	@$(BIN)/webpack-dev-server --config webpack-dev-server.config.js --hot --progress --colors --port 4002 --open --content-base .
 
 # Allows usage of `make install`, `make link`
 install link:

diff --git a/index.html b/index.html
@@ -1,12 +1,12 @@
 <html>
   <head>
-    <script src="http://localhost:4002/bundle.js"></script>
+    <script src="/bundle.js"></script>
     <title>RGL Example</title>
   </head>
   <body>
     <h3>React-Grid-Layout Dev</h3>
     <p>Try dragging the elements around.</p>
-    <p>If you don't see any content, run webpack (<span style="font-family:monospace">npm run dev</span>) 
+    <p>If you don't see any content, run webpack (<span style="font-family:monospace">npm run dev</span>)
       and load this file from the server it opens.</p>
     <div id="content"></div>
   </body>

diff --git a/webpack-dev-server.config.js b/webpack-dev-server.config.js
@@ -5,7 +5,7 @@ module.exports = {
     context: __dirname,
     entry: "./test/dev-hook.jsx",
     output: {
-        path: path.join(__dirname, "dist"),
+        path: '/',
         filename: "bundle.js",
         sourceMapFilename: "[file].map",
     },
@@ -40,7 +40,7 @@ module.exports = {
     ],
     devtool: "eval",
     devServer: {
-        publicPath: '/examples/',
+        publicPath: '/',
         compress: true,
         port: 4002
     },