Merge pull request #78 from 4Catalyzer/update-deps

Update dependencies
4Catalyzer · Apr 10, 2017 · a92e476 · a92e476
2 parents f094b36 + 6a52c03
commit a92e476
Show file tree

Hide file tree

Showing 25 changed files with 152 additions and 132 deletions.
diff --git a/examples/basic-jsx/package.json b/examples/basic-jsx/package.json
@@ -3,12 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.7.0"
+    "react-scripts": "0.9.5"
   },
   "dependencies": {
     "found": "../..",
-    "react": "^15.3.2",
-    "react-dom": "^15.3.2"
+    "prop-types": "^15.5.6",
+    "react": "^15.5.3",
+    "react-dom": "^15.5.3"
   },
   "scripts": {
     "start": "react-scripts start"

diff --git a/examples/basic-jsx/src/index.js b/examples/basic-jsx/src/index.js
@@ -3,6 +3,7 @@ import Link from 'found/lib/Link';
 import makeRouteConfig from 'found/lib/jsx/makeRouteConfig';
 import Redirect from 'found/lib/jsx/Redirect';
 import Route from 'found/lib/jsx/Route';
+import PropTypes from 'prop-types';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
@@ -19,7 +20,7 @@ function LinkItem(props) {
 }
 
 const propTypes = {
-  children: React.PropTypes.node,
+  children: PropTypes.node,
 };
 
 function App({ children }) {
@@ -85,7 +86,7 @@ const BrowserRouter = createBrowserRouter({
         from="baz"
         to="/foo"
       />
-    </Route>
+    </Route>,
   ),
 
   renderError: ({ error }) => ( // eslint-disable-line react/prop-types

diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -3,12 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.7.0"
+    "react-scripts": "0.9.5"
   },
   "dependencies": {
     "found": "../..",
-    "react": "^15.3.2",
-    "react-dom": "^15.3.2"
+    "prop-types": "^15.5.6",
+    "react": "^15.5.3",
+    "react-dom": "^15.5.3"
   },
   "scripts": {
     "start": "react-scripts start"

diff --git a/examples/basic/src/index.js b/examples/basic/src/index.js
@@ -1,6 +1,7 @@
 import createBrowserRouter from 'found/lib/createBrowserRouter';
 import Link from 'found/lib/Link';
 import Redirect from 'found/lib/Redirect';
+import PropTypes from 'prop-types';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
@@ -17,7 +18,7 @@ function LinkItem(props) {
 }
 
 const propTypes = {
-  children: React.PropTypes.node,
+  children: PropTypes.node,
 };
 
 function App({ children }) {

diff --git a/examples/global-pending/package.json b/examples/global-pending/package.json
@@ -3,12 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.7.0"
+    "react-scripts": "0.9.5"
   },
   "dependencies": {
     "found": "../..",
-    "react": "^15.3.2",
-    "react-dom": "^15.3.2",
+    "prop-types": "^15.5.6",
+    "react": "^15.5.3",
+    "react-dom": "^15.5.3",
     "react-static-container": "^1.0.1"
   },
   "scripts": {

diff --git a/examples/global-pending/src/index.js b/examples/global-pending/src/index.js
@@ -1,6 +1,7 @@
 import createBrowserRouter from 'found/lib/createBrowserRouter';
 import ElementsRenderer from 'found/lib/ElementsRenderer';
 import Link from 'found/lib/Link';
+import PropTypes from 'prop-types';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import StaticContainer from 'react-static-container';
@@ -18,7 +19,7 @@ function LinkItem(props) {
 }
 
 const propTypes = {
-  children: React.PropTypes.node,
+  children: PropTypes.node,
 };
 
 function App({ children }) {

diff --git a/examples/redux/package.json b/examples/redux/package.json
@@ -3,14 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.9.0"
+    "react-scripts": "0.9.5"
   },
   "dependencies": {
     "farce": "^0.2.1",
     "found": "../..",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "react-redux": "^5.0.2",
+    "prop-types": "^15.5.6",
+    "react": "^15.5.3",
+    "react-dom": "^15.5.3",
+    "react-redux": "^5.0.4",
     "redux": "^3.6.0"
   },
   "scripts": {

diff --git a/examples/redux/src/index.js b/examples/redux/src/index.js
@@ -1,5 +1,3 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
 import FarceActions from 'farce/lib/Actions';
 import BrowserProtocol from 'farce/lib/BrowserProtocol';
 import createHistoryEnhancer from 'farce/lib/createHistoryEnhancer';
@@ -12,6 +10,9 @@ import Matcher from 'found/lib/Matcher';
 import resolveElements from 'found/lib/resolveElements';
 import Redirect from 'found/lib/Redirect';
 import Link from 'found/lib/Link';
+import PropTypes from 'prop-types';
+import React from 'react';
+import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
 import { combineReducers, compose, createStore } from 'redux';
 
@@ -28,7 +29,7 @@ function LinkItem(props) {
 }
 
 const propTypes = {
-  children: React.PropTypes.node,
+  children: PropTypes.node,
 };
 
 function App({ children }) {

diff --git a/examples/transition-hook/package.json b/examples/transition-hook/package.json
@@ -3,12 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.7.0"
+    "react-scripts": "0.9.5"
   },
   "dependencies": {
     "found": "../..",
-    "react": "^15.3.2",
-    "react-dom": "^15.3.2"
+    "prop-types": "^15.5.6",
+    "react": "^15.5.3",
+    "react-dom": "^15.5.3"
   },
   "scripts": {
     "start": "react-scripts start"

diff --git a/examples/transition-hook/src/index.js b/examples/transition-hook/src/index.js
@@ -1,6 +1,7 @@
 import createBrowserRouter from 'found/lib/createBrowserRouter';
 import { routerShape } from 'found/lib/PropTypes';
 import Link from 'found/lib/Link';
+import PropTypes from 'prop-types';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
@@ -17,7 +18,7 @@ function LinkItem(props) {
 }
 
 const appPropTypes = {
-  children: React.PropTypes.node,
+  children: PropTypes.node,
 };
 
 function App({ children }) {

diff --git a/examples/universal-redux/package.json b/examples/universal-redux/package.json
@@ -6,19 +6,20 @@
     "start": "babel-node src/server"
   },
   "dependencies": {
-    "babel-cli": "^6.23.0",
-    "babel-loader": "^6.3.0",
-    "babel-preset-latest": "^6.22.0",
-    "babel-preset-react": "^6.23.0",
-    "express": "^4.14.1",
+    "babel-cli": "^6.24.1",
+    "babel-loader": "^6.4.1",
+    "babel-preset-latest": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "express": "^4.15.2",
     "farce": "^0.2.1",
     "found": "../..",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "react-redux": "^5.0.2",
+    "prop-types": "^15.5.6",
+    "react": "^15.5.3",
+    "react-dom": "^15.5.3",
+    "react-redux": "^5.0.4",
     "redux": "^3.6.0",
     "serialize-javascript": "^1.3.0",
-    "webpack": "^2.2.1",
-    "webpack-dev-middleware": "^1.10.0"
+    "webpack": "^2.3.3",
+    "webpack-dev-middleware": "^1.10.1"
   }
 }
diff --git a/examples/universal-redux/src/App.js b/examples/universal-redux/src/App.js
@@ -1,5 +1,6 @@
-import React from 'react';
 import Link from 'found/lib/Link';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 function LinkItem(props) {
   // TODO: Remove the pragma once evcohen/eslint-plugin-jsx-a11y#81 ships.
@@ -14,7 +15,7 @@ function LinkItem(props) {
 }
 
 const propTypes = {
-  children: React.PropTypes.node,
+  children: PropTypes.node,
 };
 
 function App({ children }) {

diff --git a/examples/universal/package.json b/examples/universal/package.json
@@ -6,15 +6,16 @@
     "start": "babel-node src/server"
   },
   "dependencies": {
-    "babel-cli": "^6.18.0",
-    "babel-loader": "^6.2.8",
-    "babel-preset-latest": "^6.16.0",
-    "babel-preset-react": "^6.16.0",
-    "express": "^4.14.0",
+    "babel-cli": "^6.24.1",
+    "babel-loader": "^6.4.1",
+    "babel-preset-latest": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "express": "^4.15.2",
     "found": "../..",
-    "react": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "webpack": "^2.1.0-beta.27",
-    "webpack-dev-middleware": "^1.8.4"
+    "prop-types": "^15.5.6",
+    "react": "^15.5.3",
+    "react-dom": "^15.5.3",
+    "webpack": "^2.3.3",
+    "webpack-dev-middleware": "^1.10.1"
   }
 }
diff --git a/examples/universal/src/routeConfig.js b/examples/universal/src/routeConfig.js
@@ -2,6 +2,7 @@ import Link from 'found/lib/Link';
 import makeRouteConfig from 'found/lib/jsx/makeRouteConfig';
 import Redirect from 'found/lib/jsx/Redirect';
 import Route from 'found/lib/jsx/Route';
+import PropTypes from 'prop-types';
 import React from 'react';
 
 function LinkItem(props) {
@@ -17,7 +18,7 @@ function LinkItem(props) {
 }
 
 const propTypes = {
-  children: React.PropTypes.node,
+  children: PropTypes.node,
 };
 
 function App({ children }) {
@@ -82,5 +83,5 @@ export default makeRouteConfig(
       from="baz"
       to="/foo"
     />
-  </Route>
+  </Route>,
 );
diff --git a/package.json b/package.json
@@ -31,14 +31,15 @@
   },
   "homepage": "https://github.com/4Catalyzer/found#readme",
   "dependencies": {
-    "babel-runtime": "^6.18.0",
+    "babel-runtime": "^6.23.0",
     "farce": "^0.2.1",
-    "invariant": "^2.2.1",
+    "invariant": "^2.2.2",
     "is-promise": "^2.1.0",
-    "lodash": "^4.16.6",
-    "path-to-regexp": "^1.6.0",
+    "lodash": "^4.17.4",
+    "path-to-regexp": "^1.7.0",
+    "prop-types": "^15.5.6",
     "react-prop-types": "^0.4.0",
-    "react-redux": "^5.0.0-beta.3",
+    "react-redux": "^5.0.4",
     "react-static-container": "^1.0.1",
     "redux": "^3.6.0",
     "warning": "^3.0.0"
@@ -47,25 +48,25 @@
     "react": ">=0.14.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.18.0",
-    "babel-eslint": "^7.1.0",
-    "babel-jest": "^17.0.2",
+    "babel-cli": "^6.24.1",
+    "babel-eslint": "^7.2.1",
+    "babel-jest": "^19.0.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "babel-preset-latest": "^6.16.0",
-    "babel-preset-react": "^6.16.0",
-    "babel-preset-stage-1": "^6.16.0",
-    "enzyme": "^2.6.0",
-    "eslint": "^3.9.1",
-    "eslint-config-4catalyzer-react": "^0.1.3",
-    "eslint-plugin-import": "^1.16.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-latest": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-1": "^6.24.1",
+    "enzyme": "^2.8.0",
+    "eslint": "^3.19.0",
+    "eslint-config-4catalyzer-react": "^0.2.0",
+    "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.5.0",
-    "jest": "^17.0.3",
-    "react": "^15.4.1",
-    "react-addons-test-utils": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "rimraf": "^2.5.4"
+    "eslint-plugin-react": "^6.10.3",
+    "jest": "^19.0.2",
+    "react": "^15.5.3",
+    "react-addons-test-utils": "^15.5.1",
+    "react-dom": "^15.5.3",
+    "rimraf": "^2.6.1"
   }
 }
diff --git a/src/BaseLink.js b/src/BaseLink.js
@@ -1,23 +1,24 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import elementType from 'react-prop-types/lib/elementType';
 
 import { routerShape } from './PropTypes';
 
 const propTypes = {
   Component: elementType.isRequired,
-  to: React.PropTypes.oneOfType([
-    React.PropTypes.string,
-    React.PropTypes.object,
+  to: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.object,
   ]),
-  match: React.PropTypes.object.isRequired,
-  activeClassName: React.PropTypes.string,
-  activeStyle: React.PropTypes.object,
-  activePropName: React.PropTypes.string,
+  match: PropTypes.object.isRequired,
+  activeClassName: PropTypes.string,
+  activeStyle: PropTypes.object,
+  activePropName: PropTypes.string,
   router: routerShape.isRequired,
-  exact: React.PropTypes.bool.isRequired,
-  target: React.PropTypes.string,
-  onClick: React.PropTypes.func,
-  childProps: React.PropTypes.object, // In case of name conflicts here.
+  exact: PropTypes.bool.isRequired,
+  target: PropTypes.string,
+  onClick: PropTypes.func,
+  childProps: PropTypes.object, // In case of name conflicts here.
 };
 
 const defaultProps = {

diff --git a/src/ElementsRenderer.js b/src/ElementsRenderer.js
@@ -1,8 +1,9 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
 const propTypes = {
-  elements: React.PropTypes.arrayOf(
-    React.PropTypes.element,
+  elements: PropTypes.arrayOf(
+    PropTypes.element,
   ).isRequired,
 };