From a6b10206799686451d279af7a475e95a540e88c9 Mon Sep 17 00:00:00 2001
From: Amy Lam <alam@fastly.com>
Date: Fri, 11 May 2018 14:26:14 -0700
Subject: [PATCH 01/11] Add LiveReload

Add to docs/, website/blog/, website/pages/, and website/static
---
 lib/core/Site.js     |  1 +
 lib/server/server.js | 24 +++++++++++
 package.json         |  4 +-
 yarn.lock            | 99 +++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 122 insertions(+), 6 deletions(-)

diff --git a/lib/core/Site.js b/lib/core/Site.js
index 9c151f4f0905..72101a195b3d 100644
--- a/lib/core/Site.js
+++ b/lib/core/Site.js
@@ -159,6 +159,7 @@ class Site extends React.Component {
                 }}
               />
             ))}
+          <script src="http://localhost:35729/livereload.js" />
         </body>
       </html>
     );
diff --git a/lib/server/server.js b/lib/server/server.js
index 3ccf01dfd839..a68198e5bdb1 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -32,6 +32,11 @@ function execute(port) {
   const join = path.join;
   const sep = path.sep;
 
+  const gaze = require('gaze');
+  const tinylr = require('tiny-lr');
+
+  const LIVE_RELOAD_PORT = 35729;
+
   // remove a module and child modules from require cache, so server does not have
   // to be restarted
   function removeModuleAndChildrenFromCache(moduleName) {
@@ -542,6 +547,25 @@ function execute(port) {
   });
 
   app.listen(port);
+
+  const server = tinylr();
+  server.listen(LIVE_RELOAD_PORT, function() {
+    console.log('Livereload listening on %s...', LIVE_RELOAD_PORT);
+  });
+
+  // Gaze watches some specified files and triggers a callback when they change.
+  gaze(['../docs/**/*', 'blog/**/*', 'pages/**/*', 'static/**/*'], function() {
+    // Trigger on all kinds of file changes - modified/added/deleted.
+    this.on('all', function() {
+      // Notify LiveReload clients that there's a change.
+      // Typically, LiveReload will only refresh the changed paths.
+      // Hence, we use / here so that the clients are informed that
+      // the root has changes, so they will do a full-page refresh.
+      server.notifyClients(['/']);
+    });
+  });
+
+
 }
 
 module.exports = execute;
diff --git a/package.json b/package.json
index ad5e101c903c..2686c6637a7f 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "express": "^4.15.3",
     "feed": "^1.1.0",
     "fs-extra": "^5.0.0",
+    "gaze": "^1.1.2",
     "glob": "^7.1.2",
     "highlight.js": "^9.12.0",
     "imagemin": "^5.3.1",
@@ -58,7 +59,8 @@
     "shelljs": "^0.7.8",
     "sitemap": "^1.13.0",
     "tcp-port-used": "^0.1.2",
