Merge branch 'master' into docs-copy-code-snippets

bin/build-site.js

@@ -2,14 +2,18 @@
 
 'use strict';
 
+const { promisify } = require('node:util');
+const exec = promisify(require('node:child_process').exec);
+
 var fs = require('fs');
+const Path = require('node:path');
+
 var replace = require('replace');
-var exec = require('child-process-promise').exec;
 var mkdirp = require('mkdirp');
 var cssmin = require('cssmin');
 
-var POUCHDB_CSS = __dirname + '/../docs/static/css/pouchdb.css';
-var POUCHDB_LESS = __dirname + '/../docs/static/less/pouchdb/pouchdb.less';
+const POUCHDB_CSS = resolvePath('docs/static/css/pouchdb.css');
+const POUCHDB_LESS = resolvePath('docs/static/less/pouchdb/pouchdb.less');
 
 process.chdir('docs');
 
@@ -20,8 +24,8 @@ function checkJekyll() {
 }
 
 function buildCSS() {
-  mkdirp.sync(__dirname + '/../docs/static/css');
-  var cmd = __dirname + '/../node_modules/less/bin/lessc ' + POUCHDB_LESS;
+  mkdirp.sync(resolvePath('docs/static/css'));
+  const cmd = [ resolvePath('node_modules/less/bin/lessc'), POUCHDB_LESS ].join(' ');
   return exec(cmd).then(function (child) {
     var minifiedCss = cssmin(child.stdout);
     fs.writeFileSync(POUCHDB_CSS, minifiedCss);
@@ -43,7 +47,7 @@ function buildJekyll(path) {
 }
 
 function highlightEs6() {
-  var path = require('path').resolve(__dirname, '../docs/_site');
+  const path = resolvePath('docs/_site');
 
   // TODO: this is a fragile and hacky way to get
   // 'async' and 'await' to highlight correctly
@@ -69,6 +73,10 @@ function buildEverything() {
     .catch(onError);
 }
 
+function resolvePath(projectLocalPath) {
+  return Path.resolve(__dirname, '..', projectLocalPath);
+}
+
 if (!process.env.BUILD) {
   const http_server = require('http-server');
   const watchGlob = require('glob-watcher');

package.json

@@ -64,7 +64,6 @@
     "chai": "3.5.0",
     "chai-as-promised": "5.3.0",
     "change-case": "4.0.1",
-    "child-process-promise": "2.2.1",
     "cssmin": "0.4.3",
     "denodeify": "1.2.1",
     "derequire": "2.1.1",