Merge pull request reactjs#1 from diasbruno/fix/compilation

Fix compilation.

Author: fuller

.babelrc

@@ -1,21 +1,3 @@
 {
-  "presets": ["react"],
-  "env": {
-    "commonjs": {
-      "plugins": [
-        "transform-class-properties", 
-        "transform-object-rest-spread"
-      ],
-      "presets": ["env"]
-    },
-    "es": {
-      "plugins": [
-        "transform-class-properties", 
-        "transform-object-rest-spread"
-      ],
-      "presets": [
-        ["env", { "modules": false }]
-      ]
-    }
-  }
+  "presets": ["es2015", "stage-2", "react"]
 }

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/*

package.json

@@ -3,8 +3,6 @@
   "version": "2.0.0",
   "description": "Accessible modal dialog component for React.JS",
   "main": "./lib/index.js",
-  "module": "./es/index.js",
-  "jsnext:main": "./es/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/reactjs/react-modal.git"
@@ -16,12 +14,8 @@
   },
   "scripts": {
     "start": "./node_modules/.bin/webpack-dev-server --inline --host 127.0.0.1 --content-base examples/",
-    "test": "cross-env BABEL_ENV=commonjs NODE_ENV=test karma start",
-    "lint": "eslint lib/",
-    "clean": "rimraf lib es",
-    "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
-    "build:es": "cross-env BABEL_ENV=es babel src --out-dir es",
-    "build": "npm run clean && npm run build:commonjs && npm run build:es"
+    "test": "cross-env NODE_ENV=test karma start",
+    "lint": "eslint lib/"
   },
   "authors": [
     "Ryan Florence"
@@ -32,10 +26,9 @@
     "babel-core": "^6.25.0",
     "babel-eslint": "^7.1.1",
     "babel-loader": "^6.2.4",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
-    "babel-preset-env": "^1.5.2",
+    "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",
     "cross-env": "^5.0.1",

specs/Modal.spec.js

@@ -3,7 +3,6 @@ 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 '../src/components/Modal';
 import * as ariaAppHider from '../src/helpers/ariaAppHider';
 import {
@@ -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);