Merge pull request #6 from TechniqueSoftware/fix/bad-dependency-for-r…

…eact-dom

Remove tightly coupled node modules dependency.

.eslintignore

@@ -1,2 +1,3 @@
 spec/spec.js
 *.md
+webpack.config.spec.js

README.md

@@ -2,11 +2,11 @@
 
 `npm install react-json-schema`
 
-This library builds React elements from JSON by mapping JSON definitions to React components that you expose. The interest behind making this library is to allow non-programmers to construct a view using JSON, which can be stored and retrieved in a database. Use it as you'd like.
+This library constructs React elements from JSON by mapping JSON definitions to React components that you expose.
 
 JSX is not a dependency for react-json-schema.
 
-For a quick reference, you can jump to [full example](#putting-it-all-together).
+For a quick reference, you can jump to the [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.
 

dist/react-json-schema.js

@@ -1,26 +1,26 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', {
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
-
 var _react = require('react');
 
-var _node_modulesReactLibReactDOMFactories = require('../node_modules/react/lib/ReactDOMFactories');
+var _ReactDOMFactories = require('react/lib/ReactDOMFactories');
 
-var _node_modulesReactLibReactDOMFactories2 = _interopRequireDefault(_node_modulesReactLibReactDOMFactories);
+var _ReactDOMFactories2 = _interopRequireDefault(_ReactDOMFactories);
 
 var _lodash = require('lodash');
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
 var _componentMap = null;
 
-var ReactJsonSchema = (function () {
+var ReactJsonSchema = function () {
   function ReactJsonSchema() {
     _classCallCheck(this, ReactJsonSchema);
   }
@@ -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_modulesReactLibReactDOMFactories2['default'], schema.component)) {
+        } else if ((0, _lodash.has)(_ReactDOMFactories2.default, schema.component)) {
           Component = schema.component;
         }
       } else {
@@ -93,7 +93,6 @@ var ReactJsonSchema = (function () {
   }]);
 
   return ReactJsonSchema;
-})();
+}();
 
-exports['default'] = ReactJsonSchema;
-module.exports = exports['default'];
+exports.default = ReactJsonSchema;

lib/ReactJsonSchema.js

@@ -1,6 +1,6 @@
 import { createElement } from 'react';
-import ReactDOMFactories from '../node_modules/react/lib/ReactDOMFactories';
-import { isFunction, isArray, forEach, omit, clone, has, isObject, isString } from 'lodash';
+import ReactDOMFactories from 'react/lib/ReactDOMFactories';
+import { isArray, forEach, omit, clone, has, isObject } from 'lodash';
 
 let _componentMap = null;
 
@@ -44,7 +44,7 @@ export default class ReactJsonSchema {
       } else if (has(ReactDOMFactories, schema.component)) {
         Component = schema.component;
       }
-    }  else {
+    } else {
       throw new Error('ReactJsonSchema could not resolve a component due to a missing component attribute in the schema.');
     }
     return Component;

package.json

@@ -37,9 +37,12 @@
     "react": "^0.14.2"
   },
   "devDependencies": {
-    "babel-core": "^5.8.25",
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
     "babel-eslint": "^4.1.3",
-    "babel-loader": "^5.3.2",
+    "babel-loader": "6.1.0",
+    "babel-preset-es2015": "6.1.18",
+    "babel-preset-react": "6.1.18",
     "bootstrap": "^3.3.5",
     "eslint": "^1.5.1",
     "eslint-config-airbnb": "^0.1.0",

webpack.config.demo.js

@@ -1,7 +1,3 @@
-/* eslint "esnext": false */
-
-'use strict';
-
 module.exports = {
   entry: {
     javascript: './demo/index.jsx',
@@ -13,14 +9,13 @@ module.exports = {
   },
   module: {
     loaders: [
-      {
-        test: /\.jsx$/,
-        loader: 'jsx-loader'
-      },
       {
         test: /\.js|jsx$/,
         exclude: /node_modules/,
-        loader: 'babel-loader'
+        loader: 'babel-loader',
+        query: {
+          presets: ['react', 'es2015']
+        }
       },
       {
         test: /\.html$/,

webpack.config.spec.js

@@ -1,14 +1,10 @@
-/* eslint "esnext": false */
-
-'use strict';
-
 var path = require('path');
 var srcPath = path.join(__dirname, './spec');
 
 module.exports = {
   entry: {
-    javascript:  path.join(srcPath, 'spec.entry'),
-    html:  path.join(srcPath, 'index.html')
+    javascript: path.join(srcPath, 'spec.entry'),
+    html: path.join(srcPath, 'index.html')
   },
   output: {
     path: srcPath,
@@ -17,14 +13,13 @@ module.exports = {
   },
   module: {
     loaders: [
-      {
-        test: /\.js|jsx$/,
-        loader: 'jsx-loader'
-      },
       {
         test: /\.js|jsx$/,
         exclude: /node_modules/,
-        loader: 'babel-loader'
+        loader: 'babel-loader',
+        query: {
+          presets: ['react', 'es2015']
+        }
       },
       {
         test: /\.html$/,