update npm/gem dependencies (#1131)

* update npm/gem dependencies

* move to react prop-types package and fix jsdom usage

* fix sinon

* fix test support

* eslint?

Gemfile

@@ -5,7 +5,7 @@ ruby '2.3.0'
 gem 'rails', '~> 5.0.0'
 
 gem 'active_model_serializers'
-gem 'aws-sdk'
+gem 'aws-sdk', '~> 2.7.0'
 gem 'best_in_place'
 gem 'delayed_job'
 gem 'delayed_job_active_record'

Gemfile.lock

@@ -1,50 +1,50 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.1)
+    actioncable (5.0.5)
-      actionpack (= 5.0.1)
+      actionpack (= 5.0.5)
-      nio4r (~> 1.2)
+      nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
+    actionmailer (5.0.5)
-      actionpack (= 5.0.1)
+      actionpack (= 5.0.5)
-      actionview (= 5.0.1)
+      actionview (= 5.0.5)
-      activejob (= 5.0.1)
+      activejob (= 5.0.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
+    actionpack (5.0.5)
-      actionview (= 5.0.1)
+      actionview (= 5.0.5)
-      activesupport (= 5.0.1)
+      activesupport (= 5.0.5)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
+    actionview (5.0.5)
-      activesupport (= 5.0.1)
+      activesupport (= 5.0.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.4)
+    active_model_serializers (0.10.6)
       actionpack (>= 4.1, < 6)
       activemodel (>= 4.1, < 6)
       case_transform (>= 0.2)
-      jsonapi (= 0.1.1.beta6)
+      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
-    activejob (5.0.1)
+    activejob (5.0.5)
-      activesupport (= 5.0.1)
+      activesupport (= 5.0.5)
       globalid (>= 0.3.6)
-    activemodel (5.0.1)
+    activemodel (5.0.5)
-      activesupport (= 5.0.1)
+      activesupport (= 5.0.5)
-    activerecord (5.0.1)
+    activerecord (5.0.5)
-      activemodel (= 5.0.1)
+      activemodel (= 5.0.5)
-      activesupport (= 5.0.1)
+      activesupport (= 5.0.5)
       arel (~> 7.0)
-    activesupport (5.0.1)
+    activesupport (5.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.2)
-      public_suffix (~> 2.0, >= 2.0.2)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (7.1.4)
     ast (2.3.0)
     aws-sdk (2.7.0)
@@ -54,53 +54,54 @@ GEM
       jmespath (~> 1.0)
     aws-sdk-resources (2.7.0)
       aws-sdk-core (= 2.7.0)
-    aws-sigv4 (1.0.0)
+    aws-sigv4 (1.0.2)
     bcrypt (3.1.11)
-    best_in_place (3.1.0)
+    best_in_place (3.1.1)
       actionpack (>= 3.2)
       railties (>= 3.2)
-    better_errors (2.1.1)
+    better_errors (2.3.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.4.1)
+    brakeman (3.7.2)
     builder (3.2.3)
-    byebug (9.0.6)
+    byebug (9.1.0)
-    carrierwave (1.0.0)
+    carrierwave (1.1.0)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     case_transform (0.2)
       activesupport
-    climate_control (0.1.0)
+    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.1)
+    coderay (1.1.2)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
-    delayed_job (4.1.2)
+    delayed_job (4.1.3)
-      activesupport (>= 3.0, < 5.1)
+      activesupport (>= 3.0, < 5.2)
-    delayed_job_active_record (4.1.1)
+    delayed_job_active_record (4.1.2)
-      activerecord (>= 3.0, < 5.1)
+      activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
-    devise (4.2.0)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
     docile (1.1.5)
-    doorkeeper (4.2.0)
+    doorkeeper (4.2.6)
       railties (>= 4.2)
-    dotenv (2.1.2)
+    dotenv (2.2.1)
-    dotenv-rails (2.1.2)
+    dotenv-rails (2.2.1)
-      dotenv (= 2.1.2)
+      dotenv (= 2.2.1)
-      railties (>= 3.2, < 5.1)
+      railties (>= 3.2, < 5.2)
+    erubi (1.6.1)
     erubis (2.7.0)
-    exception_notification (4.2.1)
+    exception_notification (4.2.2)
       actionmailer (>= 4.0, < 6)
       activesupport (>= 4.0, < 6)
     execjs (2.7.0)
@@ -109,28 +110,25 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faker (1.7.3)
+    faker (1.8.4)
       i18n (~> 0.5)
-    globalid (0.3.7)
+    ffi (1.9.18)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
-    httparty (0.14.0)
+      activesupport (>= 4.2.0)
+    httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
+    i18n (0.8.6)
     jmespath (1.3.1)
-    jquery-rails (4.2.2)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.0.3)
+    json (2.1.0)
-    json-schema (2.7.0)
+    json-schema (2.8.0)
       addressable (>= 2.4)