-    "tree-node-cli": "^1.1.1"
+    "tree-node-cli": "^1.1.1",
+    "tiny-lr": "^1.1.1"
   },
   "bin": {
     "docusaurus-start": "./lib/start-server.js",
diff --git a/yarn.lock b/yarn.lock
index b0b8f53af04a..85495d2e83d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -959,6 +959,15 @@ body-parser@1.18.2:
     raw-body "2.3.2"
     type-is "~1.6.15"
 
+body@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
+  dependencies:
+    continuable-cache "^0.3.1"
+    error "^7.0.0"
+    raw-body "~1.1.0"
+    safe-json-parse "~1.0.1"
+
 boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -1071,6 +1080,10 @@ builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
+bytes@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -1378,6 +1391,10 @@ content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
+continuable-cache@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
+
 convert-source-map@^1.1.1, convert-source-map@^1.4.0, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
@@ -1835,6 +1852,13 @@ error-ex@^1.2.0:
   dependencies:
     is-arrayish "^0.2.1"
 
+error@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02"
+  dependencies:
+    string-template "~0.2.1"
+    xtend "~4.0.0"
+
 es-abstract@^1.5.1, es-abstract@^1.6.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
@@ -2071,6 +2095,12 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
+faye-websocket@~0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  dependencies:
+    websocket-driver ">=0.5.1"
+
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
@@ -2298,6 +2328,12 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+gaze@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
+  dependencies:
+    globule "^1.0.0"
+
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -2383,7 +2419,7 @@ glob@^5.0.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -2408,6 +2444,14 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globule@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
+  dependencies:
+    glob "~7.1.1"
+    lodash "~4.17.4"
+    minimatch "~3.0.2"
+
 glogg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
@@ -2642,6 +2686,10 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-parser-js@>=0.4.0:
+  version "0.4.12"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.12.tgz#b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -3548,6 +3596,10 @@ list-item@^1.1.1:
     is-number "^2.1.0"
     repeat-string "^1.5.2"
 
+livereload-js@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -3669,7 +3721,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.14.0, lodash@^4.17.4:
+lodash@^4.14.0, lodash@^4.17.4, lodash@~4.17.4:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -3873,7 +3925,7 @@ mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
-"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -4643,7 +4695,7 @@ qs@6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
-qs@~6.5.1:
+qs@^6.4.0, qs@~6.5.1:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
@@ -4674,6 +4726,13 @@ raw-body@2.3.2:
     iconv-lite "0.4.19"
     unpipe "1.0.0"
 
+raw-body@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
+  dependencies:
+    bytes "1"
+    string_decoder "0.10"
+
 rc@^1.1.2, rc@^1.1.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297"
@@ -4956,6 +5015,10 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0,
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
+safe-json-parse@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -5299,6 +5362,10 @@ string-length@^2.0.0:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
+string-template@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -5314,7 +5381,7 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@~0.10.x:
+string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
@@ -5542,6 +5609,17 @@ timed-out@^3.0.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
 
+tiny-lr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
+  dependencies:
+    body "^5.1.0"
+    debug "^3.1.0"
+    faye-websocket "~0.10.0"
+    livereload-js "^2.3.0"
+    object-assign "^4.1.0"
+    qs "^6.4.0"
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -5884,6 +5962,17 @@ webidl-conversions@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
+websocket-driver@>=0.5.1:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  dependencies:
+    http-parser-js ">=0.4.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+
 whatwg-encoding@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"

From 7ff7b2705e65210dbafa0f800042cac20be82010 Mon Sep 17 00:00:00 2001
From: Amy Lam <alam@fastly.com>
Date: Tue, 15 May 2018 00:31:55 -0700
Subject: [PATCH 02/11] Only run LiveReload in development

---
 lib/core/Site.js     |  4 +++-
 lib/server/server.js | 32 ++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/lib/core/Site.js b/lib/core/Site.js
index 72101a195b3d..f10f48bf1316 100644
--- a/lib/core/Site.js
+++ b/lib/core/Site.js
@@ -159,7 +159,9 @@ class Site extends React.Component {
                 }}
               />
             ))}
-          <script src="http://localhost:35729/livereload.js" />
+          {process.env.NODE_ENV === 'development' && (
+            <script src="http://localhost:35729/livereload.js" />
+          )}
         </body>
       </html>
     );
