move to react prop-types package and fix jsdom usage

frontend/src/components/App/AccountMenu.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import onClickOutsideAddon from 'react-onclickoutside'
 

frontend/src/components/App/LoginForm.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import onClickOutsideAddon from 'react-onclickoutside'
 

frontend/src/components/App/MobileHeader.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 
 import Sprite from '../common/Sprite'

frontend/src/components/App/NotificationIcon.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class NotificationIcon extends Component {
 

frontend/src/components/App/Toast.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Toast extends Component {
   static propTypes = {

frontend/src/components/App/UpperLeftUI.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 
 class UpperLeftUI extends Component {

frontend/src/components/App/UpperRightUI.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import AccountMenu from './AccountMenu'
 import LoginForm from './LoginForm'

frontend/src/components/App/index.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import MobileHeader from './MobileHeader'
 import UpperLeftUI from './UpperLeftUI'

frontend/src/components/MapView/ImportDialogBox.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import Dropzone from 'react-dropzone'
 
 class ImportDialogBox extends Component {

frontend/src/components/MapView/Instructions.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Instructions extends Component {
 

frontend/src/components/MapView/MapChat/NewMessage.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Emoji, Picker } from 'emoji-mart'
 
 class NewMessage extends Component {

frontend/src/components/MapView/MapChat/Participant.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Participant extends Component {
   render() {

frontend/src/components/MapView/MapChat/index.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import Unread from './Unread'
 import Participant from './Participant'
 import Message from './Message'

frontend/src/components/MapView/MapInfoBox.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class MapInfoBox extends Component {
   static propTypes = {

frontend/src/components/MapView/index.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import DataVis from '../common/DataVis'
 import UpperOptions from '../common/UpperOptions'

frontend/src/components/Maps/Header.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 import _ from 'lodash'
 

frontend/src/components/Maps/MapCard.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 import { find, values } from 'lodash'
 import Util from '../../Metamaps/Util'

frontend/src/components/Maps/MapperCard.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class MapperCard extends Component {
   render = () => {

frontend/src/components/Maps/index.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { throttle } from 'lodash'
 import Header from './Header'
 import MapperCard from './MapperCard'

frontend/src/components/MetacodeSelect.js

@@ -8,7 +8,8 @@
  * passes that metacode's id to the callback.
  */
 
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class MetacodeSelect extends Component {
   render = () => {

frontend/src/components/TopicCard/Attachments.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import EmbedlyLink from './EmbedlyLink'
 

frontend/src/components/TopicCard/Desc.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { RIETextArea } from 'riek'
 import Util from '../../Metamaps/Util'
 

frontend/src/components/TopicCard/EmbedlyLink/Card.js

@@ -1,5 +1,6 @@
 /* global $, embedly */
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class EmbedlyCard extends Component {
   constructor(props) {

frontend/src/components/TopicCard/EmbedlyLink/index.js

@@ -1,5 +1,6 @@
 /* global embedly */
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import Card from './Card'
 

frontend/src/components/TopicCard/Follow.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Follow extends Component {
   render = () => {

frontend/src/components/TopicCard/Links.js

@@ -1,6 +1,7 @@
 /* global $ */
 
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 
 import MetacodeSelect from '../MetacodeSelect'

frontend/src/components/TopicCard/Permission.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import onClickOutsideAddon from 'react-onclickoutside'
 

frontend/src/components/TopicCard/Title.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { RIETextArea } from 'riek'
 
 const maxTitleLength = 140

frontend/src/components/TopicCard/index.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import Draggable from 'react-draggable'
 
 import Title from './Title'

frontend/src/components/TopicView/index.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import DataVis from '../common/DataVis'
 import UpperOptions from '../common/UpperOptions'

frontend/src/components/common/DataVis.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class DataVis extends Component {
   static propTypes = {

frontend/src/components/common/FilterBox.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import onClickOutsideAddon from 'react-onclickoutside'
 

frontend/src/components/common/InfoAndHelp.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import MapInfoBox from '../MapView/MapInfoBox'
 

frontend/src/components/common/Sprite.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 export default class Sprite extends Component {
   static propTypes = {

frontend/src/components/common/UpperOptions.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import FilterBox from '../common/FilterBox'
 

frontend/src/components/common/VisualizationControls.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 export default class VisualizationControls extends Component {
   static propTypes = {

frontend/test_support/dom.js

@@ -1,13 +1,14 @@
 const jsdom = require('jsdom')
-const doc = jsdom.jsdom('<!doctype html><html><body></body></html>')
-const win = doc.defaultView
 
-global.document = doc
-global.window = win
+const { JSDOM } = jsdom
+const dom = new JSDOM('<!doctype html><html><body></body></html>')
+
+global.document = dom.window.document
+global.window = dom.window
 
 // take all properties of the window object and also attach it to the
 // mocha global object
-propagateToGlobal(win)
+propagateToGlobal(dom.window)
 
 // from mocha-jsdom https://github.com/rstacruz/mocha-jsdom/blob/master/index.js#L80
 function propagateToGlobal(window) {

package.json

@@ -42,6 +42,7 @@
     "lodash": "4.17.4",
     "node-uuid": "1.4.8",
     "outdent": "0.3.0",
+    "prop-types": "15.5.10",
     "react": "15.6.1",
     "react-dom": "15.6.1",
     "react-draggable": "3.0.3",