🐛 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:
Kevin Ansfield 2017-03-03 17:19:12 +00:00
parent ea58dc6f85
commit 3df6b2693b
3 changed files with 12 additions and 11 deletions

View File

@ -5,7 +5,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app'),
concat = require('broccoli-concat'),
mergeTrees = require('broccoli-merge-trees'),
uglify = require('broccoli-uglify-js'),
cleanCSS = require('broccoli-clean-css'),
CleanCSS = require('broccoli-clean-css'),
environment = EmberApp.env(),
isProduction = environment === 'production',
disabled = {enabled: false},
@ -52,7 +52,7 @@ codemirrorAssets = function () {
if (isProduction) {
jsTree = uglify(jsTree);
cssTree = cleanCSS(cssTree);
cssTree = new CleanCSS(cssTree);
}
return mergeTrees([jsTree, cssTree]);

View File

@ -30,6 +30,7 @@
"blueimp-md5": "2.7.0",
"bower": "1.8.0",
"broccoli-asset-rev": "2.5.0",
"broccoli-clean-css": "^2.0.1",
"broccoli-concat": "3.2.2",
"broccoli-funnel": "1.1.0",
"broccoli-merge-trees": "1.2.1",

View File

@ -665,15 +665,6 @@ broccoli-caching-writer@^2.0.4, broccoli-caching-writer@^2.2.0, broccoli-caching
rsvp "^3.0.17"
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:
version "1.1.0"
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"
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:
version "3.2.2"
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.2.2.tgz#86ffdc52606eb590ba9f6b894c5ec7a016f5b7b9"