Upgrade dependencies (#569)

* upgrade some dependencies * import PropTypes from prop-types * upgrade uikit version * remove react-collapse as we are not using anywhere, @stipsan says, probably a leftover we can remove * Turn off uncool rules * Remove uncool commented Modal component that won't be added in long run * Yo bro, you need prop-types shorted, * make lint happy * Temporary work around why? * revert eslint upgrade
stipsan · May 12, 2017 · 5e49d63 · 5e49d63
1 parent a1c1648
commit 5e49d63
Show file tree

Hide file tree

Showing 18 changed files with 798 additions and 706 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -8,7 +8,8 @@ rules:
     - error
     - never
   react/no-danger: error
-  react/no-comment-textnodes: error
+  react/no-comment-textnodes: off
+  jsx-a11y/img-has-alt: off
   react/no-direct-mutation-state: error
   react/no-string-refs: error
   react/jsx-handler-names: error

diff --git a/package.json b/package.json
@@ -61,57 +61,57 @@
     "@kadira/react-storybook-addon-info": "3.4.0",
     "@kadira/storybook": "2.35.3",
     "@kadira/storybook-deployer": "1.2.0",
-    "autoprefixer": "6.7.7",
+    "autoprefixer": "7.0.1",
     "babel-cli": "6.24.1",
     "babel-core": "6.24.1",
-    "babel-eslint": "7.2.2",
-    "babel-jest": "19.0.0",
+    "babel-eslint": "7.2.3",
+    "babel-jest": "20.0.1",
     "babel-plugin-inline-import": "^2.0.4",
     "babel-plugin-react-transform": "2.0.2",
     "babel-plugin-transform-react-constant-elements": "6.23.0",
     "babel-plugin-transform-react-inline-elements": "6.22.0",
     "babel-polyfill": "6.23.0",
-    "babel-preset-es2015": "6.24.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",
-    "coveralls": "2.13.0",
-    "css-loader": "0.28.0",
+    "coveralls": "2.13.1",
+    "css-loader": "0.28.1",
     "eslint": "3.19.0",
     "eslint-config-airbnb": "14.1.0",
     "eslint-plugin-import": "2.2.0",
-    "eslint-plugin-jsx-a11y": "4.0.0",
+    "eslint-plugin-jsx-a11y": "5.0.1",
     "eslint-plugin-react": "6.10.2",
     "expect": "1.20.2",
     "file-loader": "0.11.1",
     "gh-release": "2.2.1",
     "growl": "1.9.2",
-    "jest-cli": "19.0.2",
-    "jsdom": "9.12.0",
+    "jest-cli": "20.0.1",
+    "jsdom": "10.1.0",
     "json-loader": "0.5.4",
     "less": "2.7.2",
     "less-loader": "4.0.3",
-    "mocha": "3.2.0",
+    "mocha": "3.3.0",
     "postcss-loader": "1.3.3",
+    "prop-types": "^15.5.10",
     "raw-loader": "^0.5.1",
     "react": "15.5.4",
     "react-addons-test-utils": "15.5.1",
-    "react-collapse": "2.3.3",
     "react-dom": "15.5.4",
-    "react-height": "2.2.0",
-    "react-motion": "0.4.7",
+    "react-height": "3.0.0",
+    "react-motion": "0.5.0",
     "react-test-renderer": "15.5.4",
     "semver": "^5.3.0",
     "semver-truncate": "^1.1.2",
-    "style-loader": "0.16.1",
-    "uikit": "3.0.0-beta.19",
+    "style-loader": "0.17.0",
+    "uikit": "3.0.0-beta.22",
     "url-loader": "0.5.8"
   },
   "dependencies": {
     "classnames": "2.2.5",
     "computed-style": "^0.3.0",
-    "react-input-autosize": "1.1.0",
-    "react-portal": "^3.0.0"
+    "react-input-autosize": "1.1.3",
+    "react-portal": "3.1.0"
   },
   "contributors": [
     {

diff --git a/src/Button.js b/src/Button.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import { Component, PropTypes } from 'react'
+import { Component } from 'react'
+import PropTypes from 'prop-types'
 
 export default class Button extends Component {
 

diff --git a/src/Dropdown.js b/src/Dropdown.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import { Component, PropTypes, cloneElement } from 'react'
+import { Component, cloneElement } from 'react'
+import PropTypes from 'prop-types'
 
 const links = {}
 

diff --git a/src/Icon/Default.js b/src/Icon/Default.js
@@ -1,4 +1,6 @@
-import { PureComponent, PropTypes } from 'react'
+import { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+
 import cx from 'classnames'
 
 import icons from './icons'

diff --git a/src/Icon/Spinner.js b/src/Icon/Spinner.js
@@ -1,4 +1,5 @@
-import { PropTypes, PureComponent } from 'react'
+import { PureComponent } from 'react'
+import PropTypes from 'prop-types'
 import cx from 'classnames'
 import computedStyle from 'computed-style'
 

diff --git a/src/Icon/__tests__/__snapshots__/index-test.js.snap b/src/Icon/__tests__/__snapshots__/index-test.js.snap
@@ -939,6 +939,25 @@ exports[`github-alt 1`] = `
 </span>
 `;
 
+exports[`gitter 1`] = `
+<span
+  className="uk-icon"
+>
+  <svg
+    dangerouslySetInnerHTML={
+      Object {
+        "__html": "<rect x=\\"3.5\\" y=\\"1\\" width=\\"1.531\\" height=\\"11.471\\"></rect><rect x=\\"7.324\\" y=\\"4.059\\" width=\\"1.529\\" height=\\"15.294\\"></rect><rect x=\\"11.148\\" y=\\"4.059\\" width=\\"1.527\\" height=\\"15.294\\"></rect><rect x=\\"14.971\\" y=\\"4.059\\" width=\\"1.529\\" height=\\"8.412\\"></rect>",
+      }
+    }
+    height={20}
+    icon="gitter"
+    viewBox="0 0 20 20"
+    width={20}
+    xmlns="http://www.w3.org/2000/svg"
+  />
+</span>
+`;
+
 exports[`google 1`] = `
 <span
   className="uk-icon"
@@ -1136,7 +1155,7 @@ exports[`instagram 1`] = `
   <svg
     dangerouslySetInnerHTML={
       Object {
-        "__html": "<path d=\\"M13.55,1H6.46C3.45,1,1,3.44,1,6.44v7.12c0,3,2.45,5.44,5.46,5.44h7.08c3.02,0,5.46-2.44,5.46-5.44V6.44	C19.01,3.44,16.56,1,13.55,1z M17.5,14c0,1.93-1.57,3.5-3.5,3.5H6c-1.93,0-3.5-1.57-3.5-3.5V6c0-1.93,1.57-3.5,3.5-3.5h8	c1.93,0,3.5,1.57,3.5,3.5V14z\\"/><circle cx=\\"14.87\\" cy=\\"5.26\\" r=\\"1.09\\"/><path d=\\"M10.03,5.45c-2.55,0-4.63,2.06-4.63,4.6c0,2.55,2.07,4.61,4.63,4.61c2.56,0,4.63-2.061,4.63-4.61	C14.65,7.51,12.58,5.45,10.03,5.45L10.03,5.45L10.03,5.45z M10.08,13c-1.66,0-3-1.34-3-2.99c0-1.65,1.34-2.99,3-2.99s3,1.34,3,2.99	C13.08,11.66,11.74,13,10.08,13L10.08,13L10.08,13z\\"/>",
+        "__html": "<path d=\\"M13.55,1H6.46C3.45,1,1,3.44,1,6.44v7.12c0,3,2.45,5.44,5.46,5.44h7.08c3.02,0,5.46-2.44,5.46-5.44V6.44 C19.01,3.44,16.56,1,13.55,1z M17.5,14c0,1.93-1.57,3.5-3.5,3.5H6c-1.93,0-3.5-1.57-3.5-3.5V6c0-1.93,1.57-3.5,3.5-3.5h8 c1.93,0,3.5,1.57,3.5,3.5V14z\\"></path><circle cx=\\"14.87\\" cy=\\"5.26\\" r=\\"1.09\\"></circle><path d=\\"M10.03,5.45c-2.55,0-4.63,2.06-4.63,4.6c0,2.55,2.07,4.61,4.63,4.61c2.56,0,4.63-2.061,4.63-4.61 C14.65,7.51,12.58,5.45,10.03,5.45L10.03,5.45L10.03,5.45z M10.08,13c-1.66,0-3-1.34-3-2.99c0-1.65,1.34-2.99,3-2.99s3,1.34,3,2.99 C13.08,11.66,11.74,13,10.08,13L10.08,13L10.08,13z\\"></path>",
       }
     }
     height={20}
@@ -2495,7 +2514,7 @@ exports[`tumblr 1`] = `
   <svg
     dangerouslySetInnerHTML={
       Object {
-        "__html": "<path d=\\"M6.885,8.598c0,0,0,3.393,0,4.996c0,0.282,0,0.66,0.094,0.942c0.377,1.509,1.131,2.545,2.545,3.11	c1.319,0.472,2.356,0.472,3.676,0c0.565-0.188,1.132-0.659,1.132-0.659l-0.849-2.263c0,0-1.036,0.378-1.603,0.283	c-0.565-0.094-1.226-0.66-1.226-1.508c0-1.603,0-4.902,0-4.902h2.828V5.771h-2.828V2H8.205c0,0-0.094,0.66-0.188,0.942	C7.828,3.791,7.262,4.733,6.603,5.394C5.848,6.147,5,6.43,5,6.43v2.168H6.885z\\"/>",
+        "__html": "<path d=\\"M6.885,8.598c0,0,0,3.393,0,4.996c0,0.282,0,0.66,0.094,0.942c0.377,1.509,1.131,2.545,2.545,3.11 c1.319,0.472,2.356,0.472,3.676,0c0.565-0.188,1.132-0.659,1.132-0.659l-0.849-2.263c0,0-1.036,0.378-1.603,0.283 c-0.565-0.094-1.226-0.66-1.226-1.508c0-1.603,0-4.902,0-4.902h2.828V5.771h-2.828V2H8.205c0,0-0.094,0.66-0.188,0.942 C7.828,3.791,7.262,4.733,6.603,5.394C5.848,6.147,5,6.43,5,6.43v2.168H6.885z\\"></path>",
       }
     }
     height={20}
@@ -2666,7 +2685,7 @@ exports[`vimeo 1`] = `
   <svg
     dangerouslySetInnerHTML={
       Object {
-        "__html": "<path d=\\"M2.065,7.59C1.84,7.367,1.654,7.082,1.468,6.838c-0.332-0.42-0.137-0.411,0.274-0.772c1.026-0.91,2.004-1.896,3.127-2.688	c1.017-0.713,2.365-1.173,3.286-0.039c0.849,1.045,0.869,2.629,1.084,3.891c0.215,1.309,0.421,2.648,0.88,3.901	c0.127,0.352,0.37,1.018,0.81,1.074c0.567,0.078,1.145-0.917,1.408-1.289c0.684-0.987,1.611-2.317,1.494-3.587	c-0.115-1.349-1.572-1.095-2.482-0.773c0.146-1.514,1.555-3.216,2.912-3.792c1.439-0.597,3.579-0.587,4.302,1.036	c0.772,1.759,0.078,3.802-0.763,5.396c-0.918,1.731-2.1,3.333-3.363,4.829c-1.114,1.329-2.432,2.787-4.093,3.422	c-1.897,0.723-3.021-0.686-3.667-2.318c-0.705-1.777-1.056-3.771-1.565-5.621C4.898,8.726,4.644,7.836,4.136,7.191	C3.473,6.358,2.72,7.141,2.065,7.59C1.977,7.502,2.115,7.551,2.065,7.59L2.065,7.59z\\"/>",
+        "__html": "<path d=\\"M2.065,7.59C1.84,7.367,1.654,7.082,1.468,6.838c-0.332-0.42-0.137-0.411,0.274-0.772c1.026-0.91,2.004-1.896,3.127-2.688 c1.017-0.713,2.365-1.173,3.286-0.039c0.849,1.045,0.869,2.629,1.084,3.891c0.215,1.309,0.421,2.648,0.88,3.901 c0.127,0.352,0.37,1.018,0.81,1.074c0.567,0.078,1.145-0.917,1.408-1.289c0.684-0.987,1.611-2.317,1.494-3.587 c-0.115-1.349-1.572-1.095-2.482-0.773c0.146-1.514,1.555-3.216,2.912-3.792c1.439-0.597,3.579-0.587,4.302,1.036 c0.772,1.759,0.078,3.802-0.763,5.396c-0.918,1.731-2.1,3.333-3.363,4.829c-1.114,1.329-2.432,2.787-4.093,3.422 c-1.897,0.723-3.021-0.686-3.667-2.318c-0.705-1.777-1.056-3.771-1.565-5.621C4.898,8.726,4.644,7.836,4.136,7.191 C3.473,6.358,2.72,7.141,2.065,7.59C1.977,7.502,2.115,7.551,2.065,7.59L2.065,7.59z\\"></path>",
       }
     }
     height={20}

diff --git a/src/Icon/index.js b/src/Icon/index.js
@@ -1,4 +1,4 @@
-import { PropTypes } from 'react'
+import PropTypes from 'prop-types'
 
 import Default from './Default'
 import Spinner from './Spinner'

diff --git a/src/Input.js b/src/Input.js
@@ -1,5 +1,5 @@
 import cx from 'classnames'
-import { PropTypes } from 'react'
+import PropTypes from 'prop-types'
 import Icon from './Icon'
 
 const Input = ({

diff --git a/src/Modal/Dialog.js b/src/Modal/Dialog.js
@@ -1,5 +1,7 @@
 import classNames from 'classnames'
-import { Component, PropTypes, createElement } from 'react'
+import { Component, createElement } from 'react'
+import PropTypes from 'prop-types'
+
 import Icon from '../Icon'
 
 export default class Dialog extends Component {

diff --git a/src/Modal/Prompt.js b/src/Modal/Prompt.js
@@ -1,4 +1,5 @@
-import { Component, PropTypes } from 'react'
+import { Component } from 'react'
+import PropTypes from 'prop-types'
 
 export default class Prompt extends Component {
 

diff --git a/src/Modal/index.js b/src/Modal/index.js
@@ -1,5 +1,6 @@
 import classNames from 'classnames'
-import { Component, PropTypes } from 'react'
+import { Component } from 'react'
+import PropTypes from 'prop-types'
 import Portal from 'react-portal'
 
 import Button from '../Button'
@@ -114,30 +115,34 @@ export default class Modal extends Component {
     let footer = []
     if (type === 'alert') {
       footer = [
-        () =>
+        () => (
           <Button
             primary
             className={this.props.confirmButtonClass}
             onClick={handleConfirm}
           >{confirmLabel}
-          </Button>,
+          </Button>
+        ),
       ]
     }
 
     if (type === 'confirm' || type === 'prompt') {
       footer = [
-        () => <Button className={this.props.cancelButtonClass} onClick={handleCancel}>
-          {cancelLabel}
-        </Button>,
+        () => (
+          <Button className={this.props.cancelButtonClass} onClick={handleCancel}>
+            {cancelLabel}
+          </Button>
+        ),
         () => <span>&nbsp;</span>,
-        () =>
+        () => (
           <Button
             primary
             className={this.props.confirmButtonClass}
             onClick={handleConfirm}
           >
             {confirmLabel}
-          </Button>,
+          </Button>
+        ),
       ]
     }
     const { children, ...dialogProps } = this.props

diff --git a/src/Notification/NotifyMesssage.js b/src/Notification/NotifyMesssage.js
@@ -1,5 +1,7 @@
-import { Component, PropTypes } from 'react'
+import { Component } from 'react'
+import PropTypes from 'prop-types'
 import cx from 'classnames'
+
 import Icon from '../Icon'
 
 export default class NotifyMesssage extends Component {

diff --git a/src/Notification/index.js b/src/Notification/index.js
@@ -1,4 +1,5 @@
-import { Component, PropTypes } from 'react'
+import { Component } from 'react'
+import PropTypes from 'prop-types'
 import Portal from 'react-portal'
 import cx from 'classnames'
 
@@ -11,10 +12,10 @@ export default class Notification extends Component {
   }
 
   static defaultProps = {
-    type: 'primary',
     className: 'uk-notification',
-    position: 'top-center',
     notifications: [],
+    position: 'top-center',
+    type: 'primary',
   }
 
   state = {

diff --git a/src/stories/Dropdown.js b/src/stories/Dropdown.js
@@ -1,6 +1,8 @@
 import { storiesOf } from '@kadira/storybook'
 import cx from 'classnames'
-import { PropTypes, Component } from 'react'
+import { Component } from 'react'
+import PropTypes from 'prop-types'
+
 import { Button } from 'uikit-react'
 import Dropdown from '../Dropdown'