Merge branch '8.x'

Author: vkarpov15

package.json

@@ -81,7 +81,7 @@
     "docs:prepare:publish:5x": "git checkout 5.x && git merge 5.x && npm run docs:clean:stable && npm run docs:generate && npm run docs:copy:tmp && git checkout gh-pages && npm run docs:copy:tmp:5x",
     "docs:prepare:publish:6x": "git checkout 6.x && git merge 6.x && npm run docs:clean:stable && env DOCS_DEPLOY=true npm run docs:generate && mv ./docs/6.x ./tmp && git checkout gh-pages && npm run docs:copy:tmp:6x",
     "docs:prepare:publish:7x": "env DOCS_DEPLOY=true npm run docs:generate && git checkout gh-pages && rimraf ./docs/7.x && mv ./tmp ./docs/7.x",
-    "docs:prepare:publish:8x": "git checkout gh-pages && git merge 8.x && npm run docs:generate",
+    "docs:prepare:publish:8x": "env DOCS_DEPLOY=true npm run docs:generate && git checkout gh-pages && rimraf ./docs/8.x && mv ./tmp ./docs/8.x",
     "docs:check-links": "blc http://127.0.0.1:8089 -ro",
     "lint": "eslint .",
     "lint-js": "eslint . --ext .js --ext .cjs",

scripts/generateSearch.js

@@ -20,6 +20,8 @@ markdown.setOptions({
 // 5.13.5 -> 5.x, 6.8.2 -> 6.x, etc.
 version = version.slice(0, version.indexOf('.')) + '.x';
 
+console.log('Generating search for version', version);
+
 const contentSchema = new mongoose.Schema({
   title: { type: String, required: true },
   body: { type: String, required: true },
@@ -116,12 +118,16 @@ function generateContents() {
 }
 
 async function generateSearch(config) {
+  console.log('Connect to', config.uri);
   await mongoose.connect(config.uri, { dbName: 'mongoose' });
 
   // wait for the index to be created
+  console.log('Init Content model...');
   await Content.init();
 
+  console.log('Deleting existing content...');
   await Content.deleteMany({ version });
+  console.log('Deleted content for version', version);
 
   const contents = generateContents();
 

scripts/website.js

@@ -147,6 +147,7 @@ function deleteAllHtmlFiles() {
 }
 
 function moveDocsToTemp() {
+  console.log('Moving docs to tmp dir...');
   if (!versionObj.versionedPath) {
     throw new Error('Cannot move unversioned deploy to /tmp');
   }
@@ -622,7 +623,9 @@ if (isMain) {
     }
 
     if (generateSearchPromise) {
+      console.log('Generating search...');
       await generateSearchPromise;
+      console.log('Search generated successfully');
     }
 
     console.log('Done Processing');