diff --git a/front/package-lock.json b/front/package-lock.json index fbc7543..90f0cc9 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -1576,6 +1576,7 @@ "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, + "optional": true, "requires": { "hoek": "2.x.x" } @@ -4420,7 +4421,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4438,11 +4440,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4455,15 +4459,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4566,7 +4573,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4576,6 +4584,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4588,17 +4597,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4615,6 +4627,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4687,7 +4700,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4697,6 +4711,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4772,7 +4787,8 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4802,6 +4818,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4819,6 +4836,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4857,11 +4875,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true + "bundled": true, + "optional": true } } }, @@ -5350,7 +5370,8 @@ "version": "2.16.3", "resolved": "http://registry.npm.taobao.org/hoek/download/hoek-2.16.3.tgz", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true + "dev": true, + "optional": true }, "home-or-tmp": { "version": "2.0.0", @@ -6950,9 +6971,10 @@ } }, "marked": { - "version": "0.4.0", - "resolved": "http://registry.npm.taobao.org/marked/download/marked-0.4.0.tgz", - "integrity": "sha1-mtLCp6F5HxCoUuARL3e1cdzhDGY=" + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz", + "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==", + "dev": true }, "match-at": { "version": "0.1.1", diff --git a/front/package.json b/front/package.json index eb6747e..ffc7934 100644 --- a/front/package.json +++ b/front/package.json @@ -16,7 +16,7 @@ "axios": "^0.17.1", "express": "^4.16.2", "ionic": "^3.20.0", - "marked": "^0.4.0", + "marked": "^4.0.10", "qs": "^6.5.1", "ueditor": "^1.2.3", "vue": "^2.5.13", @@ -52,7 +52,7 @@ "less": "^2.7.3", "less-loader": "^4.0.5", "lru-cache": "^4.1.1", - "marked": "^0.4.0", + "marked": "^4.0.10", "md5": "^2.2.1", "mongoose": "^4.13.9", "morgan": "^1.9.0", diff --git a/front/yarn.lock b/front/yarn.lock index 5bc2b31..5124cdf 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -5197,10 +5197,10 @@ markdown-it@^6.0.1: mdurl "~1.0.1" uc.micro "^1.0.1" -marked@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.4.0.tgz#9ad2c2a7a1791f10a852e0112f77b571dce10c66" - integrity sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw== +marked@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.10.tgz#423e295385cc0c3a70fa495e0df68b007b879423" + integrity sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw== match-at@^0.1.0: version "0.1.1"