Merge pull request #344 from emberjs/update-broccoli-deps

Update broccoli based dependencies to latest

Author: rwjblue

package.json

@@ -28,8 +28,8 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "broccoli-funnel": "^2.0.2",
-    "broccoli-merge-trees": "^3.0.2",
+    "broccoli-funnel": "^3.0.6",
+    "broccoli-merge-trees": "^4.2.0",
     "ember-cli-babel": "^7.26.3",
     "ember-cli-version-checker": "^3.1.3",
     "jquery": "^3.5.0",

yarn.lock

@@ -2848,7 +2848,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-funnel@^3.0.3:
+broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.6.tgz#2216a802fc2f6d6875a66531cfbc07e4e4c22d6c"
   integrity sha512-pJK+pO+2J6BYPiPNNAe16KiCK8SIVUHzjcDbtYMiAwGDhGrNXO91dm1Z/GOtpjqa3xmfm/IuQwMf01tW+FO2Ow==