From f6c0b6df7a27c062f3abdfd2f2360e08e45d46e0 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Mon, 6 Jan 2020 11:37:40 +0000
Subject: [PATCH] Reverted broccoli-concat to 4.0.0

no issue

- 4.2.1 was failing when building on macOS due to an issue creating asset directories
- https://github.com/broccolijs/broccoli-concat/issues/149
---
 ghost/admin/package.json  |  2 +-
 ghost/admin/renovate.json |  3 ++-
 ghost/admin/yarn.lock     | 35 +++++++++--------------------------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 868654e174..10e0f25b0d 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -40,7 +40,7 @@
     "babel-eslint": "10.0.3",
     "blueimp-md5": "2.12.0",
     "broccoli-asset-rev": "3.0.0",
-    "broccoli-concat": "4.2.2",
+    "broccoli-concat": "4.0.0",
     "broccoli-funnel": "3.0.1",
     "broccoli-merge-trees": "4.1.0",
     "broccoli-uglify-sourcemap": "3.2.0",
diff --git a/ghost/admin/renovate.json b/ghost/admin/renovate.json
index b20793760b..d5d7f581c2 100644
--- a/ghost/admin/renovate.json
+++ b/ghost/admin/renovate.json
@@ -8,7 +8,8 @@
     "normalize.css",
     "validator",
     "ember-in-viewport",
-    "codemirror"
+    "codemirror",
+    "broccoli-concat"
   ],
   "ignorePaths": ["lib/koenig-editor/package.json"],
   "travis": { "enabled": true },
diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock
index db1b56529a..650fae6131 100644
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@@ -2725,22 +2725,23 @@ broccoli-clean-css@^1.1.0:
     inline-source-map-comment "^1.0.5"
     json-stable-stringify "^1.0.0"
 
-broccoli-concat@4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.2.tgz#9551c49fcb2fc40e966ef45e8caa6dfa1c7c59e0"
-  integrity sha512-kGvdeTf7coFqUYBohh1HpEMoGX3y42C6yGd80xfDkHlWspL//hmLNiq2FRBuMAeEv5F9KnSvN+TEFi+HAtPEPQ==
+broccoli-concat@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.0.0.tgz#dc2fe95683b36ef0f9114134afa6ae06a7c430ca"
+  integrity sha512-s8sCP5A8zcomrvue15ToOIxi5CKGOtg+oIGUYdN4EdYTeD6d/mptD9v+38MigOPt+Jgc6tcLloFVZSI+9+FLEg==
   dependencies:
     broccoli-debug "^0.6.5"
     broccoli-kitchen-sink-helpers "^0.3.1"
-    broccoli-plugin "^4.0.1"
+    broccoli-plugin "^1.3.0"
     ensure-posix-path "^1.0.2"
-    fast-sourcemap-concat "^2.1.0"
+    fast-sourcemap-concat "^1.4.0"
     find-index "^1.1.0"
-    fs-extra "^8.1.0"
-    fs-tree-diff "^2.0.1"
+    fs-extra "^4.0.3"
+    fs-tree-diff "^0.5.7"
     lodash.merge "^4.6.2"
     lodash.omit "^4.1.0"
     lodash.uniq "^4.2.0"
+    walk-sync "^0.3.2"
 
 broccoli-concat@^3.2.2, broccoli-concat@^3.7.4, broccoli-concat@^3.7.5:
   version "3.7.5"
@@ -6687,20 +6688,6 @@ fast-sourcemap-concat@^1.4.0:
     source-map-url "^0.3.0"
     sourcemap-validator "^1.1.0"
 
-fast-sourcemap-concat@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-2.1.0.tgz#12dd36bfc38c804093e4bd1de61dd6216f574211"
-  integrity sha512-L9uADEnnHOeF4U5Kc3gzEs3oFpNCFkiTJXvT+nKmR0zcFqHZJJbszWT7dv4t9558FJRGpCj8UxUpTgz2zwiIZA==
-  dependencies:
-    chalk "^2.0.0"
-    fs-extra "^5.0.0"
-    heimdalljs-logger "^0.1.9"
-    memory-streams "^0.1.3"
-    mkdirp "^0.5.0"
-    source-map "^0.4.2"
-    source-map-url "^0.3.0"
-    sourcemap-validator "^1.1.0"
-
 fastboot-transform@^0.1.2, fastboot-transform@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd"
@@ -7111,7 +7098,6 @@ fsevents@^1.2.7:
   dependencies:
     bindings "^1.5.0"
     nan "^2.12.1"
-    node-pre-gyp "*"
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -7339,7 +7325,6 @@ gonzales-pe@4.2.4:
 
 "google-caja-bower@https://github.com/acburdine/google-caja-bower#ghost":
   version "6011.0.0"
-  uid "275cb75249f038492094a499756a73719ae071fd"
   resolved "https://github.com/acburdine/google-caja-bower#275cb75249f038492094a499756a73719ae071fd"
 
 got@^8.0.1:
@@ -8539,7 +8524,6 @@ just-extend@^4.0.2:
 
 "keymaster@https://github.com/madrobby/keymaster.git":
   version "1.6.3"
-  uid f8f43ddafad663b505dc0908e72853bcf8daea49
   resolved "https://github.com/madrobby/keymaster.git#f8f43ddafad663b505dc0908e72853bcf8daea49"
 
 keyv@3.0.0:
@@ -11845,7 +11829,6 @@ simple-swizzle@^0.2.2:
 
 "simplemde@https://github.com/kevinansfield/simplemde-markdown-editor.git#ghost":
   version "1.11.2"
-  uid "4c39702de7d97f9b32d5c101f39237b6dab7c3ee"
   resolved "https://github.com/kevinansfield/simplemde-markdown-editor.git#4c39702de7d97f9b32d5c101f39237b6dab7c3ee"
 
 sinon@^7.4.2: