diff --git a/ghost/admin/package.json b/ghost/admin/package.json index f0453fb869..8a44030063 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -113,7 +113,7 @@ "ember-simple-auth": "4.2.2", "ember-sinon": "5.0.0", "ember-source": "3.24.0", - "ember-svg-jar": "2.3.4", + "ember-svg-jar": "2.4.0", "ember-template-lint": "4.14.0", "ember-test-selectors": "6.0.0", "ember-tooltips": "3.6.0", diff --git a/yarn.lock b/yarn.lock index 3a9ea4fdaf..95b75ec86d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7694,24 +7694,6 @@ broccoli-concat@4.2.5, broccoli-concat@^4.2.4, broccoli-concat@^4.2.5: lodash.omit "^4.1.0" lodash.uniq "^4.2.0" -broccoli-concat@^3.7.4: - version "3.7.5" - resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.5.tgz#223beda8c1184252cf08ae020a3d45ffa6a48218" - integrity sha512-rDs1Mej3Ej0Cy5yIO9oIQq5+BCv0opAwS2NW7M0BeCsAMeFM42Z/zacDUC6jKc5OV5wiHvGTyCPLnZkMe0h6kQ== - dependencies: - broccoli-debug "^0.6.5" - broccoli-kitchen-sink-helpers "^0.3.1" - broccoli-plugin "^1.3.0" - ensure-posix-path "^1.0.2" - fast-sourcemap-concat "^1.4.0" - find-index "^1.1.0" - 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-config-loader@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a" @@ -8175,15 +8157,13 @@ broccoli-string-replace@^0.1.2: broccoli-persistent-filter "^1.1.5" minimatch "^3.0.3" -broccoli-svg-optimizer@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/broccoli-svg-optimizer/-/broccoli-svg-optimizer-2.0.0.tgz#22b6920bee5e126e86b95ae0cdf8ad6cc4be3735" - integrity sha512-zIbUmBeSxl9r18Mqjl0OArvXyAKuSDd4FFVcH5HmiX2/1SFUofL4JN5g5qhP/GqQnLTEVdwr61LawSGDZHcqOg== +broccoli-svg-optimizer@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/broccoli-svg-optimizer/-/broccoli-svg-optimizer-2.1.0.tgz#72a5e3138db1d2b897129cd174e6328c66adf35f" + integrity sha512-fGB4WUF8R9tHUf6M2t8F38ILLdVy+CQVaOFwHavaaXPD0kkoTsHjBE7erQZuk0PrioqLIoyA9dkeNMlGwohReA== dependencies: - broccoli-persistent-filter "^2.3.1" - json-stable-stringify "^1.0.1" - lodash "^4.17.15" - rsvp "^4.8.5" + broccoli-persistent-filter "^3.1.2" + safe-stable-stringify "^2.2.0" svgo "1.3.0" broccoli-templater@^2.0.1: @@ -8919,7 +8899,7 @@ cheerio@1.0.0-rc.10: parse5-htmlparser2-tree-adapter "^6.0.1" tslib "^2.2.0" -cheerio@~1.0.0-rc.12: +cheerio@^1.0.0-rc.12, cheerio@~1.0.0-rc.12: version "1.0.0-rc.12" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== @@ -12265,27 +12245,25 @@ ember-style-modifier@^0.8.0: ember-cli-babel "^7.26.6" ember-modifier "^3.2.7" -ember-svg-jar@2.3.4: - version "2.3.4" - resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-2.3.4.tgz#ed80aa137db8440e51448f58f09afb6c140e9b5f" - integrity sha512-EkY7fGeDevLROkDRsN+654THJT2b3cBVi8YH0v9mDofiASPBOlP3NgDs9q1WA1hU6cP68m08vXk/E40ayIVZzQ== +ember-svg-jar@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-2.4.0.tgz#dba73114b0f60835e76e6a6a96b4d6764503667e" + integrity sha512-bkQc1jweoS4sqpx+jaqsZWmY/tFbjq5C5gX93IsZ9lE/sDA5qypvGbXmze9VIQuhIT4viT3T39q1mFoevaW2xw== 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-plugin "^3.0.0" + broccoli-concat "^4.2.5" + broccoli-funnel "^3.0.8" + broccoli-merge-trees "^4.2.0" + broccoli-persistent-filter "^3.1.2" + broccoli-plugin "^4.0.7" broccoli-string-replace "^0.1.2" - broccoli-svg-optimizer "2.0.0" - cheerio "^0.22.0" + broccoli-svg-optimizer "^2.1.0" + cheerio "^1.0.0-rc.12" console-ui "^3.1.1" ember-cli-babel "^7.26.6" ember-cli-htmlbars "^5.7.1" - json-stable-stringify "^1.0.1" lodash "^4.17.15" - mkdirp "^0.5.1" - path-posix "^1.0.0" + safe-stable-stringify "^2.2.0" ember-template-imports@^3.1.1: version "3.1.1" @@ -14204,7 +14182,7 @@ fs-monkey@^1.0.3: resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== -fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7, fs-tree-diff@^0.5.9: +fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.9: version "0.5.9" resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946" integrity sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw== @@ -23263,6 +23241,11 @@ safe-regex@^2.1.1: dependencies: regexp-tree "~0.1.1" +safe-stable-stringify@^2.2.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.0.tgz#95fadb1bcf8057a1363e11052122f5da36a69215" + integrity sha512-eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA== + safe-timers@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-timers/-/safe-timers-1.1.0.tgz#c58ae8325db8d3b067322f0a4ef3a0cad67aad83" @@ -26103,7 +26086,7 @@ walk-sync@3.0.0, walk-sync@^3.0.0: matcher-collection "^2.0.1" minimatch "^3.0.4" -walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2, walk-sync@^0.3.3: +walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.3: version "0.3.4" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4" integrity sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==