Merge branch 'master' into relative-resolve

lib/dev.js

@@ -60,6 +60,7 @@ module.exports = async (opts) => {
     config,
     dev,
     logLevel: 'error',
+    content: opts.dirname,
     port: opts.port,
     hot: { logLevel: 'error' },
     add: (app, middleware, options) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compositor/x0",
-  "version": "5.0.4-3",
+  "version": "5.0.4",
   "description": "Zero-config React development environment and static site generator",
   "main": "index.js",
   "bin": {
@@ -9,14 +9,25 @@
   "scripts": {
     "start": "./cli.js docs -op 8888",
     "build": "./cli.js build docs",
-    "test": "nyc ava",
+    "test": "ava -T 20s",
     "cover": "nyc report --reporter=html --reporter=lcov"
   },
-  "keywords": [],
+  "keywords": [
+    "react",
+    "webpack",
+    "zero-config",
+    "jsx",
+    "mdx",
+    "ui",
+    "prototyping",
+    "static-site-generator",
+    "isolated",
+    "design-systems"
+  ],
   "author": "Brent Jackson",
   "license": "MIT",
   "dependencies": {
-    "@compositor/jsx-loader": "^1.0.0-3",
+    "@compositor/jsx-loader": "^1.0.0-4",
     "@compositor/log": "^1.0.0-0",
     "@mdx-js/loader": "^0.9.0",
     "@mdx-js/mdx": "^0.9.0",
@@ -36,7 +47,7 @@
     "find-up": "^2.1.0",
     "fs-extra": "^6.0.1",
     "glamor": "^2.20.40",
-    "html-minifier": "^3.5.15",
+    "html-minifier": "^3.5.16",
     "koa-connect": "^2.0.1",
     "meow": "^5.0.0",
     "mini-html-webpack-plugin": "^0.2.3",
@@ -49,17 +60,17 @@
     "read-pkg-up": "^3.0.0",
     "semver": "^5.5.0",
     "update-notifier": "^2.5.0",
-    "webpack": "^4.8.3",
+    "webpack": "^4.10.2",
     "webpack-merge": "^4.1.2",
     "webpack-serve": "^1.0.2"
   },
   "devDependencies": {
     "@compositor/logo": "^1.3.5",
-    "@compositor/md-loader": "^1.0.27",
+    "@compositor/md-loader": "^1.0.34",
     "ava": "^0.25.0",
     "isomorphic-fetch": "^2.2.1",
     "nano-style": "^1.0.0",
-    "nyc": "^11.8.0",
+    "nyc": "^12.0.1",
     "raw-loader": "^0.5.1",
     "rebass": "^2.0.0-2",
     "refunk": "^3.0.1",

test/components/compositor.jsx

@@ -0,0 +1,5 @@
+---
+className: beep
+---
+
+<h1 className={`${props.className} boop`}>Hello</h1>