Merge pull request #233 from rackt/commonjs-again

Use CommonJS modules until ES3 transforms are fixed

Author: gaearon

package.json

@@ -43,12 +43,12 @@
   },
   "homepage": "https://github.com/gaearon/react-redux",
   "devDependencies": {
-    "babel-cli": "^6.3.15",
-    "babel-core": "^6.1.20",
+    "babel-cli": "^6.3.17",
+    "babel-core": "^6.3.26",
     "babel-eslint": "^5.0.0-beta4",
     "babel-loader": "^6.2.0",
     "babel-plugin-transform-decorators-legacy": "^1.2.0",
-    "babel-preset-es2015-loose": "^6.1.3",
+    "babel-preset-es2015-loose": "^6.1.4",
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-0": "^6.3.13",
     "eslint": "^1.7.1",

src/components/Provider.js

@@ -1,5 +1,5 @@
-import { Component, PropTypes, Children } from 'react'
-import storeShape from '../utils/storeShape'
+const { Component, PropTypes, Children } = require('react')
+const storeShape = require('../utils/storeShape')
 
 let didWarnAboutReceivingStore = false
 function warnAboutReceivingStore() {
@@ -17,7 +17,7 @@ function warnAboutReceivingStore() {
   )
 }
 
-export default class Provider extends Component {
+class Provider extends Component {
   getChildContext() {
     return { store: this.store }
   }
@@ -49,3 +49,5 @@ Provider.propTypes = {
 Provider.childContextTypes = {
   store: storeShape.isRequired
 }
+
+module.exports = Provider

src/components/connect.js

@@ -1,10 +1,10 @@
-import { Component, createElement } from 'react'
-import storeShape from '../utils/storeShape'
-import shallowEqual from '../utils/shallowEqual'
-import isPlainObject from '../utils/isPlainObject'
-import wrapActionCreators from '../utils/wrapActionCreators'
-import hoistStatics from 'hoist-non-react-statics'
-import invariant from 'invariant'
+const { Component, createElement } = require('react')
+const storeShape = require('../utils/storeShape')
+const shallowEqual = require('../utils/shallowEqual')
+const isPlainObject = require('../utils/isPlainObject')
+const wrapActionCreators = require('../utils/wrapActionCreators')
+const hoistStatics = require('hoist-non-react-statics')
+const invariant = require('invariant')
 
 const defaultMapStateToProps = state => ({}) // eslint-disable-line no-unused-vars
 const defaultMapDispatchToProps = dispatch => ({ dispatch })
@@ -21,7 +21,7 @@ function getDisplayName(WrappedComponent) {
 // Helps track hot reloading.
 let nextVersion = 0
 
-export default function connect(mapStateToProps, mapDispatchToProps, mergeProps, options = {}) {
+function connect(mapStateToProps, mapDispatchToProps, mergeProps, options = {}) {
   const shouldSubscribe = Boolean(mapStateToProps)
   const finalMapStateToProps = mapStateToProps || defaultMapStateToProps
   const finalMapDispatchToProps = isPlainObject(mapDispatchToProps) ?
@@ -273,3 +273,5 @@ export default function connect(mapStateToProps, mapDispatchToProps, mergeProps,
     return hoistStatics(Connect, WrappedComponent)
   }
 }
+
+module.exports = connect

src/index.js

@@ -1,4 +1,4 @@
-import Provider from './components/Provider'
-import connect from './components/connect'
+const Provider = require('./components/Provider')
+const connect = require('./components/connect')
 
-export { Provider, connect }
+module.exports = { Provider, connect }

src/utils/isPlainObject.js

@@ -4,7 +4,7 @@ const fnToString = (fn) => Function.prototype.toString.call(fn)
  * @param {any} obj The object to inspect.
  * @returns {boolean} True if the argument appears to be a plain object.
  */
-export default function isPlainObject(obj) {
+function isPlainObject(obj) {
   if (!obj || typeof obj !== 'object') {
     return false
   }
@@ -23,3 +23,5 @@ export default function isPlainObject(obj) {
     && constructor instanceof constructor
     && fnToString(constructor) === fnToString(Object)
 }
+
+module.exports = isPlainObject

src/utils/shallowEqual.js

@@ -1,4 +1,4 @@
-export default function shallowEqual(objA, objB) {
+function shallowEqual(objA, objB) {
   if (objA === objB) {
     return true
   }
@@ -21,3 +21,5 @@ export default function shallowEqual(objA, objB) {
 
   return true
 }
+
+module.exports = shallowEqual

src/utils/storeShape.js

@@ -1,7 +1,9 @@
-import { PropTypes } from 'react'
+const { PropTypes } = require('react')
 
-export default PropTypes.shape({
+const storeShape = PropTypes.shape({
   subscribe: PropTypes.func.isRequired,
   dispatch: PropTypes.func.isRequired,
   getState: PropTypes.func.isRequired
 })
+
+module.exports = storeShape

src/utils/wrapActionCreators.js

@@ -1,5 +1,7 @@
 import { bindActionCreators } from 'redux'
 
-export default function wrapActionCreators(actionCreators) {
+function wrapActionCreators(actionCreators) {
   return dispatch => bindActionCreators(actionCreators, dispatch)
 }
+
+module.exports = wrapActionCreators