Merge branch 'master' into mihirsoni-fixing-dependecies-error

grgur · grgur · commit 2bc9bef30141 · 2016-11-14T10:59:10.000+01:00
# Conflicts:
#	webpack.config.js
diff --git a/client/index.html b/client/index.html
@@ -4,11 +4,11 @@
     <meta name="viewport" content="width=device-width, maximum-scale=1.0, minimum-scale=1.0, initial-scale=1.0" />
     <meta charset="utf-8">
     <title>React Router + Webpack 2 + Dynamic Chunk Navigation</title>
-    <link href="./style.css" media="all" rel="stylesheet" />
+    <link href="/style.css" media="all" rel="stylesheet" />
   </head>
   <body>
     <div id="root"></div>
-    <script src="./vendor.bundle.js"></script>
-    <script src="./bundle.js"></script>
+    <script src="/vendor.bundle.js"></script>
+    <script src="/bundle.js"></script>
   </body>
 </html>
diff --git a/webpack.config.js b/webpack.config.js
@@ -11,10 +11,12 @@ module.exports = {
   context: path.join(__dirname, './client'),
   entry: {
     js: [
-      'index', 'pages/Home'
+      'index',
+      'pages/Home'
     ],
     vendor: [
-      'react', 'react-dom'
+      'react',
+      'react-dom'
     ]
   },
   output: {
