Merge pull request #5 from TechniqueSoftware/release/0.3.0

Release v0.3.0

Author: Matthew R. Elliott

README.md

@@ -6,6 +6,8 @@ JSX is not a dependency for react-json-schema.
 
 For a quick reference, you can jump to [full example](#putting-it-all-together).
 
+For 0.3.0+, you must use React 0.14.0+. You may use 0.2.0 for older versions.
+
 ### Documentation
 
 #### Schema
@@ -73,14 +75,13 @@ Use `parseSchema` to render React elements. It returns the root node. Note that
 
 Example (ES6)
 ```js
-/* If using ReactDOM (0.14+), else use React */
 ReactDOM.render(contactForm.parseSchema(schema),
   document.getElementById('contact-form'));
 ```
 
 ##### Rendering
 
-Also note react-json-schema also does not perform any rendering, so the method in which you want to render is up to you. For example, you can use ReactDOMServer.render, ReactDOM.renderToString, etc. if you'd like.
+Also note react-json-schema does not perform any rendering, so the method in which you want to render is up to you. For example, you can use ReactDOMServer.render, ReactDOM.renderToString, etc. if you'd like.
 
 #### Putting it All Together
 

demo/index.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import ReactDOM from 'react-dom';
 import ContactForm from './components/ContactForm';
 import StringField from './components/StringField';
 import CheckboxField from './components/CheckboxField';
@@ -13,7 +13,7 @@ const welcomeSchema = {
 };
 
 const welcomeBanner = new ReactJsonSchema();
-React.render(welcomeBanner.parseSchema(welcomeSchema), document.getElementById('welcome-banner'));
+ReactDOM.render(welcomeBanner.parseSchema(welcomeSchema), document.getElementById('welcome-banner'));
 
 const formSchema = {
   'component': 'ContactForm',
@@ -43,4 +43,4 @@ const componentMap = { ContactForm, StringField, CheckboxField };
 const contactForm = new ReactJsonSchema();
 contactForm.setComponentMap(componentMap);
 
-React.render(contactForm.parseSchema(formSchema), document.getElementById('json-react-schema'));
+ReactDOM.render(contactForm.parseSchema(formSchema), document.getElementById('json-react-schema'));

dist/react-json-schema.js

@@ -12,9 +12,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 var _react = require('react');
 
-var _node_modulesReactLibReactDOM = require('../node_modules/react/lib/ReactDOM');
+var _node_modulesReactLibReactDOMFactories = require('../node_modules/react/lib/ReactDOMFactories');
 
-var _node_modulesReactLibReactDOM2 = _interopRequireDefault(_node_modulesReactLibReactDOM);
+var _node_modulesReactLibReactDOMFactories2 = _interopRequireDefault(_node_modulesReactLibReactDOMFactories);
 
 var _lodash = require('lodash');
 
@@ -67,7 +67,7 @@ var ReactJsonSchema = (function () {
           Component = schema.component;
         } else if (_componentMap && _componentMap[schema.component]) {
           Component = _componentMap[schema.component];
-        } else if ((0, _lodash.has)(_node_modulesReactLibReactDOM2['default'], schema.component)) {
+        } else if ((0, _lodash.has)(_node_modulesReactLibReactDOMFactories2['default'], schema.component)) {
           Component = schema.component;
         }
       } else {

dist/react-json-schema.min.js

@@ -1,5 +1,5 @@
 import { createElement } from 'react';
-import ReactDOM from '../node_modules/react/lib/ReactDOM';
+import ReactDOMFactories from '../node_modules/react/lib/ReactDOMFactories';
 import { isFunction, isArray, forEach, omit, clone, has, isObject, isString } from 'lodash';
 
 let _componentMap = null;
@@ -41,7 +41,7 @@ export default class ReactJsonSchema {
         Component = schema.component;
       } else if (_componentMap && _componentMap[schema.component]) {
         Component = _componentMap[schema.component];
-      } else if (has(ReactDOM, schema.component)) {
+      } else if (has(ReactDOMFactories, schema.component)) {
         Component = schema.component;
       }
     }  else {

lib/ReactJsonSchema.js

@@ -1,6 +1,6 @@
 {
   "name": "react-json-schema",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Write component schema in JSON; parse to create react elements.",
   "keywords": [
     "react",
@@ -13,8 +13,8 @@
     "url": "http://elliottisonfire.com"
   },
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/TechniqueSoftware/react-json-schema"
+    "type": "git",
+    "url": "https://github.com/TechniqueSoftware/react-json-schema"
   },
   "license": "Apache-2.0",
   "bugs": {
@@ -34,7 +34,7 @@
   ],
   "dependencies": {
     "lodash": "^3.10.1",
-    "react": "^0.13.3"
+    "react": "^0.14.2"
   },
   "devDependencies": {
     "babel-core": "^5.8.25",
@@ -48,7 +48,8 @@
     "jasmine": "^2.3.2",
     "jsx-loader": "^0.13.2",
     "path": "^0.12.7",
-    "react-bootstrap": "^0.25.2",
+    "react-bootstrap": "^0.27.3",
+    "react-dom": "^0.14.2",
     "uglify-js": "^2.4.24",
     "webpack": "^1.12.2",
     "webpack-dev-server": "^1.12.0"