Merge branch 'master' into help-colors

.travis.yml

@@ -4,6 +4,7 @@ node_js:
 before_deploy:
   - npm install
   - npm run build
+  - cp docs/hello-x0.gif docs/hello-x0.mp4 dist
 deploy:
   provider: pages
   skip_cleanup: true

examples/emotion/package.json

@@ -7,7 +7,7 @@
     "build": "x0 build pages"
   },
   "dependencies": {
-    "@compositor/x0": "^5.0.0-12",
+    "@compositor/x0": "^5.0.0",
     "emotion": "^9.1.3",
     "react-emotion": "^9.1.3"
   }

examples/graphql/package.json

@@ -5,7 +5,7 @@
     "start": "x0 pages"
   },
   "dependencies": {
-    "@compositor/x0": "^5.0.0-12",
+    "@compositor/x0": "^5.0.0",
     "graphql-request": "^1.4.0"
   }
 }

examples/jsx/package.json

@@ -6,7 +6,7 @@
     "build": "x0 build pages"
   },
   "dependencies": {
-    "@compositor/x0": "^5.0.0-12",
+    "@compositor/x0": "^5.0.0",
     "rebass": "^2.0.0-2"
   }
 }

examples/react-router/package.json

@@ -6,7 +6,7 @@
     "build": "x0 build pages"
   },
   "dependencies": {
-    "@compositor/x0": "^5.0.0-12",
+    "@compositor/x0": "^5.0.0",
     "react-router-dom": "^4.2.2",
     "styled-components": "^3.3.0"
   },

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.1",
   "description": "Zero-config React development environment and static site generator",
   "main": "index.js",
   "bin": {
@@ -69,7 +69,33 @@
   },
   "x0": {
     "title": "Compositor x0",
-    "_basename": "/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"
+      }
+    ]
   },
   "ava": {
     "files": [