use cssnano instead of clean-css

yyx990803 · yyx990803 · commit fd7525aa4d91 · 2015-11-04T17:15:36.000-05:00
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -18,8 +18,6 @@ if (process.env.NODE_ENV === 'production') {
   var htmlMinifyOptions = {
     customAttrSurround: [[/@/, new RegExp('')], [/:/, new RegExp('')]]
   }
-  var CleanCSS = require('clean-css')
-  var cssMinifier = new CleanCSS()
 }
 
 // expose compiler
@@ -229,12 +227,6 @@ function processStyle (node, filePath, id) {
     .then(function (res) {
       return rewriteStyle(id, res.source, isScoped(node))
     })
-    .then(function (res) {
-      if (process.env.NODE_ENV === 'production') {
-        res.source = cssMinifier.minify(res.source).styles
-      }
-      return res
-    })
 }
 
 /**
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
@@ -44,18 +44,24 @@ module.exports = function (id, css, scoped) {
   if (val) {
     return Promise.resolve(val)
   } else {
-    currentId = id
-
-    var processors = []
+    var plugins = []
+    // scoped css rewrite
     if (scoped) {
-      processors.push(addId)
+      plugins.push(addId)
     }
+    // autoprefixing
     if (options.autoprefixer !== false) {
       var autoprefixer = require('autoprefixer')(options.autoprefixer)
-      processors.push(autoprefixer)
+      plugins.push(autoprefixer)
     }
-
-    return postcss(processors)
+    // minification
+    if (process.env.NODE_ENV === 'production') {
+      plugins.push(require('cssnano')({
+        autoprefixer: false
+      }))
+    }
+    currentId = id
+    return postcss(plugins)
       .process(css)
       .then(function (res) {
         var val = {
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "autoprefixer": "^6.0.3",
     "babel": "^5.8.23",
-    "clean-css": "^3.4.4",
+    "cssnano": "^3.3.2",
     "es6-promise": "^3.0.2",
     "hash-sum": "^1.0.2",
     "html-minifier": "^0.8.0",
diff --git a/test/expects/myth.js b/test/expects/myth.js
@@ -1 +1 @@
-var __vueify_style__ = require("vueify-insert-css").insert("a{color:#847AD1}pre{padding:10px;margin:20px}")
+var __vueify_style__ = require("vueify-insert-css").insert("a{color:#847ad1}pre{padding:10px;margin:20px}")

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ if (process.env.NODE_ENV === 'production') {`
`18`	`18`	`var htmlMinifyOptions = {`
`19`	`19`	`customAttrSurround: [[/@/, new RegExp('')], [/:/, new RegExp('')]]`
`20`	`20`	`}`
`21`		`- var CleanCSS = require('clean-css')`
`22`		`- var cssMinifier = new CleanCSS()`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`// expose compiler`
`@@ -229,12 +227,6 @@ function processStyle (node, filePath, id) {`
`229`	`227`	`.then(function (res) {`
`230`	`228`	`return rewriteStyle(id, res.source, isScoped(node))`
`231`	`229`	`})`
`232`		`- .then(function (res) {`
`233`		`- if (process.env.NODE_ENV === 'production') {`
`234`		`- res.source = cssMinifier.minify(res.source).styles`
`235`		`- }`
`236`		`- return res`
`237`		`- })`
`238`	`230`	`}`
`239`	`231`
`240`	`232`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-var __vueify_style__ = require("vueify-insert-css").insert("a{color:#847AD1}pre{padding:10px;margin:20px}")`
	`1`	`+var __vueify_style__ = require("vueify-insert-css").insert("a{color:#847ad1}pre{padding:10px;margin:20px}")`