Skip to content

Commit 1f7d889

Browse files
committed
Merge pull request #3 from combine/feature/update-dependencies
update to node 5, update deps
2 parents 5f5fbbd + 5a1a63e commit 1f7d889

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v4.2.4
1+
v5.5.0

package.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"url": "https://github.com/combine/react-redux-starter.git"
1010
},
1111
"engines": {
12-
"node": "4.2.4",
13-
"npm": "2.14.x"
12+
"node": "5.5.0",
13+
"npm": "3.3.x"
1414
},
1515
"scripts": {
1616
"start": "npm run build:development; npm run start:development:server & npm run start:development:client",
@@ -42,30 +42,30 @@
4242
"eslint": "1.10.3",
4343
"eslint-plugin-react": "3.16.1",
4444
"mocha": "2.4.5",
45-
"react-transform-catch-errors": "1.0.1",
46-
"react-transform-hmr": "1.0.1",
47-
"redbox-react": "1.2.0",
48-
"redux-devtools": "3.0.2",
45+
"react-transform-catch-errors": "1.0.2",
46+
"react-transform-hmr": "1.0.2",
47+
"redbox-react": "1.2.2",
48+
"redux-devtools": "3.1.1",
4949
"redux-devtools-dock-monitor": "1.0.1",
50-
"redux-devtools-log-monitor": "1.0.2",
50+
"redux-devtools-log-monitor": "1.0.4",
5151
"webpack-dev-server": "1.14.1",
5252
"yargs": "3.32.0"
5353
},
5454
"dependencies": {
55-
"babel": "6.3.26",
56-
"babel-core": "6.4.5",
57-
"babel-loader": "6.2.1",
55+
"babel": "6.5.1",
56+
"babel-core": "6.5.1",
57+
"babel-loader": "6.2.2",
5858
"babel-plugin-react-transform": "2.0.0",
59-
"babel-plugin-syntax-class-properties": "6.3.13",
60-
"babel-plugin-syntax-decorators": "6.3.13",
61-
"babel-plugin-syntax-object-rest-spread": "6.3.13",
62-
"babel-plugin-transform-class-properties": "6.4.0",
63-
"babel-plugin-transform-decorators": "6.4.0",
64-
"babel-plugin-transform-object-rest-spread": "6.3.13",
65-
"babel-polyfill": "6.3.14",
66-
"babel-preset-es2015": "6.3.13",
67-
"babel-preset-react": "6.3.13",
68-
"babel-register": "6.4.3",
59+
"babel-plugin-syntax-class-properties": "6.5.0",
60+
"babel-plugin-syntax-decorators": "6.5.0",
61+
"babel-plugin-syntax-object-rest-spread": "6.5.0",
62+
"babel-plugin-transform-class-properties": "6.5.0",
63+
"babel-plugin-transform-decorators": "6.5.0",
64+
"babel-plugin-transform-object-rest-spread": "6.5.0",
65+
"babel-polyfill": "6.5.0",
66+
"babel-preset-es2015": "6.5.0",
67+
"babel-preset-react": "6.5.0",
68+
"babel-register": "6.5.1",
6969
"bootstrap-sass": "3.3.6",
7070
"classnames": "2.2.3",
7171
"compression": "1.6.1",
@@ -78,28 +78,28 @@
7878
"fastclick": "1.0.6",
7979
"file-loader": "0.8.5",
8080
"font-awesome": "4.5.0",
81-
"history": "2.0.0-rc2",
82-
"html-webpack-plugin": "2.7.2",
83-
"include-media": "1.4.1",
81+
"history": "2.0.0",
82+
"html-webpack-plugin": "2.8.1",
83+
"include-media": "1.4.2",
8484
"isomorphic-fetch": "2.2.1",
8585
"json-loader": "0.5.4",
86-
"lodash": "4.1.0",
86+
"lodash": "4.3.0",
8787
"node-sass": "3.4.2",
8888
"react": "0.14.7",
8989
"react-dom": "0.14.7",
90-
"react-redux": "4.1.2",
91-
"react-router": "2.0.0-rc5",
92-
"react-router-redux": "2.1.0",
93-
"redux": "3.1.4",
90+
"react-redux": "4.4.0",
91+
"react-router": "2.0.0",
92+
"react-router-redux": "3.0.0",
93+
"redux": "3.3.1",
9494
"redux-localstorage": "0.4.0",
9595
"redux-thunk": "1.0.3",
96-
"reselect": "2.0.2",
96+
"reselect": "2.0.3",
9797
"sass-loader": "3.1.2",
9898
"serve-static": "1.10.2",
9999
"style-loader": "0.13.0",
100100
"url-loader": "0.5.7",
101-
"webpack": "1.12.12",
101+
"webpack": "1.12.13",
102102
"webpack-isomorphic-tools": "2.2.26",
103-
"webpack-sources": "0.1.0"
103+
"webpack-sources": "0.1.1"
104104
}
105105
}

0 commit comments

Comments
 (0)