Use publicPath option instead of custom baseHref

Author: mjackson

website/index.html.ejs

@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>React Router: Declarative Routing for React.js</title>
-  <base href="<%= htmlWebpackPlugin.options.baseHref %>"/>
+  <base href="<%= webpackConfig.output.publicPath %>"/>
   <style>
     html, body, #app { height: 100%; margin: 0 }
     *, *:before, *:after { box-sizing: border-box; }

website/package.json

@@ -1,15 +1,8 @@
 {
-  "name": "react-router-website",
-  "version": "0.0.0",
   "private": true,
   "scripts": {
-    "dev": "webpack-dev-server --inline",
-    "build": "npm run clean && webpack -p",
-    "clean": "rm -rf build",
-    "start": "npm run build && pushstate-server build/"
-  },
-  "dependencies": {
-    "pushstate-server": "1.14.0"
+    "build": "webpack -p",
+    "start": "webpack-dev-server --inline"
   },
   "devDependencies": {
     "bundle-loader": "0.5.4",
@@ -20,7 +13,6 @@
     "markdown-it": "^7.0.0",
     "postcss-loader": "0.9.1",
     "prismjs-loader": "0.0.3",
-    "pushstate-server": "^1.14.0",
     "react-motion": "^0.4.4",
     "style-loader": "0.13.1",
     "url-loader": "^0.5.7",

website/webpack.config.js

@@ -1,14 +1,11 @@
+const path = require('path')
 const webpack = require('webpack')
 const HTMLWebpackPlugin = require('html-webpack-plugin')
-const path = require('path')
 
 const HASH = '[chunkHash]'
-const PROD = process.env.NODE_ENV === 'production'
-
 const ROUTER_SRC = path.join(__dirname, '..', 'modules')
 
 module.exports = {
-
   devtool: 'source-map',
 
   entry: {
@@ -19,14 +16,12 @@ module.exports = {
   output: {
     path: path.join(__dirname, 'build'),
     filename: `bundle-${HASH}.js`,
-    chunkFileName: `[name]-${HASH}.js`,
-    pubicPath: PROD ? 'build/' : ''
+    chunkFileName: `[name]-${HASH}.js`
   },
 
   plugins: [
     new webpack.optimize.CommonsChunkPlugin('vendor', `vendor-${HASH}.js`),
     new HTMLWebpackPlugin({
-      baseHref: PROD ? '//reacttraining.github.io/react-router/' : '/',
       template: 'index.html.ejs'
     })
   ],