Skip to content

Commit

Permalink
Update all devDependencies (fixes travis build issues)
Browse files Browse the repository at this point in the history
  • Loading branch information
developit committed Apr 14, 2016
1 parent 49bdc57 commit ee4c47d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 13 deletions.
21 changes: 17 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
{
"parser": "babel-eslint",
"extends": "eslint:recommended",
"plugins": [
"react"
],
"env": {
"browser": true
"browser": true,
"mocha": true,
"es6": true
},
"ecmaFeatures": {
"modules": true,
"jsx": true
"parserOptions": {
"ecmaFeatures": {
"modules": true,
"jsx": true
}
},
"globals": {
"sinon": true,
"expect": true
},
"rules": {
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"no-empty": 0,
"no-console": 0,
"no-unused-vars": [0, { "varsIgnorePattern": "^h$" }],
Expand Down
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,39 +39,40 @@
},
"devDependencies": {
"babel-core": "^6.5.2",
"babel-eslint": "^5.0.0",
"babel-eslint": "^6.0.2",
"babel-loader": "^6.2.3",
"babel-plugin-transform-class-properties": "^6.5.2",
"babel-plugin-transform-es2015-classes": "^6.5.2",
"babel-plugin-transform-object-rest-spread": "^6.3.13",
"babel-plugin-transform-object-rest-spread": "^6.6.5",
"babel-plugin-transform-react-jsx": "^6.5.2",
"babel-preset-es2015": "^6.5.0",
"babel-preset-es2015": "^6.6.0",
"babel-preset-es2015-loose": "^7.0.0",
"babel-preset-es2015-loose-rollup": "^7.0.0",
"babel-preset-stage-0": "^6.5.0",
"chai": "^3.5.0",
"eslint": "^2.2.0",
"eslint-plugin-react": "^4.3.0",
"gzip-size-cli": "^1.0.0",
"karma": "^0.13.21",
"karma-chai": "^0.1.0",
"karma-chai-sinon": "^0.1.5",
"karma-mocha": "^0.2.2",
"karma-mocha-reporter": "^1.2.1",
"karma-mocha-reporter": "^2.0.0",
"karma-phantomjs-launcher": "^1.0.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^1.7.0",
"mkdirp": "^0.5.1",
"mocha": "^2.4.5",
"npm-run-all": "^1.5.1",
"npm-run-all": "^1.7.0",
"phantomjs": "^2.1.3",
"phantomjs-prebuilt": "^2.1.4",
"preact": "^3.4.0",
"preact-jsx-chai": "^1.1.1",
"preact": "^4.6.2",
"preact-jsx-chai": "^1.4.1",
"pretty-bytes-cli": "^1.0.0",
"rollup": "^0.25.4",
"rollup-plugin-babel": "^2.4.0",
"rollup-plugin-commonjs": "^2.2.1",
"rollup-plugin-node-resolve": "^1.4.0",
"rollup-plugin-node-resolve": "^1.5.0",
"sinon": "^1.17.2",
"sinon-chai": "^2.8.0",
"uglify-js": "^2.6.2",
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ export class Navigation extends MaterialComponent {
component = 'navigation';
nodeName = 'nav';
propClassMapping = {
'large-screen-only': 'layout--large-screen-only'
'large-screen-only': 'layout--large-screen-only'
}

mdlRender(props, state) {
Expand Down

0 comments on commit ee4c47d

Please sign in to comment.