From 5c34e09a48cd93db8fecbdb2bc17e1a18a34da8c Mon Sep 17 00:00:00 2001
From: Trevor Blades <tdblades@gmail.com>
Date: Mon, 22 Apr 2019 16:22:32 -0700
Subject: [PATCH] Upgrade docs theme to 0.3 (#4742)

* Upgrade theme for better versioning strategy

* Prettier change

* Move _redirects to public dir
---
 docs/gatsby-config.js  | 12 +++++++++++-
 docs/package-lock.json | 28 +++++++++-------------------
 docs/package.json      |  2 +-
 netlify.toml           |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
index 8ad51f2c3d5..ccf4002f6bc 100644
--- a/docs/gatsby-config.js
+++ b/docs/gatsby-config.js
@@ -10,7 +10,17 @@ module.exports = {
         contentDir: 'docs/source',
         basePath: '/docs/react',
         githubRepo: 'apollographql/apollo-client',
-        versions: ['2.4', '2.5'],
+        versions: [
+          {
+            value: '2.4',
+            ref: 'origin/version-2.4',
+          },
+          {
+            value: '2.5',
+            ref: 'HEAD',
+            default: true,
+          },
+        ],
         typescriptApiBox: {
           filepathPrefix: 'packages/apollo-client/src/',
         },
diff --git a/docs/package-lock.json b/docs/package-lock.json
index 5297c20bbf6..b502a2ba743 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1573,9 +1573,9 @@
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30000960",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz",
-          "integrity": "sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA=="
+          "version": "1.0.30000962",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000962.tgz",
+          "integrity": "sha512-WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA=="
         },
         "debug": {
           "version": "4.1.1",
@@ -1586,9 +1586,9 @@
           }
         },
         "electron-to-chromium": {
-          "version": "1.3.124",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz",
-          "integrity": "sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="
+          "version": "1.3.125",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.125.tgz",
+          "integrity": "sha512-XxowpqQxJ4nDwUXHtVtmEhRqBpm2OnjBomZmZtHD0d2Eo0244+Ojezhk3sD/MBSSe2nxCdGQFRXHIsf/LUTL9A=="
         },
         "node-releases": {
           "version": "1.1.15",
@@ -6775,9 +6775,9 @@
       }
     },
     "gatsby-theme-apollo-docs": {
-      "version": "0.2.50",
-      "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-0.2.50.tgz",
-      "integrity": "sha512-ACx86rc1CWuBz4V8LZDzfP5yElyBPjJS9ssVGedigwqm7cwlyeiU3TmHSoTnIVMWEfE4Q8x/avgA2yRqWoas0Q==",
+      "version": "0.3.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-0.3.0-alpha.0.tgz",
+      "integrity": "sha512-EzXeB/TdjjKAVdGwUv8nLr/u27DdCYPI97C0m706qFJm1OZdexJJ1SOfnxXqH+xS4y+03TE1PWdIYfWm2U+vQw==",
       "requires": {
         "detab": "^2.0.1",
         "gatsby": "^2.3.23",
@@ -6807,8 +6807,6 @@
         "rehype-slug": "^2.0.2",
         "remark": "^10.0.1",
         "remark-rehype": "^4.0.0",
-        "semver": "^5.6.0",
-        "semver-match": "^0.1.1",
         "showdown": "^1.9.0",
         "simple-git": "^1.107.0",
         "unist-builder": "^1.0.3",
@@ -11721,14 +11719,6 @@
         "semver": "^5.0.3"
       }
     },
-    "semver-match": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/semver-match/-/semver-match-0.1.1.tgz",
-      "integrity": "sha1-58yzH4P9Sg43fWY4ev2Mo6Mptfw=",
-      "requires": {
-        "semver": "^5.1.0"
-      }
-    },
     "send": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
diff --git a/docs/package.json b/docs/package.json
index 0d520c088df..d29293c65fd 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "gatsby": "2.3.23",
-    "gatsby-theme-apollo-docs": "0.2.50"
+    "gatsby-theme-apollo-docs": "^0.3.0-alpha.0"
   },
   "devDependencies": {
     "typedoc": "0.14.2",
diff --git a/netlify.toml b/netlify.toml
index 7809aa2c45c..3ed4f3c0758 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,6 +1,6 @@
 [build]
   base    = "docs/"
   publish = "docs/public/"
-  command = "npm run types && gatsby build --prefix-paths && mkdir -p docs/react && mv public/* docs/react && mv docs public/"
+  command = "npm run types && gatsby build --prefix-paths && mkdir -p docs/react && mv public/* docs/react && mv docs public/ && mv public/docs/react/_redirects public"
 [build.environment]
   NPM_VERSION = "6"