[added] Build step for compiling to CommonJS modules

.codeclimate.yml

@@ -9,7 +9,7 @@ engines:
         javascript:
 ratings:
   paths:
-    - lib/**
+    - src/**
     - "**.js"
 exclude_paths:
   - "specs/"

.gitignore

@@ -8,3 +8,7 @@ _book
 *.diff
 examples/__build__
 coverage
+yarn.lock
+
+## Built folders
+lib

.npmignore

@@ -5,3 +5,4 @@ karma.conf.js
 script
 specs
 .idea/
+src

Makefile

@@ -68,7 +68,11 @@ docs: build-docs
 
 # Rules for build and publish
 
-build:
+compile:
+	@echo "[Compiling source]"
+	babel src --out-dir lib
+
+build: compile
 	@echo "[Building dists]"
 	@./node_modules/.bin/webpack --config webpack.dist.config.js
 
@@ -120,5 +124,8 @@ publish-docs: deps-docs build-docs
 
 publish-all: publish publish-docs
 
-clean:
+clean-sources:
+	@rm -rf lib/* dist/* _book
+
+clean: clean-sources
 	@rm -rf .version .branch ./coverage/*

examples/basic/app.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-import Modal from '../../lib/index';
+import Modal from '../../src/index';
 
 const appElement = document.getElementById('example');
 

package.json

@@ -15,18 +15,19 @@
   "scripts": {
     "start": "./node_modules/.bin/webpack-dev-server --inline --host 127.0.0.1 --content-base examples/",
     "test": "cross-env NODE_ENV=test karma start",
-    "lint": "eslint lib/"
+    "lint": "eslint src/"
   },
   "authors": [
     "Ryan Florence"
   ],
   "license": "MIT",
   "devDependencies": {
-    "babel-core": "^6.7.4",
+    "babel-cli": "^6.24.1",
+    "babel-core": "^6.25.0",
     "babel-eslint": "^7.1.1",
     "babel-loader": "^6.2.4",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-preset-react": "^6.5.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
     "codeclimate-test-reporter": "^0.4.0",
     "coveralls": "^2.13.1",
@@ -55,17 +56,14 @@
     "react-addons-test-utils": "^15.0.0",
     "react-dom": "^15.0.0",
     "rf-release": "0.4.0",
-    "rimraf": "^2.5.4",
     "sinon": "next",
     "uglify-js": "2.4.24",
     "webpack": "^1.12.14",
     "webpack-dev-server": "1.11.0"
   },
   "dependencies": {
-    "create-react-class": "^15.5.2",
     "element-class": "^0.2.0",
     "exenv": "1.2.0",
-    "lodash.assign": "^4.2.0",
     "prop-types": "^15.5.7",
     "react-dom-factories": "^1.0.0"
   },

specs/Modal.events.spec.js

@@ -4,7 +4,7 @@ import expect from 'expect';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import TestUtils from 'react-addons-test-utils';
-import Modal from '../lib/components/Modal';
+import Modal from '../src/components/Modal';
 import {
   moverlay, mcontent,
   clickAt, mouseDownAt, mouseUpAt, escKeyDown, tabKeyDown,

specs/Modal.spec.js

@@ -3,9 +3,8 @@ import expect from 'expect';
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import TestUtils from 'react-addons-test-utils';
-import createReactClass from 'create-react-class';
-import Modal from '../lib/components/Modal';
-import * as ariaAppHider from '../lib/helpers/ariaAppHider';
+import Modal from '../src/components/Modal';
+import * as ariaAppHider from '../src/helpers/ariaAppHider';
 import {
   isBodyWithReactModalOpenClass,
   contentAttribute,
@@ -57,7 +56,7 @@ describe('State', () => {
 
   it('renders into the body, not in context', () => {
     const node = document.createElement('div');
-    const App = createReactClass({
+    class App extends Component {
       render() {
         return (
           <div>
@@ -67,7 +66,7 @@ describe('State', () => {
           </div>
         );
       }
-    });
+    }
     Modal.setAppElement(node);
     ReactDOM.render(<App />, node);
     expect(
@@ -357,22 +356,23 @@ describe('State', () => {
     const node = document.createElement('div');
     let modal = null;
 
-    const App = createReactClass({
-      getInitialState() {
-        return { testHasChanged: false };
-      },
+    class App extends Component {
+      constructor(props) {
+        super(props);
+        this.state = { testHasChanged: false };
+      }
 
       componentDidMount() {
         expect(modal.node.className).toEqual('myPortalClass');
 
         this.setState({
           testHasChanged: true
         });
-      },
+      }
 
       componentDidUpdate() {
         expect(modal.node.className).toEqual('myPortalClass-modifier');
-      },
+      }
 
       render() {
         const portalClassName = this.state.testHasChanged === true ?
@@ -389,7 +389,7 @@ describe('State', () => {
           </div>
         );
       }
-    });
+    }
 
     Modal.setAppElement(node);
     ReactDOM.render(<App />, node);

specs/Modal.style.spec.js

@@ -3,8 +3,8 @@ import expect from 'expect';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import TestUtils from 'react-addons-test-utils';
-import Modal from '../lib/components/Modal';
-import * as ariaAppHider from '../lib/helpers/ariaAppHider';
+import Modal from '../src/components/Modal';
+import * as ariaAppHider from '../src/helpers/ariaAppHider';
 import {
   mcontent, moverlay,
   renderModal, emptyDOM

specs/helper.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import Modal from '../lib/components/Modal';
+import Modal from '../src/components/Modal';
 import TestUtils from 'react-addons-test-utils';
 
 const divStack = [];

specs/spec_index.js

@@ -8,7 +8,7 @@ testsContext.keys().forEach((path) => {
   }
 });
 
-const componentsContext = require.context('../lib', true, /\.js$/);
+const componentsContext = require.context('../src', true, /\.js$/);
 componentsContext.keys().forEach((path) => {
   try {
     componentsContext(path);

src/index.js

@@ -0,0 +1,3 @@
+import Modal from './components/Modal';
+
+export default Modal;

webpack.dist.config.js

@@ -17,8 +17,8 @@ var reactDOMExternal = {
 module.exports = {
 
   entry: {
-    'react-modal': './lib/index.js',
-    'react-modal.min': './lib/index.js'
+    'react-modal': './src/index.js',
+    'react-modal.min': './src/index.js'
   },
 
   externals: {

webpack.test.config.js

@@ -10,7 +10,7 @@ if (process.env.CONTINUOUS_INTEGRATION || process.env.COVERAGE) {
   commonConfig.module.postLoaders = commonConfig.module.postLoaders || [];
   commonConfig.module.postLoaders.push({
     test: /\.js$/,
-    include: path.resolve('lib'),
+    include: path.resolve('src'),
     loader: 'istanbul-instrumenter'
   });
 }