Merge pull request #13 from gretzky/gh-pages

Update dependencies
hew · May 3, 2017 · abd71b0 · abd71b0
2 parents 28f1ee7 + cf9a613
commit abd71b0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/dist/react-scroll-horizontal.js b/dist/react-scroll-horizontal.js
@@ -91,7 +91,7 @@ var HorizontalScroll = function (_Component) {
       e.preventDefault();
       // If scrolling on x axis, change to y axis
       // Otherwise just get the y deltas
-      // Basically, this for Apple mice that allow
+      // Basically, this for Apple mice that allow 
       // horizontal scrolling by default
       var rawData = e.deltaY ? e.deltaY : e.deltaX;
       var mouseY = Math.floor(rawData);
@@ -123,11 +123,11 @@ var HorizontalScroll = function (_Component) {
     value: function render() {
       var _this3 = this;
 
-      var _props = this.props;
-      var config = _props.config;
-      var style = _props.style;
-      var width = style.width;
-      var height = style.height;
+      var _props = this.props,
+          config = _props.config,
+          style = _props.style;
+      var width = style.width,
+          height = style.height;
 
       var springConfig = config ? config : _reactMotion.presets.noWobble;
 
@@ -189,4 +189,4 @@ HorizontalScroll.defaultProps = {
   pageLock: false,
   config: null,
   style: { width: '100%', height: '100%' }
-};
+};
diff --git a/package.json b/package.json
@@ -18,28 +18,30 @@
     "react"
   ],
   "devDependencies": {
-    "babel-cli": "^6.5.1",
-    "babel-core": "^6.5.2",
-    "babel-loader": "^6.2.4",
-    "babel-preset-es2015": "^6.5.0",
-    "babel-preset-react": "^6.5.0",
-    "babel-preset-stage-0": "^6.5.0",
-    "babel-register": "^6.5.2",
-    "css-loader": "*",
-    "postcss-loader": "*",
-    "file-loader": "*",
-    "html-loader": "*",
-    "json-loader": "*",
-    "raw-loader": "*",
-    "react": "^15.0.1",
-    "react-dom": "^15.0.0",
-    "react-hot-loader": "^1.3.0",
-    "style-loader": "^0.12.3",
-    "webpack": "2.1.0-beta.17",
-    "webpack-dev-server": "^1.10.1"
+    "babel-cli": "*",
+    "babel-core": "^6.24.1",
+    "babel-loader": "^7.0.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-0": "^6.24.1",
+    "babel-register": "^6.24.1",
+    "css-loader": "^0.28.1",
+    "file-loader": "^0.11.1",
+    "html-loader": "^0.4.5",
+    "json-loader": "^0.5.4",
+    "normalize.css": "^7.0.0",
+    "postcss-loader": "^1.3.3",
+    "raw-loader": "^0.5.1",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
+    "react-hot-loader": "^1.3.1",
+    "react-motion": "^0.5.0",
+    "style-loader": "^0.17.0",
+    "webpack": "^2.4.1",
+    "webpack-dev-server": "^2.4.5"
   },
   "peerDependencies": {
-    "react": "^15.0.0"
+    "react": "^15.5.4"
   },
   "repository": {
     "type": "git",
@@ -57,7 +59,7 @@
     ]
   },
   "dependencies": {
-    "normalize.css": "^4.2.0",
-    "react-motion": "^0.4.4"
+    "normalize.css": "^7.0.0",
+    "react-motion": "^0.5.0"
   }
 }