Skip to content

Commit 95e2312

Browse files
committed
Update to React 0.14 and babel-loader.
1 parent b6b78dd commit 95e2312

File tree

8 files changed

+28
-24
lines changed

8 files changed

+28
-24
lines changed

app.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var express = require('express');
22
var path = require('path');
3-
var favicon = require('static-favicon');
3+
var favicon = require('serve-favicon');
44
var logger = require('morgan');
55
var cookieParser = require('cookie-parser');
66
var bodyParser = require('body-parser');
@@ -13,10 +13,10 @@ var app = express();
1313
app.set('views', path.join(__dirname, 'views'));
1414
app.set('view engine', 'jade');
1515

16-
app.use(favicon());
16+
app.use(favicon(__dirname + '/public/favicon.ico'));
1717
app.use(logger('dev'));
1818
app.use(bodyParser.json());
19-
app.use(bodyParser.urlencoded());
19+
app.use(bodyParser.urlencoded({extended: true}));
2020
app.use(cookieParser());
2121
app.use(express.static(path.join(__dirname, 'public')));
2222

bin/www

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ var app = require('../app');
55
app.set('port', process.env.PORT || 3000);
66

77
var server = app.listen(app.get('port'), function() {
8-
debug('Express server listening on port ' + server.address().port);
8+
console.log('Express server listening on port ' + server.address().port);
99
});

package.json

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
{
22
"name": "webpack-react-express",
3-
"version": "0.0.1",
3+
"version": "0.2.0",
44
"private": true,
55
"dependencies": {
6-
"flux": "^2.0.1",
7-
"react": "^0.13.2"
6+
"flux": "^2.1.1",
7+
"react": "^0.14.7",
8+
"react-dom": "^0.14.7"
89
},
910
"devDependencies": {
10-
"express": "~4.12.3",
11-
"static-favicon": "~1.0.0",
12-
"morgan": "~1.5.2",
13-
"cookie-parser": "~1.3.4",
11+
"babel-core": "^6.5.1",
12+
"babel-loader": "^6.2.2",
13+
"babel-preset-es2015": "^6.5.0",
14+
"babel-preset-react": "^6.5.0",
1415
"body-parser": "~1.12.3",
16+
"cookie-parser": "~1.3.4",
1517
"debug": "~2.1.3",
18+
"express": "~4.12.3",
1619
"jade": "~1.9.2",
20+
"morgan": "~1.5.2",
21+
"serve-favicon": "^2.3.0",
1722
"statics": "~0.1.0",
18-
"webpack": "^1.8.9",
19-
"jsx-loader": "^0.13.1"
23+
"webpack": "^1.12.13"
2024
},
2125
"main": "./index.js",
2226
"scripts": {

public/favicon.ico

14.7 KB
Binary file not shown.

src/components/TestComponent.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/** @jsx React.DOM */
2-
var React = require('react');
1+
var React = require('react');
32

43
var TestComponent = React.createClass({
54
render: function() {

src/index.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/** @jsx React.DOM */
2-
var React = require('react');
3-
var TestComponent = require('./components/TestComponent.jsx');
1+
var React = require('react'),
2+
ReactDOM = require('react-dom'),
3+
TestComponent = require('./components/TestComponent.jsx');
44

5-
React.render(
5+
ReactDOM.render(
66
<TestComponent/>,
77
document.getElementById("react-container")
88
);

src/other.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
/** @jsx React.DOM */
2-
var React = require('react');
1+
var React = require('react'),
2+
ReactDOM = require('react-dom');
3+
34

45
var AnotherComponent = React.createClass({
56
render: function() {
@@ -10,7 +11,7 @@ var AnotherComponent = React.createClass({
1011
});
1112

1213

13-
React.render(
14+
ReactDOM.render(
1415
<AnotherComponent/>,
1516
document.getElementById("react-container")
1617
);

webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ module.exports = {
1919
},
2020
module: {
2121
loaders: [
22-
{test: /\.jsx$/, loader: 'jsx-loader?harmony'},
23-
{test: /\.js$/ , loader: 'jsx-loader?harmony'}
22+
{test: /\.jsx$/, loader: 'babel', exclude: /(node_modules|bower_components)/, query: { presets: ['react', 'es2015'] }},
23+
{test: /\.js$/, loader: 'babel', exclude: /(node_modules|bower_components)/, query: { presets: ['react', 'es2015'] }},
2424
]
2525
},
2626
plugins: [

0 commit comments

Comments
 (0)