summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lerna.json2
-rw-r--r--package.json7
-rw-r--r--packages/gitbook-core/package.json3
-rw-r--r--packages/gitbook-core/src/index.js2
-rw-r--r--packages/gitbook-plugin-theme-default/src/components/Body.js2
-rw-r--r--packages/gitbook-plugin-theme-default/src/components/Page.js2
-rw-r--r--packages/gitbook-plugin-theme-default/src/components/Sidebar.js2
-rw-r--r--packages/gitbook-plugin-theme-default/src/components/Summary.js2
-rw-r--r--packages/gitbook-plugin-theme-default/src/components/Toolbar.js2
-rw-r--r--packages/gitbook-plugin-theme-default/src/index.js2
10 files changed, 16 insertions, 10 deletions
diff --git a/lerna.json b/lerna.json
index e099230..60f5a64 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,4 @@
{
- "lerna": "2.0.0-beta.26",
+ "lerna": "2.0.0-beta.29",
"version": "0.0.0"
}
diff --git a/package.json b/package.json
index 5940776..f0ce91c 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,14 @@
"eslint": "3.4.0",
"eslint-config-gitbook": "^1.2.0",
"expect": "^1.20.1",
- "lerna": "2.0.0-beta.26",
+ "lerna": "2.0.0-beta.29",
"mocha": "^2.4.5"
},
"scripts": {
- "lint": "eslint ."
+ "lint": "eslint .",
+ "test": "",
+ "bootstrap": "lerna bootstrap",
+ "dist": "lerna run dist"
},
"repository": {
"type": "git",
diff --git a/packages/gitbook-core/package.json b/packages/gitbook-core/package.json
index 4d5a40a..8899a0d 100644
--- a/packages/gitbook-core/package.json
+++ b/packages/gitbook-core/package.json
@@ -4,6 +4,7 @@
"description": "Core for GitBook plugins API",
"main": "./lib/index.js",
"dependencies": {
+ "classnames": "^2.2.5",
"html-tags": "^1.1.1",
"immutable": "^3.8.1",
"react": "^15.3.1",
@@ -27,7 +28,7 @@
},
"scripts": {
"dist-lib": "rm -rf lib/ && babel -d lib/ src/",
- "dist-standalone": "browserify -r ./lib/index.js:gitbook-core -r react -r react-dom ./lib/index.js | uglifyjs -c > ./dist/gitbook.core.min.js",
+ "dist-standalone": "mkdir -p dist && browserify -r ./lib/index.js:gitbook-core -r react -r react-dom ./lib/index.js | uglifyjs -c > ./dist/gitbook.core.min.js",
"dist": "npm run dist-lib && npm run dist-standalone",
"prepublish": "npm run dist"
},
diff --git a/packages/gitbook-core/src/index.js b/packages/gitbook-core/src/index.js
index 7ae4841..02eb68f 100644
--- a/packages/gitbook-core/src/index.js
+++ b/packages/gitbook-core/src/index.js
@@ -1,3 +1,4 @@
+const React = require('react');
const Head = require('react-helmet');
const { Provider } = require('react-redux');
const { Flex, Box } = require('reflexbox');
@@ -45,6 +46,7 @@ module.exports = {
Link,
Icon,
Button,
+ React,
// Utilities
Shapes
};
diff --git a/packages/gitbook-plugin-theme-default/src/components/Body.js b/packages/gitbook-plugin-theme-default/src/components/Body.js
index de97b5c..b4d9fe6 100644
--- a/packages/gitbook-plugin-theme-default/src/components/Body.js
+++ b/packages/gitbook-plugin-theme-default/src/components/Body.js
@@ -1,5 +1,5 @@
-const React = require('react');
const GitBook = require('gitbook-core');
+const { React } = GitBook;
const Page = require('./Page');
const Toolbar = require('./Toolbar');
diff --git a/packages/gitbook-plugin-theme-default/src/components/Page.js b/packages/gitbook-plugin-theme-default/src/components/Page.js
index a7d8ef7..177de20 100644
--- a/packages/gitbook-plugin-theme-default/src/components/Page.js
+++ b/packages/gitbook-plugin-theme-default/src/components/Page.js
@@ -1,5 +1,5 @@
-const React = require('react');
const GitBook = require('gitbook-core');
+const { React } = GitBook;
const Page = React.createClass({
propTypes: {
diff --git a/packages/gitbook-plugin-theme-default/src/components/Sidebar.js b/packages/gitbook-plugin-theme-default/src/components/Sidebar.js
index ff4fcbf..39ca271 100644
--- a/packages/gitbook-plugin-theme-default/src/components/Sidebar.js
+++ b/packages/gitbook-plugin-theme-default/src/components/Sidebar.js
@@ -1,5 +1,5 @@
-const React = require('react');
const GitBook = require('gitbook-core');
+const { React } = GitBook;
const Summary = require('./Summary');
diff --git a/packages/gitbook-plugin-theme-default/src/components/Summary.js b/packages/gitbook-plugin-theme-default/src/components/Summary.js
index ba21a04..01f3044 100644
--- a/packages/gitbook-plugin-theme-default/src/components/Summary.js
+++ b/packages/gitbook-plugin-theme-default/src/components/Summary.js
@@ -1,6 +1,6 @@
-const React = require('react');
const classNames = require('classnames');
const GitBook = require('gitbook-core');
+const { React } = GitBook;
let SummaryArticle = React.createClass({
propTypes: {
diff --git a/packages/gitbook-plugin-theme-default/src/components/Toolbar.js b/packages/gitbook-plugin-theme-default/src/components/Toolbar.js
index a7958d6..ca6b7f3 100644
--- a/packages/gitbook-plugin-theme-default/src/components/Toolbar.js
+++ b/packages/gitbook-plugin-theme-default/src/components/Toolbar.js
@@ -1,5 +1,5 @@
-const React = require('react');
const GitBook = require('gitbook-core');
+const { React } = GitBook;
const sidebar = require('../actions/sidebar');
diff --git a/packages/gitbook-plugin-theme-default/src/index.js b/packages/gitbook-plugin-theme-default/src/index.js
index a8eeb91..ce678e1 100644
--- a/packages/gitbook-plugin-theme-default/src/index.js
+++ b/packages/gitbook-plugin-theme-default/src/index.js
@@ -1,5 +1,5 @@
-const React = require('react');
const GitBook = require('gitbook-core');
+const { React } = GitBook;
const Sidebar = require('./components/Sidebar');
const Body = require('./components/Body');