依赖包升级

This commit is contained in:
sookie 2018-12-07 17:40:21 +08:00
parent d5909396c4
commit edffbb8fda
4 changed files with 1083 additions and 491 deletions

451
package-lock.json generated
View File

@ -5,9 +5,9 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"JSONStream": { "JSONStream": {
"version": "1.3.2", "version": "1.3.5",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
"integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
"requires": { "requires": {
"jsonparse": "^1.2.0", "jsonparse": "^1.2.0",
"through": ">=2.2.7 <3" "through": ">=2.2.7 <3"
@ -290,7 +290,7 @@
}, },
"cheerio": { "cheerio": {
"version": "0.22.0", "version": "0.22.0",
"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", "resolved": "http://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
"integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=",
"requires": { "requires": {
"css-select": "~1.2.0", "css-select": "~1.2.0",
@ -343,11 +343,11 @@
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
}, },
"color-convert": { "color-convert": {
"version": "1.9.1", "version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
"integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
"requires": { "requires": {
"color-name": "^1.1.1" "color-name": "1.1.3"
} }
}, },
"color-name": { "color-name": {
@ -432,7 +432,7 @@
}, },
"css-select": { "css-select": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
"integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
"requires": { "requires": {
"boolbase": "~1.0.0", "boolbase": "~1.0.0",
@ -442,9 +442,9 @@
} }
}, },
"css-what": { "css-what": {
"version": "2.1.0", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz",
"integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=" "integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ=="
}, },
"cuid": { "cuid": {
"version": "1.3.8", "version": "1.3.8",
@ -458,7 +458,7 @@
"dependencies": { "dependencies": {
"core-js": { "core-js": {
"version": "1.2.7", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
} }
} }
@ -497,20 +497,20 @@
"dependencies": { "dependencies": {
"domelementtype": { "domelementtype": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
} }
} }
}, },
"domelementtype": { "domelementtype": {
"version": "1.3.0", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=" "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
}, },
"domhandler": { "domhandler": {
"version": "2.4.1", "version": "2.4.2",
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
"requires": { "requires": {
"domelementtype": "1" "domelementtype": "1"
} }
@ -540,9 +540,9 @@
"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
}, },
"entities": { "entities": {
"version": "1.1.1", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=" "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
}, },
"escape-html": { "escape-html": {
"version": "1.0.3", "version": "1.0.3",
@ -555,9 +555,9 @@
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
}, },
"esprima": { "esprima": {
"version": "4.0.0", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==" "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
}, },
"esutils": { "esutils": {
"version": "2.0.2", "version": "2.0.2",
@ -600,13 +600,13 @@
"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
}, },
"fill-range": { "fill-range": {
"version": "2.2.3", "version": "2.2.4",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
"requires": { "requires": {
"is-number": "^2.1.0", "is-number": "^2.1.0",
"isobject": "^2.0.0", "isobject": "^2.0.0",
"randomatic": "^1.1.3", "randomatic": "^3.0.0",
"repeat-element": "^1.1.2", "repeat-element": "^1.1.2",
"repeat-string": "^1.5.2" "repeat-string": "^1.5.2"
} }
@ -677,21 +677,19 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"delegates": "1.0.0", "delegates": "^1.0.0",
"readable-stream": "2.3.6" "readable-stream": "^2.0.6"
} }
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
} }
}, },
@ -702,18 +700,15 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -748,7 +743,7 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"minipass": "2.2.4" "minipass": "^2.2.1"
} }
}, },
"fs.realpath": { "fs.realpath": {
@ -761,14 +756,14 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"aproba": "1.2.0", "aproba": "^1.0.3",
"console-control-strings": "1.1.0", "console-control-strings": "^1.0.0",
"has-unicode": "2.0.1", "has-unicode": "^2.0.0",
"object-assign": "4.1.1", "object-assign": "^4.1.0",
"signal-exit": "3.0.2", "signal-exit": "^3.0.0",
"string-width": "1.0.2", "string-width": "^1.0.1",
"strip-ansi": "3.0.1", "strip-ansi": "^3.0.1",
"wide-align": "1.1.2" "wide-align": "^1.1.0"
} }
}, },
"glob": { "glob": {
@ -776,12 +771,12 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"fs.realpath": "1.0.0", "fs.realpath": "^1.0.0",
"inflight": "1.0.6", "inflight": "^1.0.4",
"inherits": "2.0.3", "inherits": "2",
"minimatch": "3.0.4", "minimatch": "^3.0.4",
"once": "1.4.0", "once": "^1.3.0",
"path-is-absolute": "1.0.1" "path-is-absolute": "^1.0.0"
} }
}, },
"has-unicode": { "has-unicode": {
@ -794,7 +789,7 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"safer-buffer": "2.1.2" "safer-buffer": "^2.1.0"
} }
}, },
"ignore-walk": { "ignore-walk": {
@ -802,7 +797,7 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"minimatch": "3.0.4" "minimatch": "^3.0.4"
} }
}, },
"inflight": { "inflight": {
@ -810,14 +805,13 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"once": "1.4.0", "once": "^1.3.0",
"wrappy": "1.0.2" "wrappy": "1"
} }
}, },
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -827,9 +821,8 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "1.0.1" "number-is-nan": "^1.0.0"
} }
}, },
"isarray": { "isarray": {
@ -840,23 +833,20 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "1.1.11" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "5.1.1", "safe-buffer": "^5.1.1",
"yallist": "3.0.2" "yallist": "^3.0.0"
} }
}, },
"minizlib": { "minizlib": {
@ -864,13 +854,12 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"minipass": "2.2.4" "minipass": "^2.2.1"
} }
}, },
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -885,9 +874,9 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"debug": "2.6.9", "debug": "^2.1.2",
"iconv-lite": "0.4.21", "iconv-lite": "^0.4.4",
"sax": "1.2.4" "sax": "^1.2.4"
} }
}, },
"node-pre-gyp": { "node-pre-gyp": {
@ -895,16 +884,16 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"detect-libc": "1.0.3", "detect-libc": "^1.0.2",
"mkdirp": "0.5.1", "mkdirp": "^0.5.1",
"needle": "2.2.0", "needle": "^2.2.0",
"nopt": "4.0.1", "nopt": "^4.0.1",
"npm-packlist": "1.1.10", "npm-packlist": "^1.1.6",
"npmlog": "4.1.2", "npmlog": "^4.0.2",
"rc": "1.2.7", "rc": "^1.1.7",
"rimraf": "2.6.2", "rimraf": "^2.6.1",
"semver": "5.5.0", "semver": "^5.3.0",
"tar": "4.4.1" "tar": "^4"
} }
}, },
"nopt": { "nopt": {
@ -912,8 +901,8 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"abbrev": "1.1.1", "abbrev": "1",
"osenv": "0.1.5" "osenv": "^0.1.4"
} }
}, },
"npm-bundled": { "npm-bundled": {
@ -926,8 +915,8 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"ignore-walk": "3.0.1", "ignore-walk": "^3.0.1",
"npm-bundled": "1.0.3" "npm-bundled": "^1.0.1"
} }
}, },
"npmlog": { "npmlog": {
@ -935,16 +924,15 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"are-we-there-yet": "1.1.4", "are-we-there-yet": "~1.1.2",
"console-control-strings": "1.1.0", "console-control-strings": "~1.1.0",
"gauge": "2.7.4", "gauge": "~2.7.3",
"set-blocking": "2.0.0" "set-blocking": "~2.0.0"
} }
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@ -954,9 +942,8 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1.0.2" "wrappy": "1"
} }
}, },
"os-homedir": { "os-homedir": {
@ -974,8 +961,8 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"os-homedir": "1.0.2", "os-homedir": "^1.0.0",
"os-tmpdir": "1.0.2" "os-tmpdir": "^1.0.0"
} }
}, },
"path-is-absolute": { "path-is-absolute": {
@ -993,10 +980,10 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"deep-extend": "0.5.1", "deep-extend": "^0.5.1",
"ini": "1.3.5", "ini": "~1.3.0",
"minimist": "1.2.0", "minimist": "^1.2.0",
"strip-json-comments": "2.0.1" "strip-json-comments": "~2.0.1"
}, },
"dependencies": { "dependencies": {
"minimist": { "minimist": {
@ -1011,13 +998,13 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"core-util-is": "1.0.2", "core-util-is": "~1.0.0",
"inherits": "2.0.3", "inherits": "~2.0.3",
"isarray": "1.0.0", "isarray": "~1.0.0",
"process-nextick-args": "2.0.0", "process-nextick-args": "~2.0.0",
"safe-buffer": "5.1.1", "safe-buffer": "~5.1.1",
"string_decoder": "1.1.1", "string_decoder": "~1.1.1",
"util-deprecate": "1.0.2" "util-deprecate": "~1.0.1"
} }
}, },
"rimraf": { "rimraf": {
@ -1025,7 +1012,7 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"glob": "7.1.2" "glob": "^7.0.5"
} }
}, },
"safe-buffer": { "safe-buffer": {
@ -1060,11 +1047,10 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "1.1.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "1.0.0", "is-fullwidth-code-point": "^1.0.0",
"strip-ansi": "3.0.1" "strip-ansi": "^3.0.0"
} }
}, },
"string_decoder": { "string_decoder": {
@ -1072,14 +1058,14 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"safe-buffer": "5.1.1" "safe-buffer": "~5.1.0"
} }
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"requires": { "requires": {
"ansi-regex": "2.1.1" "ansi-regex": "^2.0.0"
} }
}, },
"strip-json-comments": { "strip-json-comments": {
@ -1092,13 +1078,13 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"chownr": "1.0.1", "chownr": "^1.0.1",
"fs-minipass": "1.2.5", "fs-minipass": "^1.2.5",
"minipass": "2.2.4", "minipass": "^2.2.4",
"minizlib": "1.1.0", "minizlib": "^1.1.0",
"mkdirp": "0.5.1", "mkdirp": "^0.5.0",
"safe-buffer": "5.1.1", "safe-buffer": "^5.1.1",
"yallist": "3.0.2" "yallist": "^3.0.2"
} }
}, },
"util-deprecate": { "util-deprecate": {
@ -1111,7 +1097,7 @@
"bundled": true, "bundled": true,
"optional": true, "optional": true,
"requires": { "requires": {
"string-width": "1.0.2" "string-width": "^1.0.2"
} }
}, },
"wrappy": { "wrappy": {
@ -1184,9 +1170,9 @@
"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
}, },
"hexo": { "hexo": {
"version": "3.7.1", "version": "3.8.0",
"resolved": "https://registry.npmjs.org/hexo/-/hexo-3.7.1.tgz", "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.8.0.tgz",
"integrity": "sha512-+RRN4C8oWYzEnW0NtqNrIfIITRTvXpMoE6OrK5aK4nrO+4lzp0JfZkoxnsINVXUPmzHRimLWUzO95x9lt33jEg==", "integrity": "sha512-qMk0TZ+ErKMD25R+HMHFvbyTAcKszmGZYtQHT2pzVnZgitkJCShZ7b2qDbedtWBBizhutNbKkhQ4D3Dqivaviw==",
"requires": { "requires": {
"abbrev": "^1.0.7", "abbrev": "^1.0.7",
"archy": "^1.0.0", "archy": "^1.0.0",
@ -1217,6 +1203,11 @@
"warehouse": "^2.2.0" "warehouse": "^2.2.0"
}, },
"dependencies": { "dependencies": {
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
},
"ansi-styles": { "ansi-styles": {
"version": "3.2.1", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@ -1245,61 +1236,6 @@
"wordwrap": "0.0.2" "wordwrap": "0.0.2"
} }
}, },
"hexo-cli": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
"integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
"requires": {
"abbrev": "^1.0.7",
"bluebird": "^3.4.0",
"chalk": "^1.1.3",
"command-exists": "^1.2.0",
"hexo-fs": "^0.2.0",
"hexo-log": "^0.2.0",
"hexo-util": "^0.6.0",
"minimist": "^1.2.0",
"object-assign": "^4.1.0",
"resolve": "^1.5.0",
"tildify": "^1.2.0"
},
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"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"
}
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
}
}
},
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
"source-map": { "source-map": {
"version": "0.5.7", "version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@ -1311,27 +1247,20 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"requires": { "requires": {
"ansi-regex": "^3.0.0" "ansi-regex": "^3.0.0"
},
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
}
} }
}, },
"supports-color": { "supports-color": {
"version": "5.4.0", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"requires": { "requires": {
"has-flag": "^3.0.0" "has-flag": "^3.0.0"
} }
}, },
"swig-templates": { "swig-templates": {
"version": "2.0.2", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.2.tgz", "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
"integrity": "sha1-0lAqcwMBk1b06nbqkGXU9Yr2q3U=", "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
"requires": { "requires": {
"optimist": "~0.6", "optimist": "~0.6",
"uglify-js": "2.6.0" "uglify-js": "2.6.0"
@ -1339,7 +1268,7 @@
}, },
"uglify-js": { "uglify-js": {
"version": "2.6.0", "version": "2.6.0",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz", "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
"integrity": "sha1-JeqhzDVQ45QQzu+v0c+7a20V8AE=", "integrity": "sha1-JeqhzDVQ45QQzu+v0c+7a20V8AE=",
"requires": { "requires": {
"async": "~0.2.6", "async": "~0.2.6",
@ -1355,7 +1284,7 @@
}, },
"yargs": { "yargs": {
"version": "3.10.0", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"requires": { "requires": {
"camelcase": "^1.0.2", "camelcase": "^1.0.2",
@ -1376,6 +1305,31 @@
"safe-json-stringify": "~1" "safe-json-stringify": "~1"
} }
}, },
"hexo-cli": {
"version": "1.1.0",
"resolved": "http://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
"integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
"requires": {
"abbrev": "^1.0.7",
"bluebird": "^3.4.0",
"chalk": "^1.1.3",
"command-exists": "^1.2.0",
"hexo-fs": "^0.2.0",
"hexo-log": "^0.2.0",
"hexo-util": "^0.6.0",
"minimist": "^1.2.0",
"object-assign": "^4.1.0",
"resolve": "^1.5.0",
"tildify": "^1.2.0"
},
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
}
}
},
"hexo-deployer-git": { "hexo-deployer-git": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/hexo-deployer-git/-/hexo-deployer-git-0.3.1.tgz", "resolved": "https://registry.npmjs.org/hexo-deployer-git/-/hexo-deployer-git-0.3.1.tgz",
@ -1433,7 +1387,6 @@
"requires": { "requires": {
"ejs": "^1.0.0", "ejs": "^1.0.0",
"hexo": "^3.0.0", "hexo": "^3.0.0",
"hexo-generator-baidu-sitemap": "0.0.8",
"utils-merge": "^1.0.0" "utils-merge": "^1.0.0"
}, },
"dependencies": { "dependencies": {
@ -1444,7 +1397,7 @@
}, },
"hexo-generator-baidu-sitemap": { "hexo-generator-baidu-sitemap": {
"version": "0.0.8", "version": "0.0.8",
"resolved": "https://registry.npmjs.org/hexo-generator-baidu-sitemap/-/hexo-generator-baidu-sitemap-0.0.8.tgz", "resolved": "http://registry.npmjs.org/hexo-generator-baidu-sitemap/-/hexo-generator-baidu-sitemap-0.0.8.tgz",
"integrity": "sha1-NStV0BfNGylHzpzWCvXE2+vogLs=", "integrity": "sha1-NStV0BfNGylHzpzWCvXE2+vogLs=",
"requires": { "requires": {
"ejs": "^1.0.0", "ejs": "^1.0.0",
@ -1709,16 +1662,28 @@
"integrity": "sha1-GeezmX/2+6yZrlp9J2ZInv5+LQ4=" "integrity": "sha1-GeezmX/2+6yZrlp9J2ZInv5+LQ4="
}, },
"htmlparser2": { "htmlparser2": {
"version": "3.9.2", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
"requires": { "requires": {
"domelementtype": "^1.3.0", "domelementtype": "^1.3.0",
"domhandler": "^2.3.0", "domhandler": "^2.3.0",
"domutils": "^1.5.1", "domutils": "^1.5.1",
"entities": "^1.1.1", "entities": "^1.1.1",
"inherits": "^2.0.1", "inherits": "^2.0.1",
"readable-stream": "^2.0.2" "readable-stream": "^3.0.6"
},
"dependencies": {
"readable-stream": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz",
"integrity": "sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
}
}
} }
}, },
"http-errors": { "http-errors": {
@ -1877,9 +1842,9 @@
"dev": true "dev": true
}, },
"js-yaml": { "js-yaml": {
"version": "3.11.0", "version": "3.12.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
"integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==", "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
"requires": { "requires": {
"argparse": "^1.0.7", "argparse": "^1.0.7",
"esprima": "^4.0.0" "esprima": "^4.0.0"
@ -2034,6 +1999,11 @@
"word-regex": "^0.1.0" "word-regex": "^0.1.0"
} }
}, },
"math-random": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
"integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w="
},
"micromatch": { "micromatch": {
"version": "2.3.11", "version": "2.3.11",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
@ -2106,21 +2076,21 @@
"integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==" "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ=="
}, },
"moment-timezone": { "moment-timezone": {
"version": "0.5.16", "version": "0.5.23",
"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.16.tgz", "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz",
"integrity": "sha512-4d1l92plNNqnMkqI/7boWNVXJvwGL2WyByl1Hxp3h/ao3HZiAqaoQY+6KBkYdiN5QtNDpndq+58ozl8W4GVoNw==", "integrity": "sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==",
"requires": { "requires": {
"moment": ">= 2.9.0" "moment": ">= 2.9.0"
} }
}, },
"morgan": { "morgan": {
"version": "1.9.0", "version": "1.9.1",
"resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz",
"integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=", "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==",
"requires": { "requires": {
"basic-auth": "~2.0.0", "basic-auth": "~2.0.0",
"debug": "2.6.9", "debug": "2.6.9",
"depd": "~1.1.1", "depd": "~1.1.2",
"on-finished": "~2.3.0", "on-finished": "~2.3.0",
"on-headers": "~1.0.1" "on-headers": "~1.0.1"
} }
@ -2196,9 +2166,9 @@
} }
}, },
"nth-check": { "nth-check": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"requires": { "requires": {
"boolbase": "~1.0.0" "boolbase": "~1.0.0"
} }
@ -2368,7 +2338,7 @@
}, },
"pretty-hrtime": { "pretty-hrtime": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE="
}, },
"process-nextick-args": { "process-nextick-args": {
@ -2382,39 +2352,24 @@
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
}, },
"randomatic": { "randomatic": {
"version": "1.1.7", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
"requires": { "requires": {
"is-number": "^3.0.0", "is-number": "^4.0.0",
"kind-of": "^4.0.0" "kind-of": "^6.0.0",
"math-random": "^1.0.1"
}, },
"dependencies": { "dependencies": {
"is-number": { "is-number": {
"version": "3.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
"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"
}
}
}
}, },
"kind-of": { "kind-of": {
"version": "4.0.0", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
"requires": {
"is-buffer": "^1.1.5"
}
} }
} }
}, },
@ -2683,7 +2638,7 @@
}, },
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
}, },
"tildify": { "tildify": {

View File

@ -3,10 +3,14 @@
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"hexo": { "hexo": {
"version": "3.7.1" "version": "3.8.0"
},
"scripts": {
"dev": "hexo server",
"build": "hexo clean && hexo generate"
}, },
"dependencies": { "dependencies": {
"hexo": "^3.2.0", "hexo": "^3.8.0",
"hexo-generator-archive": "^0.1.4", "hexo-generator-archive": "^0.1.4",
"hexo-generator-baidu-sitemap": "^0.1.2", "hexo-generator-baidu-sitemap": "^0.1.2",
"hexo-generator-category": "^0.1.3", "hexo-generator-category": "^0.1.3",
@ -22,6 +26,7 @@
"hexo-wordcount": "^3.0.2" "hexo-wordcount": "^3.0.2"
}, },
"devDependencies": { "devDependencies": {
"hexo-cli": "^1.1.0",
"hexo-deployer-git": "^0.3.1" "hexo-deployer-git": "^0.3.1"
} }
} }

