Merge branch 'master' into DOC-244

Author: stayseesong

Makefile

@@ -49,9 +49,30 @@ package: build
 serve: package
 	@docker run -p 4000:80 segment-docs:latest
 
+# gives us user-transparent way to swap between two different systems
 .PHONY: catalog
-catalog: vendor/bundle
-	@node scripts/catalog.js
+catalog: catalog-papi
+
+# uses the old configapi
+.PHONY: capi
+capi: vendor/bundle
+	@node scripts/catalog-capi.js
+
+# shorter alias
+.PHONY: catalog-capi
+catalog-capi: vendor/bundle
+	@node scripts/catalog-capi.js
+
+# uses the new public api
+.PHONY: catalog-papi
+catalog-papi: vendor/bundle
+	@node scripts/catalog_papi.js
+
+# shorter alias
+.PHONY: papi
+papi: vendor/bundle
+	@node scripts/catalog_papi.js
+
 
 .PHONY: changelog
 changelog: vendor/bundle

_config.yml

@@ -55,4 +55,16 @@ algolia:
   index_name:     segment-docs
   files_to_exclude:
     - _release_notes/*
+    - utils/*
   nodes_to_index: 'p, table#limit'
+  settings:
+    customRanking:
+      - desc(title)
+      - desc(custom_ranking.heading)
+      - asc(custom_ranking.position)
+    attributesForFaceting:
+      - searchable(categories)
+      - searchable(hidden)
+      - searchable(tags)
+      - searchable(title)
+      - type

js/headings-anchors/index.js

@@ -2,7 +2,7 @@ import ClipboardJS from 'clipboard'
 import tippy from 'tippy.js'
 
 const COMPONENT_SELECTOR = '[data-headings-anchors]'
-const HEADINGS_SELECTOR = 'h1, h2, h3, h4, h5'
+const HEADINGS_SELECTOR = 'h1, h2, h3, h4, h5, .def'
 
 export default function () {
   const components = document.querySelectorAll(COMPONENT_SELECTOR)

scripts/catalog.js renamed to scripts/catalog_capi.js

@@ -304,14 +304,14 @@ const updateSources = async () => {
   output = "# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT\n"
   output += "# sources last updated " + todayDate + " \n";
   output += yaml.safeDump({ items: sourcesUpdated }, options);
-  fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/sources.yml`), output);
+  fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/sources_capi.yml`), output);
 
   // Create source-category mapping yaml file
   var todayDate = new Date().toISOString().slice(0,10);
   output = "# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT\n"
   output += "# source cateogries last updated " + todayDate + " \n";
   output += yaml.safeDump({ items: sourceCategories }, options);
-  fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/source_categories.yml`), output);
+  fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/source_categories_capi.yml`), output);
 }
 
 const updateDestinations = async () => {
@@ -414,14 +414,14 @@ const updateDestinations = async () => {
   var todayDate = new Date().toISOString().slice(0,10);
   output += "# destination data last updated " + todayDate + " \n";
   output += yaml.safeDump({ items: destinationsUpdated }, options);
-  fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/destinations.yml`), output);
+  fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/destinations_capi.yml`), output);
 
    // Create destination-category mapping yaml file
   output = "# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT\n"
   var todayDate = new Date().toISOString().slice(0,10);
   output += "# destination categories last updated " + todayDate + " \n";
   output += yaml.safeDump({ items: destinationCategories }, options);
-  fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/destination_categories.yml`), output);
+  fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/destination_categories_capi.yml`), output);
 }
 
 updateSources()