jalla 1.0.0-38 → 1.0.0-39

package/lib/document.js

@@ -4,9 +4,9 @@ var documentify = require('documentify')
 var { Readable } = require('stream')
 var hyperstream = require('hstream')
 var caniuse = require('caniuse-api')
+var purgecss = require('purgecss')
 var through = require('through2')
 var resolve = require('resolve')
-var dropcss = require('dropcss')
 var jsesc = require('jsesc')
 var path = require('path')
 
@@ -176,17 +176,17 @@ function prependCriticalCSS (getStyles) {
     var self = this
 
     getStyles().then(function (css) {
-      try {
-        var critical = dropcss({ html: html, css: css.toString() })
-      } catch (err) {
-        // fail silently and skip inline styles
-        self.push(html)
-        return cb()
-      }
-
+      css = css.toString().replace(/\/\*#\s*sourceMappingURL=.+?\s*\*\//g, '')
+      return new purgecss.PurgeCSS().purge({
+        content: [{ raw: html, extension: 'html' }],
+        css: [{ raw: css }]
+      }).then(function (result) {
+        return result.reduce((acc, { css }) => acc + css, '')
+      })
+    }).then(function (css) {
       var prepend = hyperstream({
         head: {
-          _prependHtml: `<style>${critical.css}</style>`
+          _prependHtml: `<style>${css}</style>`
         }
       })
       var stream = new Readable()
@@ -196,7 +196,11 @@ function prependCriticalCSS (getStyles) {
       stream.pipe(prepend).pipe(through(write, end))
       stream.push(html)
       stream.push(null)
-    }, cb)
+    }).catch(function () {
+      // fail silently and skip inline styles
+      self.push(html)
+      return cb()
+    })
 
     // collect the resulting html with inlined CSS
     // (str, str, fn) -> void

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jalla",
-  "version": "1.0.0-38",
+  "version": "1.0.0-39",
   "description": "A web compiler and server in one",
   "main": "index.js",
   "bin": "bin.js",
@@ -56,7 +56,6 @@
     "convert-source-map": "^1.7.0",
     "dedent": "^0.7.0",
     "documentify": "^3.2.2",
-    "dropcss": "^1.0.16",
     "envify": "^4.1.0",
     "exorcist": "^2.0.0",
     "get-port": "^5.1.1",
@@ -84,6 +83,7 @@
     "posthtml-minifier": "^0.1.0",
     "posthtmlify": "^0.2.0",
     "pretty-bytes": "^5.2.0",
+    "purgecss": "^4.1.3",
     "read-pkg-up": "^7.0.1",
     "regenerator-runtime": "^0.13.5",
     "resolve": "^1.15.1",