From 3579dc6eea2449de2edc91f46474d6216888f0ca Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Mon, 6 Feb 2017 14:38:48 +0000 Subject: [PATCH] deps: broccoli-concat@3.1.1 --- ghost/admin/package.json | 2 +- ghost/admin/yarn.lock | 29 ++++++++++++++++++++++------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 833d0a5cf8..0ef667efde 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -30,7 +30,7 @@ "bower": "1.8.0", "broccoli-asset-rev": "2.5.0", "broccoli-clean-css": "1.1.0", - "broccoli-concat": "3.0.5", + "broccoli-concat": "3.1.1", "broccoli-merge-trees": "1.2.1", "broccoli-uglify-js": "0.2.0", "chai-jquery": "2.0.0", diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock index 68f9ba5d52..876f919056 100644 --- a/ghost/admin/yarn.lock +++ b/ghost/admin/yarn.lock @@ -672,19 +672,20 @@ broccoli-clean-css@1.1.0, broccoli-clean-css@^1.1.0: inline-source-map-comment "^1.0.5" json-stable-stringify "^1.0.0" -broccoli-concat@3.0.5, broccoli-concat@^3.0.4: - version "3.0.5" - resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.0.5.tgz#306fb47e7caa23ec726391fe8b584765946eb52e" +broccoli-concat@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.1.1.tgz#6df3fc8e2a86e2a8c842256a2d8ff767198c3341" dependencies: - broccoli-caching-writer "^3.0.0" broccoli-kitchen-sink-helpers "^0.3.1" + broccoli-plugin "^1.3.0" broccoli-stew "^1.3.3" fast-sourcemap-concat "^1.0.1" - fs-extra "^0.30.0" + fs-extra "^1.0.0" + fs-tree-diff "^0.5.6" lodash.merge "^4.3.0" lodash.omit "^4.1.0" lodash.uniq "^4.2.0" - mkdirp "^0.5.1" + walk-sync "^0.3.1" broccoli-concat@^2.1.0: version "2.3.8" @@ -699,6 +700,20 @@ broccoli-concat@^2.1.0: lodash.omit "^4.1.0" lodash.uniq "^4.2.0" +broccoli-concat@^3.0.4: + version "3.0.5" + resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.0.5.tgz#306fb47e7caa23ec726391fe8b584765946eb52e" + dependencies: + broccoli-caching-writer "^3.0.0" + broccoli-kitchen-sink-helpers "^0.3.1" + broccoli-stew "^1.3.3" + fast-sourcemap-concat "^1.0.1" + fs-extra "^0.30.0" + lodash.merge "^4.3.0" + lodash.omit "^4.1.0" + lodash.uniq "^4.2.0" + mkdirp "^0.5.1" + broccoli-config-loader@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.0.tgz#c3cf5ecfaffc04338c6f1d5d38dc36baeaa131ba" @@ -3139,7 +3154,7 @@ fs-exists-sync@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" -fs-extra@1.0.0: +fs-extra@1.0.0, fs-extra@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" dependencies: