diff --git a/package.json b/package.json index 8f39efb0c..201b067a6 100644 --- a/package.json +++ b/package.json @@ -37,15 +37,18 @@ "custom-event-polyfill": "0.2.1", "eslint": "1.3.1", "eslint-plugin-react": "3.3.1", + "exenv": "1.2.0", "file-loader": "0.8.4", "json-loader": "0.5.2", "jsx-loader": "0.13.2", "minilog": "2.0.8", "node-sass": "3.3.3", - "react": "0.13.3", - "react-modal": "0.3.0", + "react": "0.14.0", + "react-addons-test-utils": "0.14.0", + "react-dom": "0.14.0", + "react-modal": "git://github.com/mewtaylor/react-modal.git#react-14", "react-onclickoutside": "0.3.1", - "react-slick": "0.7.0", + "react-slick": "git://github.com/mewtaylor/react-slick.git#remove-deprecation-warnings", "routes-to-nginx-conf": "0.0.4", "sass-lint": "1.2.0", "sass-loader": "2.0.1", @@ -55,7 +58,7 @@ "tape": "4.2.0", "url-loader": "0.5.6", "watch": "0.16.0", - "webpack": "1.12.0", + "webpack": "1.12.2", "xhr": "2.0.4" } } diff --git a/server/template.html b/server/template.html index c03f7da7b..88d2db840 100644 --- a/server/template.html +++ b/server/template.html @@ -36,6 +36,8 @@ + + diff --git a/src/components/login/login.jsx b/src/components/login/login.jsx index da65adcf7..b08d6126f 100644 --- a/src/components/login/login.jsx +++ b/src/components/login/login.jsx @@ -13,8 +13,8 @@ var Login = React.createClass({ handleSubmit: function (event) { event.preventDefault(); this.props.onLogIn({ - 'username': this.refs.username.getDOMNode().value, - 'password': this.refs.password.getDOMNode().value + 'username': this.refs.username.value, + 'password': this.refs.password.value }); }, render: function () { diff --git a/src/lib/renderer.jsx b/src/lib/renderer.jsx index ec3209ef4..9a470cd21 100644 --- a/src/lib/renderer.jsx +++ b/src/lib/renderer.jsx @@ -1,8 +1,8 @@ -var React = require('react'); +var ReactDOM = require('react-dom'); var Renderer = { render: function (jsx, toElement) { - var rendered = React.render(jsx, toElement); + var rendered = ReactDOM.render(jsx, toElement); if (process.env.NODE_ENV != 'production') { window.renderedComponents = window.renderedComponents || []; window.renderedComponents.push(rendered); diff --git a/static/js/lib/react-dom.js b/static/js/lib/react-dom.js new file mode 100644 index 000000000..8f54ea727 --- /dev/null +++ b/static/js/lib/react-dom.js @@ -0,0 +1,42 @@ +/** + * ReactDOM v0.14.0 + * + * Copyright 2013-2015, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + */ +// Based off https://github.com/ForbesLindesay/umd/blob/master/template.js +;(function(f) { + // CommonJS + if (typeof exports === "object" && typeof module !== "undefined") { + module.exports = f(require('react')); + + // RequireJS + } else if (typeof define === "function" && define.amd) { + define(['react'], f); + + //