mirror of
https://github.com/TryGhost/Ghost-Admin.git
synced 2023-12-14 02:33:04 +01:00
🐛 re-add broccoli-clean-css
no issue - `broccoli-clean-css` is used to compress codemirror CSS files so it's still needed - update usage in `ember-cli-build.js` to match 2.0's class interface
This commit is contained in:
parent
89776fb169
commit
5181852b50
|
@ -5,7 +5,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app'),
|
||||||
concat = require('broccoli-concat'),
|
concat = require('broccoli-concat'),
|
||||||
mergeTrees = require('broccoli-merge-trees'),
|
mergeTrees = require('broccoli-merge-trees'),
|
||||||
uglify = require('broccoli-uglify-js'),
|
uglify = require('broccoli-uglify-js'),
|
||||||
cleanCSS = require('broccoli-clean-css'),
|
CleanCSS = require('broccoli-clean-css'),
|
||||||
environment = EmberApp.env(),
|
environment = EmberApp.env(),
|
||||||
isProduction = environment === 'production',
|
isProduction = environment === 'production',
|
||||||
disabled = {enabled: false},
|
disabled = {enabled: false},
|
||||||
|
@ -52,7 +52,7 @@ codemirrorAssets = function () {
|
||||||
|
|
||||||
if (isProduction) {
|
if (isProduction) {
|
||||||
jsTree = uglify(jsTree);
|
jsTree = uglify(jsTree);
|
||||||
cssTree = cleanCSS(cssTree);
|
cssTree = new CleanCSS(cssTree);
|
||||||
}
|
}
|
||||||
|
|
||||||
return mergeTrees([jsTree, cssTree]);
|
return mergeTrees([jsTree, cssTree]);
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
"blueimp-md5": "2.7.0",
|
"blueimp-md5": "2.7.0",
|
||||||
"bower": "1.8.0",
|
"bower": "1.8.0",
|
||||||
"broccoli-asset-rev": "2.5.0",
|
"broccoli-asset-rev": "2.5.0",
|
||||||
|
"broccoli-clean-css": "^2.0.1",
|
||||||
"broccoli-concat": "3.2.2",
|
"broccoli-concat": "3.2.2",
|
||||||
"broccoli-funnel": "1.1.0",
|
"broccoli-funnel": "1.1.0",
|
||||||
"broccoli-merge-trees": "1.2.1",
|
"broccoli-merge-trees": "1.2.1",
|
||||||
|
|
18
yarn.lock
18
yarn.lock
|
@ -665,15 +665,6 @@ broccoli-caching-writer@^2.0.4, broccoli-caching-writer@^2.2.0, broccoli-caching
|
||||||
rsvp "^3.0.17"
|
rsvp "^3.0.17"
|
||||||
walk-sync "^0.2.5"
|
walk-sync "^0.2.5"
|
||||||
|
|
||||||
broccoli-clean-css@2.0.1:
|
|
||||||
version "2.0.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-2.0.1.tgz#1bf48a43d7626522621351c696e5f9441f628db2"
|
|
||||||
dependencies:
|
|
||||||
broccoli-persistent-filter "^1.2.13"
|
|
||||||
clean-css-promise "^2.0.1"
|
|
||||||
json-stable-stringify "^1.0.1"
|
|
||||||
source-map-to-comment "^1.1.0"
|
|
||||||
|
|
||||||
broccoli-clean-css@^1.1.0:
|
broccoli-clean-css@^1.1.0:
|
||||||
version "1.1.0"
|
version "1.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
|
resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
|
||||||
|
@ -683,6 +674,15 @@ broccoli-clean-css@^1.1.0:
|
||||||
inline-source-map-comment "^1.0.5"
|
inline-source-map-comment "^1.0.5"
|
||||||
json-stable-stringify "^1.0.0"
|
json-stable-stringify "^1.0.0"
|
||||||
|
|
||||||
|
broccoli-clean-css@^2.0.1:
|
||||||
|
version "2.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-2.0.1.tgz#1bf48a43d7626522621351c696e5f9441f628db2"
|
||||||
|
dependencies:
|
||||||
|
broccoli-persistent-filter "^1.2.13"
|
||||||
|
clean-css-promise "^2.0.1"
|
||||||
|
json-stable-stringify "^1.0.1"
|
||||||
|
source-map-to-comment "^1.1.0"
|
||||||
|
|
||||||
broccoli-concat@3.2.2, broccoli-concat@^3.0.4:
|
broccoli-concat@3.2.2, broccoli-concat@^3.0.4:
|
||||||
version "3.2.2"
|
version "3.2.2"
|
||||||
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.2.2.tgz#86ffdc52606eb590ba9f6b894c5ec7a016f5b7b9"
|
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.2.2.tgz#86ffdc52606eb590ba9f6b894c5ec7a016f5b7b9"
|
||||||
|
|
Loading…
Reference in a new issue