Merge branch 'master' into initial-props-path

cli.js

@@ -15,26 +15,26 @@ const pkg = readPkg().pkg
 log.name = 'x0'
 
 const cli = meow(`
-  Usage
+  ${chalk.gray('Usage')}
 
-    Dev Server
+    ${chalk.gray('Dev Server')}
 
-      x0 pages
+      ${chalk.cyan('x0 pages')}
 
-    Build
+    ${chalk.gray('Build')}
 
-      x0 build pages
+      ${chalk.cyan('x0 build pages')}
 
-  Options
+  ${chalk.gray('Options')}
 
       --webpack       Path to webpack config file
 
-    Dev Server
+    ${chalk.gray('Dev Server')}
 
       -o --open       Open dev server in default browser
       -p --port       Port for dev server
 
-    Build
+    ${chalk.gray('Build')}
 
       -d --out-dir    Output directory (default dist)
       -s --static     Output static HTML without JS bundle

lib/dev.js

@@ -17,6 +17,7 @@ const dev = {
 }
 
 module.exports = async (opts) => {
+  if (opts.basename) delete opts.basename
   const config = merge(baseConfig, opts.webpack)
   const template = createTemplate(opts)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compositor/x0",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "Zero-config React development environment and static site generator",
   "main": "index.js",
   "bin": {
@@ -71,12 +71,30 @@
     "title": "Compositor x0",
     "basename": "/x0",
     "meta": [
-      { "name": "description", "content": "Zero-config React development environment and static site generator" },
-      { "name": "twitter:card", "content": "summary" },
-      { "name": "twitter:site", "content": "@getcompositor" },
-      { "name": "twitter:image", "content": "https://compositor.io/logo/dist/compositor.png" },
-      { "name": "twitter:title", "content": "Compositor x0" },
-      { "name": "twitter:description", "content": "Zero-config React development environment and static site generator" }
+      {
+        "name": "description",
+        "content": "Zero-config React development environment and static site generator"
+      },
+      {
+        "name": "twitter:card",
+        "content": "summary"
+      },
+      {
+        "name": "twitter:site",
+        "content": "@getcompositor"
+      },
+      {
+        "name": "twitter:image",
+        "content": "https://compositor.io/logo/dist/compositor.png"
+      },
+      {
+        "name": "twitter:title",
+        "content": "Compositor x0"
+      },
+      {
+        "name": "twitter:description",
+        "content": "Zero-config React development environment and static site generator"
+      }
     ]
   },
   "ava": {