Merge pull request #180 from billybonks/dependabot/npm_and_yarn/jest-…

…24.8.0 Bump jest from 23.6.0 to 24.8.0
billybonks · May 22, 2019 · 26411dc · 26411dc
2 parents a3e433b + b21c9bf
commit 26411dc
Show file tree

Hide file tree

Showing 2 changed files with 1,060 additions and 1,354 deletions.
diff --git a/package.json b/package.json
@@ -34,10 +34,11 @@
     "broccoli": "^0.16.9",
     "co": "^4.6.0",
     "eslint": "^5.11.0",
-    "jest": "^23.2.0",
+    "jest": "^24.8.0",
     "jest-runner-eslint": "^0.7.1",
     "stylelint-selector-bem-pattern": "^2.0.0",
-    "walk-sync": "^1.0.1"
+    "walk-sync": "^1.0.1",
+    "merge": "^1.2.1"
   },
   "dependencies": {
     "aot-test-generators": "^0.1.0",