Merge pull request #424 from electricbookworks/web-vs-app-search-indexes

Generate separate web and app search indexes

_config.yml

@@ -143,6 +143,9 @@ exclude:
 - .sass-cache
 # Included as-is in other files, no need to process
 - /assets/js/annotation.js
+- /assets/js/search-store.js
+- /assets/js/elasticlunr.min.js
+- /assets/js/elasticlunr-setup.js
 # Files for formats we're not building here
 - /assets/profiles
 - /*/package.opf

_configs/_config.app.yml

@@ -26,6 +26,12 @@ exclude:
 - package.json
 - package-lock.json
 - CNAME
+- .sass-cache
+# Included as-is in other files, no need to process
+- /assets/js/annotation.js
+- /assets/js/search-store.js
+- /assets/js/elasticlunr.min.js
+- /assets/js/elasticlunr-setup.js
 # Things we don't need for an app
 - assets/profiles
 - /*/package.opf

_includes/close-body.html

@@ -5,7 +5,7 @@
 {% if site.output == "web" or site.output == "app" %}
     {% if is-project-search or is-book-search %}
         <script src="{{ path-to-root-directory }}assets/js/search-engine.js"></script>
-        <script src="{{ path-to-root-directory }}assets/js/search-index.js"></script>
+        <script src="{{ path-to-root-directory }}assets/js/search-index-{{ site.output }}.js"></script>
         <script src="{{ path-to-root-directory }}assets/js/search-results.js"></script>
     {% endif %}
 {% endif %}

assets/js/render-search-index.js

@@ -1,7 +1,8 @@
 ---
 # Jekyll processes this file to generate the array of URLs.
 # Then the output script passes this to phantomjs,
-# which generates the search index as search-index.js.
+# which generates the search index as search-index-web.js
+# or search-index-app.js, depending on current output format.
 layout: null
 ---
 
@@ -73,8 +74,8 @@ function process() {
         count = count + 1;
 
     } else {
-        console.log('Writing search-index.js...');
-        fs.write('../../../assets/js/search-index.js', index, 'w');
+        console.log('Writing search-index-{{ site.output }}.js...');
+        fs.write('../../../assets/js/search-index-{{ site.output }}.js', index, 'w');
         console.log('Done.');
         page.close();
         phantom.exit();