From 70fa45ac740c8044f2bd9bf72d78f98e2801ad9c Mon Sep 17 00:00:00 2001 From: Brent Jackson Date: Sat, 26 May 2018 11:34:54 -0400 Subject: [PATCH 1/5] Edit travis deploy --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1adc919..427bba1 100644 --- a/.travis.yml +++ b/.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 From 786b8d8e2e780d43df48599b2ffc796b709a5f3c Mon Sep 17 00:00:00 2001 From: Brent Jackson Date: Sat, 26 May 2018 11:38:26 -0400 Subject: [PATCH 2/5] Adjust site build --- package.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 014ee8c..b2a41b8 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "scripts": { "start": "./cli.js docs -op 8888", - "build": "./cli.js build docs", + "build": "./cli.js build docs --basename '/x0'", "test": "nyc ava", "cover": "nyc report --reporter=html --reporter=lcov" }, @@ -69,7 +69,15 @@ }, "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": [ From 64edd6f746e93a0db9d94dcfc93d85185fe6e720 Mon Sep 17 00:00:00 2001 From: Brent Jackson Date: Sat, 26 May 2018 11:40:35 -0400 Subject: [PATCH 3/5] Update example deps --- examples/emotion/package.json | 2 +- examples/graphql/package.json | 2 +- examples/jsx/package.json | 2 +- examples/react-router/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/emotion/package.json b/examples/emotion/package.json index d10cef0..0a378eb 100644 --- a/examples/emotion/package.json +++ b/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" } diff --git a/examples/graphql/package.json b/examples/graphql/package.json index d3bf2db..14e0975 100644 --- a/examples/graphql/package.json +++ b/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" } } diff --git a/examples/jsx/package.json b/examples/jsx/package.json index adb3852..c129fee 100644 --- a/examples/jsx/package.json +++ b/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" } } diff --git a/examples/react-router/package.json b/examples/react-router/package.json index 61c27b9..39c2aec 100644 --- a/examples/react-router/package.json +++ b/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" }, From 413db21bba2c70b208556c3679db81c9a2406473 Mon Sep 17 00:00:00 2001 From: Brent Jackson Date: Sun, 27 May 2018 16:37:06 -0400 Subject: [PATCH 4/5] Ignore basename option in dev --- lib/dev.js | 1 + package.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/dev.js b/lib/dev.js index 0363ea0..103e833 100644 --- a/lib/dev.js +++ b/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) diff --git a/package.json b/package.json index b2a41b8..b7f9eac 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "scripts": { "start": "./cli.js docs -op 8888", - "build": "./cli.js build docs --basename '/x0'", + "build": "./cli.js build docs", "test": "nyc ava", "cover": "nyc report --reporter=html --reporter=lcov" }, @@ -69,7 +69,7 @@ }, "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" }, From 053c01481192bd2b161ea663950e28860a6627c4 Mon Sep 17 00:00:00 2001 From: Brent Jackson Date: Sun, 27 May 2018 16:46:56 -0400 Subject: [PATCH 5/5] 5.0.1 --- package.json | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index b7f9eac..8fe0d3e 100644 --- a/package.json +++ b/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": { @@ -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": {