From fa855b618405ec2bf640779737c1aa40e06a5ca4 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Mon, 2 Sep 2019 12:17:27 +0100 Subject: [PATCH] Reverted update of ember-svg-jar to 2.2.1 refs https://github.com/ivanvotti/ember-svg-jar/issues/138 - 2.2.1 is breaking development builds --- ghost/admin/package.json | 2 +- ghost/admin/yarn.lock | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 5695e91f97..32ebd196aa 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -92,7 +92,7 @@ "ember-sinon": "4.0.0", "ember-source": "3.12.0", "ember-sticky-element": "0.2.3", - "ember-svg-jar": "2.2.1", + "ember-svg-jar": "2.1.0", "ember-test-selectors": "2.1.0", "ember-truth-helpers": "2.1.0", "ember-useragent": "0.9.1", diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock index 58e979e31a..1b0a9de201 100644 --- a/ghost/admin/yarn.lock +++ b/ghost/admin/yarn.lock @@ -2532,7 +2532,7 @@ broccoli-clean-css@^1.1.0: inline-source-map-comment "^1.0.5" json-stable-stringify "^1.0.0" -broccoli-concat@3.7.4, broccoli-concat@^3.2.2, broccoli-concat@^3.7.3, broccoli-concat@^3.7.4: +broccoli-concat@3.7.4, broccoli-concat@^3.2.2, broccoli-concat@^3.7.3: version "3.7.4" resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.4.tgz#7371e846eb7a97cb44ccff10f68582bcadcafacd" integrity sha512-9gRv1tyCQuq2+48DT9DQyxRNLOuwDtHybDeYuWA3g26HFqZd0PGAOeXcLXHpKRhxzrEbU6Gm28dZ/KolMr04cQ== @@ -2763,7 +2763,7 @@ broccoli-node-info@^2.1.0: resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644" integrity sha512-l6qDuboJThHfRVVWQVaTs++bFdrFTP0gJXgsWenczc1PavRVUmL1Eyb2swTAXXMpDOnr2zhNOBLx4w9AxkqbPQ== -broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3: +broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.3: version "1.4.6" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615" integrity sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw== @@ -2963,6 +2963,17 @@ broccoli-svg-optimizer@2.0.0: rsvp "^4.8.5" svgo "1.3.0" +broccoli-symbolizer@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/broccoli-symbolizer/-/broccoli-symbolizer-0.6.0.tgz#1ece00fba329f19ab42d920350a5f2014f8d0b52" + integrity sha512-ZwVDX+kkJ7/TXdhl2ChRZARNAeBiru1+53HHafN5UcnpIzJaE+CbyuSQdxEtnIakSKIZtgI/J6uJIffGDgft3g== + dependencies: + broccoli-concat "^3.2.2" + broccoli-persistent-filter "^1.2.0" + cheerio "^0.22.0" + json-stable-stringify "^1.0.1" + lodash "^4.17.10" + broccoli-templater@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/broccoli-templater/-/broccoli-templater-2.0.2.tgz#285a892071c0b3ad5ebc275d9e8b3465e2d120d6" @@ -5437,22 +5448,20 @@ ember-sticky-element@0.2.3: ember-cli-htmlbars "^2.0.1" ember-in-viewport "~3.0.0" -ember-svg-jar@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-2.2.1.tgz#89c672162a7b479e10c08acfd3eabe93d1eb0275" - integrity sha512-NHG2go9iX+xggX0J65kKPjDMhJPF2r237CTqFlVM857acWqxS1XkHnpPP6Tesihk/S0y6+fjefuf2GzK/NtchA== +ember-svg-jar@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-2.1.0.tgz#663d9cf7f63b046cc27862ddd0a946af718637e3" + integrity sha512-UGW+wSXqFq6agZR4yD2ukfqiFylFHOwrD+Ku347tHubicvccpSqlhpiZsDHC/zpISIWLCE+Bo/75zPsb7Mh31Q== dependencies: broccoli-caching-writer "^3.0.3" - broccoli-concat "^3.7.4" broccoli-funnel "^2.0.2" broccoli-merge-trees "^3.0.2" - broccoli-persistent-filter "^2.3.1" broccoli-string-replace "^0.1.2" broccoli-svg-optimizer "2.0.0" + broccoli-symbolizer "^0.6.0" cheerio "^0.22.0" ember-assign-polyfill "^2.5.0" ember-cli-babel "^7.7.3" - json-stable-stringify "^1.0.1" lodash "^4.17.15" mkdirp "^0.5.1" path-posix "^1.0.0" @@ -6722,7 +6731,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: @@ -7893,7 +7901,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: @@ -10967,7 +10974,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.3.2: