Merge pull request #479 from ember-cli/dep-upgrade

Bump broccoli-merge-trees
ember-cli · Mar 30, 2020 · 6198455 · 6198455
2 parents 9df9ef4 + ca88a0d
commit 6198455
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "abortcontroller-polyfill": "^1.4.0",
     "broccoli-concat": "^4.2.4",
     "broccoli-debug": "^0.6.5",
-    "broccoli-merge-trees": "^4.1.0",
+    "broccoli-merge-trees": "^4.2.0",
     "broccoli-rollup": "^2.1.1",
     "broccoli-stew": "^3.0.0",
     "broccoli-templater": "^2.0.1",

diff --git a/yarn.lock b/yarn.lock
@@ -3069,6 +3069,14 @@ broccoli-merge-trees@^4.1.0:
     broccoli-plugin "^3.1.0"
     merge-trees "^2.0.0"
 
+broccoli-merge-trees@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
+  integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
+  dependencies:
+    broccoli-plugin "^4.0.2"
+    merge-trees "^2.0.0"
+
 broccoli-middleware@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"