-    jsonapi (0.1.1.beta6)
+    jsonapi-renderer (0.1.3)
-      jsonapi-parser (= 0.1.1.beta3)
-      jsonapi-renderer (= 0.1.1.beta1)
-    jsonapi-parser (0.1.1.beta3)
-    jsonapi-renderer (0.1.1.beta1)
     kaminari (1.0.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.0.1)
@@ -145,22 +143,22 @@ GEM
     kaminari-core (1.0.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
-    mailboxer (0.14.0)
+    mailboxer (0.15.1)
       carrierwave (>= 0.5.8)
-      rails (>= 4.2.0)
+      rails (>= 5.0.0)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
-    minitest (5.10.1)
+    minitest (5.10.3)
     multi_xml (0.6.0)
-    nio4r (1.2.1)
+    nio4r (2.1.0)
-    nokogiri (1.7.0.1)
+    nokogiri (1.8.0)
-      mini_portile2 (~> 2.1.0)
+      mini_portile2 (~> 2.2.0)
     orm_adapter (0.5.0)
     paperclip (5.1.0)
       activemodel (>= 4.2.0)
@@ -168,122 +166,133 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parser (2.3.3.1)
+    parallel (1.12.0)
+    parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.19.0)
+    pg (0.21.0)
     powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.4.2)
+    pry-byebug (3.5.0)
-      byebug (~> 9.0)
+      byebug (~> 9.1)
       pry (~> 0.10)
-    pry-rails (0.3.4)
+    pry-rails (0.3.6)
-      pry (>= 0.9.10)
+      pry (>= 0.10.4)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
-    puma (3.6.2)
+    puma (3.10.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
     pundit_extra (0.3.0)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-attack (5.0.1)
       rack
-    rack-cors (0.4.0)
+    rack-cors (1.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.1)
+    rails (5.0.5)
-      actioncable (= 5.0.1)
+      actioncable (= 5.0.5)
-      actionmailer (= 5.0.1)
+      actionmailer (= 5.0.5)
-      actionpack (= 5.0.1)
+      actionpack (= 5.0.5)
-      actionview (= 5.0.1)
+      actionview (= 5.0.5)
-      activejob (= 5.0.1)
+      activejob (= 5.0.5)
-      activemodel (= 5.0.1)
+      activemodel (= 5.0.5)
-      activerecord (= 5.0.1)
+      activerecord (= 5.0.5)
-      activesupport (= 5.0.1)
+      activesupport (= 5.0.5)
-      bundler (>= 1.3.0, < 2.0)
+      bundler (>= 1.3.0)
-      railties (= 5.0.1)
+      railties (= 5.0.5)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
+    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0, < 6.0)
+      activesupport (>= 4.2.0)
-      nokogiri (~> 1.6)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.1)
+    railties (5.0.5)
-      actionpack (= 5.0.1)
+      actionpack (= 5.0.5)
-      activesupport (= 5.0.1)
+      activesupport (= 5.0.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
-    redis (3.3.2)
+    rb-fsevent (0.10.2)
-    responders (2.3.0)
+    rb-inotify (0.9.10)
-      railties (>= 4.2.0, < 5.1)
+      ffi (>= 0.5.0, < 2)
-    rspec-core (3.5.4)
+    redis (4.0.0)
-      rspec-support (~> 3.5.0)
+    responders (2.4.0)
-    rspec-expectations (3.5.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
-    rspec-rails (3.5.2)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
+      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.5.0)
+      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.5.0)
+      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
-    rspec-support (3.5.0)
+    rspec-support (3.6.0)
-    rubocop (0.47.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    sass (3.4.23)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    shoulda-matchers (3.1.1)
+    shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    simplecov (0.12.0)
+    simplecov (0.15.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
-    slack-notifier (2.0.0)
+    slack-notifier (2.3.1)
     slop (3.6.0)
     snorlax (0.1.6)
       rails (> 4.1)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sucker_punch (2.0.2)
+    sucker_punch (2.0.3)
       concurrent-ruby (~> 1.0.0)
-    thor (0.19.4)
+    thor (0.20.0)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
-    tilt (2.0.5)
+    tilt (2.0.8)
-    timecop (0.8.1)
+    timecop (0.9.1)
     tunemygc (1.0.69)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (3.0.4)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.3.0)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
 
@@ -292,7 +301,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers
-  aws-sdk
+  aws-sdk (~> 2.7.0)
   best_in_place
   better_errors
   binding_of_caller

frontend/src/Metamaps/PasteInput.js

@@ -67,6 +67,9 @@ const PasteInput = {
       Import.handleJSON(text)
     } else if (text.match(/^[Tt]opics\t/) || text.match(/^[Ss]ynapses\t/)) {
       Import.handleTSV(text)
+    } else if ((text.match(/^[Tt]opics/) && text.match(/[\n,][Nn]ame[,\n]/)) ||
+               (text.match(/^[Ss]ynapses/) && text.match(/[\n,][Tt]opic1[,\n]/))) {
+      Import.handleCSV(text)
     } else {
       // Handle as plain text
       let textItems = text.split('\n')

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'
 

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,22 +1,22 @@
 const jsdom = require('jsdom')
-const doc = jsdom.jsdom('<!doctype html><html><body></body></html>')
-const win = doc.defaultView
 
-global.document = doc
+const { JSDOM } = jsdom
-global.window = win
+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) {
-  for (let key in window) {
+  global.HTMLElement = window.HTMLElement
-    if (!window.hasOwnProperty(key)) continue
+  Object.keys(window).forEach(key => {
-    if (key in global) continue
+    if (key in global) return
-
     global[key] = window[key]
-  }
+  })
 }
 
 // Metamaps dependencies fixes

package.json

@@ -21,56 +21,57 @@
   "homepage": "https://github.com/metamaps/metamaps#readme",
   "dependencies": {
     "ajaxq": "0.0.7",
-    "attachmediastream": "1.4.2",
+    "attachmediastream": "2.0.0",
-    "autolinker": "1.4.0",
+    "autolinker": "1.4.3",
-    "babel-cli": "6.22.2",
+    "babel-cli": "6.26.0",
-    "babel-loader": "6.2.10",
+    "babel-loader": "7.1.2",
     "babel-plugin-lodash": "3.2.11",
-    "babel-plugin-transform-class-properties": "6.22.0",
+    "babel-plugin-transform-class-properties": "6.24.1",
-    "babel-preset-es2015": "6.22.0",
+    "babel-preset-es2015": "6.24.1",
-    "babel-preset-react": "6.22.0",
+    "babel-preset-react": "6.24.1",
     "backbone": "1.3.3",
-    "clipboard-js": "0.3.2",
+    "clipboard-js": "0.3.5",
-    "commonmark": "0.27.0",
+    "commonmark": "0.28.1",
-    "csv-parse": "1.1.10",
+    "csv-parse": "1.2.1",
-    "emoji-mart": "0.3.7",
+    "emoji-mart": "1.0.1",
-    "getscreenmedia": "2.0.0",
+    "getscreenmedia": "4.0.1",
     "hark": "1.1.5",
-    "howler": "2.0.2",
+    "howler": "2.0.4",
-    "jquery": "3.1.1",
+    "jquery": "3.2.1",
-    "json-loader": "0.5.4",
+    "json-loader": "0.5.7",
     "lodash": "4.17.4",
-    "node-uuid": "1.4.7",
+    "node-uuid": "1.4.8",
     "outdent": "0.3.0",
-    "react": "15.4.2",
+    "prop-types": "15.5.10",
-    "react-dom": "15.4.2",
+    "react": "15.6.1",
-    "react-draggable": "2.2.3",
+    "react-dom": "15.6.1",
-    "react-dropzone": "3.9.1",
+    "react-draggable": "3.0.3",
-    "react-onclickoutside": "5.9.0",
+    "react-dropzone": "4.1.2",
-    "react-router": "3.0.2",
+    "react-onclickoutside": "6.5.0",
-    "redux": "3.6.0",
+    "react-router": "4.2.0",
-    "riek": "1.0.7",
+    "redux": "3.7.2",
+    "riek": "1.1.0",
     "simplewebrtc": "2.2.2",
     "socket.io": "1.3.7",
-    "webpack": "2.2.1"
+    "webpack": "3.5.6"
   },
   "devDependencies": {
-    "babel-eslint": "^7.1.1",
+    "babel-eslint": "^7.2.3",
-    "chai": "^3.5.0",
+    "chai": "^4.1.2",
-    "circular-dependency-plugin": "^2.0.0",
+    "circular-dependency-plugin": "^4.2.0",
-    "enzyme": "^2.8.2",
+    "enzyme": "^2.9.1",
-    "eslint": "^3.11.1",
+    "eslint": "^4.6.1",
-    "eslint-config-standard": "^6.2.1",
+    "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-promise": "^3.5.0",
-    "eslint-plugin-react": "^6.8.0",
+    "eslint-plugin-react": "^7.3.0",
-    "eslint-plugin-standard": "^2.0.1",
+    "eslint-plugin-standard": "^3.0.1",
-    "jsdom": "^9.11.0",
+    "jsdom": "^11.2.0",
-    "mocha": "^3.2.0",
+    "mocha": "^3.5.0",
     "mocha-webpack": "^0.7.0",
-    "react-addons-test-utils": "^15.5.1",
+    "react-addons-test-utils": "^15.6.0",
-    "sinon": "^2.2.0"
+    "sinon": "2.2.0"
   },
   "optionalDependencies": {
-    "raml2html": "4.0.5"
+    "raml2html": "6.4.1"
   }
 }