Skip to content

Commit 5b0f265

Browse files
committed
chore: upgraded libs, bumped version to 3.9.0
1 parent c90d526 commit 5b0f265

File tree

3 files changed

+38
-36
lines changed

3 files changed

+38
-36
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ I prefer to keep this setup trim but feel free to sprinkle some more pixie dust
2020
* Style guide: [JS Standard Style](docs/style-guide.md)
2121
* Docker - build & launch your project - [Instructions](docs/docker.md)
2222
* Development: HMR (Hot Module Replacement) for both client & server
23+
* HTTPS & HTTP2
2324
* Production ready
2425
* Miscellaneous features: react-router-transition, react-jsonschema-form, pre-git, bunyan, mustache, GA tracking code, etc.
2526

package.json

+35-33
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "react-setup",
33
"description": "A Universal React setup with i18n: Babel 6, Koa 2, React, React Router, React Transmit, React Bootstrap, React-intl, Mocha, Webpack HMR, PostCSS, ESLint.",
4-
"version": "3.8.0",
4+
"version": "3.9.0",
55
"author": "Duc Nguyen (https://github.com/ngduc)",
66
"license": "MIT",
77
"homepage": "https://github.com/ngduc/react-setup",
@@ -48,87 +48,89 @@
4848
"commit": "commit-wizard"
4949
},
5050
"dependencies": {
51-
"autoprefixer": "^6.5.1",
51+
"autoprefixer": "^6.5.3",
5252
"babel": "^6.5.2",
53-
"babel-cli": "^6.16.0",
54-
"babel-core": "^6.17.0",
55-
"babel-eslint": "^7.0.0",
56-
"babel-loader": "^6.2.5",
53+
"babel-cli": "^6.18.0",
54+
"babel-core": "^6.18.2",
55+
"babel-eslint": "^7.1.1",
56+
"babel-loader": "^6.2.7",
5757
"babel-plugin-react-intl": "^2.2.0",
5858
"babel-polyfill": "^6.16.0",
59-
"babel-preset-es2015": "^6.16.0",
59+
"babel-preset-es2015": "^6.18.0",
6060
"babel-preset-react": "^6.16.0",
6161
"babel-preset-react-hmre": "^1.1.1",
6262
"babel-preset-stage-0": "^6.16.0",
6363
"bootstrap": "^3.3.7",
64-
"bunyan": "^1.8.1",
64+
"bunyan": "^1.8.5",
6565
"classnames": "^2.2.5",
6666
"concurrently": "^3.1.0",
67-
"copy-webpack-plugin": "^3.0.1",
68-
"css-loader": "^0.25.0",
67+
"copy-webpack-plugin": "^4.0.1",
68+
"css-loader": "^0.26.0",
6969
"extract-text-webpack-plugin": "^2.0.0-beta",
7070
"fetch-plus": "^3.10.4",
7171
"fetch-plus-bearerauth": "^3.10.4",
7272
"fetch-plus-json": "^3.10.4",
73-
"forever": "^0.15.2",
73+
"forever": "^0.15.3",
7474
"glob": "^7.1.1",
75-
"html-webpack-plugin": "^2.22.0",
76-
"http2": "3.3.6",
75+
"html-webpack-plugin": "^2.24.1",
76+
"http2": "3.3.4",
7777
"intl": "^1.2.5",
7878
"intl-locales-supported": "^1.0.0",
7979
"intl-messageformat-parser": "^1.2.0",
8080
"isomorphic-fetch": "^2.2.1",
8181
"json-loader": "^0.5.4",
82-
"just-wait": "^1.0.5",
82+
"just-wait": "^1.0.9",
8383
"koa": "2.0.0",
84-
"koa-better-body": "^2.0.1",
84+
"koa-better-body": "~2.0.1",
8585
"koa-bodyparser": "^3.0",
8686
"koa-compose": "^3.0.0",
8787
"koa-compress": "^2.0.0",
8888
"koa-convert": "^1.2",
8989
"koa-passport": "^2.0",
9090
"koa-router": "^7.0.1",
91-
"koa-session": "^3.3.1",
91+
"koa-session": "^3.4.0",
9292
"koa-static-cache": "^3.1.7",
9393
"mkdirp": "^0.5.1",
94-
"mustache": "^2.2.1",
94+
"mousetrap": "^1.6.0",
95+
"mustache": "^2.3.0",
9596
"postcss-cssnext": "^2.8.0",
96-
"postcss-import": "8.1.0",
97-
"postcss-loader": "^0.13.0",
98-
"postcss-mixins": "^5.3.0",
97+
"postcss-import": "8.0.2",
98+
"postcss-loader": "^1.1.1",
99+
"postcss-mixins": "^5.4.0",
99100
"postcss-nested": "^1.0.0",
100101
"postcss-simple-vars": "^3.0.0",
101-
"react": "^15.3.2",
102-
"react-addons-css-transition-group": "^15.3.2",
103-
"react-addons-test-utils": "^15.3.2",
104-
"react-bootstrap": "^0.30.5",
105-
"react-dom": "^15.3.2",
102+
"react": "^15.4.0",
103+
"react-addons-css-transition-group": "^15.4.0",
104+
"react-addons-test-utils": "^15.4.0",
105+
"react-addons-update": "^15.4.0",
106+
"react-bootstrap": "^0.30.6",
107+
"react-dom": "^15.4.0",
106108
"react-inline-css": "^2.3.0",
107109
"react-intl": "^2.1.5",
108-
"react-jsonschema-form": "^0.40.0",
110+
"react-jsonschema-form": "^0.41.1",
109111
"react-motion": "^0.4.5",
110-
"react-router": "^2.8.1",
112+
"react-router": "^3.0.0",
111113
"react-router-transition": "^0.0.6",
112114
"react-transmit": "^3.2.0",
113115
"serialize-javascript": "^1.3.0",
114116
"style-loader": "^0.13.1",
115117
"webpack": "2.1.0-beta.22",
118+
"webpack-dev-server": "2.1.0-beta.9",
116119
"webpack-node-externals": "^1.5.4"
117120
},
118121
"devDependencies": {
119122
"chai": "^3.5.0",
120-
"eslint": "^3.7.1",
123+
"eslint": "^3.10.2",
121124
"eslint-plugin-jsdoc": "^2.3.1",
122-
"eslint-plugin-react": "^6.4.1",
125+
"eslint-plugin-react": "^6.7.1",
123126
"isparta": "^4.0.0",
124-
"jsdom": "^9.6.0",
127+
"jsdom": "^9.8.3",
125128
"mocha": "^3.1.2",
126-
"pre-git": "^3.10.0",
129+
"pre-git": "^3.11.0",
127130
"react-proxy": "^1.1.8",
128131
"sinon": "^1.17.6",
129132
"sinon-chai": "^2.8.0",
130-
"teaspoon": "^6.4.1",
131-
"webpack-dev-server": "^2.1.0-beta"
133+
"teaspoon": "^6.4.1"
132134
},
133135
"engines": {
134136
"node": ">=4.4.0"

src/utils/Utils.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default class Utils {
55
* Find a parent element by traversing up.
66
* @param {Object} child - DOM element.
77
* @param {string} selector - Selector to find parent. e.g. '#id123' or '.content' or 'div'.
8-
* @returns {Object} - Return parent dom element.
8+
* @returns {Object} - Return parent dom element (return itself if it satisfies the selector).
99
*/
1010
static findParentByChild (child, selector) {
1111
let el = child
@@ -14,7 +14,6 @@ export default class Utils {
1414
if (isId || isClassName) {
1515
selector = selector.slice(1)
1616
}
17-
el = el.parentElement
1817
while (el) {
1918
const classes = el.getAttribute('class')
2019
if ((isId && el.getAttribute('id') === selector) ||
@@ -86,7 +85,7 @@ export default class Utils {
8685
/**
8786
* Helper function to wrap Component with Transmit Container to fetch fragments for server rendering.
8887
* @param {Class} Component - Component to wrap.
89-
* @param {Array} fragmentArr - Array of fragments which declare functions to fetch data.
88+
* @param {Array} fragmentObj - Object of fragments which declare functions to fetch data.
9089
* @returns {Object} - Transmit Container.
9190
*/
9291
static createTransmitContainer (Component, fragmentObj) {

0 commit comments

Comments
 (0)