jalla 1.0.0-36 → 1.0.0-39

package/lib/build.js

@@ -26,7 +26,11 @@ function build (state, emit) {
       Promise.all(assets.map(async function (asset) {
         var file = path.resolve(state.dist, 'public', asset.file)
         emit('progress', asset.id, 0)
-        await createDir(path.dirname(file), { recursive: true })
+        try {
+          await createDir(path.dirname(file), { recursive: true })
+        } catch (err) {
+          // Ignore failed `mkdir` and try writing file anyway
+        }
         return writeFile(file, asset.buffer)
       })),
       writeFile(path.resolve(state.dist, 'stat.json'), stat)

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/lib/script.js

@@ -11,8 +11,8 @@ var concat = require('concat-stream')
 var browserify = require('browserify')
 var splitRequire = require('split-require')
 var sourcemap = require('convert-source-map')
+var envify = require('@goto-bus-stop/envify')
 var babelPresetEnv = require('@babel/preset-env')
-var envify = require('tinyify/private_modules/envify/custom')
 var inject = require('./inject')
 
 module.exports = script
@@ -57,7 +57,7 @@ function script (state, emit) {
         return !file.includes('source-map-support') && include(file)
       }
     }), { global: true })
-    b.transform(tfilter(envify(env), { filter: include }))
+    b.transform(tfilter(envify, { filter: include }), env)
   } else {
     // compile dynamic imports but nothing else to preserve template literals
     b.transform(tfilter(babelify, { filter: include }), {

package/lib/service-worker.js

@@ -7,7 +7,7 @@ var watchify = require('watchify')
 var concat = require('concat-stream')
 var browserify = require('browserify')
 var sourcemap = require('convert-source-map')
-var envify = require('tinyify/private_modules/envify/custom')
+var envify = require('@goto-bus-stop/envify')
 var inject = require('./inject')
 
 module.exports = serviceWorker
@@ -29,7 +29,7 @@ function serviceWorker (state, emit) {
   b.on('reset', capture)
 
   // run envify regardless due to tinyify loosing the reference to env
-  b.transform(tfilter(envify(env), { filter: include }))
+  b.transform(tfilter(envify, { filter: include }), env)
   b.transform(tfilter(brfs, { filter: include }))
 
   if (state.env === 'development') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jalla",
-  "version": "1.0.0-36",
+  "version": "1.0.0-39",
   "description": "A web compiler and server in one",
   "main": "index.js",
   "bin": "bin.js",
@@ -41,57 +41,58 @@
   "dependencies": {
     "@babel/core": "^7.8.7",
     "@babel/preset-env": "^7.8.7",
+    "@goto-bus-stop/envify": "^5.0.0",
     "autoprefixer": "^9.7.4",
     "babel-plugin-dynamic-import-split-require": "^2.0.0",
     "babelify": "^10.0.0",
     "brfs": "^2.0.2",
-    "browserify": "^16.5.0",
-    "browserslist": "^4.9.1",
+    "browserify": "^17.0.0",
+    "browserslist": "^4.16.6",
     "caniuse-api": "^3.0.0",
-    "chalk": "^3.0.0",
+    "chalk": "^4.1.1",
     "chokidar": "^3.3.1",
     "clear-module": "^4.1.1",
     "concat-stream": "^2.0.0",
     "convert-source-map": "^1.7.0",
     "dedent": "^0.7.0",
     "documentify": "^3.2.2",
-    "dropcss": "^1.0.16",
     "envify": "^4.1.0",
-    "exorcist": "^1.0.1",
+    "exorcist": "^2.0.0",
     "get-port": "^5.1.1",
-    "hstream": "^2.0.0",
+    "hstream": "^3.1.1",
     "is-interactive": "^1.0.0",
-    "jsesc": "^2.5.2",
+    "jsesc": "^3.0.2",
     "koa": "^2.11.0",
-    "koa-conditional-get": "^2.0.0",
-    "koa-etag": "^3.0.0",
+    "koa-conditional-get": "^3.0.0",
+    "koa-etag": "^4.0.0",
     "koa-static": "^5.0.0",
     "mime": "^2.4.3",
-    "minify-stream": "^1.2.1",
+    "minify-stream": "^2.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.4",
     "nanobus": "^4.4.0",
     "nanohtml": "^1.9.1",
     "ora": "^4.0.3",
     "pirates": "^4.0.0",
-    "postcss": "^7.0.27",
-    "postcss-csso": "^4.0.0",
-    "postcss-import": "^12.0.1",
-    "postcss-load-config": "^2.1.0",
-    "postcss-url": "^8.0.0",
+    "postcss": "^8.3.5",
+    "postcss-csso": "^5.0.1",
+    "postcss-import": "^14.0.2",
+    "postcss-load-config": "^3.1.0",
+    "postcss-url": "^10.1.3",
     "postcss-watcher": "^2.0.0",
     "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",
     "source-map-support": "^0.5.16",
     "split-require": "^3.1.2",
     "tfilter": "^1.0.1",
-    "through2": "^3.0.1",
-    "tinyify": "^2.5.2",
+    "through2": "^4.0.2",
+    "tinyify": "^3.0.0",
     "transform-ast": "^2.4.4",
-    "watchify": "^3.11.1"
+    "watchify": "^4.0.0"
   }
 }