Merge pull request #53 from ganderzz/feature/cleanup-and-address-depencencies

Code cleanup & address dependencies

Author: ganderzz

package-lock.json

@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "all-contributors-cli": "^4.11.1",
-    "babel-core": "^6.26.0",
+    "babel-core": "^6.26.3",
     "babel-jest": "^22.4.3",
     "babel-loader": "^7.1.4",
     "babel-preset-env": "^1.6.1",
@@ -53,27 +53,26 @@
     "eslint-plugin-react": "^7.7.0",
     "husky": "^0.14.3",
     "jest": "^22.4.3",
-    "lint-staged": "^7.0.4",
+    "lint-staged": "^7.0.5",
     "prettier": "1.12.1",
     "react": "^16.3.2",
     "react-dom": "^16.3.2",
     "react-test-renderer": "^16.3.2",
     "webpack": "^4.6.0",
-    "webpack-cli": "^2.0.14"
+    "webpack-cli": "^2.0.15"
   },
   "dependencies": {
-    "prop-types": "^15.6.1",
-    "react-display-name": "^0.2.4"
+    "prop-types": "^15.6.1"
   },
   "jest": {
     "setupFiles": [
-      "./src/shim.js",
-      "./src/setupTests.js"
+      "./src/tests/setup/shim.js",
+      "./src/tests/setup/setupTests.js"
     ],
     "collectCoverageFrom": [
       "src/*.{js,jsx}",
       "!src/{setupTests,shim}.js",
-      "!src/index.jsx"
+      "!src/index.{js,jsx}"
     ],
     "coverageThreshold": {
       "global": {

package.json

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
-import generateId from "./generateId";
+import generateId from "./utilities/generateId";
 
 class ScrollArea extends Component {
   componentDidMount() {

src/ScrollArea.jsx

@@ -1,6 +1,6 @@
 import { Component } from "react";
 import PropTypes from "prop-types";
-import scrollWindow from "./scrollWindow";
+import scrollWindow from "./utilities/scrollWindow";
 
 /**
  * Component that uses render props to inject

src/ScrollTo.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import getDisplayName from "react-display-name";
+import getDisplayName from "./utilities/getDisplayName";
 import ScrollTo from "./ScrollTo";
 
 /**

src/ScrollToHOC.jsx

@@ -0,0 +1,3 @@
+export { ScrollTo } from "./ScrollTo";
+export { ScrollArea } from "./ScrollArea";
+export { ScrollToHOC } from "./ScrollToHOC";

src/index.js

@@ -2,7 +2,7 @@ import React from "react";
 import { mount } from "enzyme";
 import toJSON from "enzyme-to-json";
 import ScrollArea from "../ScrollArea";
-jest.mock("../generateId", () => () => "mock-id");
+jest.mock("../utilities/generateId", () => () => "mock-id");
 
 describe("Test Scroll Area.", () => {
   it("should call addScrollArea when mounting.", () => {

src/index.jsx

@@ -1,4 +1,4 @@
-import generateId from "../generateId";
+import generateId from "../utilities/generateId";
 
 it("should return a unique ID whenever it is called", () => {
   expect(generateId()).toEqual("scrollto-0");