chore(upgrade): Yoran brondsema yarn upgrade (#613)

* yarn upgrade * Update broccoli-funnel to 2.0.1 * Update broccoli-merge-trees to 3.0.0 * Update testem
bustle · Mar 31, 2018 · 2e79133 · 2e79133
1 parent 2bcafaf
commit 2e79133
Show file tree

Hide file tree

Showing 2 changed files with 1,218 additions and 628 deletions.
diff --git a/package.json b/package.json
@@ -44,9 +44,9 @@
     "broccoli": "^1.1.3",
     "broccoli-babel-transpiler": "^6.1.2",
     "broccoli-cli": "^1.0.0",
-    "broccoli-funnel": "^1.2.0",
+    "broccoli-funnel": "^2.0.0",
     "broccoli-livereload": "^1.0.0",
-    "broccoli-merge-trees": "^2.0.0",
+    "broccoli-merge-trees": "^3.0.0",
     "broccoli-multi-builder": "^0.3.0",
     "broccoli-sane-watcher": "^1.1.4",
     "broccoli-string-replace": "^0.1.1",
@@ -56,7 +56,7 @@
     "jquery": "^3.2.1",
     "jsdoc": "^3.5.4",
     "saucie": "^3.3.0",
-    "testem": "^1.18.4"
+    "testem": "^2.0.0"
   },
   "main": "dist/commonjs/mobiledoc-kit/index.js"
 }