Skip to content

Commit cd65fec

Browse files
authored
Merge pull request #35 from r-park/dev
chore: misc. updates
2 parents ee0fb75 + 79c7a55 commit cd65fec

File tree

6 files changed

+40
-41
lines changed

6 files changed

+40
-41
lines changed

.babelrc

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,19 @@
22
"presets": [
33
"es2015",
44
"react",
5-
"stage-1"
5+
"stage-0"
66
],
77

88
"plugins": [
9-
"transform-function-bind",
109
"react-hot-loader/babel"
11-
]
10+
],
11+
12+
"env": {
13+
"production": {
14+
"plugins": [
15+
"transform-react-constant-elements",
16+
"transform-react-inline-elements"
17+
]
18+
}
19+
}
1220
}

.eslintrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ rules:
264264
react/no-direct-mutation-state: 2
265265
react/no-is-mounted: 2
266266
react/no-multi-comp: 1
267-
react/no-set-state: 1
267+
react/no-set-state: 0
268268
react/no-string-refs: 2
269269
react/no-unknown-property: 2
270270
react/prefer-es6-class: 2

firebase.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
22
"database": {
3-
"rules": "firebase.rules.json"
3+
"rules": {
4+
"tasks": {
5+
"$uid": {
6+
".read": "auth !== null && auth.uid === $uid",
7+
".write": "auth !== null && auth.uid === $uid"
8+
}
9+
}
10+
}
411
},
512

613
"hosting": {

firebase.rules.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

karma.conf.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ module.exports = config => {
2828

2929
singleRun: false,
3030

31-
customLaunchers: {
32-
TRAVIS_CHROME: {
33-
base: 'Chrome',
34-
flags: ['--no-sandbox']
35-
}
36-
},
37-
38-
browsers: process.env.TRAVIS ? ['TRAVIS_CHROME'] : ['Chrome']
31+
browsers: ['Chrome']
3932
});
4033
};

package.json

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,52 +29,53 @@
2929
},
3030
"devDependencies": {
3131
"autoprefixer": "~6.3.6",
32-
"babel-core": "~6.9.1",
33-
"babel-eslint": "6.0.4",
32+
"babel-core": "~6.10.4",
33+
"babel-eslint": "6.1.0",
3434
"babel-loader": "~6.2.4",
35-
"babel-plugin-transform-function-bind": "~6.8.0",
35+
"babel-plugin-transform-react-constant-elements": "~6.9.1",
36+
"babel-plugin-transform-react-inline-elements": "~6.8.0",
3637
"babel-polyfill": "~6.9.1",
3738
"babel-preset-es2015": "~6.9.0",
38-
"babel-preset-react": "~6.5.0",
39-
"babel-preset-stage-1": "~6.5.0",
39+
"babel-preset-react": "~6.11.1",
40+
"babel-preset-stage-0": "~6.5.0",
4041
"classnames": "~2.2.5",
4142
"cross-env": "~1.0.8",
4243
"css-loader": "~0.23.1",
4344
"del-cli": "~0.2.0",
44-
"eslint": "~2.11.1",
45-
"eslint-plugin-react": "~5.1.1",
46-
"express": "~4.13.4",
45+
"eslint": "~2.13.1",
46+
"eslint-plugin-react": "~5.2.2",
47+
"express": "~4.14.0",
4748
"extract-text-webpack-plugin": "~1.0.1",
48-
"firebase": "~3.0.3",
49+
"firebase": "~3.1.0",
4950
"firebase-tools": "3.0.4",
50-
"html-webpack-plugin": "~2.19.0",
51+
"html-webpack-plugin": "~2.21.0",
5152
"jasmine-core": "~2.4.1",
52-
"karma": "~0.13.22",
53+
"karma": "~1.0.0",
5354
"karma-chrome-launcher": "~1.0.1",
5455
"karma-jasmine": "~1.0.2",
5556
"karma-sourcemap-loader": "~0.3.7",
5657
"karma-webpack": "~1.7.0",
5758
"minx": "~0.4.14",
5859
"morgan": "~1.7.0",
59-
"node-sass": "~3.7.0",
60+
"node-sass": "~3.8.0",
6061
"nodemon": "~1.9.2",
61-
"npm-run-all": "~2.1.1",
62+
"npm-run-all": "~2.3.0",
6263
"postcss-loader": "~0.9.1",
6364
"react": "~15.1.0",
6465
"react-addons-test-utils": "~15.1.0",
6566
"react-dom": "~15.1.0",
6667
"react-hot-loader": "3.0.0-beta.2",
6768
"react-redux": "~4.4.5",
68-
"react-router": "~2.4.1",
69-
"react-router-redux": "~4.0.4",
69+
"react-router": "~2.5.1",
70+
"react-router-redux": "~4.0.5",
7071
"redux": "~3.5.2",
7172
"redux-thunk": "~2.1.0",
72-
"sass-loader": "~3.2.0",
73+
"sass-loader": "~4.0.0",
7374
"sinon": "~1.17.4",
7475
"style-loader": "~0.13.1",
7576
"webpack": "~1.13.1",
7677
"webpack-dev-server": "~1.14.1",
77-
"winston": "~2.2.0",
78-
"webpack-md5-hash": "~0.0.5"
78+
"webpack-md5-hash": "~0.0.5",
79+
"winston": "~2.2.0"
7980
}
8081
}

0 commit comments

Comments
 (0)