[UNSTABLE] Upgrade to react 0.14

pull/232/head
Rick Carlino 2015-10-08 13:03:07 -05:00
parent 51b7347b3e
commit f01ceeb682
4 changed files with 12 additions and 12 deletions

View File

@ -3,7 +3,8 @@ var gulp = require('gulp'),
concat = require('gulp-concat'),
browserify = require('browserify'),
source = require('vinyl-source-stream'),
exec = require('child_process').exec;
exec = require('child_process').exec,
babelify = require('babelify');
var paths = {
js: './javascripts/**/**/*.js'
@ -19,10 +20,8 @@ gulp.task('watch', function () {
});
gulp.task('default', function () {
browserify({
entries: ['javascripts/farm_designer.js'],
extensions: ['.js']
})
browserify('javascripts/farm_designer.js',{debug:true})
.transform(babelify)
.bundle()
.on('error', oops)
.pipe(source('farm-designer.js'))

View File

@ -1,19 +1,20 @@
import React from 'react/addons';
import React from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import { store } from './redux/store';
import { connect } from 'react-redux';
import { DesignerMain } from './menus/designer_main';
function wow(d) {
function mapDispatchToProps(d) {
return {
dispatch: d
};
}
var App = connect(s => s, wow)(DesignerMain);
var App = connect(state => state, mapDispatchToProps)(DesignerMain);
React.render(
ReactDOM.render(
<Provider store={store}>
{() => <App />}
<App />
</Provider>,
document.getElementById('root')
);

View File

@ -1,5 +1,4 @@
import { store } from './store';
import { addons } from 'react/addons';
let actions = {};

View File

@ -31,7 +31,8 @@
"gulp": "^3.9.0",
"gulp-concat": "^2.6.0",
"gulp-util": "^3.0.6",
"react": "^0.13.3",
"react": "^0.14.0",
"react-dom": "^0.14.0",
"react-redux": "^2.1.2",
"reactify": "^1.1.1",
"redux": "^3.0.0",