From 6ca8951ef4be7b0d423269380cb30e06806b29fa Mon Sep 17 00:00:00 2001 From: Misha Moroshko Date: Tue, 13 Dec 2016 10:48:19 -0800 Subject: [PATCH] Upgrade deps --- .gitignore | 1 - README.md | 3 -- .../ScrollableContainer.js | 1 + .../App/components/Footer/Footer.js | 2 +- .../components/App/components/Header/redux.js | 2 +- package.json | 37 +++++++++---------- test/helpers.js | 2 +- webpack.dev.config.js | 13 +------ 8 files changed, 24 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index fdf7bdeb..8739e838 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ coverage dist demo/dist npm-debug.log -.happypack yarn.lock diff --git a/README.md b/README.md index f2750e76..c0d4023f 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,6 @@ [![bitHound Overall Score](https://www.bithound.io/github/moroshko/react-autosuggest/badges/score.svg)](https://www.bithound.io/github/moroshko/react-autosuggest) [![npms Score](https://badges.npms.io/react.svg?style=flat-square)](https://npms.io/search?q=react-autosuggest) -[![Pull Requests stats](https://img.shields.io/issuestats/p/long/github/moroshko/react-autosuggest.svg?style=flat-square)](http://issuestats.com/github/moroshko/react-autosuggest) -[![Issues stats](https://img.shields.io/issuestats/i/long/github/moroshko/react-autosuggest.svg?style=flat-square)](http://issuestats.com/github/moroshko/react-autosuggest) - [![npm Downloads](https://img.shields.io/npm/dm/react-autosuggest.svg?style=flat-square)](https://npmjs.org/package/react-autosuggest) [![npm Version](https://img.shields.io/npm/v/react-autosuggest.svg?style=flat-square)](https://npmjs.org/package/react-autosuggest) diff --git a/demo/src/components/App/components/Examples/components/ScrollableContainer/ScrollableContainer.js b/demo/src/components/App/components/Examples/components/ScrollableContainer/ScrollableContainer.js index 3002533a..cd1b483b 100644 --- a/demo/src/components/App/components/Examples/components/ScrollableContainer/ScrollableContainer.js +++ b/demo/src/components/App/components/Examples/components/ScrollableContainer/ScrollableContainer.js @@ -121,6 +121,7 @@ export default class ScrollableContainer extends Component { ( href="https://twitter.com/vedranio" underline={false} > - @thatbalduxguy + @vedranio
diff --git a/demo/src/components/App/components/Header/redux.js b/demo/src/components/App/components/Header/redux.js index a8dcbb02..6d2e6253 100644 --- a/demo/src/components/App/components/Header/redux.js +++ b/demo/src/components/App/components/Header/redux.js @@ -3,7 +3,7 @@ import fetch from 'isomorphic-fetch'; const UPDATE_STARGAZERS = 'UPDATE_STARGAZERS'; const initialState = { - stargazers: '1261' + stargazers: '1416' }; export const loadStargazers = () => dispatch => diff --git a/package.json b/package.json index 41b33a70..95cb2f4a 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "react-autowhatever": "^7.0.0", - "react-redux": "^4.4.5", + "react-redux": "^4.4.6", "redux": "^3.6.0", "shallow-equal": "^1.0.0" }, @@ -32,14 +32,14 @@ "react": "^0.14.7 || ^15.0.1" }, "devDependencies": { - "autoprefixer": "^6.5.1", + "autoprefixer": "^6.5.4", "autosuggest-highlight": "^3.1.0", "babel-cli": "^6.18.0", - "babel-core": "^6.18.0", - "babel-eslint": "^7.0.0", - "babel-loader": "^6.2.5", + "babel-core": "^6.20.0", + "babel-eslint": "^7.1.1", + "babel-loader": "^6.2.9", "babel-plugin-react-transform": "^2.0.2", - "babel-plugin-transform-react-remove-prop-types": "^0.2.10", + "babel-plugin-transform-react-remove-prop-types": "^0.2.11", "babel-preset-es2015": "^6.18.0", "babel-preset-react": "^6.16.0", "babel-preset-stage-0": "^6.16.0", @@ -47,26 +47,25 @@ "bithound": "^1.7.0", "chai": "^3.5.0", "cross-env": "^3.1.3", - "css-loader": "^0.25.0", + "css-loader": "^0.26.1", "es6-promise": "^4.0.5", - "eslint": "^3.8.1", - "eslint-plugin-react": "6.3.0", + "eslint": "^3.12.1", + "eslint-plugin-react": "6.8.0", "extract-text-webpack-plugin": "^1.0.1", "file-loader": "^0.9.0", - "happypack": "^2.2.1", "ismobilejs": "^0.4.0", "isomorphic-fetch": "^2.2.1", - "jsdom": "^9.8.2", + "jsdom": "^9.8.3", "less": "^2.7.1", "less-loader": "^2.2.3", - "mocha": "^3.1.2", - "nyc": "^8.3.2", + "mocha": "^3.2.0", + "nyc": "^10.0.0", "openurl": "^1.1.1", - "postcss-loader": "^1.0.0", - "react": "^15.3.2", - "react-addons-test-utils": "^15.3.2", - "react-dom": "^15.3.2", - "react-modal": "^1.5.2", + "postcss-loader": "^1.2.1", + "react": "^15.4.1", + "react-addons-test-utils": "^15.4.1", + "react-dom": "^15.4.1", + "react-modal": "^1.6.3", "react-transform-hmr": "^1.0.4", "redux-thunk": "^2.1.0", "sinon": "^1.17.6", @@ -75,7 +74,7 @@ "svgo": "^0.7.1", "svgo-loader": "^1.1.2", "url-loader": "^0.5.7", - "webpack": "^1.13.2", + "webpack": "^1.14.0", "webpack-dev-server": "^1.16.2" }, "files": [ diff --git a/test/helpers.js b/test/helpers.js index 7acbe968..ed29f4ce 100644 --- a/test/helpers.js +++ b/test/helpers.js @@ -1,7 +1,7 @@ import chai, { expect } from 'chai'; import sinon from 'sinon'; import sinonChai from 'sinon-chai'; -import SyntheticEvent from 'react/lib/SyntheticEvent'; +import SyntheticEvent from 'react-dom/lib/SyntheticEvent'; import TestUtils, { Simulate } from 'react-addons-test-utils'; chai.use(sinonChai); diff --git a/webpack.dev.config.js b/webpack.dev.config.js index 9483fccd..9d60e2eb 100644 --- a/webpack.dev.config.js +++ b/webpack.dev.config.js @@ -2,7 +2,6 @@ var path = require('path'); var webpack = require('webpack'); var autoprefixer = require('autoprefixer'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var HappyPack = require('happypack'); var host = process.env.NODE_HOST || 'localhost'; var port = process.env.NODE_PORT || 3000; @@ -22,7 +21,7 @@ module.exports = { loaders: [ { test: /\.js$/, - loader: 'happypack/loader', + loader: 'babel', include: [ path.join(__dirname, 'src'), // Must be an absolute path path.join(__dirname, 'demo', 'src') // Must be an absolute path @@ -61,14 +60,6 @@ module.exports = { plugins: [ new webpack.HotModuleReplacementPlugin(), - new ExtractTextPlugin('app.css'), - new HappyPack({ - loaders: [ - { - path: path.resolve(__dirname, 'node_modules/babel-loader/index.js'), // Must be an absolute path - query: '?presets[]=es2015,presets[]=stage-0,presets[]=react' - } - ] - }) + new ExtractTextPlugin('app.css') ] };