Skip to content

Commit 8a4cabb

Browse files
committed
version bumps and minor tweaks
1 parent 89c2ce9 commit 8a4cabb

File tree

6 files changed

+41
-43
lines changed

6 files changed

+41
-43
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
Major refactor to bring dependencies up-to-date:
44

5-
- Update React 0.13 -> 0.14
6-
- Update React Router 0.x -> 1.0
7-
- Update Babel 5 -> 6
5+
- Upgrade React 0.13 -> 0.14
6+
- Upgrade React Router 0.x -> 2.0
7+
- Upgrade Babel 5 -> 6
88
- Replace Karma and Istanbul with ava and nyc
99
- No more custom routers
1010

app.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "Essential React",
3-
"description": "A minimal skeleton for building testable React apps using ES6",
3+
"description": "A minimal skeleton for building testable React apps using Babel",
44
"keywords": [
55
"react",
6-
"es6",
6+
"babel",
77
"starter"
88
],
99
"repository": "https://github.com/pheuter/essential-react",

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,34 @@
2929
"homepage": "https://github.com/pheuter/essential-react",
3030
"devDependencies": {
3131
"autoprefixer": "^6.0.2",
32-
"ava": "^0.11.0",
33-
"babel-loader": "^6.2.1",
34-
"babel-plugin-transform-runtime": "^6.4.3",
35-
"babel-preset-es2015": "^6.3.13",
36-
"babel-preset-react": "^6.3.13",
37-
"babel-preset-stage-0": "^6.3.13",
38-
"babel-register": "^6.4.3",
32+
"ava": "^0.12.0",
33+
"babel-loader": "^6.2.4",
34+
"babel-plugin-transform-runtime": "^6.5.2",
35+
"babel-preset-es2015": "^6.5.0",
36+
"babel-preset-react": "^6.5.0",
37+
"babel-preset-stage-0": "^6.5.0",
38+
"babel-register": "^6.5.2",
3939
"coveralls": "^2.11.2",
4040
"css-loader": "^0.18.0",
41-
"enzyme": "^1.4.0",
41+
"enzyme": "^2.0.0",
4242
"extract-text-webpack-plugin": "^0.8.2",
43-
"nyc": "^5.3.0",
43+
"nyc": "^5.6.0",
4444
"postcss-loader": "^0.6.0",
4545
"postcss-nested": "^1.0.0",
46-
"react-addons-test-utils": "^0.14.6",
46+
"react-addons-test-utils": "^0.14.7",
4747
"react-hot-loader": "^1.3.0",
4848
"sinon": "^1.17.2",
4949
"style-loader": "^0.12.3",
50-
"webpack": "^1.12.12",
50+
"webpack": "^1.12.14",
5151
"webpack-dev-server": "^1.14.1"
5252
},
5353
"dependencies": {
54-
"babel-core": "^6.4.5",
55-
"babel-polyfill": "^6.3.14",
56-
"babel-runtime": "^6.3.19",
54+
"babel-core": "^6.5.2",
55+
"babel-polyfill": "^6.5.0",
56+
"babel-runtime": "^6.5.0",
5757
"express": "^4.12.3",
58-
"react": "^0.14.6",
59-
"react-dom": "^0.14.6",
58+
"react": "^0.14.7",
59+
"react-dom": "^0.14.7",
6060
"react-router": "^2.0.0"
6161
}
6262
}

server.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var express = require('express');
2-
var app = express();
1+
const express = require('express');
2+
const app = express();
33

44

55
/************************************************************
@@ -44,9 +44,9 @@ app.get('*', function(req, res) {
4444
*************************************************************/
4545

4646
if (!process.env.PRODUCTION) {
47-
var webpack = require('webpack');
48-
var WebpackDevServer = require('webpack-dev-server');
49-
var config = require('./webpack.local.config');
47+
const webpack = require('webpack');
48+
const WebpackDevServer = require('webpack-dev-server');
49+
const config = require('./webpack.local.config');
5050

5151
new WebpackDevServer(webpack(config), {
5252
publicPath: config.output.publicPath,
@@ -67,10 +67,10 @@ if (!process.env.PRODUCTION) {
6767
*
6868
*****************/
6969

70-
var port = process.env.PORT || 8080;
71-
var server = app.listen(port, function () {
72-
var host = server.address().address;
73-
var port = server.address().port;
70+
const port = process.env.PORT || 8080;
71+
const server = app.listen(port, function () {
72+
const host = server.address().address;
73+
const port = server.address().port;
7474

7575
console.log('Essential React listening at http://%s:%s', host, port);
7676
});

src/main.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,27 @@
33
*/
44

55
// Polyfill
6-
import "babel-polyfill";
6+
import 'babel-polyfill';
77

88
// Libraries
9-
import React from "react";
10-
import ReactDOM from "react-dom";
11-
import { Router, browserHistory } from "react-router";
9+
import React from 'react';
10+
import ReactDOM from 'react-dom';
11+
import { Router, browserHistory } from 'react-router';
1212

1313
// Routes
1414
import Routes from './common/components/Routes';
1515

1616
// Base styling
17-
import "./common/base.css";
17+
import './common/base.css';
1818

1919

2020
// ID of the DOM element to mount app on
21-
const DOM_APP_EL_ID = "app";
22-
23-
21+
const DOM_APP_EL_ID = 'app';
2422

2523
// Render the router
2624
ReactDOM.render((
2725
<Router history={browserHistory}>
2826
{Routes}
2927
</Router>
3028
), document.getElementById(DOM_APP_EL_ID));
29+

src/pages/login/page.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import React from "react";
2-
import { browserHistory } from "react-router";
3-
import styles from "./style.css";
1+
import React from 'react';
2+
import { browserHistory } from 'react-router';
3+
import styles from './style.css';
44

55

66
export default class LoginPage extends React.Component {
7-
87
signUp() {
9-
browserHistory.push("/home");
8+
browserHistory.push('/home');
109
}
1110

1211
render() {

0 commit comments

Comments
 (0)