diff --git a/CHANGELOG.md b/CHANGELOG.md index 0643adc..5f0c4f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # react-webpack-template - Changelog +## 1.5.2: + +1. Updated dependencies to latests (babel-eslint, eslint, karma-mocha-reporter, normalize.css) + ## 1.5.1: 1. Emergency fix for corruct eslint version (2.3 is currently buggy). Fixes https://github.com/newtriks/generator-react-webpack/issues/196 diff --git a/package.json b/package.json index 3f34f66..9a02c93 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "homepage": "https://github.com/weblogixx/react-webpack-template#readme", "devDependencies": { "babel-core": "^6.0.0", - "babel-eslint": "^5.0.0", + "babel-eslint": "^6.0.0", "babel-loader": "^6.0.0", "babel-polyfill": "^6.3.14", "babel-preset-es2015": "^6.0.15", @@ -46,7 +46,7 @@ "chai": "^3.2.0", "copyfiles": "^0.2.1", "css-loader": "^0.23.0", - "eslint": "~2.2.0", + "eslint": "^2.2.0", "eslint-loader": "^1.0.0", "eslint-plugin-react": "^4.0.0", "file-loader": "^0.8.4", @@ -56,7 +56,7 @@ "karma-chai": "^0.1.0", "karma-coverage": "^0.5.3", "karma-mocha": "^0.2.0", - "karma-mocha-reporter": "^1.1.1", + "karma-mocha-reporter": "^2.0.0", "karma-phantomjs-launcher": "^1.0.0", "karma-sourcemap-loader": "^0.3.5", "karma-webpack": "^1.7.0", @@ -75,7 +75,7 @@ }, "dependencies": { "core-js": "^2.0.0", - "normalize.css": "^3.0.3", + "normalize.css": "^4.0.0", "react": "^0.14.0", "react-dom": "^0.14.0" } diff --git a/src/components/Main.js b/src/components/Main.js index 7a477f3..9c404ac 100644 --- a/src/components/Main.js +++ b/src/components/Main.js @@ -1,4 +1,4 @@ -require('normalize.css'); +require('normalize.css/normalize.css'); require('styles/App.css'); import React from 'react';