refactor to only use CommonJS

README.md

@@ -14,32 +14,16 @@ rich interactive react charting components using [chart.js](http://www.chartjs.o
 
 Installation
 ------------
-### Browser
+This is a CommonJS component only (to be used with something like Webpack or Browserify)
 ```
-    <!-- chart.js must be loaded before react-chartjs -->
-    <script src="path/to/chart.js"></script>
-    <script src="path/to/react-chartjs.js"></script>
-```
-
-### CommonJS
-```
-    // nothing you need to do here for initialization
-```
-
-### AMD
-```
-    define('path/to/chart.js', 'react', 'react-chartjs', function(Chart, React, ReactChart) {
-        // initialize ReactChartjs
-        ReactChart(Chart, React);
-        /// now you can refer to React charts as Chart.React.*
-    });
+npm install --save react-chartjs
 ```
+You must also include the [chartjs](http://www.chartjs.org/) script on your html page
 
 Example Usage
 -------------
 ```
-var LineChart = Chart.React.Line;  // for browser or AMD (using define('path/to/chart.js'))
-var LineChart = require("react-chartjs/line"); // for commonJS
+var LineChart = require("react-chartjs").Line;
 
 var MyComponent = React.createClass({
   render: function() {

index.js

@@ -1,23 +1,8 @@
-(function(main) {
-    if (typeof Chart === 'function') {
-        // script include
-        main(Chart);
-    } else  {
-        // AMD
-        define([], function() {
-            return main;
-        });
-    }
-})(function(Chart, React) {
-  require('./vars').React = React;
-  Chart.React = {
-    Bar: require('./bar'),
-    Doughnut: require('./doughnut'),
-    Line: require('./line'),
-    Pie: require('./pie'),
-    PolarArea: require('./polar-area'),
-    Radar: require('./radar')
-  };
-  return Chart;
-});
-
+module.exports = {
+  Bar: require('./lib/bar'),
+  Doughnut: require('./lib/doughnut'),
+  Line: require('./lib/line'),
+  Pie: require('./lib/pie'),
+  PolarArea: require('./lib/polar-area'),
+  Radar: require('./lib/radar')
+};

bar.js → lib/bar.js

@@ -1,3 +1,3 @@
-var vars = require('./vars');
+var vars = require('./core');
 
 module.exports = vars.createClass('Bar', ['getBarsAtEvent']);

vars.js → lib/core.js

@@ -55,15 +55,7 @@ module.exports = {
       }
     }
 
-    var React = this.React || global.React;
-    if (!React && (typeof require !== 'undefined') && (typeof define !== 'function')) {
-      // allow the charts to not need to be initialized for commonJS
-      React = this.React = require('react');
-    }
-    if (!React) {
-      throw new Error("The charts were not initialized with the React instance");
-    }
-
+    var React = require('react');
     return React.createClass(classData);
   }
 };

doughnut.js → lib/doughnut.js

@@ -1,3 +1,3 @@
-var vars = require('./vars');
+var vars = require('./core');
 
 module.exports = vars.createClass('Doughnut', ['getSegmentsAtEvent']);

line.js → lib/line.js

@@ -1,3 +1,3 @@
-var vars = require('./vars');
+var vars = require('./core');
 
 module.exports = vars.createClass('Line', ['getPointsAtEvent']);

pie.js → lib/pie.js

@@ -1,3 +1,3 @@
-var vars = require('./vars');
+var vars = require('./core');
 
 module.exports = vars.createClass('Pie', ['getSegmentsAtEvent']);

polar-area.js → lib/polar-area.js

@@ -1,3 +1,3 @@
-var vars = require('./vars');
+var vars = require('./core');
 
 module.exports = vars.createClass('PolarArea', ['getSegmentsAtEvent']);

radar.js → lib/radar.js

@@ -1,3 +1,3 @@
-var vars = require('./vars');
+var vars = require('./core');
 
 module.exports = vars.createClass('Radar', ['getPointsAtEvent']);