TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 22:43:30 +03:00
Code Issues Projects Releases Wiki Activity

Update dependency broccoli-merge-trees to v4 (#1444)

Browse Source 
Co-authored-by: Renovate Bot <renovatebot@gmail.com>
This commit is contained in:
renovate[bot] 2020-01-06 09:46:27 +00:00 committed by Kevin Ansfield
parent 7f45453fb7
commit 2d9cc6fb37
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/package.json
View File

@ -42,7 +42,7 @@
"broccoli-asset-rev": "3.0.0",
"broccoli-concat": "4.2.2",
"broccoli-funnel": "2.0.2",
"broccoli-merge-trees": "3.0.2",
"broccoli-merge-trees": "4.1.0",
"broccoli-uglify-sourcemap": "3.2.0",
"chai-dom": "1.8.1",
"codemirror": "5.48.2",

20
ghost/admin/yarn.lock
View File

@ -2844,12 +2844,12 @@ broccoli-lint-eslint@^5.0.0:
lodash.defaultsdeep "^4.6.0"
md5-hex "^2.0.0"
broccoli-merge-trees@3.0.2, "broccoli-merge-trees@^2.0.0 || ^3.0.0", broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
broccoli-merge-trees@4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.1.0.tgz#a30e2e4c5bb0f5eb8981e8af33a8077714c11f1a"
integrity sha512-1OXsksKPFiRdiZZOfh1z1mm7ZqKezlMS+DPBpHMDLSb6AhYHvoQfjf0KuMXbY8aoYskj7+Z+EJ5SsS/OC2v5yw==
dependencies:
broccoli-plugin "^1.3.0"
broccoli-plugin "^3.1.0"
merge-trees "^2.0.0"
broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.2.4:
@ -2874,6 +2874,14 @@ broccoli-merge-trees@^2.0.0:
broccoli-plugin "^1.3.0"
merge-trees "^1.0.1"
"broccoli-merge-trees@^2.0.0 || ^3.0.0", broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
dependencies:
broccoli-plugin "^1.3.0"
merge-trees "^2.0.0"
broccoli-middleware@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
@ -2993,7 +3001,7 @@ broccoli-plugin@^2.0.0, broccoli-plugin@^2.1.0:
rimraf "^2.3.4"
symlink-or-copy "^1.1.8"
broccoli-plugin@^3.0.0:
broccoli-plugin@^3.0.0, broccoli-plugin@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542"
integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA==