fix: security vulnerability in lodash.merge

This commit is contained in:
Changkun Ou
2019-07-11 09:41:45 +02:00
parent cc1d3d7cb9
commit b073e290fb
3 changed files with 23 additions and 24 deletions

View File

@@ -1958,13 +1958,12 @@
} }
}, },
"hexo-renderer-marked": { "hexo-renderer-marked": {
"version": "0.3.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/hexo-renderer-marked/-/hexo-renderer-marked-0.3.2.tgz", "resolved": "https://registry.npmjs.org/hexo-renderer-marked/-/hexo-renderer-marked-1.0.1.tgz",
"integrity": "sha512-joSLeHB0YRkuViIPQlRz4A+zfJKPNHT+rABFgPHiT1zL9eeTUPxoLL4h7kcgOwRLAontVScaxP2Sie15mNitFg==", "integrity": "sha512-oAOthvEYWJx4hvzD8WE7hOSYoTooOe5Vtb7mW6LtM3rEpQhXaWXPq7fOrEhCfdjgDr3DusSi7x19XgLIx+hcmQ==",
"requires": { "requires": {
"hexo-util": "^0.6.2", "hexo-util": "^0.6.2",
"marked": "^0.3.9", "marked": "^0.6.1",
"object-assign": "^4.1.1",
"strip-indent": "^2.0.0" "strip-indent": "^2.0.0"
} }
}, },
@@ -2246,9 +2245,9 @@
} }
}, },
"lodash": { "lodash": {
"version": "4.17.11", "version": "4.17.14",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
"dev": true "dev": true
}, },
"lodash.assignin": { "lodash.assignin": {
@@ -2294,9 +2293,9 @@
"dev": true "dev": true
}, },
"lodash.merge": { "lodash.merge": {
"version": "4.6.1", "version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
"integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
"dev": true "dev": true
}, },
"lodash.pick": { "lodash.pick": {
@@ -2368,9 +2367,9 @@
} }
}, },
"marked": { "marked": {
"version": "0.3.19", "version": "0.6.3",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz",
"integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==" "integrity": "sha512-Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ=="
}, },
"micromatch": { "micromatch": {
"version": "3.1.10", "version": "3.1.10",
@@ -2968,9 +2967,9 @@
"integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=" "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
}, },
"serve": { "serve": {
"version": "11.0.2", "version": "11.1.0",
"resolved": "https://registry.npmjs.org/serve/-/serve-11.0.2.tgz", "resolved": "https://registry.npmjs.org/serve/-/serve-11.1.0.tgz",
"integrity": "sha512-TjjjwUdPU+STkUyxvZFtkWOTRXdNDNMfot9Z/f97eEeyjPAV69o1TmJrNAlDbvpPu1JEjCoWiGCjkel7kWNF4A==", "integrity": "sha512-+4wpDtOSS+4ZLyDWMxThutA3iOTawX2+yDovOI8cjOUOmemyvNlHyFAsezBlSgbZKTYChI3tzA1Mh0z6XZ62qA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@zeit/schemas": "2.6.0", "@zeit/schemas": "2.6.0",
@@ -2980,7 +2979,7 @@
"chalk": "2.4.1", "chalk": "2.4.1",
"clipboardy": "1.2.3", "clipboardy": "1.2.3",
"compression": "1.7.3", "compression": "1.7.3",
"serve-handler": "6.0.2", "serve-handler": "6.1.0",
"update-check": "1.5.2" "update-check": "1.5.2"
}, },
"dependencies": { "dependencies": {
@@ -2998,9 +2997,9 @@
} }
}, },
"serve-handler": { "serve-handler": {
"version": "6.0.2", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.0.2.tgz", "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.0.tgz",
"integrity": "sha512-D1zgDpvx9Rgjip6rzY2QBjlZwfr/oiDSg66HipOWkEw1appHn7/mXdVRL6F8+bd1KD117Wch4+4x78OTXQVwDg==", "integrity": "sha512-63N075Tn3PsFYcu0NVV7tb367UbiW3gnC+/50ohL4oqOhAG6bmbaWqiRcXQgbzqc0ALBjSAzg7VTfa0Qw4E3hA==",
"dev": true, "dev": true,
"requires": { "requires": {
"bytes": "3.0.0", "bytes": "3.0.0",

View File

@@ -9,11 +9,11 @@
"hexo-generator-index": "^0.2.1", "hexo-generator-index": "^0.2.1",
"hexo-image-caption": "^0.1.1", "hexo-image-caption": "^0.1.1",
"hexo-renderer-ejs": "^0.3.1", "hexo-renderer-ejs": "^0.3.1",
"hexo-renderer-marked": "^0.3.2", "hexo-renderer-marked": "^1.0.1",
"hexo-renderer-stylus": "^0.3.3" "hexo-renderer-stylus": "^0.3.3"
}, },
"devDependencies": { "devDependencies": {
"hexo": "^3.8.0", "hexo": "^3.8.0",
"serve": ">=7.0.0" "serve": ">=7.0.0"
} }
} }

View File

@@ -6,7 +6,7 @@ $width = 900px
body body
background-color: #fff background-color: #fff
margin-bottom: 200px
#logo #logo
span span
font-size: 1.2em font-size: 1.2em