summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2016-09-05 22:29:41 +0200
committerSamy Pesse <samypesse@gmail.com>2016-09-05 22:29:41 +0200
commit82c2c214eb5179538c925460f1d3e823dbba47e2 (patch)
treed77c93ba2b850bafc1998f0c08c5d5520fa98120
parentee35da4be577943734d57c8c54a5c37f0cc10a0e (diff)
downloadgitbook-82c2c214eb5179538c925460f1d3e823dbba47e2.zip
gitbook-82c2c214eb5179538c925460f1d3e823dbba47e2.tar.gz
gitbook-82c2c214eb5179538c925460f1d3e823dbba47e2.tar.bz2
Fix build of gitbook.core.min.js
-rw-r--r--packages/gitbook-core/.gitignore2
-rw-r--r--packages/gitbook-core/.npmignore2
-rw-r--r--packages/gitbook-core/package.json2
-rw-r--r--packages/gitbook-core/src/index.js4
-rw-r--r--packages/gitbook-plugin-theme-default/src/index.js5
-rw-r--r--packages/gitbook/src/output/website/render.js3
6 files changed, 13 insertions, 5 deletions
diff --git a/packages/gitbook-core/.gitignore b/packages/gitbook-core/.gitignore
index 1c25790..eed58d7 100644
--- a/packages/gitbook-core/.gitignore
+++ b/packages/gitbook-core/.gitignore
@@ -1 +1 @@
-gitbook.core.js.min
+gitbook.core.min.js
diff --git a/packages/gitbook-core/.npmignore b/packages/gitbook-core/.npmignore
index a128ba4..5862c13 100644
--- a/packages/gitbook-core/.npmignore
+++ b/packages/gitbook-core/.npmignore
@@ -1,3 +1,3 @@
src
!lib
-!gitbook.core.js.min
+!gitbook.core.min.js
diff --git a/packages/gitbook-core/package.json b/packages/gitbook-core/package.json
index 071837b..c75f05d 100644
--- a/packages/gitbook-core/package.json
+++ b/packages/gitbook-core/package.json
@@ -23,7 +23,7 @@
},
"scripts": {
"dist-lib": "rm -rf lib/ && babel -d lib/ src/",
- "dist-standalone": "browserify -r react -r react-dom -r ./lib/index.js:gitbook-core | uglifyjs -c > gitbook.core.js.min",
+ "dist-standalone": "browserify -r ./lib/index.js:gitbook-core -r react -r react-dom ./lib/index.js | uglifyjs -c > gitbook.core.min.js",
"prepublish": "npm run dist-lib && npm run dist-standalone"
},
"repository": {
diff --git a/packages/gitbook-core/src/index.js b/packages/gitbook-core/src/index.js
index 4a2f21f..84dcd47 100644
--- a/packages/gitbook-core/src/index.js
+++ b/packages/gitbook-core/src/index.js
@@ -1,3 +1,4 @@
+const Head = require('react-helmet');
const { InjectedComponent, InjectedComponentSet } = require('./components/InjectedComponent');
const { registerComponent } = require('./actions/components');
const ACTIONS = require('./actions/TYPES');
@@ -16,5 +17,6 @@ module.exports = {
renderComponent,
registerComponent,
InjectedComponent,
- InjectedComponentSet
+ InjectedComponentSet,
+ Head
};
diff --git a/packages/gitbook-plugin-theme-default/src/index.js b/packages/gitbook-plugin-theme-default/src/index.js
index 8c47b38..3630bbe 100644
--- a/packages/gitbook-plugin-theme-default/src/index.js
+++ b/packages/gitbook-plugin-theme-default/src/index.js
@@ -5,6 +5,11 @@ const ThemeBody = React.createClass({
render() {
return (
<div>
+ <GitBook.Head
+ title={'Homepage'}
+ titleTemplate="%s - GitBook"
+ />
+
My Base theme for gitbook
</div>
);
diff --git a/packages/gitbook/src/output/website/render.js b/packages/gitbook/src/output/website/render.js
index 237c234..1028b92 100644
--- a/packages/gitbook/src/output/website/render.js
+++ b/packages/gitbook/src/output/website/render.js
@@ -14,7 +14,7 @@ function HTML({head, innerHTML, props}) {
{head.link.toComponent()}
</head>
<body>
- <div id="content" dangerouslySetInnerHTML={{__html: innerHTML}} />
+ <div id="content" dangerouslySetInnerHTML={{__html: innerHTML}} />
{head.link.toComponent()}
<script
type="application/payload+json"
@@ -25,6 +25,7 @@ function HTML({head, innerHTML, props}) {
}
HTML.propTypes = {
head: React.PropTypes.object,
+ props: React.PropTypes.object,
innerHTML: React.PropTypes.string
};