Skip to content

Commit

Permalink
Merge pull request #71 from smashingboxes/feature/upgrade-babel-relat…
Browse files Browse the repository at this point in the history
…ed-packages

Update: Upgrade NPM packages, babel-related, axios, etc.
  • Loading branch information
leeallen337 authored Feb 14, 2018
2 parents 465499b + 913dc68 commit f193671
Show file tree
Hide file tree
Showing 3 changed files with 563 additions and 574 deletions.
21 changes: 9 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
},
"homepage": "https://github.com/smashingboxes/web-boilerplate#readme",
"dependencies": {
"axios": "^0.15.3",
"axios": "^0.17.1",
"es6-promise": "^4.2.4",
"keymirror": "^0.1.1",
"normalize.css": "^5.0.0",
"prop-types": "^15.6.0",
Expand All @@ -43,21 +44,20 @@
"sanitize.css": "^4.1.0"
},
"devDependencies": {
"babel-core": "^6.21.0",
"babel-loader": "^6.4.1",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.16.0",
"babel-preset-stage-2": "^6.18.0",
"babel-register": "^6.18.0",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"babel-register": "^6.26.0",
"chai": "^3.5.0",
"chai-enzyme": "^0.6.1",
"cheerio": "^0.22.0",
"clean-webpack-plugin": "^0.1.14",
"css-loader": "^0.28.1",
"enzyme": "^2.7.0",
"es6-promise": "^4.0.5",
"eslint": "^3.12.2",
"eslint-config-smashing-boxes": "^1.1.0",
"eslint-config-smashing-boxes": "^2.0.0",
"eslint-friendly-formatter": "^2.0.6",
"eslint-loader": "^1.6.1",
"eslint-plugin-react": "^6.8.0",
Expand All @@ -66,8 +66,6 @@
"file-loader": "^0.9.0",
"html-webpack-plugin": "^2.30.1",
"inline-manifest-webpack-plugin": "^3.0.1",
"json-loader": "^0.5.4",
"lolex": "^1.5.2",
"mocha": "^3.2.0",
"postcss-apply": "^0.4.0",
"postcss-assets": "^4.1.0",
Expand All @@ -79,7 +77,6 @@
"postcss-reporter": "^3.0.0",
"precss": "^1.4.0",
"react-addons-test-utils": "^15.4.1",
"resolve-url-loader": "^1.6.1",
"sinon": "^1.17.6",
"sinon-chai": "^2.8.0",
"style-loader": "^0.13.1",
Expand Down
1 change: 1 addition & 0 deletions src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'es6-promise/auto';
import React from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
Expand Down
Loading

0 comments on commit f193671

Please sign in to comment.