fix dev server updates by moving index.html to docs/build, update low…

…er index.html files to redirect to docs/build
spotify · Nov 8, 2017 · 41d6071 · 41d6071
1 parent 5a569b6
commit 41d6071
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 37 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1,35 +1,9 @@
-<!--
-  NOTE: index.html is autogenerated by webpack & html-webpack-plugin.
-  To modify this HTML, make changes to docs/src/index_html.ejs and then run `npm run build`.
- -->
-<!DOCTYPE html>
 <html>
-<head lang="en">
-    <meta charset="UTF-8">
-    <title>Reactochart Docs</title>
-    <!-- Compiled and minified Bootstrap 3.3.6 CSS + Sp-bootstrap 8.0.0 theme CSS -->
-    <link href="https://sp-bootstrap.global.ssl.fastly.net/8.0.0/sp-bootstrap.min.css" rel="stylesheet">
-
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.0.0/codemirror.min.css"/>
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.0.0/theme/monokai.min.css"/>
-
-    <link rel="shortcut icon" href="build/assets/favicon.png">
+<head>
+    <title>Redirect</title>
+    <META http-equiv="refresh" content="0;URL=build">
 </head>
-
-<body>
-    <div class="navbar navbar-default" role="navigation">
-        <div class="container-fluid">
-            <div class="navbar-header">
-                <a class="navbar-brand" href="#">
-                    <span class="navbar-logo">Spotify</span>
-                    <span class="navbar-title">Reactochart</span>
-                </a>
-            </div>
-            <div class="collapse navbar-collapse">
-            </div>
-        </div>
-    </div>
-
-    <div class="container-fluid" id="container">Loading...</div>
-<script type="text/javascript" src="build/bundle.474507a48401d9514cff.js"></script></body>
-</html>
+<body bgcolor="#ffffff">
+Redirecting to docs...
+</body>
+</html>
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title>Redirect</title>
-    <META http-equiv="refresh" content="0;URL=docs">
+    <META http-equiv="refresh" content="0;URL=docs/build">
 </head>
 <body bgcolor="#ffffff">
     Redirecting to docs...

diff --git a/webpack.config.base.js b/webpack.config.base.js
@@ -14,7 +14,7 @@ module.exports = {
   },
   devServer: {
     port: 9876,
-    // contentBase: path.join(__dirname, "docs"),
+    contentBase: path.join(__dirname, "docs/build"),
   },
   devtool: 'source-map',
   plugins: [
@@ -23,8 +23,7 @@ module.exports = {
       // put built html file in /docs/index.html ('../' because relative to /docs/build)
       // filename: path.join(__dirname, 'docs/index.html'),
       title: "Reactochart Docs",
-      template: "docs/src/index_html.ejs",
-      filename: "../index.html"
+      template: "docs/src/index_html.ejs"
     }),
     new CopyPlugin([{from: path.join(__dirname, 'docs/assets'), to: 'assets'}])
   ],