Merge pull request #1414 from input-output-hk/fix/ddw-686-fix-vulnera…

…bility-warning [DDW-686] Fix vulnerability warning
input-output-hk · Jun 6, 2019 · 5487695 · 5487695
2 parents f8ece2d + 144bd9d
commit 5487695
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ Changelog
 
 ### Fixes
 
+- Fixed "marked" dependency vulnerability warning ([PR 1414](https://github.com/input-output-hk/daedalus/pull/1414)
 - Fixed addresses not visible on Receive screen when Password is set for the wallet in minimized mode ([PR 1407](https://github.com/input-output-hk/daedalus/pull/1407))
 - Fixed truncated "Add Wallet" screen while wallet is restored ([PR 1405](https://github.com/input-output-hk/daedalus/pull/1405))
 - Fixed spending password being asked on Receive screen when clicking on "Copy address" link. ([PR 1392](https://github.com/input-output-hk/daedalus/pull/1392))

diff --git a/package.json b/package.json
@@ -188,5 +188,8 @@
       "pre-commit": "pretty-quick --staged",
       "pre-push": "yarn prettier:check && yarn lint && yarn flow:test && yarn manage:translations"
     }
+  },
+  "resolutions": {
+    "**/**/marked": "^0.6.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -7264,9 +7264,10 @@ markdown-loader@4.0.0:
     loader-utils "^1.1.0"
     marked "^0.5.0"
 
-marked@^0.5.0, marked@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.2.tgz#3efdb27b1fd0ecec4f5aba362bddcd18120e5ba9"
+marked@^0.5.0, marked@^0.5.2, marked@^0.6.1:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
+  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
 
 matchdep@^2.0.0:
   version "2.0.0"