From 2194be79e28e0f91bd93d4698fe0f7cc7a6e1b2f Mon Sep 17 00:00:00 2001
From: liqingwei <liqingwei@shimo.im>
Date: Tue, 19 Feb 2019 15:25:24 +0800
Subject: [PATCH 1/4] feat: add static command
---
bin/docsify | 34 +-
lib/commands/start.js | 54 +-
lib/commands/static.js | 60 +++
lib/config.js | 17 +
lib/index.js | 9 +-
lib/util/index.js | 34 ++
package-lock.json | 1119 ++++++++++++++++++++++++++++++++++------
package.json | 5 +-
tools/locales/de.json | 5 +-
tools/locales/en.json | 5 +-
tools/locales/zh.json | 5 +-
11 files changed, 1134 insertions(+), 213 deletions(-)
create mode 100644 lib/commands/static.js
create mode 100644 lib/config.js
diff --git a/bin/docsify b/bin/docsify
index 5f29880..e09c29c 100755
--- a/bin/docsify
+++ b/bin/docsify
@@ -86,7 +86,7 @@ const yargs = require("yargs")
handler: argv => run.serve(argv.path, argv.open, argv.port, argv.P, argv.i)
})
.command({
- command: "start <path>",
+ command: "start [path]",
desc: chalk.gray(y18n.__("start")),
builder: yargs =>
yargs.options({
@@ -109,6 +109,38 @@ const yargs = require("yargs")
}),
handler: argv => run.start(argv.path, argv.config, argv.port)
})
+ .command({
+ command: "static [path]",
+ desc: chalk.gray(y18n.__("static")),
+ builder: yargs =>
+ yargs.options({
+ dest: {
+ alias: "d",
+ default: "docs-static",
+ desc: chalk.gray(y18n.__("static.dest")),
+ nargs: 0,
+ requiresArg: false,
+ type: "string"
+ },
+ config: {
+ alias: "c",
+ default: false,
+ desc: chalk.gray(y18n.__("static.config")),
+ nargs: 0,
+ requiresArg: false,
+ type: "string"
+ },
+ "index-name": {
+ alias: "i",
+ desc: chalk.gray(y18n.__("serve.indexname")),
+ nargs: 1,
+ requiresArg: true,
+ type: "string"
+ }
+ }),
+ handler: argv =>
+ run.static(argv.path, argv.config, argv.indexName, argv.dest)
+ })
.help()
.option("help", {
alias: "h",
diff --git a/lib/commands/start.js b/lib/commands/start.js
index f7583f5..89f1d25 100644
--- a/lib/commands/start.js
+++ b/lib/commands/start.js
@@ -3,67 +3,21 @@
const connect = require("connect");
const serveStatic = require("serve-static");
const Renderer = require("docsify-server-renderer");
-const fs = require("fs");
const util = require("../util/index");
const chalk = require("chalk");
const LRU = require("lru-cache");
-const defaultConfig = {
- template: `<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>My Doc</title>
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
- <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
- <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css" title="vue">
-</head>
-<body>
- <!--inject-app-->
- <!--inject-config-->
-<script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
-</body>
-</html>`
-};
-
-function loadConfig(config) {
- try {
- return require(util.cwd(config));
- } catch (e) {
- console.log(chalk.red(`${e.message} in ${config}`));
- process.exit(1);
- }
-}
-
module.exports = function(path, configFile, port) {
- let config = defaultConfig;
- const pkg = util.pkg();
- const ctx = util.cwd(".");
-
- path = path || "./";
-
- if (configFile) {
- config = loadConfig(configFile);
- config.template = /\.html$/.test(config.template)
- ? util.read(util.resolve(ctx, config.template))
- : defaultConfig.template;
- } else if (pkg.docsify) {
- const tpl = pkg.docsify.template;
+ const config = util.getConfig(configFile);
- config = pkg.docsify;
- config.template =
- tpl && util.exists(util.resolve(ctx, tpl))
- ? util.read(tpl)
- : defaultConfig.template;
- }
+ path = path || ".";
- const renderer = new Renderer(Object.assign(defaultConfig, config));
+ const renderer = new Renderer(config);
const server = connect();
const cached = new LRU(config.maxAge || 0);
- server.use(serveStatic(path));
server.use(function(req, res) {
- serveStatic(path)(req, res, function() {
+ serveStatic(path, { index: false })(req, res, function() {
if (
/\.(jpg|jpeg|gif|png|svg|ico|mp4|webm|ogg|ogv|js|css|md)(?:\?v=[0-9.]+)?$/.test(
req.url
diff --git a/lib/commands/static.js b/lib/commands/static.js
new file mode 100644
index 0000000..3294fc0
--- /dev/null
+++ b/lib/commands/static.js
@@ -0,0 +1,60 @@
+"use strict";
+
+const serveStatic = require("serve-static");
+const connect = require("connect");
+const getPort = require("get-port");
+const Renderer = require("docsify-server-renderer");
+const util = require("../util/index");
+const fg = require("fast-glob");
+const write = require("write");
+const ora = require("ora");
+const chalk = require("chalk");
+const resolve = util.resolve;
+
+module.exports = function(
+ path = "",
+ configFile,
+ indexName,
+ dest = "docs-static"
+) {
+ path = resolve(path || ".");
+ const config = util.getConfig(configFile);
+ const server = connect();
+ const indexFile = resolve(path, indexName || "index.html");
+ const render = new Renderer(config);
+ const files = fg.sync("**/*.md", {
+ cwd: path
+ });
+ let app;
+ const spinner = ora();
+
+ spinner.start("Rendering");
+
+ getPort()
+ .then(port => {
+ server.use(serveStatic(path, { index: indexFile }));
+ app = server.listen(port);
+
+ return Promise.all(files.map(file => render.render(file)));
+ })
+ .then(data => {
+ // 保存文件
+ return Promise.all(
+ data.map(({ url, content }) => {
+ const filePath = url
+ .replace(/README\.md$/, "index.html")
+ .replace(/\.md$/, ".html");
+ spinner.text = `Rendering ${url}`;
+ write(resolve(util.cwd(), dest, filePath), content);
+ })
+ );
+ })
+ .then(() => {
+ spinner.succeed(`Success! Generate static files at ${chalk.green(dest)}`);
+ app && app.close();
+ })
+ .catch(e => {
+ spinner.fail(e.message);
+ app && app.close();
+ });
+};
diff --git a/lib/config.js b/lib/config.js
new file mode 100644
index 0000000..12f5cc3
--- /dev/null
+++ b/lib/config.js
@@ -0,0 +1,17 @@
+exports.SSR_DEFAULT = {
+ template: `<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>My Doc</title>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+ <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css" title="vue">
+</head>
+<body>
+ <!--inject-app-->
+ <!--inject-config-->
+<script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
+</body>
+</html>`
+};
diff --git a/lib/index.js b/lib/index.js
index 002938f..19e4656 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,5 +1,6 @@
module.exports = {
- init: require('./commands/init'),
- serve: require('./commands/serve'),
- start: require('./commands/start')
-}
+ init: require("./commands/init"),
+ serve: require("./commands/serve"),
+ start: require("./commands/start"),
+ static: require("./commands/static")
+};
diff --git a/lib/util/index.js b/lib/util/index.js
index 417981d..11b028c 100644
--- a/lib/util/index.js
+++ b/lib/util/index.js
@@ -1,6 +1,8 @@
"use strict";
const fs = require("fs");
+const SSR_DEFAULT = require("../config").SSR_DEFAULT;
+const chalk = require("chalk");
const resolve = (exports.resolve = require("path").resolve);
@@ -28,3 +30,35 @@ exports.pkg = function() {
exports.read = function(path) {
return fs.readFileSync(path, "utf-8").toString();
};
+
+function loadConfig(config) {
+ try {
+ return require(exports.cwd(config));
+ } catch (e) {
+ console.log(chalk.red(`${e.message} in ${config}`));
+ process.exit(1);
+ }
+}
+
+exports.getConfig = function(configFile) {
+ const pkg = exports.pkg();
+ const ctx = exports.cwd(".");
+ let config = SSR_DEFAULT;
+
+ if (configFile) {
+ config = loadConfig(configFile);
+ config.template = /\.html$/.test(config.template)
+ ? read(resolve(ctx, config.template))
+ : SSR_DEFAULT.template;
+ } else if (pkg.docsify) {
+ const tpl = pkg.docsify.template;
+
+ config = pkg.docsify;
+ config.template =
+ tpl && exports.exists(resolve(ctx, tpl))
+ ? exports.read(tpl)
+ : SSR_DEFAULT.template;
+ }
+
+ return Object.assign(SSR_DEFAULT, config);
+};
diff --git a/package-lock.json b/package-lock.json
index c787af1..48df653 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,20 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@mrmlnc/readdir-enhanced": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+ "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+ "requires": {
+ "call-me-maybe": "^1.0.1",
+ "glob-to-regexp": "^0.3.0"
+ }
+ },
+ "@nodelib/fs.stat": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+ "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
+ },
"acorn": {
"version": "5.7.3",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
@@ -321,6 +335,11 @@
}
}
},
+ "call-me-maybe": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+ "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
+ },
"caller-path": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
@@ -429,6 +448,11 @@
"restore-cursor": "^2.0.0"
}
},
+ "cli-spinners": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
+ "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="
+ },
"cli-width": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
@@ -475,6 +499,11 @@
}
}
},
+ "clone": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+ "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+ },
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -658,6 +687,14 @@
"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
"dev": true
},
+ "defaults": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+ "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+ "requires": {
+ "clone": "^1.0.2"
+ }
+ },
"define-property": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -735,9 +772,7 @@
}
},
"docsify-server-renderer": {
- "version": "4.8.6",
- "resolved": "https://registry.npmjs.org/docsify-server-renderer/-/docsify-server-renderer-4.8.6.tgz",
- "integrity": "sha512-uRPoyyJDrdBx75vfXKX+rJDsIera8r3MNZ33H8fYHG5cM/6pOA5WQVBX1c6VXgpdiLCEsSweMQvltOVcROPf5A==",
+ "version": "file:../docsify/packages/docsify-server-renderer",
"requires": {
"debug": "^2.6.8",
"docsify": "^4.8.0",
@@ -745,14 +780,379 @@
"resolve-pathname": "^2.1.0"
},
"dependencies": {
+ "ansi-escapes": {
+ "version": "1.4.0",
+ "bundled": true
+ },
+ "ansi-regex": {
+ "version": "2.1.1",
+ "bundled": true
+ },
+ "ansi-styles": {
+ "version": "2.2.1",
+ "bundled": true
+ },
+ "babel-polyfill": {
+ "version": "6.23.0",
+ "bundled": true,
+ "requires": {
+ "babel-runtime": "^6.22.0",
+ "core-js": "^2.4.0",
+ "regenerator-runtime": "^0.10.0"
+ }
+ },
+ "babel-runtime": {
+ "version": "6.26.0",
+ "bundled": true,
+ "requires": {
+ "core-js": "^2.4.0",
+ "regenerator-runtime": "^0.11.0"
+ },
+ "dependencies": {
+ "regenerator-runtime": {
+ "version": "0.11.1",
+ "bundled": true
+ }
+ }
+ },
+ "chalk": {
+ "version": "1.1.3",
+ "bundled": true,
+ "requires": {
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+ }
+ },
+ "chardet": {
+ "version": "0.4.2",
+ "bundled": true
+ },
+ "cli-cursor": {
+ "version": "2.1.0",
+ "bundled": true,
+ "requires": {
+ "restore-cursor": "^2.0.0"
+ }
+ },
+ "cli-width": {
+ "version": "2.2.0",
+ "bundled": true
+ },
+ "clipboard": {
+ "version": "2.0.4",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "good-listener": "^1.2.2",
+ "select": "^1.1.2",
+ "tiny-emitter": "^2.0.0"
+ }
+ },
+ "core-js": {
+ "version": "2.6.5",
+ "bundled": true
+ },
+ "debug": {
+ "version": "2.6.9",
+ "bundled": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "delegate": {
+ "version": "3.2.0",
+ "bundled": true,
+ "optional": true
+ },
+ "docsify": {
+ "version": "4.8.6",
+ "bundled": true,
+ "requires": {
+ "marked": "^0.5.1",
+ "medium-zoom": "^0.4.0",
+ "opencollective": "^1.0.3",
+ "prismjs": "^1.15.0",
+ "tinydate": "^1.0.0",
+ "tweezer.js": "^1.4.0"
+ }
+ },
+ "encoding": {
+ "version": "0.1.12",
+ "bundled": true,
+ "requires": {
+ "iconv-lite": "~0.4.13"
+ }
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "bundled": true
+ },
+ "external-editor": {
+ "version": "2.2.0",
+ "bundled": true,
+ "requires": {
+ "chardet": "^0.4.0",
+ "iconv-lite": "^0.4.17",
+ "tmp": "^0.0.33"
+ }
+ },
+ "figures": {
+ "version": "2.0.0",
+ "bundled": true,
+ "requires": {
+ "escape-string-regexp": "^1.0.5"
+ }
+ },
+ "good-listener": {
+ "version": "1.2.2",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "delegate": "^3.1.2"
+ }
+ },
+ "has-ansi": {
+ "version": "2.0.0",
+ "bundled": true,
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ },
+ "iconv-lite": {
+ "version": "0.4.24",
+ "bundled": true,
+ "requires": {
+ "safer-buffer": ">= 2.1.2 < 3"
+ }
+ },
+ "inquirer": {
+ "version": "3.0.6",
+ "bundled": true,
+ "requires": {
+ "ansi-escapes": "^1.1.0",
+ "chalk": "^1.0.0",
+ "cli-cursor": "^2.1.0",
+ "cli-width": "^2.0.0",
+ "external-editor": "^2.0.1",
+ "figures": "^2.0.0",
+ "lodash": "^4.3.0",
+ "mute-stream": "0.0.7",
+ "run-async": "^2.2.0",
+ "rx": "^4.1.0",
+ "string-width": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "through": "^2.3.6"
+ }
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "bundled": true
+ },
+ "is-promise": {
+ "version": "2.1.0",
+ "bundled": true
+ },
+ "is-stream": {
+ "version": "1.1.0",
+ "bundled": true
+ },
+ "lodash": {
+ "version": "4.17.11",
+ "bundled": true
+ },
+ "marked": {
+ "version": "0.5.2",
+ "bundled": true
+ },
+ "medium-zoom": {
+ "version": "0.4.0",
+ "bundled": true
+ },
+ "mimic-fn": {
+ "version": "1.2.0",
+ "bundled": true
+ },
+ "minimist": {
+ "version": "1.2.0",
+ "bundled": true
+ },
+ "ms": {
+ "version": "2.0.0",
+ "bundled": true
+ },
+ "mute-stream": {
+ "version": "0.0.7",
+ "bundled": true
+ },
"node-fetch": {
"version": "1.7.3",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
- "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+ "bundled": true,
"requires": {
"encoding": "^0.1.11",
"is-stream": "^1.0.1"
}
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "bundled": true
+ },
+ "onetime": {
+ "version": "2.0.1",
+ "bundled": true,
+ "requires": {
+ "mimic-fn": "^1.0.0"
+ }
+ },
+ "opencollective": {
+ "version": "1.0.3",
+ "bundled": true,
+ "requires": {
+ "babel-polyfill": "6.23.0",
+ "chalk": "1.1.3",
+ "inquirer": "3.0.6",
+ "minimist": "1.2.0",
+ "node-fetch": "1.6.3",
+ "opn": "4.0.2"
+ },
+ "dependencies": {
+ "node-fetch": {
+ "version": "1.6.3",
+ "bundled": true,
+ "requires": {
+ "encoding": "^0.1.11",
+ "is-stream": "^1.0.1"
+ }
+ }
+ }
+ },
+ "opn": {
+ "version": "4.0.2",
+ "bundled": true,
+ "requires": {
+ "object-assign": "^4.0.1",
+ "pinkie-promise": "^2.0.0"
+ }
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "bundled": true
+ },
+ "pinkie": {
+ "version": "2.0.4",
+ "bundled": true
+ },
+ "pinkie-promise": {
+ "version": "2.0.1",
+ "bundled": true,
+ "requires": {
+ "pinkie": "^2.0.0"
+ }
+ },
+ "prismjs": {
+ "version": "1.15.0",
+ "bundled": true,
+ "requires": {
+ "clipboard": "^2.0.0"
+ }
+ },
+ "regenerator-runtime": {
+ "version": "0.10.5",
+ "bundled": true
+ },
+ "resolve-pathname": {
+ "version": "2.2.0",
+ "bundled": true
+ },
+ "restore-cursor": {
+ "version": "2.0.0",
+ "bundled": true,
+ "requires": {
+ "onetime": "^2.0.0",
+ "signal-exit": "^3.0.2"
+ }
+ },
+ "run-async": {
+ "version": "2.3.0",
+ "bundled": true,
+ "requires": {
+ "is-promise": "^2.1.0"
+ }
+ },
+ "rx": {
+ "version": "4.1.0",
+ "bundled": true
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "bundled": true
+ },
+ "select": {
+ "version": "1.1.2",
+ "bundled": true,
+ "optional": true
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "bundled": true
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "bundled": true,
+ "requires": {
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^4.0.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "bundled": true
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "bundled": true,
+ "requires": {
+ "ansi-regex": "^3.0.0"
+ }
+ }
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "bundled": true,
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ },
+ "supports-color": {
+ "version": "2.0.0",
+ "bundled": true
+ },
+ "through": {
+ "version": "2.3.8",
+ "bundled": true
+ },
+ "tiny-emitter": {
+ "version": "2.1.0",
+ "bundled": true,
+ "optional": true
+ },
+ "tinydate": {
+ "version": "1.0.1",
+ "bundled": true
+ },
+ "tmp": {
+ "version": "0.0.33",
+ "bundled": true,
+ "requires": {
+ "os-tmpdir": "~1.0.2"
+ }
+ },
+ "tweezer.js": {
+ "version": "1.4.0",
+ "bundled": true
}
}
},
@@ -1025,148 +1425,443 @@
"strip-ansi": "^3.0.0"
}
},
- "strip-bom": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
- "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
- "dev": true
- }
- }
- },
- "espree": {
- "version": "3.5.4",
- "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
- "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
- "dev": true,
- "requires": {
- "acorn": "^5.5.0",
- "acorn-jsx": "^3.0.0"
- }
- },
- "esprima": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
- "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
- "dev": true
- },
- "esquery": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
- "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
- "dev": true,
- "requires": {
- "estraverse": "^4.0.0"
- }
- },
- "esrecurse": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
- "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
- "dev": true,
- "requires": {
- "estraverse": "^4.1.0"
- }
- },
- "estraverse": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
- "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
- "dev": true
- },
- "esutils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
- "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
- "dev": true
- },
- "etag": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
- "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
- },
- "event-emitter": {
- "version": "0.3.5",
- "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
- "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
- "dev": true,
- "requires": {
- "d": "1",
- "es5-ext": "~0.10.14"
- }
- },
- "execa": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
- "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
- "requires": {
- "cross-spawn": "^5.0.1",
- "get-stream": "^3.0.0",
- "is-stream": "^1.1.0",
- "npm-run-path": "^2.0.0",
- "p-finally": "^1.0.0",
- "signal-exit": "^3.0.0",
- "strip-eof": "^1.0.0"
- }
- },
- "exit-hook": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
- "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
- "dev": true
- },
- "expand-brackets": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
- "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
- "requires": {
- "is-posix-bracket": "^0.1.0"
- }
- },
- "expand-range": {
- "version": "1.8.2",
- "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
- "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
- "requires": {
- "fill-range": "^2.1.0"
- }
- },
- "extend-shallow": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
- "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
- "requires": {
- "assign-symbols": "^1.0.0",
- "is-extendable": "^1.0.1"
- },
- "dependencies": {
- "is-extendable": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "strip-bom": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+ "dev": true
+ }
+ }
+ },
+ "espree": {
+ "version": "3.5.4",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+ "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+ "dev": true,
+ "requires": {
+ "acorn": "^5.5.0",
+ "acorn-jsx": "^3.0.0"
+ }
+ },
+ "esprima": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+ "dev": true
+ },
+ "esquery": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+ "dev": true,
+ "requires": {
+ "estraverse": "^4.0.0"
+ }
+ },
+ "esrecurse": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+ "dev": true,
+ "requires": {
+ "estraverse": "^4.1.0"
+ }
+ },
+ "estraverse": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+ "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+ "dev": true
+ },
+ "esutils": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+ "dev": true
+ },
+ "etag": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+ },
+ "event-emitter": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+ "dev": true,
+ "requires": {
+ "d": "1",
+ "es5-ext": "~0.10.14"
+ }
+ },
+ "execa": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+ "requires": {
+ "cross-spawn": "^5.0.1",
+ "get-stream": "^3.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
+ }
+ },
+ "exit-hook": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+ "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
+ "dev": true
+ },
+ "expand-brackets": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+ "requires": {
+ "is-posix-bracket": "^0.1.0"
+ }
+ },
+ "expand-range": {
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+ "requires": {
+ "fill-range": "^2.1.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+ "requires": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "dependencies": {
+ "is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "requires": {
+ "is-plain-object": "^2.0.4"
+ }
+ }
+ }
+ },
+ "external-editor": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+ "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+ "requires": {
+ "chardet": "^0.4.0",
+ "iconv-lite": "^0.4.17",
+ "tmp": "^0.0.33"
+ }
+ },
+ "extglob": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+ "requires": {
+ "is-extglob": "^1.0.0"
+ }
+ },
+ "fast-glob": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
+ "integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+ "requires": {
+ "@mrmlnc/readdir-enhanced": "^2.2.1",
+ "@nodelib/fs.stat": "^1.1.2",
+ "glob-parent": "^3.1.0",
+ "is-glob": "^4.0.0",
+ "merge2": "^1.2.3",
+ "micromatch": "^3.1.10"
+ },
+ "dependencies": {
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+ },
+ "braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "requires": {
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "expand-brackets": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+ "requires": {
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "requires": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+ }
+ },
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+ }
+ }
+ },
+ "extglob": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+ "requires": {
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "expand-brackets": "^2.1.4",
+ "extend-shallow": "^2.0.1",
+ "fragment-cache": "^0.2.1",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "requires": {
+ "is-descriptor": "^1.0.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "glob-parent": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+ "requires": {
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
+ },
+ "dependencies": {
+ "is-glob": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "requires": {
+ "is-extglob": "^2.1.0"
+ }
+ }
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ },
+ "is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+ },
+ "is-glob": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+ "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+ "requires": {
+ "is-extglob": "^2.1.1"
+ }
+ },
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+ },
+ "micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
"requires": {
- "is-plain-object": "^2.0.4"
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
}
}
}
},
- "external-editor": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
- "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
- "requires": {
- "chardet": "^0.4.0",
- "iconv-lite": "^0.4.17",
- "tmp": "^0.0.33"
- }
- },
- "extglob": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
- "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
- "requires": {
- "is-extglob": "^1.0.0"
- }
- },
"fast-levenshtein": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -1246,6 +1941,17 @@
"graceful-fs": "^4.1.2",
"rimraf": "~2.6.2",
"write": "^0.2.1"
+ },
+ "dependencies": {
+ "write": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+ "dev": true,
+ "requires": {
+ "mkdirp": "^0.5.1"
+ }
+ }
}
},
"for-in": {
@@ -1839,6 +2545,11 @@
"is-glob": "^2.0.0"
}
},
+ "glob-to-regexp": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+ "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs="
+ },
"global-dirs": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
@@ -2395,6 +3106,42 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
},
+ "log-symbols": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+ "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+ "requires": {
+ "chalk": "^2.0.1"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
"lowercase-keys": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
@@ -2452,6 +3199,11 @@
"resolved": "https://registry.npmjs.org/medium-zoom/-/medium-zoom-0.4.0.tgz",
"integrity": "sha512-0z7yMfd6I1BTCAa8QaR4cp5AqDkQD571GzhHIbbfefKEssGLSvs+4Xai/itOAncm4FBlF5gUoMQ22yW9/f8Sig=="
},
+ "merge2": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz",
+ "integrity": "sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA=="
+ },
"micromatch": {
"version": "2.3.11",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
@@ -2519,7 +3271,6 @@
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
- "dev": true,
"requires": {
"minimist": "0.0.8"
},
@@ -2527,8 +3278,7 @@
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
- "dev": true
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
}
}
},
@@ -2786,6 +3536,60 @@
"resolved": "https://registry.npmjs.org/opts/-/opts-1.2.6.tgz",
"integrity": "sha1-0YXAQlz9652h0YKQi2W1wCOP67M="
},
+ "ora": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/ora/-/ora-3.1.0.tgz",
+ "integrity": "sha512-vRBPaNCclUi8pUxRF/G8+5qEQkc6EgzKK1G2ZNJUIGu088Un5qIxFXeDgymvPRM9nmrcUOGzQgS1Vmtz+NtlMw==",
+ "requires": {
+ "chalk": "^2.4.2",
+ "cli-cursor": "^2.1.0",
+ "cli-spinners": "^1.3.1",
+ "log-symbols": "^2.2.0",
+ "strip-ansi": "^5.0.0",
+ "wcwidth": "^1.0.1"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+ "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w=="
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+ "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+ "requires": {
+ "ansi-regex": "^4.0.0"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
"os-homedir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -2855,6 +3659,11 @@
"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
},
+ "path-dirname": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+ "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+ },
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -3418,11 +4227,6 @@
"integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
"dev": true
},
- "resolve-pathname": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz",
- "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg=="
- },
"resolve-url": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -4167,6 +4971,14 @@
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
"dev": true
},
+ "wcwidth": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+ "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+ "requires": {
+ "defaults": "^1.0.3"
+ }
+ },
"which": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -4230,10 +5042,9 @@
"dev": true
},
"write": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
- "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
- "dev": true,
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+ "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
"requires": {
"mkdirp": "^0.5.1"
}
diff --git a/package.json b/package.json
index 41d1945..58941c7 100644
--- a/package.json
+++ b/package.json
@@ -32,14 +32,17 @@
"connect-livereload": "^0.6.0",
"cp-file": "^4.1.1",
"docsify": ">=3",
- "docsify-server-renderer": ">=4",
+ "docsify-server-renderer": "file:../docsify/packages/docsify-server-renderer",
+ "fast-glob": "^2.2.6",
"fs-extra": "^2.1.2",
"get-port": "^4.1.0",
"livereload": "^0.7.0",
"lru-cache": "^4.1.1",
"opn": "^5.3.0",
+ "ora": "^3.1.0",
"serve-static": "^1.12.1",
"update-notifier": "^2.1.0",
+ "write": "^1.0.3",
"y18n": "^3.2.1",
"yargonaut": "^1.1.2",
"yargs": "^7.0.2"
diff --git a/tools/locales/de.json b/tools/locales/de.json
index 8c32a8c..8f69bb7 100644
--- a/tools/locales/de.json
+++ b/tools/locales/de.json
@@ -1,5 +1,5 @@
{
- "epilog": "Dokumentation:\n https://QingWei-Li.github.io/docsify\n https://QingWei-Li.github.io/docsify-cli\n\nEntwicklung:\n https://github.com/QingWei-Li/docsify-cli/blob/master/CONTRIBUTING.md\n",
+ "epilog": "Dokumentation:\n https://docsify.js.org\n https://docsifyjs.github.io/docsify-cli\n\nEntwicklung:\n https://github.com/docsifyjs/docsify-cli/blob/master/CONTRIBUTING.md\n",
"group.globaloptions": "Globale Optionen",
"help": "Zeige Hilfe an",
"init": "Erzeuge neue Dokumentation.",
@@ -10,6 +10,9 @@
"serve.open": "Dokumentation im Standardbrowser öffnen. Um explizit --open auf false zu setzen, kannst du --no-open verwenden.",
"serve.port": "Listen port.",
"serve.indexname": "Custom filename instead of index.html to serve by default",
+ "static": "Generate static HTML",
+ "static.dest": "Output directory",
+ "static.config": "docsify config file",
"livereload.port": "livereload Listen port.",
"usage": "Anwendung",
"version": "Zeige Versionsnummer an"
diff --git a/tools/locales/en.json b/tools/locales/en.json
index e0f4c53..f8ebe15 100644
--- a/tools/locales/en.json
+++ b/tools/locales/en.json
@@ -1,5 +1,5 @@
{
- "epilog": "Documentation:\n https://QingWei-Li.github.io/docsify\n https://QingWei-Li.github.io/docsify-cli\n\nDevelopment:\n https://github.com/QingWei-Li/docsify-cli/blob/master/CONTRIBUTING.md\n",
+ "epilog": "Documentation:\n https://docsify.js.org\n https://docsifyjs.github.io/docsify-cli\n\nDevelopment:\n https://github.com/docsifyjs/docsify-cli/blob/master/CONTRIBUTING.md\n",
"group.globaloptions": "Global Options",
"help": "Show help",
"init": "Creates new docs",
@@ -10,6 +10,9 @@
"serve.open": "Open docs in default browser. To explicitly set --open to false you may use --no-open.",
"serve.port": "Listen port.",
"serve.indexname": "Custom filename instead of index.html to serve by default",
+ "static": "Generate static HTML",
+ "static.dest": "Output directory",
+ "static.config": "docsify config file",
"livereload.port": "livereload Listen port.",
"usage": "Usage",
"version": "Show version number"
diff --git a/tools/locales/zh.json b/tools/locales/zh.json
index f916c1b..28141b6 100644
--- a/tools/locales/zh.json
+++ b/tools/locales/zh.json
@@ -1,5 +1,5 @@
{
- "epilog": "文档地址:\n https://QingWei-Li.github.io/docsify\n https://QingWei-Li.github.io/docsify-cli\n\n开发:\n https://github.com/QingWei-Li/docsify-cli/blob/master/CONTRIBUTING.md\n",
+ "epilog": "文档地址:\n https://docsify.js.org\n https://docsifyjs.github.io/docsify-cli\n\n开发:\n https://github.com/docsifyjs/docsify-cli/blob/master/CONTRIBUTING.md\n",
"group.globaloptions": "全局选项",
"help": "帮助",
"start": "Server for SSR",
@@ -10,6 +10,9 @@
"serve.open": "自动打开浏览器",
"serve.port": "设置端口",
"serve.indexname": "Custom filename instead of index.html to serve by default",
+ "static": "生成静态 HTML",
+ "static.dest": "输出目录",
+ "static.config": "配置文件",
"livereload.port": "设置livereload端口",
"usage": "例子",
"version": "当前版本号"
From 5d168b56c80b7838906965243c3ac9a7174162cd Mon Sep 17 00:00:00 2001
From: liqingwei <liqingwei@shimo.im>
Date: Wed, 20 Feb 2019 11:06:25 +0800
Subject: [PATCH 2/4] chore: upgrade docsify deps
---
package-lock.json | 378 ++--------------------------------------------
package.json | 4 +-
2 files changed, 12 insertions(+), 370 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 48df653..29e9859 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -772,7 +772,9 @@
}
},
"docsify-server-renderer": {
- "version": "file:../docsify/packages/docsify-server-renderer",
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/docsify-server-renderer/-/docsify-server-renderer-4.9.0.tgz",
+ "integrity": "sha512-umwLhyiuH8J5lAe20d7oYdhN1tXRylHtWp+Sq9M+08RZRGpuXn2KfInvIEp5QT8xXmun1I2p7O0xEe7JS7eu0w==",
"requires": {
"debug": "^2.6.8",
"docsify": "^4.8.0",
@@ -780,379 +782,14 @@
"resolve-pathname": "^2.1.0"
},
"dependencies": {
- "ansi-escapes": {
- "version": "1.4.0",
- "bundled": true
- },
- "ansi-regex": {
- "version": "2.1.1",
- "bundled": true
- },
- "ansi-styles": {
- "version": "2.2.1",
- "bundled": true
- },
- "babel-polyfill": {
- "version": "6.23.0",
- "bundled": true,
- "requires": {
- "babel-runtime": "^6.22.0",
- "core-js": "^2.4.0",
- "regenerator-runtime": "^0.10.0"
- }
- },
- "babel-runtime": {
- "version": "6.26.0",
- "bundled": true,
- "requires": {
- "core-js": "^2.4.0",
- "regenerator-runtime": "^0.11.0"
- },
- "dependencies": {
- "regenerator-runtime": {
- "version": "0.11.1",
- "bundled": true
- }
- }
- },
- "chalk": {
- "version": "1.1.3",
- "bundled": true,
- "requires": {
- "ansi-styles": "^2.2.1",
- "escape-string-regexp": "^1.0.2",
- "has-ansi": "^2.0.0",
- "strip-ansi": "^3.0.0",
- "supports-color": "^2.0.0"
- }
- },
- "chardet": {
- "version": "0.4.2",
- "bundled": true
- },
- "cli-cursor": {
- "version": "2.1.0",
- "bundled": true,
- "requires": {
- "restore-cursor": "^2.0.0"
- }
- },
- "cli-width": {
- "version": "2.2.0",
- "bundled": true
- },
- "clipboard": {
- "version": "2.0.4",
- "bundled": true,
- "optional": true,
- "requires": {
- "good-listener": "^1.2.2",
- "select": "^1.1.2",
- "tiny-emitter": "^2.0.0"
- }
- },
- "core-js": {
- "version": "2.6.5",
- "bundled": true
- },
- "debug": {
- "version": "2.6.9",
- "bundled": true,
- "requires": {
- "ms": "2.0.0"
- }
- },
- "delegate": {
- "version": "3.2.0",
- "bundled": true,
- "optional": true
- },
- "docsify": {
- "version": "4.8.6",
- "bundled": true,
- "requires": {
- "marked": "^0.5.1",
- "medium-zoom": "^0.4.0",
- "opencollective": "^1.0.3",
- "prismjs": "^1.15.0",
- "tinydate": "^1.0.0",
- "tweezer.js": "^1.4.0"
- }
- },
- "encoding": {
- "version": "0.1.12",
- "bundled": true,
- "requires": {
- "iconv-lite": "~0.4.13"
- }
- },
- "escape-string-regexp": {
- "version": "1.0.5",
- "bundled": true
- },
- "external-editor": {
- "version": "2.2.0",
- "bundled": true,
- "requires": {
- "chardet": "^0.4.0",
- "iconv-lite": "^0.4.17",
- "tmp": "^0.0.33"
- }
- },
- "figures": {
- "version": "2.0.0",
- "bundled": true,
- "requires": {
- "escape-string-regexp": "^1.0.5"
- }
- },
- "good-listener": {
- "version": "1.2.2",
- "bundled": true,
- "optional": true,
- "requires": {
- "delegate": "^3.1.2"
- }
- },
- "has-ansi": {
- "version": "2.0.0",
- "bundled": true,
- "requires": {
- "ansi-regex": "^2.0.0"
- }
- },
- "iconv-lite": {
- "version": "0.4.24",
- "bundled": true,
- "requires": {
- "safer-buffer": ">= 2.1.2 < 3"
- }
- },
- "inquirer": {
- "version": "3.0.6",
- "bundled": true,
- "requires": {
- "ansi-escapes": "^1.1.0",
- "chalk": "^1.0.0",
- "cli-cursor": "^2.1.0",
- "cli-width": "^2.0.0",
- "external-editor": "^2.0.1",
- "figures": "^2.0.0",
- "lodash": "^4.3.0",
- "mute-stream": "0.0.7",
- "run-async": "^2.2.0",
- "rx": "^4.1.0",
- "string-width": "^2.0.0",
- "strip-ansi": "^3.0.0",
- "through": "^2.3.6"
- }
- },
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "bundled": true
- },
- "is-promise": {
- "version": "2.1.0",
- "bundled": true
- },
- "is-stream": {
- "version": "1.1.0",
- "bundled": true
- },
- "lodash": {
- "version": "4.17.11",
- "bundled": true
- },
- "marked": {
- "version": "0.5.2",
- "bundled": true
- },
- "medium-zoom": {
- "version": "0.4.0",
- "bundled": true
- },
- "mimic-fn": {
- "version": "1.2.0",
- "bundled": true
- },
- "minimist": {
- "version": "1.2.0",
- "bundled": true
- },
- "ms": {
- "version": "2.0.0",
- "bundled": true
- },
- "mute-stream": {
- "version": "0.0.7",
- "bundled": true
- },
"node-fetch": {
"version": "1.7.3",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+ "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
"requires": {
"encoding": "^0.1.11",
"is-stream": "^1.0.1"
}
- },
- "object-assign": {
- "version": "4.1.1",
- "bundled": true
- },
- "onetime": {
- "version": "2.0.1",
- "bundled": true,
- "requires": {
- "mimic-fn": "^1.0.0"
- }
- },
- "opencollective": {
- "version": "1.0.3",
- "bundled": true,
- "requires": {
- "babel-polyfill": "6.23.0",
- "chalk": "1.1.3",
- "inquirer": "3.0.6",
- "minimist": "1.2.0",
- "node-fetch": "1.6.3",
- "opn": "4.0.2"
- },
- "dependencies": {
- "node-fetch": {
- "version": "1.6.3",
- "bundled": true,
- "requires": {
- "encoding": "^0.1.11",
- "is-stream": "^1.0.1"
- }
- }
- }
- },
- "opn": {
- "version": "4.0.2",
- "bundled": true,
- "requires": {
- "object-assign": "^4.0.1",
- "pinkie-promise": "^2.0.0"
- }
- },
- "os-tmpdir": {
- "version": "1.0.2",
- "bundled": true
- },
- "pinkie": {
- "version": "2.0.4",
- "bundled": true
- },
- "pinkie-promise": {
- "version": "2.0.1",
- "bundled": true,
- "requires": {
- "pinkie": "^2.0.0"
- }
- },
- "prismjs": {
- "version": "1.15.0",
- "bundled": true,
- "requires": {
- "clipboard": "^2.0.0"
- }
- },
- "regenerator-runtime": {
- "version": "0.10.5",
- "bundled": true
- },
- "resolve-pathname": {
- "version": "2.2.0",
- "bundled": true
- },
- "restore-cursor": {
- "version": "2.0.0",
- "bundled": true,
- "requires": {
- "onetime": "^2.0.0",
- "signal-exit": "^3.0.2"
- }
- },
- "run-async": {
- "version": "2.3.0",
- "bundled": true,
- "requires": {
- "is-promise": "^2.1.0"
- }
- },
- "rx": {
- "version": "4.1.0",
- "bundled": true
- },
- "safer-buffer": {
- "version": "2.1.2",
- "bundled": true
- },
- "select": {
- "version": "1.1.2",
- "bundled": true,
- "optional": true
- },
- "signal-exit": {
- "version": "3.0.2",
- "bundled": true
- },
- "string-width": {
- "version": "2.1.1",
- "bundled": true,
- "requires": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "3.0.0",
- "bundled": true
- },
- "strip-ansi": {
- "version": "4.0.0",
- "bundled": true,
- "requires": {
- "ansi-regex": "^3.0.0"
- }
- }
- }
- },
- "strip-ansi": {
- "version": "3.0.1",
- "bundled": true,
- "requires": {
- "ansi-regex": "^2.0.0"
- }
- },
- "supports-color": {
- "version": "2.0.0",
- "bundled": true
- },
- "through": {
- "version": "2.3.8",
- "bundled": true
- },
- "tiny-emitter": {
- "version": "2.1.0",
- "bundled": true,
- "optional": true
- },
- "tinydate": {
- "version": "1.0.1",
- "bundled": true
- },
- "tmp": {
- "version": "0.0.33",
- "bundled": true,
- "requires": {
- "os-tmpdir": "~1.0.2"
- }
- },
- "tweezer.js": {
- "version": "1.4.0",
- "bundled": true
}
}
},
@@ -4227,6 +3864,11 @@
"integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
"dev": true
},
+ "resolve-pathname": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz",
+ "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg=="
+ },
"resolve-url": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
diff --git a/package.json b/package.json
index 58941c7..be9296f 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,8 @@
"connect": "^3.6.0",
"connect-livereload": "^0.6.0",
"cp-file": "^4.1.1",
- "docsify": ">=3",
- "docsify-server-renderer": "file:../docsify/packages/docsify-server-renderer",
+ "docsify": ">=4",
+ "docsify-server-renderer": "^4.9.0",
"fast-glob": "^2.2.6",
"fs-extra": "^2.1.2",
"get-port": "^4.1.0",
From ef773949bc9184b8d07754347f42e4c52a437f49 Mon Sep 17 00:00:00 2001
From: "cinwell.li" <cinwell.li@gmail.com>
Date: Sun, 31 Mar 2019 11:24:49 +0800
Subject: [PATCH 3/4] fix: copy md file
---
lib/commands/static.js | 17 ++++++++++++++---
package-lock.json | 41 +++++++++++------------------------------
2 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/lib/commands/static.js b/lib/commands/static.js
index 3294fc0..e8c8e16 100644
--- a/lib/commands/static.js
+++ b/lib/commands/static.js
@@ -9,6 +9,7 @@ const fg = require("fast-glob");
const write = require("write");
const ora = require("ora");
const chalk = require("chalk");
+const fs = require("fs");
const resolve = util.resolve;
module.exports = function(
@@ -19,6 +20,9 @@ module.exports = function(
) {
path = resolve(path || ".");
const config = util.getConfig(configFile);
+ // docs absolute path
+ config.path = path;
+
const server = connect();
const indexFile = resolve(path, indexName || "index.html");
const render = new Renderer(config);
@@ -31,21 +35,28 @@ module.exports = function(
spinner.start("Rendering");
getPort()
- .then(port => {
+ .then(async port => {
server.use(serveStatic(path, { index: indexFile }));
app = server.listen(port);
- return Promise.all(files.map(file => render.render(file)));
+ const queue = [];
+ for (const file of files) {
+ const res = await render.render(file);
+ queue.push(res);
+ spinner.text = "Rendering " + file;
+ }
+ return queue;
})
.then(data => {
// 保存文件
return Promise.all(
- data.map(({ url, content }) => {
+ data.map(({ url, content, path }) => {
const filePath = url
.replace(/README\.md$/, "index.html")
.replace(/\.md$/, ".html");
spinner.text = `Rendering ${url}`;
write(resolve(util.cwd(), dest, filePath), content);
+ fs.copyFileSync(path, resolve(util.cwd(), dest, url));
})
);
})
diff --git a/package-lock.json b/package-lock.json
index 29e9859..40bc24a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1649,8 +1649,7 @@
},
"ansi-regex": {
"version": "2.1.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"aproba": {
"version": "1.2.0",
@@ -1668,13 +1667,11 @@
},
"balanced-match": {
"version": "1.0.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -1687,18 +1684,15 @@
},
"code-point-at": {
"version": "1.1.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"concat-map": {
"version": "0.0.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"console-control-strings": {
"version": "1.1.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"core-util-is": {
"version": "1.0.2",
@@ -1801,8 +1795,7 @@
},
"inherits": {
"version": "2.0.3",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"ini": {
"version": "1.3.5",
@@ -1812,7 +1805,6 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -1825,20 +1817,17 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -1855,7 +1844,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -1928,8 +1916,7 @@
},
"number-is-nan": {
"version": "1.0.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"object-assign": {
"version": "4.1.1",
@@ -1939,7 +1926,6 @@
"once": {
"version": "1.4.0",
"bundled": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -2015,8 +2001,7 @@
},
"safe-buffer": {
"version": "5.1.2",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -2046,7 +2031,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -2064,7 +2048,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -2103,13 +2086,11 @@
},
"wrappy": {
"version": "1.0.2",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"yallist": {
"version": "3.0.3",
- "bundled": true,
- "optional": true
+ "bundled": true
}
}
},
From e4880bdc91d307952852c62b588f47995bee24ff Mon Sep 17 00:00:00 2001
From: "cinwell.li" <cinwell.li@gmail.com>
Date: Sun, 31 Mar 2019 14:29:27 +0800
Subject: [PATCH 4/4] fix: file path
---
lib/commands/static.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/commands/static.js b/lib/commands/static.js
index e8c8e16..86fcde0 100644
--- a/lib/commands/static.js
+++ b/lib/commands/static.js
@@ -9,7 +9,8 @@ const fg = require("fast-glob");
const write = require("write");
const ora = require("ora");
const chalk = require("chalk");
-const fs = require("fs");
+const fse = require("fs-extra");
+
const resolve = util.resolve;
module.exports = function(
@@ -27,7 +28,8 @@ module.exports = function(
const indexFile = resolve(path, indexName || "index.html");
const render = new Renderer(config);
const files = fg.sync("**/*.md", {
- cwd: path
+ cwd: path,
+ ignore: ["_*"]
});
let app;
const spinner = ora();
@@ -43,23 +45,24 @@ module.exports = function(
for (const file of files) {
const res = await render.render(file);
queue.push(res);
- spinner.text = "Rendering " + file;
+ console.log("Rendering " + file);
}
return queue;
})
.then(data => {
- // 保存文件
+ // save file
return Promise.all(
data.map(({ url, content, path }) => {
const filePath = url
.replace(/README\.md$/, "index.html")
.replace(/\.md$/, ".html");
- spinner.text = `Rendering ${url}`;
write(resolve(util.cwd(), dest, filePath), content);
- fs.copyFileSync(path, resolve(util.cwd(), dest, url));
})
);
})
+ .then(() => {
+ return fse.copy(path, dest);
+ })
.then(() => {
spinner.succeed(`Success! Generate static files at ${chalk.green(dest)}`);
app && app.close();