Merge pull request #104 from ganderzz/feature/#99

Remove create-react-context and start v3.0.0 development

Author: ganderzz

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Dylan
+Copyright (c) 2017 Dylan Paulus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

config/webpack.config.js

@@ -15,7 +15,7 @@ module.exports = {
   context: path.resolve(__dirname, ".."),
   resolve: {
     modules: [path.resolve(__dirname, "..", "src"), "node_modules"],
-    extensions: [".js", ".jsx"]
+    extensions: [".js", ".jsx", ".ts", ".tsx"]
   },
   externals: [
     {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-scroll-to",
-  "version": "2.0.9",
+  "version": "3.0.0-beta.1",
   "description": "Scroll to a position using react",
   "main": "./dist/react-scroll-to.js",
   "types": "./dist/definitions",
@@ -15,23 +15,6 @@
     "storybook": "start-storybook -p 9001 -c .storybook",
     "build:docs": "build-storybook -c .storybook -o docs"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ganderzz/react-scroll-to.git"
-  },
-  "keywords": [
-    "react",
-    "scroll",
-    "to",
-    "window",
-    "position"
-  ],
-  "author": "Dylan Paulus",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ganderzz/react-scroll-to/issues"
-  },
-  "homepage": "https://github.com/ganderzz/react-scroll-to#readme",
   "peerDepedencies": {
     "react": ">= ^16.0.0"
   },
@@ -41,17 +24,18 @@
     "@babel/preset-env": "7.4.5",
     "@babel/preset-react": "7.0.0",
     "@storybook/react": "5.0.11",
-    "all-contributors-cli": "6.6.0",
+    "@testing-library/react": "^8.0.1",
+    "all-contributors-cli": "6.6.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "24.8.0",
     "babel-loader": "8.0.6",
-    "copy-webpack-plugin": "4.6.0",
+    "copy-webpack-plugin": "5.0.3",
     "enzyme": "3.7.0",
     "enzyme-adapter-react-16": "1.6.0",
     "eslint": "5.16.0",
     "eslint-config-airbnb": "17.1.0",
     "eslint-config-prettier": "4.3.0",
-    "eslint-plugin-import": "2.17.2",
+    "eslint-plugin-import": "2.17.3",
     "eslint-plugin-jsx-a11y": "6.2.1",
     "eslint-plugin-react": "7.13.0",
     "husky": "2.3.0",
@@ -60,11 +44,28 @@
     "prettier": "1.17.1",
     "react": "16.8.6",
     "react-dom": "16.8.6",
-    "react-testing-library": "7.0.1",
-    "ts-loader": "^6.0.1",
+    "ts-loader": "6.0.2",
+    "typescript": "^3.5.1",
     "webpack": "4.32.1",
     "webpack-cli": "3.3.2"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ganderzz/react-scroll-to.git"
+  },
+  "keywords": [
+    "react",
+    "scroll",
+    "to",
+    "window",
+    "position"
+  ],
+  "author": "Dylan Paulus",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ganderzz/react-scroll-to/issues"
+  },
+  "homepage": "https://github.com/ganderzz/react-scroll-to#readme",
   "jest": {
     "setupFiles": [
       "./src/tests/setup/shim.js",
@@ -96,8 +97,5 @@
     "hooks": {
       "pre-commit": "lint-staged"
     }
-  },
-  "dependencies": {
-    "create-react-context": "^0.2.3"
   }
 }

src/ScrollTo.jsx

@@ -1,12 +1,9 @@
 import React, { Component, isValidElement } from "react";
 import ReactDOM from "react-dom";
 import { relative } from "./utilities/relative";
-import createReactContext from "create-react-context";
 
 /* istanbul ignore next */
-export const ScrollToContext = React.createContext
-  ? React.createContext({}) /* istanbul ignore next */
-  : createReactContext({});
+export const ScrollToContext = React.createContext({});
 
 /**
  * Component that uses render props to inject

src/tests/ScrollArea.spec.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { render } from "react-testing-library";
+import { render } from "@testing-library/react";
 import { ScrollToContext } from "../ScrollTo";
 import ScrollArea, { createRefPoly } from "../ScrollArea";
 

src/tests/ScrollTo.spec.jsx

@@ -1,7 +1,6 @@
 import React from "react";
-import { render, cleanup, fireEvent } from "react-testing-library";
+import { render, cleanup, fireEvent } from "@testing-library/react";
 import { shallow } from "enzyme";
-import createReactContext from "create-react-context";
 import ScrollTo from "../ScrollTo";
 
 afterEach(cleanup);
@@ -255,7 +254,7 @@ describe("Test render prop.", () => {
   });
 
   it("Should handle using the relative() function", () => {
-    const refDOM = React.createRef ? React.createRef() : createReactContext();
+    const refDOM = React.createRef();
     const { getByText } = render(
       <ScrollTo>
         {({ scrollTo, relative }) => (

src/tests/ScrollToHOC.spec.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { render, fireEvent, cleanup } from "react-testing-library";
+import { render, fireEvent, cleanup } from "@testing-library/react";
 import ScrollToHOC from "../ScrollToHOC";
 
 afterAll(cleanup);