diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 408aa4ad97..e9609b2919 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -57,7 +57,7 @@ "ember-cli-mirage": "0.2.6", "ember-cli-mocha": "0.13.2", "ember-cli-node-assets": "0.1.6", - "ember-cli-postcss": "3.1.1", + "ember-cli-postcss": "3.1.2", "ember-cli-pretender": "1.0.1", "ember-cli-selectize": "0.5.12", "ember-cli-shims": "1.0.2", diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock index 092da5436a..76dda9b624 100644 --- a/ghost/admin/yarn.lock +++ b/ghost/admin/yarn.lock @@ -867,7 +867,14 @@ broccoli-merge-trees@1.1.1: rimraf "^2.4.3" symlink-or-copy "^1.0.0" -broccoli-merge-trees@1.2.1, broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.5, broccoli-merge-trees@^1.2.1: +broccoli-merge-trees@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz#10aea46dd5cebcc8b8f7d5a54f0a84a4f0bb90b9" + dependencies: + broccoli-plugin "^1.3.0" + merge-trees "^1.0.1" + +broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.5, broccoli-merge-trees@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.1.tgz#16a7494ed56dbe61611f6c2d4817cfbaad2a3055" dependencies: @@ -880,13 +887,6 @@ broccoli-merge-trees@1.2.1, broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1 rimraf "^2.4.3" symlink-or-copy "^1.0.0" -broccoli-merge-trees@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz#10aea46dd5cebcc8b8f7d5a54f0a84a4f0bb90b9" - dependencies: - broccoli-plugin "^1.3.0" - merge-trees "^1.0.1" - broccoli-middleware@^0.18.1: version "0.18.1" resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-0.18.1.tgz#bf525581c2deb652c425942b18580f76d3748122" @@ -2094,11 +2094,11 @@ ember-cli-path-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed" -ember-cli-postcss@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/ember-cli-postcss/-/ember-cli-postcss-3.1.1.tgz#cb6797bda2f0e1899b2a5424c57f92a4264a20f1" +ember-cli-postcss@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/ember-cli-postcss/-/ember-cli-postcss-3.1.2.tgz#0297a4a097a692cfa7e2000284fae8f0d226082f" dependencies: - broccoli-merge-trees "1.2.1" + broccoli-merge-trees "2.0.0" broccoli-postcss "3.2.1" broccoli-postcss-single "1.2.1" ember-cli-dependency-checker "1.3.0"