diff --git a/lib/server/server.js b/lib/server/server.js
index a68198e5bdb1..374d264be9a9 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -548,24 +548,24 @@ function execute(port) {
 
   app.listen(port);
 
-  const server = tinylr();
-  server.listen(LIVE_RELOAD_PORT, function() {
-    console.log('Livereload listening on %s...', LIVE_RELOAD_PORT);
-  });
-
-  // Gaze watches some specified files and triggers a callback when they change.
-  gaze(['../docs/**/*', 'blog/**/*', 'pages/**/*', 'static/**/*'], function() {
-    // Trigger on all kinds of file changes - modified/added/deleted.
-    this.on('all', function() {
-      // Notify LiveReload clients that there's a change.
-      // Typically, LiveReload will only refresh the changed paths.
-      // Hence, we use / here so that the clients are informed that
-      // the root has changes, so they will do a full-page refresh.
-      server.notifyClients(['/']);
+  if (process.env.NODE_ENV === 'development') {
+    const server = tinylr();
+    server.listen(LIVE_RELOAD_PORT, function() {
+      console.log('Livereload listening on %s...', LIVE_RELOAD_PORT);
     });
-  });
-
 
+    // Gaze watches some specified files and triggers a callback when they change.
+    gaze(['../docs/**/*', 'blog/**/*', 'pages/**/*', 'static/**/*'], function() {
+      // Trigger on all kinds of file changes - modified/added/deleted.
+      this.on('all', function() {
+        // Notify LiveReload clients that there's a change.
+        // Typically, LiveReload will only refresh the changed paths.
+        // Hence, we use / here so that the clients are informed that
+        // the root has changes, so they will do a full-page refresh.
+        server.notifyClients(['/']);
+      });
+    });
+  }
 }
 
 module.exports = execute;

From e9ecf5256c1f7ccbf42458f6ce6473fa8101f1c0 Mon Sep 17 00:00:00 2001
From: Amy Lam <alam@fastly.com>
Date: Tue, 15 May 2018 00:34:19 -0700
Subject: [PATCH 03/11] Prettify file

---
 lib/server/server.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/server/server.js b/lib/server/server.js
index 374d264be9a9..7c7fe82930c7 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -555,16 +555,19 @@ function execute(port) {
     });
 
     // Gaze watches some specified files and triggers a callback when they change.
-    gaze(['../docs/**/*', 'blog/**/*', 'pages/**/*', 'static/**/*'], function() {
-      // Trigger on all kinds of file changes - modified/added/deleted.
-      this.on('all', function() {
-        // Notify LiveReload clients that there's a change.
-        // Typically, LiveReload will only refresh the changed paths.
-        // Hence, we use / here so that the clients are informed that
-        // the root has changes, so they will do a full-page refresh.
-        server.notifyClients(['/']);
-      });
-    });
+    gaze(
+      ['../docs/**/*', 'blog/**/*', 'pages/**/*', 'static/**/*'],
+      function() {
+        // Trigger on all kinds of file changes - modified/added/deleted.
+        this.on('all', function() {
+          // Notify LiveReload clients that there's a change.
+          // Typically, LiveReload will only refresh the changed paths.
+          // Hence, we use / here so that the clients are informed that
+          // the root has changes, so they will do a full-page refresh.
+          server.notifyClients(['/']);
+        });
+      }
+    );
   }
 }
 

From 8127dfd29b9b9a421d9e1e28b1c560775fb09af9 Mon Sep 17 00:00:00 2001
From: Amy Lam <alam@fastly.com>
Date: Tue, 15 May 2018 00:56:01 -0700
Subject: [PATCH 04/11] Add catch for NODE_ENV being undefined

---
 lib/core/Site.js     | 3 ++-
 lib/server/server.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/core/Site.js b/lib/core/Site.js
index f10f48bf1316..624a284be632 100644
--- a/lib/core/Site.js
+++ b/lib/core/Site.js
@@ -159,7 +159,8 @@ class Site extends React.Component {
                 }}
               />
             ))}