View File

@ -34,7 +34,7 @@ const p2 = Promise.resolve(test2())
表达式的结果可以是Promise对象, 也可以不是 表达式的结果可以是Promise对象, 也可以不是
+ 不是promise对象 : await会阻塞后面的代码先执行async外面的同步代码同步代码执行完再回到async内部把这个非promise的东西作为 await表达式的结果 + 不是promise对象 : await会阻塞后面的代码先执行await所在的async函数调用之后的同步代码同步代码执行完再回到async内部把这个非promise的东西作为 await表达式的结果
例如 例如
```javascript ```javascript
console.log(1); console.log(1);
@ -48,5 +48,92 @@ console.log(3);
``` ```
正因为await会阻塞之后的代码, 所以才必须放在async函数当中 正因为await会阻塞之后的代码, 所以才必须放在async函数当中
+ 是promise对象 : await 也会暂停async后面的代码先执行async外面的同步代码等着 Promise 对象 fulfilled然后把 resolve 的参数作为 await 表达式的运算结果。 + 是promise对象 : await 也会阻塞async后面的代码先执行async外面的同步代码等着 Promise 对象 fulfilled然后把 resolve 的参数作为 await 表达式的运算结果。
例如
```javascript
async function test() {
console.log(4)
return 1
}
(async function(){
// 因为test函数是async修饰的, 所以返回的是Promise对象
console.log(await test())
console.log(2)
})()
console.log(3)
/* output: 4 3 1 2 */
```
### setTimeout与Promise
Promise是一个`micro task`,我们的主线程是一个`task`。micro task会在task后面执行然后才会接着执行下一个task。
而setTimeout的返回函数是一个新的task,所以这里**Promise的执行会先于新task执行**
简单来说就是
setTimeout的队列与promise的队列不是同一个队列执行的优先级低于promise
---
### 综合运用
```javascript
async function async1() {
console.log( 'async1 start' ) // (3)
await async2() // (4)
console.log( 'async1 end' ) // (5)
}
async function async2() {
console.log( 'async2' ) // (6)
}
console.log( 'script start' ) // (1)
setTimeout( function () {
console.log( 'setTimeout' ) // (2)
}, 0 )
async1()
new Promise( function ( resolve ) {
console.log( 'promise1' ) // (7)
resolve();
} ).then( function () {
console.log( 'promise2' ) // (8)
} )
console.log( 'script end' ) // (9)
```
执行过程分析:
1. 开始是async1和async2两个函数定义, 但是没有调用, 所以先跳过, 首先执行的肯定是(1), 输出**script start**
2. 然后是一个定时器, 那么此时会吧定时器的回调函数加入到任务队列当中
> 此时的task队列 _[ (2) ]_
3. 然后是async1的调用, 会先执行(3), 输出**async1 start**
4. 执行到(4)时, 会阻塞之后的内容, 也就是(5), 并加入任务队列
但是async2函数内部的内容不会阻塞, 还是同步执行, 执行(6), 输出**async2**
> 此时的micro task队列 _[ (5) ]_
5. 之后创建Promise对象, 构造方法传入的函数是立即执行的, 执行(7), 输出**promise1**
6. resolve的执行加入到任务队列, 也就是(8)
> 此时的micro task队列 _[ (5) (8) ]_
7. 最后的(9)属于主线, 所以直接执行, 输出**script end**
8. 主线执行完毕, 开始执行任务队列当中的内容, 首先会执行micro task队列的内容
依次输出**async1 end**和**promise2**
9. micro task队列出队执行完毕, 开始执行新的task队列(由setTimeout创建的)
所以输出**setTimeout**
> 最终的输出结果是:
```
script start
async1 start
async2
promise1
script end
async1 end
promise2
setTimeout
```
说明: 不同的js引擎的实现, async1 end和promise2的顺序可能有差别, 其他的顺序都是一样的

1021
yarn.lock

File diff suppressed because it is too large Load Diff