Skip to content

Commit

Permalink
updates to react 16. adds inline source map
Browse files Browse the repository at this point in the history
  • Loading branch information
minaorangina committed Nov 26, 2017
1 parent 8b35a87 commit 3950375
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 168 deletions.
136 changes: 0 additions & 136 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Run or walk for your transport?",
"main": "start.js",
"engines": {
"node": "8.7.0"
"node": "9.0.0"
},
"scripts": {
"start": "node start.js",
Expand Down Expand Up @@ -42,8 +42,10 @@
"lodash.isequal": "^4.5.0",
"moment": "^2.15.1",
"morgan": "^1.7.0",
"react": "^15.3.2",
"react-dom": "^15.3.2",
"prop-types": "^15.6.0",
"react": "^16.1.1",
"react-dom": "^16.1.1",
"react-hot-loader": "^3.1.3",
"react-redux": "^4.4.5",
"redux": "^3.6.0",
"redux-thunk": "^2.1.0",
Expand All @@ -62,7 +64,6 @@
"jsdom": "^9.8.0",
"mocha": "^3.1.2",
"react-addons-test-utils": "^15.3.2",
"react-hot-loader": "^3.0.0-beta.6",
"tap-spec": "^4.1.1",
"webpack-dev-server": "^2.4.2"
}
Expand Down
26 changes: 19 additions & 7 deletions src/js/app.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { AppContainer } from 'react-hot-loader';
import { Provider } from 'react-redux';
import { store } from './store.js';
import { getArrivals } from './actions.js';
import ArrivalsContainer from './containers/arrivals.js';
import ArrivalsContainer from './containers/arrivals.js';

require('../styles.css');

const { direction } = store.getState();
store.dispatch(getArrivals('train', direction));
store.dispatch(getArrivals('dlr', direction));

ReactDOM.render(
const render = AppRoot => {

<Provider store={ store }>
<ArrivalsContainer />
</Provider>,
document.querySelector(".container")
);
ReactDOM.render(
<Provider store={ store }>
<AppContainer>
<AppRoot />
</AppContainer>
</Provider>,
document.querySelector(".container")
);
};

render(ArrivalsContainer);

// Webpack Hot Module Replacement API
if (module.hot) {
module.hot.accept('./containers/arrivals', () => { render(ArrivalsContainer); });
}
3 changes: 2 additions & 1 deletion src/js/components/arrivals.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import Card from './card';


Expand Down
3 changes: 2 additions & 1 deletion src/js/components/card.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import moment from 'moment';

const normaliseStationName = (stationName, mode) => {
Expand Down
5 changes: 4 additions & 1 deletion webpack.dev.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@ const path = require('path');

module.exports = {
entry: [
"react-hot-loader/patch",
"./src/js/app.js",
"webpack/hot/dev-server",
"webpack-dev-server/client?http://localhost:8080/"
],
entry: './src/js/app.js',
output: {
path: path.resolve(__dirname, 'dist'),
filename: 'bundle.js'
filename: 'bundle.js',
publicPath: "/"
},
devtool: 'inline-source-map',
module: {
rules: [
{ test: /\.js$/, exclude: /node_modules/, use: 'babel-loader' },
Expand Down
35 changes: 17 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

create-react-class@^15.5.1, create-react-class@^15.6.0:
create-react-class@^15.5.1:
version "15.6.2"
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
dependencies:
Expand Down Expand Up @@ -4119,7 +4119,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

prop-types@^15.5.10, prop-types@^15.5.4:
prop-types@^15.5.4, prop-types@^15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
dependencies:
Expand Down Expand Up @@ -4238,18 +4238,18 @@ react-deep-force-update@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz#8ea4263cd6455a050b37445b3f08fd839d86e909"

react-dom@^15.3.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
react-dom@^16.1.1:
version "16.1.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8"
dependencies:
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-hot-loader@^3.0.0-beta.6:
version "3.1.1"
resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.1.1.tgz#e06db8cd0841c41e3ab0b395b2b774126fc8914e"
react-hot-loader@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.1.3.tgz#6f92877326958c7cb0134b512474517869126082"
dependencies:
global "^4.3.0"
react-deep-force-update "^2.1.1"
Expand All @@ -4274,15 +4274,14 @@ react-redux@^4.4.5:
loose-envify "^1.1.0"
prop-types "^15.5.4"

react@^15.3.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
react@^16.1.1:
version "16.1.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f"
dependencies:
create-react-class "^15.6.0"
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"
object-assign "^4.1.1"
prop-types "^15.6.0"

read-pkg-up@^1.0.1:
version "1.0.1"
Expand Down

0 comments on commit 3950375

Please sign in to comment.