From 9b1155c4aa5f6b0124d17a58f92efa3ce698984b Mon Sep 17 00:00:00 2001 From: Isiah Meadows Date: Sun, 18 Aug 2019 14:51:44 -0400 Subject: [PATCH] Fix a docs generation bug [skip ci] --- package-lock.json | 121 --------------------------------------- package.json | 1 - scripts/_command.js | 5 +- scripts/generate-docs.js | 4 +- 4 files changed, 4 insertions(+), 127 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6f95b40..bb6e0625 100644 --- a/package-lock.json +++ b/package-lock.json @@ -200,12 +200,6 @@ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, "array-filter": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz", @@ -251,12 +245,6 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", - "dev": true - }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -903,12 +891,6 @@ "integrity": "sha512-kUlSC06PVvvjlMRpNIl3kR1NRXLEe86VQ7N0bQeaCZb2g+InShCeHQp/JvyYNTugMnRN2NvJhHlc3q12MWbbpg==", "dev": true }, - "emitter-mixin": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/emitter-mixin/-/emitter-mixin-0.0.3.tgz", - "integrity": "sha1-WUjLKG8uSO3DslGnz8H3iDOW1lw=", - "dev": true - }, "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", @@ -918,15 +900,6 @@ "once": "^1.4.0" } }, - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, - "requires": { - "prr": "~1.0.1" - } - }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -2939,12 +2912,6 @@ "verror": "1.10.0" } }, - "junk": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz", - "integrity": "sha1-h75jSIZJy9ym9Tqzm+yczSNH9ZI=", - "dev": true - }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -3218,18 +3185,6 @@ } } }, - "maximatch": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz", - "integrity": "sha1-hs2NawTJ8wfAWmuUGZBtA2D7E6I=", - "dev": true, - "requires": { - "array-differ": "^1.0.0", - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "minimatch": "^3.0.0" - } - }, "memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", @@ -3807,27 +3762,12 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "dev": true, - "requires": { - "asap": "~2.0.3" - } - }, "property-expr": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-1.5.1.tgz", "integrity": "sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==", "dev": true }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, "psl": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz", @@ -3903,61 +3843,6 @@ "readable-stream": "^2.0.2" } }, - "recursive-copy": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/recursive-copy/-/recursive-copy-2.0.10.tgz", - "integrity": "sha512-S9J9XJUnfZ2NUS3lK6lx6HWLl2nWui+f7AKuu+qoFs4ikEPYgZ3qKk1T6tmBnr7PzhtKnawE+6TREy9XQKmxCA==", - "dev": true, - "requires": { - "del": "^2.2.0", - "emitter-mixin": "0.0.3", - "errno": "^0.1.2", - "graceful-fs": "^4.1.4", - "junk": "^1.0.1", - "maximatch": "^0.1.0", - "mkdirp": "^0.5.1", - "pify": "^2.3.0", - "promise": "^7.0.1", - "slash": "^1.0.0" - }, - "dependencies": { - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" - } - }, - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, "regenerator-runtime": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", @@ -4255,12 +4140,6 @@ } } }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - }, "slice-ansi": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", diff --git a/package.json b/package.json index 049e9381..247dd6d3 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "minimist": "^1.2.0", "npm-run-all": "^4.1.5", "pinpoint": "^1.1.0", - "recursive-copy": "^2.0.10", "request": "^2.88.0", "request-promise-native": "^1.0.7", "rimraf": "^2.6.3", diff --git a/scripts/_command.js b/scripts/_command.js index d3bbc085..d15bf5b2 100644 --- a/scripts/_command.js +++ b/scripts/_command.js @@ -2,7 +2,7 @@ process.on("unhandledRejection", function (e) { process.exitCode = 1 - if (!e.stdout || !e.stderr) return false + if (!e.stdout || !e.stderr) throw e console.error(e.stack) if (e.stdout && e.stdout.length) { @@ -12,7 +12,8 @@ process.on("unhandledRejection", function (e) { console.error(e.stderr.toString("utf-8")) } - return true + // eslint-disable-next-line no-process-exit + process.exit() }) module.exports = ({exec, watch}) => { diff --git a/scripts/generate-docs.js b/scripts/generate-docs.js index 7a366612..bf020d57 100644 --- a/scripts/generate-docs.js +++ b/scripts/generate-docs.js @@ -5,7 +5,6 @@ const path = require("path") const {promisify} = require("util") const marked = require("marked") const rimraf = promisify(require("rimraf")) -const copy = require("recursive-copy") const {execFileSync} = require("child_process") const escapeRegExp = require("escape-string-regexp") const HTMLMinifier = require("html-minifier") @@ -174,7 +173,7 @@ class Generator { await init(dest) }) - if ((/\.(md|html)$/).test(file)) { + if (!(/\.(md|html)$/).test(file)) { await archived(relative, (dest) => fs.copyFile(file, dest)) console.log(`Copied: ${relative}`) } @@ -211,7 +210,6 @@ class Generator { async generate() { await this.generateRec(r("docs")) - await copy(r(`dist/archive/v${this._version}`), r("dist")) // Just ensure it exists. await (await fs.open(r("dist/.nojekyll"), "a")).close() }