From 58fac8db25103c7943325fb75bab73b68aaa7fb9 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Fri, 16 Mar 2018 13:13:20 +0200
Subject: [PATCH 1/2] Only inject docsearch JavaScript when docsearch is
 enabled.

While this won't be necessary for much longer since we'll enable it
everywhere (hopefully), there's no sense in loading extra unused JavaScript
on repositories that may choose to not have search, or just don't have it
configured yet.
---
 _config.yaml => _config.yml | 0
 layout/layout.ejs           | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename _config.yaml => _config.yml (100%)

diff --git a/_config.yaml b/_config.yml
similarity index 100%
rename from _config.yaml
rename to _config.yml
diff --git a/layout/layout.ejs b/layout/layout.ejs
index 8875e25..fd86899 100644
--- a/layout/layout.ejs
+++ b/layout/layout.ejs
@@ -47,7 +47,9 @@
     <%- body %>
     <script src="<%= url_for('script/smooth-scroll.min.js', { relative: true }) %>"></script>
     <script src="<%= url_for('script/main.js', { relative: true }) %>"></script>
-    <script type="text/javascript" src="//cdn.jsdelivr.net/docsearch.js/2.1.8/docsearch.min.js"></script>
+    <% if (config.apis && config.apis.docsearch) { %>
+      <script type="text/javascript" src="//cdn.jsdelivr.net/docsearch.js/2.1.8/docsearch.min.js"></script>
+    <% } %>
     <script type="text/javascript" src="//cdn.jsdelivr.net/fastclick/1.0.6/fastclick.min.js"></script>
 
     <script>

From e4ed72b9a65d707ca6c8377a605de0ae36e4a1fc Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Fri, 16 Mar 2018 13:14:21 +0200
Subject: [PATCH 2/2] Add support for docsearch `appId` for custom search
 deployments.

This only seems to be important to me for the moment because of my need to
test search improvements.  Typically, Algolia docsearch runs their own free
deployment for open-source projects.  This is done through a public
configuration repository available at
https://github.com/algolia/docsearch-configs.

However, in order to test these configurations, it's necessary to run your
own deployment through their paid service (or a free trial!).  Their public
service defaults to their own app, but when using the paid service, it's
necessary to specify the `appId`, which this new code allows.
---
 layout/layout.ejs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/layout/layout.ejs b/layout/layout.ejs
index fd86899..b387e52 100644
--- a/layout/layout.ejs
+++ b/layout/layout.ejs
@@ -90,10 +90,16 @@
         })(window,document,'script','//s.swiftypecdn.com/install/v2/st.js','_st');
         _st('install','<%- config.apis.swiftype %>','2.0.0');
       <% } else if (config.apis && config.apis.docsearch) { %>
-
         ['desktop'].forEach(function(type) {
           var search = docsearch({
             apiKey: '<%- config.apis.docsearch.apiKey %>',
+            <%#
+              A custom deployment, directly through Algolia, requires the 'appId'.  This is useful
+              for testing, but is not necessary when using their free Docsearch service.
+            %>
+            <% if (config.apis.docsearch.appId) { %>
+              appId: '<%- config.apis.docsearch.appId %>',
+            <% } %>
             indexName: '<%- config.apis.docsearch.indexName %>',
             inputSelector: '#' + type + '-search-input',
             autocompleteOptions: {