-          {process.env.NODE_ENV === 'development' && (
+          {(process.env.NODE_ENV === 'development' ||
+            !process.env.NODE_ENV) && (
             <script src="http://localhost:35729/livereload.js" />
           )}
         </body>
diff --git a/lib/server/server.js b/lib/server/server.js
index 7c7fe82930c7..988312c888ff 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -548,7 +548,7 @@ function execute(port) {
 
   app.listen(port);
 
-  if (process.env.NODE_ENV === 'development') {
+  if (process.env.NODE_ENV === 'development' || !process.env.NODE_ENV) {
     const server = tinylr();
     server.listen(LIVE_RELOAD_PORT, function() {
       console.log('Livereload listening on %s...', LIVE_RELOAD_PORT);

From b63db945e7179b7456a95a0116cc13f6f9274adb Mon Sep 17 00:00:00 2001
From: Amy Lam <alam@fastly.com>
Date: Tue, 15 May 2018 01:00:49 -0700
Subject: [PATCH 05/11] Add LiveReload docs update

---
 admin/testing-changes-on-Docusaurus-itself.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/testing-changes-on-Docusaurus-itself.md b/admin/testing-changes-on-Docusaurus-itself.md
index 2abab9661efc..3ec45b4102b3 100644
--- a/admin/testing-changes-on-Docusaurus-itself.md
+++ b/admin/testing-changes-on-Docusaurus-itself.md
@@ -47,4 +47,4 @@ Feel free to contribute debug instructions for other IDEs
 
 ### Observing changes
 
-Now that the server is running, you can make changes to the core Docusaurus code and docs to see the effects on the Docusaurus site. Just refresh the local site, usually running at http://localhost:3000
+Now that the server is running, you can make changes to the core Docusaurus code and docs to see the effects on the Docusaurus site. LiveReload will reflect changes to the local site in your browser, usually running at http://localhost:3000

From 2c264e898efda48ccd6bca9ad7e5f8225fce1c82 Mon Sep 17 00:00:00 2001
From: Amy Lam <alam@fastly.com>
Date: Tue, 15 May 2018 01:06:27 -0700
Subject: [PATCH 06/11] Simplify process.env call

---
 lib/core/Site.js     | 3 +--
 lib/server/server.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/core/Site.js b/lib/core/Site.js
index 624a284be632..5268a3993607 100644
--- a/lib/core/Site.js
+++ b/lib/core/Site.js
@@ -159,8 +159,7 @@ class Site extends React.Component {
                 }}
               />
             ))}
-          {(process.env.NODE_ENV === 'development' ||
-            !process.env.NODE_ENV) && (
+          {process.env.NODE_ENV !== 'production' && (
             <script src="http://localhost:35729/livereload.js" />
           )}
         </body>
diff --git a/lib/server/server.js b/lib/server/server.js
index 988312c888ff..2ddd40a8d819 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -548,7 +548,7 @@ function execute(port) {
 
   app.listen(port);
 
-  if (process.env.NODE_ENV === 'development' || !process.env.NODE_ENV) {
+  if (process.env.NODE_ENV !== 'production') {
     const server = tinylr();
     server.listen(LIVE_RELOAD_PORT, function() {
       console.log('Livereload listening on %s...', LIVE_RELOAD_PORT);

From 11bf35091cebbd7c7f65a873330bd17f31f49151 Mon Sep 17 00:00:00 2001
From: Yangshun Tay <tay.yang.shun@gmail.com>
Date: Tue, 15 May 2018 21:47:50 -0700
Subject: [PATCH 07/11] Tweak code a little

---
 lib/core/Site.js      | 12 +++++++---
 lib/core/constants.js | 10 ++++++++
 lib/server/server.js  | 56 +++++++++++++++++++++++--------------------
 lib/start-server.js   |  2 +-
 4 files changed, 50 insertions(+), 30 deletions(-)
 create mode 100644 lib/core/constants.js

diff --git a/lib/core/Site.js b/lib/core/Site.js
index 5268a3993607..ab68638cf8e7 100644
--- a/lib/core/Site.js
+++ b/lib/core/Site.js
@@ -7,11 +7,13 @@
 
 const React = require('react');
 const fs = require('fs');
+const classNames = require('classnames');
+
 const HeaderNav = require('./nav/HeaderNav.js');
 const Head = require('./Head.js');
 const Footer = require(process.cwd() + '/core/Footer.js');
 const translation = require('../server/translation.js');
-const classNames = require('classnames');
+const constants = require('./constants');
 
 const CWD = process.cwd();
 
@@ -159,8 +161,12 @@ class Site extends React.Component {
                 }}
               />
             ))}
-          {process.env.NODE_ENV !== 'production' && (
-            <script src="http://localhost:35729/livereload.js" />
+          {process.env.NODE_ENV === 'development' && (
+            <script
+              src={`http://localhost:${
+                constants.LIVE_RELOAD_PORT
+              }/livereload.js`}
+            />
           )}
         </body>
       </html>
diff --git a/lib/core/constants.js b/lib/core/constants.js
new file mode 100644
index 000000000000..6a7d6cc5d3b4
--- /dev/null
+++ b/lib/core/constants.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+module.exports = {
+  LIVE_RELOAD_PORT: 35730,
+};
diff --git a/lib/server/server.js b/lib/server/server.js
index 2ddd40a8d819..896d18214c7c 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -21,6 +21,10 @@ function execute(port) {
   const mkdirp = require('mkdirp');
   const glob = require('glob');
   const chalk = require('chalk');
+  const gaze = require('gaze');
+  const tinylr = require('tiny-lr');
+
+  const constants = require('../core/constants');
   const translate = require('./translate');
   const {renderToStaticMarkupWithDoctype} = require('./renderUtils');
 
@@ -32,11 +36,6 @@ function execute(port) {
   const join = path.join;
   const sep = path.sep;
 
-  const gaze = require('gaze');
-  const tinylr = require('tiny-lr');
-
-  const LIVE_RELOAD_PORT = 35729;
-
   // remove a module and child modules from require cache, so server does not have
   // to be restarted
   function removeModuleAndChildrenFromCache(moduleName) {
@@ -546,29 +545,34 @@ function execute(port) {
     );
   });
 
-  app.listen(port);
+  // Start LiveReload server.
+  process.env.NODE_ENV = 'development';
+  const server = tinylr();
+  server.listen(constants.LIVE_RELOAD_PORT, function() {
+    console.log(
+      'LiveReload server started on port %d',
+      constants.LIVE_RELOAD_PORT
+    );
+  });
 
-  if (process.env.NODE_ENV !== 'production') {
-    const server = tinylr();
-    server.listen(LIVE_RELOAD_PORT, function() {
-      console.log('Livereload listening on %s...', LIVE_RELOAD_PORT);
-    });
+  // gaze watches some specified dirs and triggers a callback when they change.
+  gaze(
+    [
+      '../docs/**/*', // docs
+      './**/*', // website
+    ],
+    function() {
+      // Listen for all kinds of file changes - modified/added/deleted.
+      this.on('all', function() {
+        // Notify LiveReload clients that there's a change.
+        // Typically, LiveReload will only refresh the changed paths,
+        // so we use / here to force a full-page reload.
+        server.notifyClients(['/']);
+      });
+    }
+  );
 
-    // Gaze watches some specified files and triggers a callback when they change.
-    gaze(
-      ['../docs/**/*', 'blog/**/*', 'pages/**/*', 'static/**/*'],
-      function() {
-        // Trigger on all kinds of file changes - modified/added/deleted.
-        this.on('all', function() {
-          // Notify LiveReload clients that there's a change.
-          // Typically, LiveReload will only refresh the changed paths.
-          // Hence, we use / here so that the clients are informed that
-          // the root has changes, so they will do a full-page refresh.
-          server.notifyClients(['/']);
-        });
-      }
-    );
-  }
+  app.listen(port);
 }
 
 module.exports = execute;
diff --git a/lib/start-server.js b/lib/start-server.js
index 08b3f1b52abd..62ab655147bb 100755
--- a/lib/start-server.js
+++ b/lib/start-server.js
@@ -64,7 +64,7 @@ function checkPort() {
         const server = require('./server/server.js');
         server(port);
         const host = `http://localhost:${port}`;
-        console.log(`Starting Docusaurus server on ${host}`);
+        console.log('Docusaurus server started on port %d', port);
         opn(host);
       }
     })

From e703dde755740bb09afd9465b23269fc2550716a Mon Sep 17 00:00:00 2001
From: Amy Lam <alam@fastly.com>
Date: Wed, 16 May 2018 02:00:20 -0700
Subject: [PATCH 08/11] Fix LiveReload path

---
 lib/server/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/server/server.js b/lib/server/server.js
index 896d18214c7c..cb035653d801 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -559,7 +559,7 @@ function execute(port) {
   gaze(
     [
       '../docs/**/*', // docs
-      './**/*', // website
+      '*/*.*', // website
     ],
     function() {
       // Listen for all kinds of file changes - modified/added/deleted.

From 7c5bb0d2f311a1be9d3c229f577cde91bf39c683 Mon Sep 17 00:00:00 2001
From: Yangshun Tay <tay.yang.shun@gmail.com>
Date: Wed, 16 May 2018 09:42:49 -0700
Subject: [PATCH 09/11] Forgot to change the LiveReload port back

---
 lib/core/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core/constants.js b/lib/core/constants.js
index 6a7d6cc5d3b4..a99db6632357 100644
--- a/lib/core/constants.js
+++ b/lib/core/constants.js
@@ -6,5 +6,5 @@
  */
 
 module.exports = {
-  LIVE_RELOAD_PORT: 35730,
+  LIVE_RELOAD_PORT: 35729,
 };

From 04f627df3f3862389214cdf20f9065537dbe6225 Mon Sep 17 00:00:00 2001
From: Amy Lam <alam@fastly.com>
Date: Wed, 16 May 2018 10:35:12 -0700
Subject: [PATCH 10/11] Fix gaze

---
 lib/server/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/server/server.js b/lib/server/server.js
index cb035653d801..6af3642d8ab4 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -559,7 +559,7 @@ function execute(port) {
   gaze(
     [
       '../docs/**/*', // docs
-      '*/*.*', // website
+      '**/*', // website
     ],
     function() {
       // Listen for all kinds of file changes - modified/added/deleted.

From 8f6377fca8607283b92672aa7382db55f8c70e71 Mon Sep 17 00:00:00 2001
From: Joel Marcey <joelm@fb.com>
Date: Thu, 17 May 2018 07:08:23 -0700
Subject: [PATCH 11/11] Update package-lock.json with required entities for
 Live Reload

---
 package-lock.json | 129 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 358c41aa4087..fd51708ca250 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1562,6 +1562,38 @@
       "integrity": "sha1-L/nQfJs+2ynW0oD+B1KDZefs05I=",
       "dev": true
     },
+    "body": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+      "requires": {
+        "continuable-cache": "^0.3.1",
+        "error": "^7.0.0",
+        "raw-body": "~1.1.0",
+        "safe-json-parse": "~1.0.1"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+          "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g="
+        },
+        "raw-body": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+          "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+          "requires": {
+            "bytes": "1",
+            "string_decoder": "0.10"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
+      }
+    },
     "body-parser": {
       "version": "1.18.2",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
@@ -2142,6 +2174,11 @@
       "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==",
       "dev": true
     },
+    "continuable-cache": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8="
+    },
     "convert-source-map": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
@@ -2760,6 +2797,15 @@
         "prr": "~1.0.1"
       }
     },
+    "error": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
+      "integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=",
+      "requires": {
+        "string-template": "~0.2.1",
+        "xtend": "~4.0.0"
+      }
+    },
     "error-ex": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
@@ -3050,6 +3096,14 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
     "fb-watchman": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
@@ -3838,6 +3892,14 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
+    "gaze": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+      "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
+      "requires": {
+        "globule": "^1.0.0"
+      }
+    },
     "get-caller-file": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
@@ -4000,6 +4062,16 @@
         }
       }
     },
+    "globule": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
+      "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+      "requires": {
+        "glob": "~7.1.1",
+        "lodash": "~4.17.4",
+        "minimatch": "~3.0.2"
+      }
+    },
     "glogg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz",
