Remove ignored file from tracking

Author: cortex-lp

assets/js/generate-lunr-index.js

@@ -2,9 +2,11 @@ const fs = require('fs');
 const lunr = require('lunr');
 
 const args = process.argv.slice(2);
-const destination = args[0] ?? ".";
+const destination = args[0] === undefined
+    ? "./docs"
+    : args[0];
 
-const data = JSON.parse(fs.readFileSync(`${destination}/docs/offline-search-index.json`));
+const data = JSON.parse(fs.readFileSync(`${destination}/offline-search-index.json`));
 
 const idx = lunr(function () {
     this.ref('ref');
@@ -14,7 +16,7 @@ const idx = lunr(function () {
     this.field('description', { boost: 2 });
     this.field('body');
 
-    data.forEach((doc) => {let docToAdd;
+    data.forEach((doc) => {
         if (doc
             && doc.ref !== undefined
             && !doc.ref.includes('/_shared/')
@@ -24,10 +26,10 @@ const idx = lunr(function () {
     });
 });
 
-fs.writeFileSync(`${destination}/assets/json/lunr-index.json`, JSON.stringify(idx));
+fs.writeFileSync(`${destination}/lunr-index.json`, JSON.stringify(idx));
 
 // check if file got created
-if (!fs.existsSync(`${destination}/assets/json/lunr-index.json`)) {
+if (!fs.existsSync(`${destination}/lunr-index.json`)) {
     console.error('Failed to create lunr index');
     process.exit(1);
 }

assets/js/offline-search.js

@@ -28,12 +28,13 @@
 
         if (window.Worker) {
             worker = new Worker('/js/worker.js');
-            const url = '/json/lunr-index.json';
+            const url = '/lunr-index.json';
 
-            worker.postMessage({ 
-                type: 'init', 
-                lunrIndexUrl: url, 
-                rawIndexUrl: $searchInput.data('offline-search-index-json-src') 
+            worker.postMessage({
+                type: 'init',
+                currentPath: window.location.pathname,
+                lunrIndexUrl: url,
+                rawIndexUrl: $searchInput.data('offline-search-index-json-src')
             });
 
             worker.onerror = function (error) {
@@ -142,7 +143,11 @@
                 return;
             }
 
-            worker.postMessage({ type: 'search', query: searchQuery, maxResults: $targetSearchInput.data('offline-search-max-results') });
+            worker.postMessage({
+                type: 'search',
+                query: searchQuery,
+                maxResults: $targetSearchInput.data('offline-search-max-results')
+            });
         };
 
         //

assets/js/worker.js

@@ -3,22 +3,29 @@ if (typeof importScripts === 'function') {
 }
 
 let idx;
+const versionRegex = new RegExp("^\/docs\/([0-9\.]*|latest)\/");
 const resultDetails = new Map(); // Will hold the data for the search results (titles and summaries)
 let indexReadyPromise;
 
 // Initialize the index
 self.onmessage = async function (event) {
     if (event.data.type === 'init') {
+        const regexResults = versionRegex.exec(event.data.currentPath);
+        const version = regexResults
+            ? regexResults[1]
+            : undefined;
         indexReadyPromise = new Promise(async (resolve, reject) => {
             try {
                 const rawIndex = await fetch(event.data.rawIndexUrl);
                 let json = await rawIndex.json();
                 json.forEach((doc) => {
-                    resultDetails.set(doc.ref, {
-                        version: doc.version,
-                        title: doc.title,
-                        excerpt: doc.excerpt,
-                    });
+                    if (version === undefined || doc.ref.startsWith(version)) {
+                        resultDetails.set(doc.ref, {
+                            version: doc.version,
+                            title: doc.title,
+                            excerpt: doc.excerpt,
+                        });
+                    }
                 });
 
                 const lunrIndex = await fetch(event.data.lunrIndexUrl);
@@ -51,6 +58,7 @@ self.onmessage = async function (event) {
                         });
                     });
                 })
+                .filter((result) => resultDetails.has(result.ref))
                 .slice(0, event.data.maxResults);
 
             const docs = new Map();