Skip to content

Commit

Permalink
version bumps and minor tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
pheuter committed Feb 28, 2016
1 parent 89c2ce9 commit 8a4cabb
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 43 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

Major refactor to bring dependencies up-to-date:

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

Expand Down
4 changes: 2 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "Essential React",
"description": "A minimal skeleton for building testable React apps using ES6",
"description": "A minimal skeleton for building testable React apps using Babel",
"keywords": [
"react",
"es6",
"babel",
"starter"
],
"repository": "https://github.com/pheuter/essential-react",
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@
"homepage": "https://github.com/pheuter/essential-react",
"devDependencies": {
"autoprefixer": "^6.0.2",
"ava": "^0.11.0",
"babel-loader": "^6.2.1",
"babel-plugin-transform-runtime": "^6.4.3",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-0": "^6.3.13",
"babel-register": "^6.4.3",
"ava": "^0.12.0",
"babel-loader": "^6.2.4",
"babel-plugin-transform-runtime": "^6.5.2",
"babel-preset-es2015": "^6.5.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.5.2",
"coveralls": "^2.11.2",
"css-loader": "^0.18.0",
"enzyme": "^1.4.0",
"enzyme": "^2.0.0",
"extract-text-webpack-plugin": "^0.8.2",
"nyc": "^5.3.0",
"nyc": "^5.6.0",
"postcss-loader": "^0.6.0",
"postcss-nested": "^1.0.0",
"react-addons-test-utils": "^0.14.6",
"react-addons-test-utils": "^0.14.7",
"react-hot-loader": "^1.3.0",
"sinon": "^1.17.2",
"style-loader": "^0.12.3",
"webpack": "^1.12.12",
"webpack": "^1.12.14",
"webpack-dev-server": "^1.14.1"
},
"dependencies": {
"babel-core": "^6.4.5",
"babel-polyfill": "^6.3.14",
"babel-runtime": "^6.3.19",
"babel-core": "^6.5.2",
"babel-polyfill": "^6.5.0",
"babel-runtime": "^6.5.0",
"express": "^4.12.3",
"react": "^0.14.6",
"react-dom": "^0.14.6",
"react": "^0.14.7",
"react-dom": "^0.14.7",
"react-router": "^2.0.0"
}
}
18 changes: 9 additions & 9 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var express = require('express');
var app = express();
const express = require('express');
const app = express();


/************************************************************
Expand Down Expand Up @@ -44,9 +44,9 @@ app.get('*', function(req, res) {
*************************************************************/

if (!process.env.PRODUCTION) {
var webpack = require('webpack');
var WebpackDevServer = require('webpack-dev-server');
var config = require('./webpack.local.config');
const webpack = require('webpack');
const WebpackDevServer = require('webpack-dev-server');
const config = require('./webpack.local.config');

new WebpackDevServer(webpack(config), {
publicPath: config.output.publicPath,
Expand All @@ -67,10 +67,10 @@ if (!process.env.PRODUCTION) {
*
*****************/

var port = process.env.PORT || 8080;
var server = app.listen(port, function () {
var host = server.address().address;
var port = server.address().port;
const port = process.env.PORT || 8080;
const server = app.listen(port, function () {
const host = server.address().address;
const port = server.address().port;

console.log('Essential React listening at http://%s:%s', host, port);
});
15 changes: 7 additions & 8 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,27 @@
*/

// Polyfill
import "babel-polyfill";
import 'babel-polyfill';

// Libraries
import React from "react";
import ReactDOM from "react-dom";
import { Router, browserHistory } from "react-router";
import React from 'react';
import ReactDOM from 'react-dom';
import { Router, browserHistory } from 'react-router';

// Routes
import Routes from './common/components/Routes';

// Base styling
import "./common/base.css";
import './common/base.css';


// ID of the DOM element to mount app on
const DOM_APP_EL_ID = "app";


const DOM_APP_EL_ID = 'app';

// Render the router
ReactDOM.render((
<Router history={browserHistory}>
{Routes}
</Router>
), document.getElementById(DOM_APP_EL_ID));

9 changes: 4 additions & 5 deletions src/pages/login/page.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React from "react";
import { browserHistory } from "react-router";
import styles from "./style.css";
import React from 'react';
import { browserHistory } from 'react-router';
import styles from './style.css';


export default class LoginPage extends React.Component {

signUp() {
browserHistory.push("/home");
browserHistory.push('/home');
}

render() {
Expand Down

0 comments on commit 8a4cabb

Please sign in to comment.