@@ -4386,6 +4458,11 @@
         "statuses": ">= 1.4.0 < 2"
       }
     },
+    "http-parser-js": {
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz",
+      "integrity": "sha1-uc+/Sizybw/DSxDKFImid3HjR08="
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -5806,6 +5883,11 @@
         "repeat-string": "^1.5.2"
       }
     },
+    "livereload-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz",
+      "integrity": "sha512-j1R0/FeGa64Y+NmqfZhyoVRzcFlOZ8sNlKzHjh4VvLULFACZhn68XrX5DFg2FhMvSMJmROuFxRSa560ECWKBMg=="
+    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -7711,6 +7793,11 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
+    "safe-json-parse": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
+      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c="
+    },
     "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
@@ -8545,6 +8632,11 @@
         }
       }
     },
+    "string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0="
+    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -9154,6 +9246,29 @@
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc="
     },
+    "tiny-lr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
+      "requires": {
+        "body": "^5.1.0",
+        "debug": "^3.1.0",
+        "faye-websocket": "~0.10.0",
+        "livereload-js": "^2.3.0",
+        "object-assign": "^4.1.0",
+        "qs": "^6.4.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
     "tmpl": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
@@ -9694,6 +9809,20 @@
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
       "dev": true
     },
+    "websocket-driver": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "requires": {
+        "http-parser-js": ">=0.4.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
+    },
     "whatwg-encoding": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz",