From 11278ae1e244a3be738ea99e927cd0d9a6ee0f12 Mon Sep 17 00:00:00 2001 From: Brian Koh Date: Tue, 16 May 2017 11:25:01 +0800 Subject: [PATCH 1/8] Upgrade to React 15.5 and add required dependencies --- client/package.json | 25 ++--- client/yarn.lock | 229 +++++++++++++++++++++++--------------------- 2 files changed, 135 insertions(+), 119 deletions(-) diff --git a/client/package.json b/client/package.json index 4e48ab2999..847f6eaeb3 100644 --- a/client/package.json +++ b/client/package.json @@ -71,25 +71,27 @@ "intl": "^1.2.5", "jquery-ui": "^1.12.1", "json-loader": "^0.5.4", - "material-ui": "^0.17.1", + "material-ui": "^0.18.1", "mirror-creator": "1.1.0", "mkdirp": "^0.5.1", "moment": "^2.18.1", "moment-timezone": "^0.5.11", "node-sass": "^4.5.2", - "react": "^0.14.8 || ^15.0.0", - "react-ace": "^4.1.1", - "react-dnd": "^2.3.0", - "react-dnd-html5-backend": "^2.3.0", - "react-dom": "^0.14.8 || ^15.0.0", + "prop-types": "^15.5.10", + "react": "^15.5.4", + "react-ace": "^4.3.0", + "react-dnd": "^2.4.0", + "react-dnd-html5-backend": "^2.4.1", + "react-dom": "^15.5.4", "react-intl": "jeremyyap/react-intl#build", - "react-redux": "^5.0.3", + "react-redux": "^5.0.4", "react-router-dom": "^4.1.1", - "react-scroll": "^1.4.7", + "react-scroll": "^1.5.2", "react-summernote": "^1.0.5", "react-tap-event-plugin": "^2.0.1", + "react-test-renderer": "^15.5.4", "redux": "^3.3.1", - "redux-form": "^6.6.1", + "redux-form": "^6.7.0", "redux-immutable": "^4.0.0", "redux-promise": "^0.5.3", "redux-thunk": "^2.0.1", @@ -103,7 +105,7 @@ "axios-mock-adapter": "^1.8.1", "babel-eslint": "^7.2.1", "babel-jest": "^19.0.0", - "enzyme": "^2.8.0", + "enzyme": "^2.8.2", "enzyme-to-json": "^1.5.0", "eslint": "^3.18.0", "eslint-config-airbnb": "^14.1.0", @@ -113,8 +115,7 @@ "eslint-plugin-react": "^6.10.3", "jest": "^19.0.2", "jquery": "^3.2.1", - "react-addons-test-utils": "^15.4.2", - "react-dnd-test-backend": "^2.3.0", + "react-dnd-test-backend": "^2.4.0", "redux-logger": "^3.0.1", "webpack-dev-server": "^2.4.2" }, diff --git a/client/yarn.lock b/client/yarn.lock index e0f64d21ab..473f3610ab 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -924,7 +924,7 @@ babel-register@^6.24.0: mkdirp "^0.5.1" source-map-support "^0.4.2" -babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.6.1: +babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.6.1: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" dependencies: @@ -1022,9 +1022,9 @@ boom@2.x.x: dependencies: hoek "2.x.x" -bowser@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.6.0.tgz#37fc387b616cb6aef370dab4d6bd402b74c5c54d" +bowser@^1.6.0: + version "1.6.1" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.6.1.tgz#9157e9498f456e937173a2918f3b2161e5353eb3" brace-expansion@^1.0.0: version "1.1.6" @@ -1039,12 +1039,6 @@ brace@^0.10.0: dependencies: w3c-blob "0.0.1" -brace@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/brace/-/brace-0.9.1.tgz#19dcbae2faec9a9920a0452ec64d8d84df45e7b6" - dependencies: - w3c-blob "0.0.1" - braces@^1.8.2: version "1.8.5" resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" @@ -1218,6 +1212,10 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" +chain-function@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc" + chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1508,6 +1506,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2: create-hash "^1.1.0" inherits "^2.0.1" +create-react-class@^15.5.1: + version "15.5.3" + resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.3.tgz#fb0f7cae79339e9a179e194ef466efa3923820fe" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.3.1" + object-assign "^4.1.1" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -1540,6 +1546,12 @@ css-color-names@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" +css-in-js-utils@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-1.0.3.tgz#9ac7e02f763cf85d94017666565ed68a5b5f3215" + dependencies: + hyphenate-style-name "^1.0.2" + css-loader@^0.28.0: version "0.28.0" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.0.tgz#417cfa9789f8cde59a30ccbf3e4da7a806889bad" @@ -1776,9 +1788,9 @@ disposables@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.1.tgz#064727a25b54f502bd82b89aa2dfb8df9f1b39e3" -dnd-core@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.3.0.tgz#f7b29ac37e2c78efe89e911ca5a534f280390450" +dnd-core@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.4.0.tgz#c4a5bc2aea75164f8a295d769d5f551810e7d411" dependencies: asap "^2.0.3" invariant "^2.0.0" @@ -1799,6 +1811,10 @@ doctrine@^2.0.0: esutils "^2.0.2" isarray "^1.0.0" +dom-helpers@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a" + dom-serializer@0, dom-serializer@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" @@ -1908,9 +1924,9 @@ enzyme-to-json@^1.5.0: object-values "^1.0.0" object.entries "^1.0.3" -enzyme@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.8.0.tgz#86cc1fc96e5cbd7695766dd6e89deb13a0aead51" +enzyme@^2.8.2: + version "2.8.2" + resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.8.2.tgz#6c8bcb05012abc4aa4bc3213fb23780b9b5b1714" dependencies: cheerio "^0.22.0" function.prototype.name "^1.0.0" @@ -1920,6 +1936,7 @@ enzyme@^2.8.0: object.assign "^4.0.4" object.entries "^1.0.3" object.values "^1.0.3" + prop-types "^15.5.4" uuid "^2.0.3" "errno@>=0.1.1 <0.2.0-0", errno@^0.1.3: @@ -2782,7 +2799,7 @@ https-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" -hyphenate-style-name@^1.0.1: +hyphenate-style-name@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b" @@ -2851,12 +2868,12 @@ ini@~1.3.0: version "1.3.4" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" -inline-style-prefixer@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz#c153c7e88fd84fef5c602e95a8168b2770671fe7" +inline-style-prefixer@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.3.tgz#eca9767080b29a8afcf13299fe6358e1f320bbeb" dependencies: - bowser "^1.0.0" - hyphenate-style-name "^1.0.1" + bowser "^1.6.0" + css-in-js-utils "^1.0.3" inquirer@^0.12.0: version "0.12.0" @@ -3543,9 +3560,9 @@ jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4: dependencies: object-assign "^4.1.0" -keycode@^2.1.1: - version "2.1.8" - resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.8.tgz#94d2b7098215eff0e8f9a8931d5a59076c4532fb" +keycode@^2.1.8: + version "2.1.9" + resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa" kind-of@^2.0.1: version "2.0.1" @@ -3820,19 +3837,19 @@ map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" -material-ui@^0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.17.1.tgz#37f9b9c073afa1603b8fb900d620b41699663176" +material-ui@^0.18.1: + version "0.18.1" + resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.18.1.tgz#1c8a47d7e930ff0b07064dd8633035984a5a3569" dependencies: - babel-runtime "^6.18.0" - inline-style-prefixer "^2.0.1" - keycode "^2.1.1" + babel-runtime "^6.23.0" + inline-style-prefixer "^3.0.2" + keycode "^2.1.8" lodash.merge "^4.6.0" lodash.throttle "^4.1.1" - react-addons-create-fragment "^15.0.0" - react-addons-transition-group "^15.0.0" - react-event-listener "^0.4.0" - recompose "^0.22.0" + prop-types "^15.5.7" + react-event-listener "^0.4.5" + react-transition-group "^1.1.2" + recompose "0.23.4" simple-assign "^0.1.0" warning "^3.0.0" @@ -4188,7 +4205,7 @@ oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -4744,11 +4761,12 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.5.4: - version "15.5.8" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394" +prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7: + version "15.5.10" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" dependencies: fbjs "^0.8.9" + loose-envify "^1.3.1" proxy-addr@~1.1.3: version "1.1.3" @@ -4838,77 +4856,53 @@ rc@~1.1.6: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-ace@^4.1.1: - version "4.1.6" - resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-4.1.6.tgz#404e1439f45660b8797778ac77c6e26b060a9b79" +react-ace@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-4.3.0.tgz#915818da019dbb762d034f52b1e0e173671b1292" dependencies: - brace "^0.9.1" + brace "^0.10.0" lodash.isequal "^4.1.1" + prop-types "^15.5.8" -react-addons-create-fragment@^15.0.0: - version "15.4.2" - resolved "https://registry.yarnpkg.com/react-addons-create-fragment/-/react-addons-create-fragment-15.4.2.tgz#11372924f730a97dff4c690535211bb73d8f8815" - dependencies: - fbjs "^0.8.4" - object-assign "^4.1.0" - -react-addons-shallow-compare@^15.4.2: - version "15.4.2" - resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.4.2.tgz#027ffd9720e3a1e0b328dcd8fc62e214a0d174a5" - dependencies: - fbjs "^0.8.4" - object-assign "^4.1.0" - -react-addons-test-utils@^15.4.2: - version "15.4.2" - resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.4.2.tgz#93bcaa718fcae7360d42e8fb1c09756cc36302a2" - dependencies: - fbjs "^0.8.4" - object-assign "^4.1.0" - -react-addons-transition-group@^15.0.0: - version "15.4.2" - resolved "https://registry.yarnpkg.com/react-addons-transition-group/-/react-addons-transition-group-15.4.2.tgz#4c42fa1c2ce024acab2924316c0f11268ded1af3" - dependencies: - fbjs "^0.8.4" - object-assign "^4.1.0" - -react-dnd-html5-backend@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.3.0.tgz#a45ce593f5c6944aa01114b368117c56c954804e" +react-dnd-html5-backend@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.4.1.tgz#439d2bcaf8bd8b87a51386beb51c128826182ddd" dependencies: lodash "^4.2.0" -react-dnd-test-backend@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/react-dnd-test-backend/-/react-dnd-test-backend-2.3.0.tgz#37b10cd267c6743b4f6723a24f3cec2b58954d71" +react-dnd-test-backend@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/react-dnd-test-backend/-/react-dnd-test-backend-2.4.0.tgz#007039c9f4e4b76e30dabfe4ae286097032f5e64" dependencies: - dnd-core "^2.3.0" + dnd-core "^2.4.0" -react-dnd@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.3.0.tgz#aede61c06b968554dcf2a2445657cdbb3100be49" +react-dnd@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.4.0.tgz#96f0042cd4cd375b4f0c3413f6ec84d267b7d792" dependencies: disposables "^1.0.1" - dnd-core "^2.3.0" + dnd-core "^2.4.0" hoist-non-react-statics "^1.2.0" invariant "^2.1.0" lodash "^4.2.0" + prop-types "^15.5.8" -"react-dom@^0.14.8 || ^15.0.0": - version "15.4.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f" +react-dom@^15.5.4: + version "15.5.4" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.5.4.tgz#ba0c28786fd52ed7e4f2135fe0288d462aef93da" dependencies: - fbjs "^0.8.1" + fbjs "^0.8.9" loose-envify "^1.1.0" object-assign "^4.1.0" + prop-types "~15.5.7" -react-event-listener@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.4.1.tgz#86b53974c3df651857766b7b177682ed7c7c8318" +react-event-listener@^0.4.5: + version "0.4.5" + resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.4.5.tgz#e3e895a0970cf14ee8f890113af68197abf3d0b1" dependencies: babel-runtime "^6.20.0" - react-addons-shallow-compare "^15.4.2" + fbjs "^0.8.4" + prop-types "^15.5.4" warning "^3.0.0" react-intl@jeremyyap/react-intl#build: @@ -4920,15 +4914,17 @@ react-intl@jeremyyap/react-intl#build: intl-relativeformat "^1.3.0" invariant "^2.1.1" -react-redux@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.3.tgz#86c3b68d56e74294a42e2a740ab66117ef6c019f" +react-redux@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.4.tgz#1563babadcfb2672f57f9ceaa439fb16bf85d55b" dependencies: + create-react-class "^15.5.1" hoist-non-react-statics "^1.0.3" invariant "^2.0.0" lodash "^4.2.0" lodash-es "^4.2.0" loose-envify "^1.1.0" + prop-types "^15.0.0" react-router-dom@^4.1.1: version "4.1.1" @@ -4951,11 +4947,12 @@ react-router@^4.1.1: prop-types "^15.5.4" warning "^3.0.0" -react-scroll@^1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/react-scroll/-/react-scroll-1.4.7.tgz#e2823d0977ed76d5d5b9fd8dc8e1afb43ebb88fe" +react-scroll@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/react-scroll/-/react-scroll-1.5.2.tgz#f10f14840d3138a121d2c0f04933bbfee4193975" dependencies: - object-assign "^4.0.1" + object-assign "^4.1.1" + prop-types "^15.5.8" react-summernote@^1.0.5: version "1.0.5" @@ -4970,13 +4967,30 @@ react-tap-event-plugin@^2.0.1: dependencies: fbjs "^0.8.6" -"react@^0.14.8 || ^15.0.0": - version "15.4.2" - resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef" +react-test-renderer@^15.5.4: + version "15.5.4" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.5.4.tgz#d4ebb23f613d685ea8f5390109c2d20fbf7c83bc" dependencies: - fbjs "^0.8.4" + fbjs "^0.8.9" + object-assign "^4.1.0" + +react-transition-group@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.1.3.tgz#5e02cf6e44a863314ff3c68a0c826c2d9d70b221" + dependencies: + chain-function "^1.0.0" + dom-helpers "^3.2.0" + prop-types "^15.5.6" + warning "^3.0.0" + +react@^15.5.4: + version "15.5.4" + resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047" + dependencies: + fbjs "^0.8.9" loose-envify "^1.1.0" object-assign "^4.1.0" + prop-types "^15.5.7" read-pkg-up@^1.0.1: version "1.0.1" @@ -5040,9 +5054,9 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -recompose@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.22.0.tgz#f099d18385882ca41d9eec891718dadddc3204ef" +recompose@0.23.4: + version "0.23.4" + resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.23.4.tgz#af09e4e08424effa449c9b793037166f7b30644a" dependencies: change-emitter "^0.1.2" fbjs "^0.8.1" @@ -5070,9 +5084,9 @@ reduce-function-call@^1.0.1: dependencies: balanced-match "^0.4.2" -redux-form@^6.6.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-6.6.1.tgz#368dc4fc41301bfb1cd471b059a2215573649c8c" +redux-form@^6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-6.7.0.tgz#9fb0769e76f14febf1dd7686e02c4ab2d6f953aa" dependencies: deep-equal "^1.0.1" es6-error "^4.0.0" @@ -5081,6 +5095,7 @@ redux-form@^6.6.1: is-promise "^2.1.0" lodash "^4.17.3" lodash-es "^4.17.3" + prop-types "^15.5.6" redux-immutable@^4.0.0: version "4.0.0" From c45574f4b2736a9e9c7cfbb40818ec7a9cf8c933 Mon Sep 17 00:00:00 2001 From: Brian Koh Date: Tue, 16 May 2017 11:25:53 +0800 Subject: [PATCH 2/8] =?UTF-8?q?Use=20PropTypes=20from=20=E2=80=98prop-type?= =?UTF-8?q?s=E2=80=99=20instead=20of=20=E2=80=98react=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/app/__test__/setup.js | 2 +- client/app/__test__/utils/__test__/shallowUntil.test.js | 3 ++- .../course/assessment/components/ConditionList/index.jsx | 3 ++- .../assessment/containers/AssessmentForm/index.jsx | 3 ++- .../assessment/containers/MaterialUploader/Material.jsx | 3 ++- .../containers/MaterialUploader/MaterialList.jsx | 3 ++- .../assessment/containers/MaterialUploader/index.jsx | 3 ++- .../course/assessment/pages/AssessmentEdit/index.jsx | 3 ++- .../course/assessment/pages/AssessmentIndex/index.jsx | 3 ++- .../question/programming/ProgrammingQuestion.jsx | 3 ++- .../question/programming/components/BuildLog.jsx | 3 ++- .../question/programming/components/OnlineEditor.jsx | 3 ++- .../programming/components/OnlineEditorPythonView.jsx | 7 ++++--- .../programming/components/ProgrammingQuestionForm.jsx | 5 +++-- .../components/UploadedPackageTemplateView.jsx | 3 ++- .../components/UploadedPackageTestCaseView.jsx | 3 ++- .../programming/components/UploadedPackageView.jsx | 3 ++- .../course/lesson-plan/components/LessonPlanEdit.jsx | 3 ++- .../lesson-plan/components/LessonPlanFilterButton.jsx | 3 ++- .../course/lesson-plan/components/LessonPlanGroup.jsx | 5 +++-- .../course/lesson-plan/components/LessonPlanIndex.jsx | 3 ++- .../course/lesson-plan/components/LessonPlanItem.jsx | 3 ++- .../course/lesson-plan/components/LessonPlanItemEdit.jsx | 3 ++- .../lesson-plan/components/LessonPlanMilestone.jsx | 3 ++- .../course/lesson-plan/components/LessonPlanNav.jsx | 3 ++- .../lesson-plan/containers/LessonPlanContainer.jsx | 3 ++- .../course/lesson-plan/containers/LessonPlanFilter.jsx | 3 ++- .../app/bundles/course/survey/components/AddButton.jsx | 3 ++- .../bundles/course/survey/components/FormDialogue.jsx | 3 ++- .../bundles/course/survey/components/OptionsListItem.jsx | 3 ++- .../app/bundles/course/survey/components/Thumbnail.jsx | 3 ++- .../containers/QuestionFormDialogue/QuestionForm.jsx | 3 ++- .../QuestionFormDialogue/QuestionFormDeletedOptions.jsx | 3 ++- .../QuestionFormDialogue/QuestionFormOption.jsx | 3 ++- .../QuestionFormDialogue/QuestionFormOptions.jsx | 3 ++- .../survey/containers/QuestionFormDialogue/index.jsx | 5 +++-- .../course/survey/containers/RespondButton/index.jsx | 3 ++- .../survey/containers/ResponseForm/ResponseAnswer.jsx | 3 ++- .../survey/containers/ResponseForm/ResponseSection.jsx | 3 ++- .../course/survey/containers/ResponseForm/index.jsx | 3 ++- .../containers/SectionFormDialogue/SectionForm.jsx | 3 ++- .../survey/containers/SectionFormDialogue/index.jsx | 3 ++- .../survey/containers/SurveyFormDialogue/SurveyForm.jsx | 3 ++- .../survey/containers/SurveyFormDialogue/index.jsx | 5 +++-- .../course/survey/containers/SurveyLayout/AdminMenu.jsx | 3 ++- .../course/survey/containers/SurveyLayout/index.jsx | 3 ++- .../containers/SurveysLayout/DeleteConfirmation.jsx | 3 ++- .../bundles/course/survey/containers/UnsubmitButton.jsx | 3 ++- .../bundles/course/survey/pages/ResponseEdit/index.jsx | 3 ++- .../course/survey/pages/ResponseIndex/RemindButton.jsx | 3 ++- .../bundles/course/survey/pages/ResponseIndex/index.jsx | 3 ++- .../bundles/course/survey/pages/ResponseShow/index.jsx | 3 ++- .../course/survey/pages/SurveyIndex/NewSurveyButton.jsx | 3 ++- .../course/survey/pages/SurveyIndex/SurveysTable.jsx | 3 ++- .../bundles/course/survey/pages/SurveyIndex/index.jsx | 3 ++- .../pages/SurveyResults/OptionsQuestionResults.jsx | 3 ++- .../survey/pages/SurveyResults/ResultsQuestion.jsx | 3 ++- .../course/survey/pages/SurveyResults/ResultsSection.jsx | 3 ++- .../survey/pages/SurveyResults/TextResponseResults.jsx | 3 ++- .../bundles/course/survey/pages/SurveyResults/index.jsx | 3 ++- .../course/survey/pages/SurveyShow/NewSectionButton.jsx | 3 ++- .../pages/SurveyShow/Section/DeleteSectionButton.jsx | 3 ++- .../pages/SurveyShow/Section/EditSectionButton.jsx | 3 ++- .../survey/pages/SurveyShow/Section/MoveDownButton.jsx | 3 ++- .../survey/pages/SurveyShow/Section/MoveUpButton.jsx | 3 ++- .../pages/SurveyShow/Section/NewQuestionButton.jsx | 3 ++- .../course/survey/pages/SurveyShow/Section/Question.jsx | 3 ++- .../survey/pages/SurveyShow/Section/QuestionCard.jsx | 3 ++- .../survey/pages/SurveyShow/Section/SectionCard.jsx | 3 ++- .../course/survey/pages/SurveyShow/Section/index.jsx | 3 ++- .../course/survey/pages/SurveyShow/SurveyDetails.jsx | 3 ++- .../app/bundles/course/survey/pages/SurveyShow/index.jsx | 3 ++- client/app/bundles/course/survey/propTypes.js | 2 +- client/app/lib/components/BarChart.jsx | 3 ++- client/app/lib/components/ChipInput.jsx | 5 +++-- client/app/lib/components/ConfirmationDialog.jsx | 3 ++- client/app/lib/components/ExpandableText.jsx | 3 ++- client/app/lib/components/MaterialSummernote.jsx | 9 +++++---- client/app/lib/components/NotificationBar.jsx | 3 ++- client/app/lib/components/ProviderWrapper.jsx | 5 +++-- client/app/lib/components/RailsConfirmationDialog.jsx | 3 ++- client/app/lib/components/TitleBar.jsx | 3 ++- client/app/lib/components/form/DateTimePicker.jsx | 3 ++- client/app/lib/components/redux-form/Toggle.jsx | 3 ++- 84 files changed, 177 insertions(+), 95 deletions(-) diff --git a/client/app/__test__/setup.js b/client/app/__test__/setup.js index 7e40961652..8bddabc9f4 100644 --- a/client/app/__test__/setup.js +++ b/client/app/__test__/setup.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; import { IntlProvider, intlShape } from 'react-intl'; import getMuiTheme from 'material-ui/styles/getMuiTheme'; import injectTapEventPlugin from 'lib/injectTapEventPlugin'; diff --git a/client/app/__test__/utils/__test__/shallowUntil.test.js b/client/app/__test__/utils/__test__/shallowUntil.test.js index 878447ee0f..d6920968f5 100644 --- a/client/app/__test__/utils/__test__/shallowUntil.test.js +++ b/client/app/__test__/utils/__test__/shallowUntil.test.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import shallowUntil from '../shallowUntil'; describe('#shallowUntil', () => { diff --git a/client/app/bundles/course/assessment/components/ConditionList/index.jsx b/client/app/bundles/course/assessment/components/ConditionList/index.jsx index bd1a28782d..aa3a55544f 100644 --- a/client/app/bundles/course/assessment/components/ConditionList/index.jsx +++ b/client/app/bundles/course/assessment/components/ConditionList/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table'; import Subheader from 'material-ui/Subheader'; diff --git a/client/app/bundles/course/assessment/containers/AssessmentForm/index.jsx b/client/app/bundles/course/assessment/containers/AssessmentForm/index.jsx index 05395c6a12..059dd83b55 100644 --- a/client/app/bundles/course/assessment/containers/AssessmentForm/index.jsx +++ b/client/app/bundles/course/assessment/containers/AssessmentForm/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { reduxForm, Field, Form, formValueSelector, change } from 'redux-form'; import { connect } from 'react-redux'; diff --git a/client/app/bundles/course/assessment/containers/MaterialUploader/Material.jsx b/client/app/bundles/course/assessment/containers/MaterialUploader/Material.jsx index 80dfad2f9f..4ee43f21e6 100644 --- a/client/app/bundles/course/assessment/containers/MaterialUploader/Material.jsx +++ b/client/app/bundles/course/assessment/containers/MaterialUploader/Material.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage, defineMessages } from 'react-intl'; import { formatLongDateTime } from 'lib/moment'; import IconButton from 'material-ui/IconButton'; diff --git a/client/app/bundles/course/assessment/containers/MaterialUploader/MaterialList.jsx b/client/app/bundles/course/assessment/containers/MaterialUploader/MaterialList.jsx index dc3a54130e..c5f10bbec6 100644 --- a/client/app/bundles/course/assessment/containers/MaterialUploader/MaterialList.jsx +++ b/client/app/bundles/course/assessment/containers/MaterialUploader/MaterialList.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { List } from 'material-ui/List'; import Subheader from 'material-ui/Subheader'; diff --git a/client/app/bundles/course/assessment/containers/MaterialUploader/index.jsx b/client/app/bundles/course/assessment/containers/MaterialUploader/index.jsx index 869e9e2b16..a70fcd970d 100644 --- a/client/app/bundles/course/assessment/containers/MaterialUploader/index.jsx +++ b/client/app/bundles/course/assessment/containers/MaterialUploader/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import CourseAPI from 'api/course'; import MaterialList from './MaterialList'; diff --git a/client/app/bundles/course/assessment/pages/AssessmentEdit/index.jsx b/client/app/bundles/course/assessment/pages/AssessmentEdit/index.jsx index 1901c66dd8..81d04be729 100644 --- a/client/app/bundles/course/assessment/pages/AssessmentEdit/index.jsx +++ b/client/app/bundles/course/assessment/pages/AssessmentEdit/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { submit } from 'redux-form'; import { injectIntl, FormattedMessage, intlShape } from 'react-intl'; diff --git a/client/app/bundles/course/assessment/pages/AssessmentIndex/index.jsx b/client/app/bundles/course/assessment/pages/AssessmentIndex/index.jsx index a807c2842a..f1a95d852e 100644 --- a/client/app/bundles/course/assessment/pages/AssessmentIndex/index.jsx +++ b/client/app/bundles/course/assessment/pages/AssessmentIndex/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { submit, isPristine } from 'redux-form'; import { injectIntl, FormattedMessage, intlShape } from 'react-intl'; diff --git a/client/app/bundles/course/assessment/question/programming/ProgrammingQuestion.jsx b/client/app/bundles/course/assessment/question/programming/ProgrammingQuestion.jsx index bad388d4fe..8544221be9 100644 --- a/client/app/bundles/course/assessment/question/programming/ProgrammingQuestion.jsx +++ b/client/app/bundles/course/assessment/question/programming/ProgrammingQuestion.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import Immutable from 'immutable'; diff --git a/client/app/bundles/course/assessment/question/programming/components/BuildLog.jsx b/client/app/bundles/course/assessment/question/programming/components/BuildLog.jsx index 452e9ca10e..b8f31fa802 100644 --- a/client/app/bundles/course/assessment/question/programming/components/BuildLog.jsx +++ b/client/app/bundles/course/assessment/question/programming/components/BuildLog.jsx @@ -1,6 +1,7 @@ import Immutable from 'immutable'; -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; const translations = defineMessages({ diff --git a/client/app/bundles/course/assessment/question/programming/components/OnlineEditor.jsx b/client/app/bundles/course/assessment/question/programming/components/OnlineEditor.jsx index 3e12531d82..83afdc2aad 100644 --- a/client/app/bundles/course/assessment/question/programming/components/OnlineEditor.jsx +++ b/client/app/bundles/course/assessment/question/programming/components/OnlineEditor.jsx @@ -1,6 +1,7 @@ import Immutable from 'immutable'; -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import OnlineEditorPythonView, { validation as pythonValidation } from './OnlineEditorPythonView'; diff --git a/client/app/bundles/course/assessment/question/programming/components/OnlineEditorPythonView.jsx b/client/app/bundles/course/assessment/question/programming/components/OnlineEditorPythonView.jsx index a181504d71..498abd7059 100644 --- a/client/app/bundles/course/assessment/question/programming/components/OnlineEditorPythonView.jsx +++ b/client/app/bundles/course/assessment/question/programming/components/OnlineEditorPythonView.jsx @@ -1,6 +1,7 @@ import Immutable from 'immutable'; -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import AceEditor from 'react-ace'; import { injectIntl, FormattedMessage, intlShape } from 'react-intl'; import { Card, CardHeader, CardText } from 'material-ui/Card'; @@ -24,7 +25,7 @@ const MAX_TEST_CASES = 99; const propTypes = { data: PropTypes.instanceOf(Immutable.Map).isRequired, dataFiles: PropTypes.instanceOf(Immutable.Map).isRequired, - actions: React.PropTypes.shape({ + actions: PropTypes.shape({ updatePythonCodeBlock: PropTypes.func.isRequired, createPythonTestCase: PropTypes.func.isRequired, updatePythonTestCase: PropTypes.func.isRequired, @@ -39,7 +40,7 @@ const propTypes = { }; const contextTypes = { - muiTheme: React.PropTypes.object.isRequired, + muiTheme: PropTypes.object.isRequired, }; export function validation(data, pathOfKeysToData, intl) { diff --git a/client/app/bundles/course/assessment/question/programming/components/ProgrammingQuestionForm.jsx b/client/app/bundles/course/assessment/question/programming/components/ProgrammingQuestionForm.jsx index 4fffbd300e..5893afe48e 100644 --- a/client/app/bundles/course/assessment/question/programming/components/ProgrammingQuestionForm.jsx +++ b/client/app/bundles/course/assessment/question/programming/components/ProgrammingQuestionForm.jsx @@ -1,7 +1,8 @@ /* eslint-disable react/no-array-index-key */ import Immutable from 'immutable'; -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; import SelectField from 'material-ui/SelectField'; import MenuItem from 'material-ui/MenuItem'; @@ -23,7 +24,7 @@ import translations from './ProgrammingQuestionForm.intl'; const propTypes = { data: PropTypes.instanceOf(Immutable.Map).isRequired, - actions: React.PropTypes.shape({ + actions: PropTypes.shape({ submitForm: PropTypes.func.isRequired, updateProgrammingQuestion: PropTypes.func.isRequired, updateSkills: PropTypes.func.isRequired, diff --git a/client/app/bundles/course/assessment/question/programming/components/UploadedPackageTemplateView.jsx b/client/app/bundles/course/assessment/question/programming/components/UploadedPackageTemplateView.jsx index f0866f853e..e1c4b594e1 100644 --- a/client/app/bundles/course/assessment/question/programming/components/UploadedPackageTemplateView.jsx +++ b/client/app/bundles/course/assessment/question/programming/components/UploadedPackageTemplateView.jsx @@ -1,6 +1,7 @@ import Immutable from 'immutable'; -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Card } from 'material-ui/Card'; import { Tabs, Tab } from 'material-ui/Tabs'; import { cyan500, grey300 } from 'material-ui/styles/colors'; diff --git a/client/app/bundles/course/assessment/question/programming/components/UploadedPackageTestCaseView.jsx b/client/app/bundles/course/assessment/question/programming/components/UploadedPackageTestCaseView.jsx index b26cfe256e..7ebb7b9302 100644 --- a/client/app/bundles/course/assessment/question/programming/components/UploadedPackageTestCaseView.jsx +++ b/client/app/bundles/course/assessment/question/programming/components/UploadedPackageTestCaseView.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import { Card, CardHeader } from 'material-ui/Card'; import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table'; diff --git a/client/app/bundles/course/assessment/question/programming/components/UploadedPackageView.jsx b/client/app/bundles/course/assessment/question/programming/components/UploadedPackageView.jsx index 4fa5046318..e10f8e04b0 100644 --- a/client/app/bundles/course/assessment/question/programming/components/UploadedPackageView.jsx +++ b/client/app/bundles/course/assessment/question/programming/components/UploadedPackageView.jsx @@ -1,6 +1,7 @@ import Immutable from 'immutable'; -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import UploadedPackageTemplateView from './UploadedPackageTemplateView'; import UploadedPackageTestCaseView from './UploadedPackageTestCaseView'; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanEdit.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanEdit.jsx index be613a72ea..af7224e0bd 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanEdit.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanEdit.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import moment from 'lib/moment'; import Snackbar from 'material-ui/Snackbar'; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanFilterButton.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanFilterButton.jsx index e33d882c6f..5e570b635b 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanFilterButton.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanFilterButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import RaisedButton from 'material-ui/RaisedButton'; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanGroup.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanGroup.jsx index ba3f4c1571..23b04165ca 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanGroup.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanGroup.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import { Element } from 'react-scroll'; import Paper from 'material-ui/Paper'; @@ -27,7 +28,7 @@ const LessonPlanGroup = ({ milestone, items }) => { LessonPlanGroup.propTypes = { milestone: PropTypes.instanceOf(Immutable.Map).isRequired, items: PropTypes.arrayOf( - React.PropTypes.instanceOf(Immutable.Map).isRequired + PropTypes.instanceOf(Immutable.Map).isRequired ).isRequired, }; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanIndex.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanIndex.jsx index ce5dadb5e7..8826659bfd 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanIndex.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanIndex.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import { scroller } from 'react-scroll'; import styles from './LessonPlanIndex.scss'; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanItem.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanItem.jsx index d3dc340445..4ea6f1ddc0 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanItem.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanItem.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import moment, { shortDateTime, shortTime } from 'lib/moment'; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanItemEdit.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanItemEdit.jsx index 592060bed2..ccf987526e 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanItemEdit.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanItemEdit.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import moment from 'lib/moment'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanMilestone.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanMilestone.jsx index f8c834430b..3e17e169fe 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanMilestone.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanMilestone.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import moment, { longDate } from 'lib/moment'; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanNav.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanNav.jsx index 8c3af1589a..a090386308 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanNav.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanNav.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import RaisedButton from 'material-ui/RaisedButton'; diff --git a/client/app/bundles/course/lesson-plan/containers/LessonPlanContainer.jsx b/client/app/bundles/course/lesson-plan/containers/LessonPlanContainer.jsx index fa30e390ab..1ba7adb72b 100644 --- a/client/app/bundles/course/lesson-plan/containers/LessonPlanContainer.jsx +++ b/client/app/bundles/course/lesson-plan/containers/LessonPlanContainer.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import { connect } from 'react-redux'; import { Route, Switch } from 'react-router-dom'; diff --git a/client/app/bundles/course/lesson-plan/containers/LessonPlanFilter.jsx b/client/app/bundles/course/lesson-plan/containers/LessonPlanFilter.jsx index 9decb467db..1b42b5adea 100644 --- a/client/app/bundles/course/lesson-plan/containers/LessonPlanFilter.jsx +++ b/client/app/bundles/course/lesson-plan/containers/LessonPlanFilter.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Immutable from 'immutable'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/client/app/bundles/course/survey/components/AddButton.jsx b/client/app/bundles/course/survey/components/AddButton.jsx index fd1cae5023..1bc3efe723 100644 --- a/client/app/bundles/course/survey/components/AddButton.jsx +++ b/client/app/bundles/course/survey/components/AddButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import FloatingActionButton from 'material-ui/FloatingActionButton'; import ContentAdd from 'material-ui/svg-icons/content/add'; diff --git a/client/app/bundles/course/survey/components/FormDialogue.jsx b/client/app/bundles/course/survey/components/FormDialogue.jsx index 6b56dc3240..d3edd30e02 100644 --- a/client/app/bundles/course/survey/components/FormDialogue.jsx +++ b/client/app/bundles/course/survey/components/FormDialogue.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; import Dialog from 'material-ui/Dialog'; import FlatButton from 'material-ui/FlatButton'; diff --git a/client/app/bundles/course/survey/components/OptionsListItem.jsx b/client/app/bundles/course/survey/components/OptionsListItem.jsx index f15e57e253..5bad228088 100644 --- a/client/app/bundles/course/survey/components/OptionsListItem.jsx +++ b/client/app/bundles/course/survey/components/OptionsListItem.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Card, CardText } from 'material-ui/Card'; import Thumbnail from './Thumbnail'; diff --git a/client/app/bundles/course/survey/components/Thumbnail.jsx b/client/app/bundles/course/survey/components/Thumbnail.jsx index b0fed2cd51..18b4d800e1 100644 --- a/client/app/bundles/course/survey/components/Thumbnail.jsx +++ b/client/app/bundles/course/survey/components/Thumbnail.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Dialog from 'material-ui/Dialog'; import FlatButton from 'material-ui/FlatButton'; diff --git a/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionForm.jsx b/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionForm.jsx index ede585d717..b6b9dfa54d 100644 --- a/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionForm.jsx +++ b/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionForm.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { defineMessages, injectIntl, intlShape } from 'react-intl'; import { reduxForm, Field, FieldArray, Form } from 'redux-form'; import TextField from 'lib/components/redux-form/TextField'; diff --git a/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormDeletedOptions.jsx b/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormDeletedOptions.jsx index 1c6e2d5c6d..6fcf6d107b 100644 --- a/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormDeletedOptions.jsx +++ b/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormDeletedOptions.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Checkbox from 'material-ui/Checkbox'; import RadioButton from 'material-ui/RadioButton'; import IconButton from 'material-ui/IconButton'; diff --git a/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormOption.jsx b/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormOption.jsx index 60f7a08d4d..313e444859 100644 --- a/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormOption.jsx +++ b/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormOption.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { defineMessages, injectIntl, intlShape } from 'react-intl'; import { Field } from 'redux-form'; import IconButton from 'material-ui/IconButton'; diff --git a/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormOptions.jsx b/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormOptions.jsx index 6f4b81e0d8..ac1e2f30b9 100644 --- a/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormOptions.jsx +++ b/client/app/bundles/course/survey/containers/QuestionFormDialogue/QuestionFormOptions.jsx @@ -1,5 +1,6 @@ /* eslint-disable react/no-array-index-key */ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { defineMessages, injectIntl, intlShape } from 'react-intl'; import FlatButton from 'material-ui/FlatButton'; import QuestionFormOption from './QuestionFormOption'; diff --git a/client/app/bundles/course/survey/containers/QuestionFormDialogue/index.jsx b/client/app/bundles/course/survey/containers/QuestionFormDialogue/index.jsx index 176701c121..fcb0ac948e 100644 --- a/client/app/bundles/course/survey/containers/QuestionFormDialogue/index.jsx +++ b/client/app/bundles/course/survey/containers/QuestionFormDialogue/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { getFormValues, isPristine } from 'redux-form'; @@ -28,7 +29,7 @@ const propTypes = { description: PropTypes.string, start_at: PropTypes.instanceOf(Date), end_at: PropTypes.instanceOf(Date), - base_exp: React.PropTypes.number, + base_exp: PropTypes.number, }).isRequired, formValues: PropTypes.object, }; diff --git a/client/app/bundles/course/survey/containers/RespondButton/index.jsx b/client/app/bundles/course/survey/containers/RespondButton/index.jsx index a0b27757ee..96aacb1ae9 100644 --- a/client/app/bundles/course/survey/containers/RespondButton/index.jsx +++ b/client/app/bundles/course/survey/containers/RespondButton/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { defineMessages, FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import moment from 'lib/moment'; diff --git a/client/app/bundles/course/survey/containers/ResponseForm/ResponseAnswer.jsx b/client/app/bundles/course/survey/containers/ResponseForm/ResponseAnswer.jsx index 96d1db5574..8899f34f7b 100644 --- a/client/app/bundles/course/survey/containers/ResponseForm/ResponseAnswer.jsx +++ b/client/app/bundles/course/survey/containers/ResponseForm/ResponseAnswer.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Field } from 'redux-form'; import { defineMessages, injectIntl, intlShape } from 'react-intl'; import { RadioButton } from 'material-ui/RadioButton'; diff --git a/client/app/bundles/course/survey/containers/ResponseForm/ResponseSection.jsx b/client/app/bundles/course/survey/containers/ResponseForm/ResponseSection.jsx index 2bafc107e1..7a33afc4e8 100644 --- a/client/app/bundles/course/survey/containers/ResponseForm/ResponseSection.jsx +++ b/client/app/bundles/course/survey/containers/ResponseForm/ResponseSection.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FieldArray } from 'redux-form'; import { defineMessages, FormattedMessage } from 'react-intl'; import { Card, CardText, CardTitle } from 'material-ui/Card'; diff --git a/client/app/bundles/course/survey/containers/ResponseForm/index.jsx b/client/app/bundles/course/survey/containers/ResponseForm/index.jsx index d8658330b5..7c967c1527 100644 --- a/client/app/bundles/course/survey/containers/ResponseForm/index.jsx +++ b/client/app/bundles/course/survey/containers/ResponseForm/index.jsx @@ -1,5 +1,6 @@ /* eslint-disable camelcase */ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { defineMessages, FormattedMessage } from 'react-intl'; import { reduxForm, FieldArray, Form } from 'redux-form'; import RaisedButton from 'material-ui/RaisedButton'; diff --git a/client/app/bundles/course/survey/containers/SectionFormDialogue/SectionForm.jsx b/client/app/bundles/course/survey/containers/SectionFormDialogue/SectionForm.jsx index b4585dd845..71ab2b500b 100644 --- a/client/app/bundles/course/survey/containers/SectionFormDialogue/SectionForm.jsx +++ b/client/app/bundles/course/survey/containers/SectionFormDialogue/SectionForm.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; import { reduxForm, Field, Form } from 'redux-form'; import TextField from 'lib/components/redux-form/TextField'; diff --git a/client/app/bundles/course/survey/containers/SectionFormDialogue/index.jsx b/client/app/bundles/course/survey/containers/SectionFormDialogue/index.jsx index 30d478c923..c55d98449d 100644 --- a/client/app/bundles/course/survey/containers/SectionFormDialogue/index.jsx +++ b/client/app/bundles/course/survey/containers/SectionFormDialogue/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { isPristine } from 'redux-form'; diff --git a/client/app/bundles/course/survey/containers/SurveyFormDialogue/SurveyForm.jsx b/client/app/bundles/course/survey/containers/SurveyFormDialogue/SurveyForm.jsx index cc5e182929..5faa16a415 100644 --- a/client/app/bundles/course/survey/containers/SurveyFormDialogue/SurveyForm.jsx +++ b/client/app/bundles/course/survey/containers/SurveyFormDialogue/SurveyForm.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { defineMessages, injectIntl, intlShape } from 'react-intl'; import { reduxForm, Field, Form } from 'redux-form'; import TextField from 'lib/components/redux-form/TextField'; diff --git a/client/app/bundles/course/survey/containers/SurveyFormDialogue/index.jsx b/client/app/bundles/course/survey/containers/SurveyFormDialogue/index.jsx index 257a39d1f0..9ded2e1762 100644 --- a/client/app/bundles/course/survey/containers/SurveyFormDialogue/index.jsx +++ b/client/app/bundles/course/survey/containers/SurveyFormDialogue/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { getFormValues, isPristine } from 'redux-form'; @@ -29,7 +30,7 @@ const propTypes = { description: PropTypes.string, start_at: PropTypes.instanceOf(Date), end_at: PropTypes.instanceOf(Date), - base_exp: React.PropTypes.number, + base_exp: PropTypes.number, }).isRequired, formValues: PropTypes.object, }; diff --git a/client/app/bundles/course/survey/containers/SurveyLayout/AdminMenu.jsx b/client/app/bundles/course/survey/containers/SurveyLayout/AdminMenu.jsx index fa9224147e..54cdc50410 100644 --- a/client/app/bundles/course/survey/containers/SurveyLayout/AdminMenu.jsx +++ b/client/app/bundles/course/survey/containers/SurveyLayout/AdminMenu.jsx @@ -1,5 +1,6 @@ /* eslint-disable camelcase */ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import IconButton from 'material-ui/IconButton'; diff --git a/client/app/bundles/course/survey/containers/SurveyLayout/index.jsx b/client/app/bundles/course/survey/containers/SurveyLayout/index.jsx index f80cb1ead5..a533252c05 100644 --- a/client/app/bundles/course/survey/containers/SurveyLayout/index.jsx +++ b/client/app/bundles/course/survey/containers/SurveyLayout/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { Route, Switch } from 'react-router-dom'; import IconButton from 'material-ui/IconButton'; diff --git a/client/app/bundles/course/survey/containers/SurveysLayout/DeleteConfirmation.jsx b/client/app/bundles/course/survey/containers/SurveysLayout/DeleteConfirmation.jsx index 94270bcb34..342ba1c1f4 100644 --- a/client/app/bundles/course/survey/containers/SurveysLayout/DeleteConfirmation.jsx +++ b/client/app/bundles/course/survey/containers/SurveysLayout/DeleteConfirmation.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import ConfirmationDialog from 'lib/components/ConfirmationDialog'; import { resetDeleteConfirmation } from 'course/survey/actions'; diff --git a/client/app/bundles/course/survey/containers/UnsubmitButton.jsx b/client/app/bundles/course/survey/containers/UnsubmitButton.jsx index 8a6d8d5414..c8485c1f66 100644 --- a/client/app/bundles/course/survey/containers/UnsubmitButton.jsx +++ b/client/app/bundles/course/survey/containers/UnsubmitButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { red500 } from 'material-ui/styles/colors'; import { defineMessages, FormattedMessage } from 'react-intl'; diff --git a/client/app/bundles/course/survey/pages/ResponseEdit/index.jsx b/client/app/bundles/course/survey/pages/ResponseEdit/index.jsx index ef1e44b6d2..4f426bd546 100644 --- a/client/app/bundles/course/survey/pages/ResponseEdit/index.jsx +++ b/client/app/bundles/course/survey/pages/ResponseEdit/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, FormattedMessage } from 'react-intl'; import { Card, CardText } from 'material-ui/Card'; diff --git a/client/app/bundles/course/survey/pages/ResponseIndex/RemindButton.jsx b/client/app/bundles/course/survey/pages/ResponseIndex/RemindButton.jsx index aa014afc43..198bb4841f 100644 --- a/client/app/bundles/course/survey/pages/ResponseIndex/RemindButton.jsx +++ b/client/app/bundles/course/survey/pages/ResponseIndex/RemindButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, FormattedMessage } from 'react-intl'; import RaisedButton from 'material-ui/RaisedButton'; diff --git a/client/app/bundles/course/survey/pages/ResponseIndex/index.jsx b/client/app/bundles/course/survey/pages/ResponseIndex/index.jsx index 38bd02f630..1d3fd1978c 100644 --- a/client/app/bundles/course/survey/pages/ResponseIndex/index.jsx +++ b/client/app/bundles/course/survey/pages/ResponseIndex/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import moment, { formatLongDateTime } from 'lib/moment'; import { defineMessages, FormattedMessage } from 'react-intl'; diff --git a/client/app/bundles/course/survey/pages/ResponseShow/index.jsx b/client/app/bundles/course/survey/pages/ResponseShow/index.jsx index 3e73fc8f93..56a0a74fa1 100644 --- a/client/app/bundles/course/survey/pages/ResponseShow/index.jsx +++ b/client/app/bundles/course/survey/pages/ResponseShow/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, FormattedMessage } from 'react-intl'; import { formatLongDateTime } from 'lib/moment'; diff --git a/client/app/bundles/course/survey/pages/SurveyIndex/NewSurveyButton.jsx b/client/app/bundles/course/survey/pages/SurveyIndex/NewSurveyButton.jsx index 1e5e525788..e21ee42037 100644 --- a/client/app/bundles/course/survey/pages/SurveyIndex/NewSurveyButton.jsx +++ b/client/app/bundles/course/survey/pages/SurveyIndex/NewSurveyButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import moment from 'lib/moment'; diff --git a/client/app/bundles/course/survey/pages/SurveyIndex/SurveysTable.jsx b/client/app/bundles/course/survey/pages/SurveyIndex/SurveysTable.jsx index ff845d7355..e6d68d4312 100644 --- a/client/app/bundles/course/survey/pages/SurveyIndex/SurveysTable.jsx +++ b/client/app/bundles/course/survey/pages/SurveyIndex/SurveysTable.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router-dom'; diff --git a/client/app/bundles/course/survey/pages/SurveyIndex/index.jsx b/client/app/bundles/course/survey/pages/SurveyIndex/index.jsx index fa0de98916..1eac478308 100644 --- a/client/app/bundles/course/survey/pages/SurveyIndex/index.jsx +++ b/client/app/bundles/course/survey/pages/SurveyIndex/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, FormattedMessage } from 'react-intl'; import Subheader from 'material-ui/Subheader'; diff --git a/client/app/bundles/course/survey/pages/SurveyResults/OptionsQuestionResults.jsx b/client/app/bundles/course/survey/pages/SurveyResults/OptionsQuestionResults.jsx index 6727b71195..79d6b1f8c0 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/OptionsQuestionResults.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/OptionsQuestionResults.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Link } from 'react-router-dom'; import { defineMessages, FormattedMessage } from 'react-intl'; import { CardText } from 'material-ui/Card'; diff --git a/client/app/bundles/course/survey/pages/SurveyResults/ResultsQuestion.jsx b/client/app/bundles/course/survey/pages/SurveyResults/ResultsQuestion.jsx index 9a5066c589..f5b58a57fd 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/ResultsQuestion.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/ResultsQuestion.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Card, CardText } from 'material-ui/Card'; import { FormattedMessage } from 'react-intl'; import formTranslations from 'lib/translations/form'; diff --git a/client/app/bundles/course/survey/pages/SurveyResults/ResultsSection.jsx b/client/app/bundles/course/survey/pages/SurveyResults/ResultsSection.jsx index 94459f3926..41986471cc 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/ResultsSection.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/ResultsSection.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Card, CardText, CardTitle } from 'material-ui/Card'; import { sectionShape } from 'course/survey/propTypes'; import ResultsQuestion from './ResultsQuestion'; diff --git a/client/app/bundles/course/survey/pages/SurveyResults/TextResponseResults.jsx b/client/app/bundles/course/survey/pages/SurveyResults/TextResponseResults.jsx index e58d8248ae..387e938364 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/TextResponseResults.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/TextResponseResults.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Link } from 'react-router-dom'; import { defineMessages, FormattedMessage } from 'react-intl'; import { CardText } from 'material-ui/Card'; diff --git a/client/app/bundles/course/survey/pages/SurveyResults/index.jsx b/client/app/bundles/course/survey/pages/SurveyResults/index.jsx index f901f6f44c..5a8902b3e2 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/index.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, FormattedMessage } from 'react-intl'; import Subheader from 'material-ui/Subheader'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/NewSectionButton.jsx b/client/app/bundles/course/survey/pages/SurveyShow/NewSectionButton.jsx index 9df93e5fbc..ac0e48cdd0 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/NewSectionButton.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/NewSectionButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { injectIntl, defineMessages, intlShape, FormattedMessage } from 'react-intl'; import RaisedButton from 'material-ui/RaisedButton'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/DeleteSectionButton.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/DeleteSectionButton.jsx index 74b0dc32f9..d95c7055d9 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/DeleteSectionButton.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/DeleteSectionButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, FormattedMessage } from 'react-intl'; import FlatButton from 'material-ui/FlatButton'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/EditSectionButton.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/EditSectionButton.jsx index 692edaab4e..4ccb8e993d 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/EditSectionButton.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/EditSectionButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { injectIntl, defineMessages, intlShape, FormattedMessage } from 'react-intl'; import FlatButton from 'material-ui/FlatButton'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/MoveDownButton.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/MoveDownButton.jsx index 2aec3186e5..e00d22c6b4 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/MoveDownButton.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/MoveDownButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, FormattedMessage } from 'react-intl'; import FlatButton from 'material-ui/FlatButton'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/MoveUpButton.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/MoveUpButton.jsx index b870317675..b95144ee66 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/MoveUpButton.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/MoveUpButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, FormattedMessage } from 'react-intl'; import FlatButton from 'material-ui/FlatButton'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/NewQuestionButton.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/NewQuestionButton.jsx index 6f3a181fe0..d3b596c5bd 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/NewQuestionButton.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/NewQuestionButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { injectIntl, defineMessages, intlShape, FormattedMessage } from 'react-intl'; import FlatButton from 'material-ui/FlatButton'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/Question.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/Question.jsx index 33712bec3e..83ae0b47f7 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/Question.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/Question.jsx @@ -1,5 +1,6 @@ /* eslint-disable new-cap */ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import { connect } from 'react-redux'; import { DragSource, DropTarget } from 'react-dnd'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/QuestionCard.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/QuestionCard.jsx index 4a56b264d1..59dbcebdeb 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/QuestionCard.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/QuestionCard.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Card, CardText } from 'material-ui/Card'; import TextField from 'material-ui/TextField'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/SectionCard.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/SectionCard.jsx index be04c8d83c..3630762d09 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/SectionCard.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/SectionCard.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { defineMessages, FormattedMessage } from 'react-intl'; import { Card, CardText, CardTitle, CardActions } from 'material-ui/Card'; import Subheader from 'material-ui/Subheader'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/index.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/index.jsx index 58edd8928b..1a94bf9597 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/index.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/index.jsx @@ -1,5 +1,6 @@ /* eslint-disable new-cap */ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { DropTarget } from 'react-dnd'; import { draggableTypes } from 'course/survey/constants'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/SurveyDetails.jsx b/client/app/bundles/course/survey/pages/SurveyShow/SurveyDetails.jsx index a55f833cb3..107159aa8c 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/SurveyDetails.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/SurveyDetails.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; import { formatLongDateTime } from 'lib/moment'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/index.jsx b/client/app/bundles/course/survey/pages/SurveyShow/index.jsx index d0258c7147..c16ea1ab06 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/index.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/index.jsx @@ -1,5 +1,6 @@ /* eslint-disable new-cap */ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import { DragDropContext } from 'react-dnd'; diff --git a/client/app/bundles/course/survey/propTypes.js b/client/app/bundles/course/survey/propTypes.js index 254fe586d5..84f68e20ba 100644 --- a/client/app/bundles/course/survey/propTypes.js +++ b/client/app/bundles/course/survey/propTypes.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export const sectionShape = PropTypes.shape({ id: PropTypes.number, diff --git a/client/app/lib/components/BarChart.jsx b/client/app/lib/components/BarChart.jsx index ed45f0fe41..ad82bc601d 100644 --- a/client/app/lib/components/BarChart.jsx +++ b/client/app/lib/components/BarChart.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Chip from 'material-ui/Chip'; import Avatar from 'material-ui/Avatar'; diff --git a/client/app/lib/components/ChipInput.jsx b/client/app/lib/components/ChipInput.jsx index c4eb7bf238..7bc940b986 100644 --- a/client/app/lib/components/ChipInput.jsx +++ b/client/app/lib/components/ChipInput.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import TextFieldUnderline from 'material-ui/TextField/TextFieldUnderline'; import TextFieldHint from 'material-ui/TextField/TextFieldHint'; import TextFieldLabel from 'material-ui/TextField/TextFieldLabel'; @@ -152,7 +153,7 @@ const defaultProps = { }; const contextTypes = { - muiTheme: React.PropTypes.object.isRequired, + muiTheme: PropTypes.object.isRequired, }; diff --git a/client/app/lib/components/ConfirmationDialog.jsx b/client/app/lib/components/ConfirmationDialog.jsx index 61546c97b2..1fd872eb2b 100644 --- a/client/app/lib/components/ConfirmationDialog.jsx +++ b/client/app/lib/components/ConfirmationDialog.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; import Dialog from 'material-ui/Dialog'; import FlatButton from 'material-ui/FlatButton'; diff --git a/client/app/lib/components/ExpandableText.jsx b/client/app/lib/components/ExpandableText.jsx index 1b25842d32..657d61847f 100644 --- a/client/app/lib/components/ExpandableText.jsx +++ b/client/app/lib/components/ExpandableText.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; const translations = defineMessages({ diff --git a/client/app/lib/components/MaterialSummernote.jsx b/client/app/lib/components/MaterialSummernote.jsx index 6be3a7f4d0..2ae0fda9cd 100644 --- a/client/app/lib/components/MaterialSummernote.jsx +++ b/client/app/lib/components/MaterialSummernote.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import ReactSummernote from 'react-summernote'; import TextFieldLabel from 'material-ui/TextField/TextFieldLabel'; @@ -6,9 +7,9 @@ import '../styles/MaterialSummernote.scss'; const propTypes = { field: PropTypes.string, - label: React.PropTypes.oneOfType([ - React.PropTypes.string, - React.PropTypes.object, + label: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.object, ]), disabled: PropTypes.bool, onChange: PropTypes.func.isRequired, diff --git a/client/app/lib/components/NotificationBar.jsx b/client/app/lib/components/NotificationBar.jsx index f4a791e843..12a3800f57 100644 --- a/client/app/lib/components/NotificationBar.jsx +++ b/client/app/lib/components/NotificationBar.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Snackbar from 'material-ui/Snackbar'; export const notificationShape = PropTypes.shape({ diff --git a/client/app/lib/components/ProviderWrapper.jsx b/client/app/lib/components/ProviderWrapper.jsx index d35305bd88..b411595fab 100644 --- a/client/app/lib/components/ProviderWrapper.jsx +++ b/client/app/lib/components/ProviderWrapper.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Provider } from 'react-redux'; import { IntlProvider, addLocaleData } from 'react-intl'; import { i18nLocale, timeZone } from 'lib/helpers/server-context'; @@ -17,7 +18,7 @@ const propTypes = { dispatch: PropTypes.func.isRequired, getState: PropTypes.func.isRequired, }), - children: React.PropTypes.element.isRequired, + children: PropTypes.element.isRequired, }; const ProviderWrapper = ({ store, children }) => { diff --git a/client/app/lib/components/RailsConfirmationDialog.jsx b/client/app/lib/components/RailsConfirmationDialog.jsx index c133df6947..db57b87b8c 100644 --- a/client/app/lib/components/RailsConfirmationDialog.jsx +++ b/client/app/lib/components/RailsConfirmationDialog.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import ConfirmationDialog from 'lib/components/ConfirmationDialog'; class RailsConfirmationDialog extends React.Component { diff --git a/client/app/lib/components/TitleBar.jsx b/client/app/lib/components/TitleBar.jsx index 8124fc4f66..a9f7a6134a 100644 --- a/client/app/lib/components/TitleBar.jsx +++ b/client/app/lib/components/TitleBar.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import AppBar from 'material-ui/AppBar'; const styles = { diff --git a/client/app/lib/components/form/DateTimePicker.jsx b/client/app/lib/components/form/DateTimePicker.jsx index a3ac2a4315..abc7505bf1 100644 --- a/client/app/lib/components/form/DateTimePicker.jsx +++ b/client/app/lib/components/form/DateTimePicker.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, defineMessages, intlShape } from 'react-intl'; import moment from 'lib/moment'; import TextField from 'material-ui/TextField'; diff --git a/client/app/lib/components/redux-form/Toggle.jsx b/client/app/lib/components/redux-form/Toggle.jsx index cf7f9e61e4..ab8ba6005d 100644 --- a/client/app/lib/components/redux-form/Toggle.jsx +++ b/client/app/lib/components/redux-form/Toggle.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import MaterialToggle from 'material-ui/Toggle'; import { red500 } from 'material-ui/styles/colors'; import createComponent from './createComponent'; From 80b927b005e74ef6d9a968498faa35bbb5b58b8d Mon Sep 17 00:00:00 2001 From: Brian Koh Date: Tue, 16 May 2017 11:28:55 +0800 Subject: [PATCH 3/8] =?UTF-8?q?Use=20ReactTestUtils=20from=20=E2=80=98reac?= =?UTF-8?q?t-dom/test-utils=E2=80=99=20instead=20of=20'react-addons-test-u?= =?UTF-8?q?tils'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assessment/pages/AssessmentIndex/__test__/index.test.js | 2 +- .../survey/containers/RespondButton/__test__/index.test.jsx | 2 +- .../survey/containers/ResponseForm/__test__/index.test.jsx | 2 +- .../survey/containers/SurveyLayout/__test__/AdminMenu.test.jsx | 2 +- .../course/survey/pages/ResponseEdit/__test__/index.test.jsx | 2 +- .../survey/pages/ResponseIndex/__test__/RemindButton.test.jsx | 2 +- .../survey/pages/SurveyIndex/__test__/NewSurveyButton.test.jsx | 2 +- .../pages/SurveyResults/__test__/ResultsQuestion.test.jsx | 2 +- .../SurveyShow/Section/__test__/DeleteSectionButton.test.jsx | 2 +- .../SurveyShow/Section/__test__/EditSectionButton.test.jsx | 2 +- .../pages/SurveyShow/Section/__test__/MoveDownButton.test.jsx | 2 +- .../pages/SurveyShow/Section/__test__/MoveUpButton.test.jsx | 2 +- .../SurveyShow/Section/__test__/NewQuestionButton.test.jsx | 2 +- .../survey/pages/SurveyShow/__test__/NewSectionButton.test.jsx | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client/app/bundles/course/assessment/pages/AssessmentIndex/__test__/index.test.js b/client/app/bundles/course/assessment/pages/AssessmentIndex/__test__/index.test.js index 4f4ab8ebb3..25269ce646 100644 --- a/client/app/bundles/course/assessment/pages/AssessmentIndex/__test__/index.test.js +++ b/client/app/bundles/course/assessment/pages/AssessmentIndex/__test__/index.test.js @@ -1,6 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import { mount } from 'enzyme'; import ProviderWrapper from 'lib/components/ProviderWrapper'; import storeCreator from '../../../store'; diff --git a/client/app/bundles/course/survey/containers/RespondButton/__test__/index.test.jsx b/client/app/bundles/course/survey/containers/RespondButton/__test__/index.test.jsx index 7344f36beb..5d4a2dade7 100644 --- a/client/app/bundles/course/survey/containers/RespondButton/__test__/index.test.jsx +++ b/client/app/bundles/course/survey/containers/RespondButton/__test__/index.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import MockAdapter from 'axios-mock-adapter'; import storeCreator from 'course/survey/store'; diff --git a/client/app/bundles/course/survey/containers/ResponseForm/__test__/index.test.jsx b/client/app/bundles/course/survey/containers/ResponseForm/__test__/index.test.jsx index 6e927c39a6..2df531cbae 100644 --- a/client/app/bundles/course/survey/containers/ResponseForm/__test__/index.test.jsx +++ b/client/app/bundles/course/survey/containers/ResponseForm/__test__/index.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import storeCreator from 'course/survey/store'; import ResponseForm, { buildInitialValues, buildResponsePayload } from '../index'; diff --git a/client/app/bundles/course/survey/containers/SurveyLayout/__test__/AdminMenu.test.jsx b/client/app/bundles/course/survey/containers/SurveyLayout/__test__/AdminMenu.test.jsx index b4757ed3d4..86888d89c3 100644 --- a/client/app/bundles/course/survey/containers/SurveyLayout/__test__/AdminMenu.test.jsx +++ b/client/app/bundles/course/survey/containers/SurveyLayout/__test__/AdminMenu.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount, ReactWrapper } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; import DeleteConfirmation from 'course/survey/containers/SurveysLayout/DeleteConfirmation'; diff --git a/client/app/bundles/course/survey/pages/ResponseEdit/__test__/index.test.jsx b/client/app/bundles/course/survey/pages/ResponseEdit/__test__/index.test.jsx index 700feecacf..b01ee5cbbc 100644 --- a/client/app/bundles/course/survey/pages/ResponseEdit/__test__/index.test.jsx +++ b/client/app/bundles/course/survey/pages/ResponseEdit/__test__/index.test.jsx @@ -2,7 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { connect } from 'react-redux'; import { mount } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import MockAdapter from 'axios-mock-adapter'; import storeCreator from 'course/survey/store'; diff --git a/client/app/bundles/course/survey/pages/ResponseIndex/__test__/RemindButton.test.jsx b/client/app/bundles/course/survey/pages/ResponseIndex/__test__/RemindButton.test.jsx index 3096fc6a79..3815d74092 100644 --- a/client/app/bundles/course/survey/pages/ResponseIndex/__test__/RemindButton.test.jsx +++ b/client/app/bundles/course/survey/pages/ResponseIndex/__test__/RemindButton.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; diff --git a/client/app/bundles/course/survey/pages/SurveyIndex/__test__/NewSurveyButton.test.jsx b/client/app/bundles/course/survey/pages/SurveyIndex/__test__/NewSurveyButton.test.jsx index 0100c22466..2e06cbfa9c 100644 --- a/client/app/bundles/course/survey/pages/SurveyIndex/__test__/NewSurveyButton.test.jsx +++ b/client/app/bundles/course/survey/pages/SurveyIndex/__test__/NewSurveyButton.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount, ReactWrapper } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; import SurveyFormDialogue from 'course/survey/containers/SurveyFormDialogue'; diff --git a/client/app/bundles/course/survey/pages/SurveyResults/__test__/ResultsQuestion.test.jsx b/client/app/bundles/course/survey/pages/SurveyResults/__test__/ResultsQuestion.test.jsx index 0ec173d7fd..995ae2e17c 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/__test__/ResultsQuestion.test.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/__test__/ResultsQuestion.test.jsx @@ -3,7 +3,7 @@ import { mount } from 'enzyme'; import ReactDOM from 'react-dom'; import { MemoryRouter } from 'react-router-dom'; import storeCreator from 'course/survey/store'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import ResultsQuestion from '../ResultsQuestion'; const surveyId = '6'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/DeleteSectionButton.test.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/DeleteSectionButton.test.jsx index 6a99f560ec..b77bb99f04 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/DeleteSectionButton.test.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/DeleteSectionButton.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; import DeleteConfirmation from 'course/survey/containers/SurveysLayout/DeleteConfirmation'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/EditSectionButton.test.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/EditSectionButton.test.jsx index cdad33ad8b..b51f6d9f71 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/EditSectionButton.test.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/EditSectionButton.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount, ReactWrapper } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; import SectionFormDialogue from 'course/survey/containers/SectionFormDialogue'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/MoveDownButton.test.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/MoveDownButton.test.jsx index 4ff9e88e2f..f0ab7dff6a 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/MoveDownButton.test.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/MoveDownButton.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; import MoveDownButton from '../MoveDownButton'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/MoveUpButton.test.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/MoveUpButton.test.jsx index 3a781f50ad..035155c7af 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/MoveUpButton.test.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/MoveUpButton.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; import MoveUpButton from '../MoveUpButton'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/NewQuestionButton.test.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/NewQuestionButton.test.jsx index 7d829cb3a5..e6ed0caf09 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/NewQuestionButton.test.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/__test__/NewQuestionButton.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount, ReactWrapper } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; import QuestionFormDialogue from 'course/survey/containers/QuestionFormDialogue'; diff --git a/client/app/bundles/course/survey/pages/SurveyShow/__test__/NewSectionButton.test.jsx b/client/app/bundles/course/survey/pages/SurveyShow/__test__/NewSectionButton.test.jsx index bdfa62b5f9..9f9652af91 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/__test__/NewSectionButton.test.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/__test__/NewSectionButton.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { mount, ReactWrapper } from 'enzyme'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import CourseAPI from 'api/course'; import storeCreator from 'course/survey/store'; import SectionFormDialogue from 'course/survey/containers/SectionFormDialogue'; From cb82dea3e7181742f3de8920271418bfc70d744b Mon Sep 17 00:00:00 2001 From: Brian Koh Date: Wed, 17 May 2017 15:27:16 +0800 Subject: [PATCH 4/8] Fix test snapshot for upgraded material ui component --- .../ResponseShow/__test__/__snapshots__/index.test.jsx.snap | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/app/bundles/course/survey/pages/ResponseShow/__test__/__snapshots__/index.test.jsx.snap b/client/app/bundles/course/survey/pages/ResponseShow/__test__/__snapshots__/index.test.jsx.snap index 60e5cce48f..eda9fd93be 100644 --- a/client/app/bundles/course/survey/pages/ResponseShow/__test__/__snapshots__/index.test.jsx.snap +++ b/client/app/bundles/course/survey/pages/ResponseShow/__test__/__snapshots__/index.test.jsx.snap @@ -44,7 +44,6 @@ exports[` shows form and admin buttons if user has permissions a hoverable={false} hovered={false} selectable={false} - selected={false} striped={false} > @@ -61,7 +60,6 @@ exports[` shows form and admin buttons if user has permissions a hoverable={false} hovered={false} selectable={false} - selected={false} striped={false} > From 0cb10b075fdfc5744293f1b7079da4136492a626 Mon Sep 17 00:00:00 2001 From: Brian Koh Date: Wed, 17 May 2017 15:07:58 +0800 Subject: [PATCH 5/8] Use yahoo's branch of react-intl since we don't need timeZone anymore --- .../__test__/__snapshots__/AdminMenu.test.jsx.snap | 1 - client/app/lib/components/ProviderWrapper.jsx | 4 ++-- client/package.json | 2 +- client/yarn.lock | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/client/app/bundles/course/survey/containers/SurveyLayout/__test__/__snapshots__/AdminMenu.test.jsx.snap b/client/app/bundles/course/survey/containers/SurveyLayout/__test__/__snapshots__/AdminMenu.test.jsx.snap index 61ea70b58e..a9267b8329 100644 --- a/client/app/bundles/course/survey/containers/SurveyLayout/__test__/__snapshots__/AdminMenu.test.jsx.snap +++ b/client/app/bundles/course/survey/containers/SurveyLayout/__test__/__snapshots__/AdminMenu.test.jsx.snap @@ -49,7 +49,6 @@ exports[` does not render button if user cannot edit or update 1`] "messages": Object {}, "now": [Function], "textComponent": "span", - "timeZone": "Asia/Singapore", } } survey={ diff --git a/client/app/lib/components/ProviderWrapper.jsx b/client/app/lib/components/ProviderWrapper.jsx index b411595fab..1e27cd7a06 100644 --- a/client/app/lib/components/ProviderWrapper.jsx +++ b/client/app/lib/components/ProviderWrapper.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Provider } from 'react-redux'; import { IntlProvider, addLocaleData } from 'react-intl'; -import { i18nLocale, timeZone } from 'lib/helpers/server-context'; +import { i18nLocale } from 'lib/helpers/server-context'; import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'; import injectTapEventPlugin from 'lib/injectTapEventPlugin'; @@ -32,7 +32,7 @@ const ProviderWrapper = ({ store, children }) => { } let providers = - ( + ( { children } diff --git a/client/package.json b/client/package.json index 847f6eaeb3..cae444f0fb 100644 --- a/client/package.json +++ b/client/package.json @@ -83,7 +83,7 @@ "react-dnd": "^2.4.0", "react-dnd-html5-backend": "^2.4.1", "react-dom": "^15.5.4", - "react-intl": "jeremyyap/react-intl#build", + "react-intl": "^2.3.0", "react-redux": "^5.0.4", "react-router-dom": "^4.1.1", "react-scroll": "^1.5.2", diff --git a/client/yarn.lock b/client/yarn.lock index 473f3610ab..467eff3499 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -4905,9 +4905,9 @@ react-event-listener@^0.4.5: prop-types "^15.5.4" warning "^3.0.0" -react-intl@jeremyyap/react-intl#build: - version "2.2.3" - resolved "https://codeload.github.com/jeremyyap/react-intl/tar.gz/a681ca76c33745781ae2dd2c20241b83a9f658c8" +react-intl@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.3.0.tgz#e1df6af5667fdf01cbe4aab20e137251e2ae5142" dependencies: intl-format-cache "^2.0.5" intl-messageformat "^1.3.0" From ecc6bf685f0bb7af2d69e7f4b3dfe20b728dec13 Mon Sep 17 00:00:00 2001 From: Brian Koh Date: Wed, 17 May 2017 15:45:17 +0800 Subject: [PATCH 6/8] Upgrade yarn packages --- client/package.json | 56 +- client/yarn.lock | 1342 +++++++++++++++++++++++-------------------- 2 files changed, 741 insertions(+), 657 deletions(-) diff --git a/client/package.json b/client/package.json index cae444f0fb..6d6bbc86c9 100644 --- a/client/package.json +++ b/client/package.json @@ -4,7 +4,7 @@ "description": "Coursemology Frontend", "engines": { "node": ">=5.10.0", - "yarn": "^0.20.3" + "yarn": "^0.24.4" }, "scripts": { "test": "yarn run jest -- --coverage", @@ -52,20 +52,20 @@ }, "dependencies": { "@types/moment-timezone": "^0.2.34", - "axios": "^0.15.3", + "axios": "^0.16.1", "babel": "^6.5.2", - "babel-cli": "^6.24.0", - "babel-core": "^6.24.0", - "babel-loader": "^6.4.1", + "babel-cli": "^6.24.1", + "babel-core": "^6.24.1", + "babel-loader": "^7.0.0", "babel-plugin-react-intl": "^2.2.0", "babel-polyfill": "^6.7.4", - "babel-preset-es2015": "^6.24.0", - "babel-preset-react": "^6.5.0", - "babel-preset-stage-2": "^6.5.0", + "babel-preset-es2015": "^6.24.1", + "babel-preset-react": "^6.24.1", + "babel-preset-stage-2": "^6.24.1", "babel-runtime": "^6.6.1", "brace": "^0.10.0", - "css-loader": "^0.28.0", - "glob": "^7.1.1", + "css-loader": "^0.28.2", + "glob": "^7.1.2", "history": "^4.6.1", "immutable": "^3.8.1", "intl": "^1.2.5", @@ -75,8 +75,8 @@ "mirror-creator": "1.1.0", "mkdirp": "^0.5.1", "moment": "^2.18.1", - "moment-timezone": "^0.5.11", - "node-sass": "^4.5.2", + "moment-timezone": "^0.5.13", + "node-sass": "^4.5.3", "prop-types": "^15.5.10", "react": "^15.5.4", "react-ace": "^4.3.0", @@ -84,40 +84,40 @@ "react-dnd-html5-backend": "^2.4.1", "react-dom": "^15.5.4", "react-intl": "^2.3.0", - "react-redux": "^5.0.4", + "react-redux": "^5.0.5", "react-router-dom": "^4.1.1", "react-scroll": "^1.5.2", - "react-summernote": "^1.0.5", + "react-summernote": "^2.0.0-rc.1", "react-tap-event-plugin": "^2.0.1", - "react-test-renderer": "^15.5.4", "redux": "^3.3.1", "redux-form": "^6.7.0", "redux-immutable": "^4.0.0", "redux-promise": "^0.5.3", "redux-thunk": "^2.0.1", - "sass-loader": "^6.0.3", + "sass-loader": "^6.0.5", "stats-webpack-plugin": "^0.6.0", - "style-loader": "^0.16.1", + "style-loader": "^0.18.0", "webfontloader": "^1.6.27", - "webpack": "^2.3.2" + "webpack": "^2.5.1" }, "devDependencies": { "axios-mock-adapter": "^1.8.1", - "babel-eslint": "^7.2.1", - "babel-jest": "^19.0.0", + "babel-eslint": "^7.2.3", + "babel-jest": "^20.0.3", "enzyme": "^2.8.2", - "enzyme-to-json": "^1.5.0", - "eslint": "^3.18.0", - "eslint-config-airbnb": "^14.1.0", + "enzyme-to-json": "^1.5.1", + "eslint": "^3.19.0", + "eslint-config-airbnb": "^15.0.1", "eslint-import-resolver-webpack": "^0.8.1", "eslint-plugin-import": "^2.0.1", - "eslint-plugin-jsx-a11y": "^4.0.0", - "eslint-plugin-react": "^6.10.3", - "jest": "^19.0.2", + "eslint-plugin-jsx-a11y": "^5.0.3", + "eslint-plugin-react": "^7.0.1", + "jest": "^20.0.3", "jquery": "^3.2.1", "react-dnd-test-backend": "^2.4.0", - "redux-logger": "^3.0.1", - "webpack-dev-server": "^2.4.2" + "react-test-renderer": "^15.5.4", + "redux-logger": "^3.0.6", + "webpack-dev-server": "^2.4.5" }, "license": "MIT", "repository": "git+https://github.com/Coursemology/coursemology2.git", diff --git a/client/yarn.lock b/client/yarn.lock index 467eff3499..e8dc022c91 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -41,7 +41,7 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn@4.0.4: +acorn@4.0.4, acorn@^4.0.3, acorn@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" @@ -49,9 +49,9 @@ acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.3, acorn@^4.0.4: - version "4.0.11" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" +acorn@^5.0.0: + version "5.0.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" ajv-keywords@^1.0.0, ajv-keywords@^1.1.1: version "1.5.1" @@ -64,6 +64,13 @@ ajv@^4.7.0: co "^4.6.0" json-stable-stringify "^1.0.1" +ajv@^5.0.0: + version "5.1.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.3.tgz#423d1c302c61e617081b30ca05f595ec51408e33" + dependencies: + co "^4.6.0" + json-stable-stringify "^1.0.1" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -88,7 +95,7 @@ ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" -ansi-regex@^2.0.0: +ansi-regex@^2.0.0, ansi-regex@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -132,9 +139,9 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -aria-query@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.3.0.tgz#cb8a9984e2862711c83c80ade5b8f5ca0de2b467" +aria-query@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.5.0.tgz#85e3152cd8cc5bab18dbed61cd9c4fce54fa79c3" dependencies: ast-types-flow "0.0.7" @@ -164,6 +171,13 @@ array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" +array-includes@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" + dependencies: + define-properties "^1.1.2" + es-abstract "^1.7.0" + array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -178,13 +192,6 @@ array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" -array.prototype.find@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.3.tgz#08c3ec33e32ec4bab362a2958e686ae92f59271d" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - arrify@^1.0.0, arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -231,7 +238,7 @@ async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" -async@^1.4.0, async@^1.4.2, async@^1.5.2: +async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" @@ -270,19 +277,25 @@ axios-mock-adapter@^1.8.1: dependencies: deep-equal "^1.0.1" -axios@^0.15.3: - version "0.15.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053" +axios@^0.16.1: + version "0.16.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.1.tgz#c0b6d26600842384b8f509e57111f0d2df8223ca" dependencies: - follow-redirects "1.0.0" + follow-redirects "^1.2.3" + +axobject-query@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-0.1.0.tgz#62f59dbc59c9f9242759ca349960e7a2fe3c36c0" + dependencies: + ast-types-flow "0.0.7" -babel-cli@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.0.tgz#a05ffd210dca0c288a26d5319c5ac8669a265ad0" +babel-cli@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.1.tgz#207cd705bba61489b2ea41b5312341cf6aca2283" dependencies: - babel-core "^6.24.0" + babel-core "^6.24.1" babel-polyfill "^6.23.0" - babel-register "^6.24.0" + babel-register "^6.24.1" babel-runtime "^6.22.0" commander "^2.8.1" convert-source-map "^1.1.0" @@ -305,19 +318,19 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.0" -babel-core@^6.0.0, babel-core@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02" +babel-core@^6.0.0, babel-core@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83" dependencies: babel-code-frame "^6.22.0" - babel-generator "^6.24.0" - babel-helpers "^6.23.0" + babel-generator "^6.24.1" + babel-helpers "^6.24.1" babel-messages "^6.23.0" - babel-register "^6.24.0" + babel-register "^6.24.1" babel-runtime "^6.22.0" - babel-template "^6.23.0" - babel-traverse "^6.23.1" - babel-types "^6.23.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" babylon "^6.11.0" convert-source-map "^1.1.0" debug "^2.1.1" @@ -329,171 +342,169 @@ babel-core@^6.0.0, babel-core@^6.24.0: slash "^1.0.0" source-map "^0.5.0" -babel-eslint@^7.2.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.1.tgz#079422eb73ba811e3ca0865ce87af29327f8c52f" +babel-eslint@^7.2.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827" dependencies: babel-code-frame "^6.22.0" babel-traverse "^6.23.1" babel-types "^6.23.0" - babylon "^6.16.1" + babylon "^6.17.0" -babel-generator@^6.18.0, babel-generator@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56" +babel-generator@^6.18.0, babel-generator@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497" dependencies: babel-messages "^6.23.0" babel-runtime "^6.22.0" - babel-types "^6.23.0" + babel-types "^6.24.1" detect-indent "^4.0.0" jsesc "^1.3.0" lodash "^4.2.0" source-map "^0.5.0" trim-right "^1.0.1" -babel-helper-bindify-decorators@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.22.0.tgz#d7f5bc261275941ac62acfc4e20dacfb8a3fe952" +babel-helper-bindify-decorators@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330" dependencies: babel-runtime "^6.22.0" - babel-traverse "^6.22.0" - babel-types "^6.22.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-helper-builder-binary-assignment-operator-visitor@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.22.0.tgz#29df56be144d81bdeac08262bfa41d2c5e91cdcd" +babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" dependencies: - babel-helper-explode-assignable-expression "^6.22.0" + babel-helper-explode-assignable-expression "^6.24.1" babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" -babel-helper-builder-react-jsx@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.23.0.tgz#d53fc8c996e0bc56d0de0fc4cc55a7138395ea4b" +babel-helper-builder-react-jsx@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz#0ad7917e33c8d751e646daca4e77cc19377d2cbc" dependencies: babel-runtime "^6.22.0" - babel-types "^6.23.0" + babel-types "^6.24.1" esutils "^2.0.0" - lodash "^4.2.0" -babel-helper-call-delegate@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.22.0.tgz#119921b56120f17e9dae3f74b4f5cc7bcc1b37ef" +babel-helper-call-delegate@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" dependencies: - babel-helper-hoist-variables "^6.22.0" + babel-helper-hoist-variables "^6.24.1" babel-runtime "^6.22.0" - babel-traverse "^6.22.0" - babel-types "^6.22.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-helper-define-map@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz#1444f960c9691d69a2ced6a205315f8fd00804e7" +babel-helper-define-map@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080" dependencies: - babel-helper-function-name "^6.23.0" + babel-helper-function-name "^6.24.1" babel-runtime "^6.22.0" - babel-types "^6.23.0" + babel-types "^6.24.1" lodash "^4.2.0" -babel-helper-explode-assignable-expression@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.22.0.tgz#c97bf76eed3e0bae4048121f2b9dae1a4e7d0478" +babel-helper-explode-assignable-expression@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" dependencies: babel-runtime "^6.22.0" - babel-traverse "^6.22.0" - babel-types "^6.22.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-helper-explode-class@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.22.0.tgz#646304924aa6388a516843ba7f1855ef8dfeb69b" +babel-helper-explode-class@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb" dependencies: - babel-helper-bindify-decorators "^6.22.0" + babel-helper-bindify-decorators "^6.24.1" babel-runtime "^6.22.0" - babel-traverse "^6.22.0" - babel-types "^6.22.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6" +babel-helper-function-name@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" dependencies: - babel-helper-get-function-arity "^6.22.0" + babel-helper-get-function-arity "^6.24.1" babel-runtime "^6.22.0" - babel-template "^6.23.0" - babel-traverse "^6.23.0" - babel-types "^6.23.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-helper-get-function-arity@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce" +babel-helper-get-function-arity@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" dependencies: babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" -babel-helper-hoist-variables@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz#3eacbf731d80705845dd2e9718f600cfb9b4ba72" +babel-helper-hoist-variables@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" dependencies: babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" -babel-helper-optimise-call-expression@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz#f3ee7eed355b4282138b33d02b78369e470622f5" +babel-helper-optimise-call-expression@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" dependencies: babel-runtime "^6.22.0" - babel-types "^6.23.0" + babel-types "^6.24.1" -babel-helper-regex@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz#79f532be1647b1f0ee3474b5f5c3da58001d247d" +babel-helper-regex@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8" dependencies: babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" lodash "^4.2.0" -babel-helper-remap-async-to-generator@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.22.0.tgz#2186ae73278ed03b8b15ced089609da981053383" +babel-helper-remap-async-to-generator@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" dependencies: - babel-helper-function-name "^6.22.0" + babel-helper-function-name "^6.24.1" babel-runtime "^6.22.0" - babel-template "^6.22.0" - babel-traverse "^6.22.0" - babel-types "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-helper-replace-supers@^6.22.0, babel-helper-replace-supers@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz#eeaf8ad9b58ec4337ca94223bacdca1f8d9b4bfd" +babel-helper-replace-supers@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" dependencies: - babel-helper-optimise-call-expression "^6.23.0" + babel-helper-optimise-call-expression "^6.24.1" babel-messages "^6.23.0" babel-runtime "^6.22.0" - babel-template "^6.23.0" - babel-traverse "^6.23.0" - babel-types "^6.23.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-helpers@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992" +babel-helpers@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" dependencies: babel-runtime "^6.22.0" - babel-template "^6.23.0" + babel-template "^6.24.1" -babel-jest@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-19.0.0.tgz#59323ced99a3a84d359da219ca881074ffc6ce3f" +babel-jest@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-20.0.3.tgz#e4a03b13dc10389e140fc645d09ffc4ced301671" dependencies: babel-core "^6.0.0" babel-plugin-istanbul "^4.0.0" - babel-preset-jest "^19.0.0" + babel-preset-jest "^20.0.3" -babel-loader@^6.4.1: - version "6.4.1" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca" +babel-loader@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7" dependencies: find-cache-dir "^0.1.1" - loader-utils "^0.2.16" + loader-utils "^1.0.2" mkdirp "^0.5.1" - object-assign "^4.0.1" babel-messages@^6.23.0: version "6.23.0" @@ -515,9 +526,9 @@ babel-plugin-istanbul@^4.0.0: istanbul-lib-instrument "^1.4.2" test-exclude "^4.0.0" -babel-plugin-jest-hoist@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-19.0.0.tgz#4ae2a04ea612a6e73651f3fde52c178991304bea" +babel-plugin-jest-hoist@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-20.0.3.tgz#afedc853bd3f8dc3548ea671fbe69d03cc2c1767" babel-plugin-react-intl@^2.2.0: version "2.3.1" @@ -567,40 +578,40 @@ babel-plugin-syntax-trailing-function-commas@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" -babel-plugin-transform-async-generator-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.22.0.tgz#a720a98153a7596f204099cd5409f4b3c05bab46" +babel-plugin-transform-async-generator-functions@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db" dependencies: - babel-helper-remap-async-to-generator "^6.22.0" + babel-helper-remap-async-to-generator "^6.24.1" babel-plugin-syntax-async-generators "^6.5.0" babel-runtime "^6.22.0" -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.22.0.tgz#194b6938ec195ad36efc4c33a971acf00d8cd35e" +babel-plugin-transform-async-to-generator@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" dependencies: - babel-helper-remap-async-to-generator "^6.22.0" + babel-helper-remap-async-to-generator "^6.24.1" babel-plugin-syntax-async-functions "^6.8.0" babel-runtime "^6.22.0" -babel-plugin-transform-class-properties@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.23.0.tgz#187b747ee404399013563c993db038f34754ac3b" +babel-plugin-transform-class-properties@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" dependencies: - babel-helper-function-name "^6.23.0" + babel-helper-function-name "^6.24.1" babel-plugin-syntax-class-properties "^6.8.0" babel-runtime "^6.22.0" - babel-template "^6.23.0" + babel-template "^6.24.1" -babel-plugin-transform-decorators@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.22.0.tgz#c03635b27a23b23b7224f49232c237a73988d27c" +babel-plugin-transform-decorators@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d" dependencies: - babel-helper-explode-class "^6.22.0" + babel-helper-explode-class "^6.24.1" babel-plugin-syntax-decorators "^6.13.0" babel-runtime "^6.22.0" - babel-template "^6.22.0" - babel-types "^6.22.0" + babel-template "^6.24.1" + babel-types "^6.24.1" babel-plugin-transform-es2015-arrow-functions@^6.22.0: version "6.22.0" @@ -614,36 +625,36 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-block-scoping@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.23.0.tgz#e48895cf0b375be148cd7c8879b422707a053b51" +babel-plugin-transform-es2015-block-scoping@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576" dependencies: babel-runtime "^6.22.0" - babel-template "^6.23.0" - babel-traverse "^6.23.0" - babel-types "^6.23.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" lodash "^4.2.0" -babel-plugin-transform-es2015-classes@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz#49b53f326202a2fd1b3bbaa5e2edd8a4f78643c1" +babel-plugin-transform-es2015-classes@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" dependencies: - babel-helper-define-map "^6.23.0" - babel-helper-function-name "^6.23.0" - babel-helper-optimise-call-expression "^6.23.0" - babel-helper-replace-supers "^6.23.0" + babel-helper-define-map "^6.24.1" + babel-helper-function-name "^6.24.1" + babel-helper-optimise-call-expression "^6.24.1" + babel-helper-replace-supers "^6.24.1" babel-messages "^6.23.0" babel-runtime "^6.22.0" - babel-template "^6.23.0" - babel-traverse "^6.23.0" - babel-types "^6.23.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz#7c383e9629bba4820c11b0425bdd6290f7f057e7" +babel-plugin-transform-es2015-computed-properties@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" dependencies: babel-runtime "^6.22.0" - babel-template "^6.22.0" + babel-template "^6.24.1" babel-plugin-transform-es2015-destructuring@^6.22.0: version "6.23.0" @@ -651,12 +662,12 @@ babel-plugin-transform-es2015-destructuring@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz#672397031c21610d72dd2bbb0ba9fb6277e1c36b" +babel-plugin-transform-es2015-duplicate-keys@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" dependencies: babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" babel-plugin-transform-es2015-for-of@^6.22.0: version "6.23.0" @@ -664,13 +675,13 @@ babel-plugin-transform-es2015-for-of@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz#f5fcc8b09093f9a23c76ac3d9e392c3ec4b77104" +babel-plugin-transform-es2015-function-name@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" dependencies: - babel-helper-function-name "^6.22.0" + babel-helper-function-name "^6.24.1" babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" babel-plugin-transform-es2015-literals@^6.22.0: version "6.22.0" @@ -678,63 +689,63 @@ babel-plugin-transform-es2015-literals@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-modules-amd@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.0.tgz#a1911fb9b7ec7e05a43a63c5995007557bcf6a2e" +babel-plugin-transform-es2015-modules-amd@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.0" + babel-plugin-transform-es2015-modules-commonjs "^6.24.1" babel-runtime "^6.22.0" - babel-template "^6.22.0" + babel-template "^6.24.1" -babel-plugin-transform-es2015-modules-commonjs@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f" +babel-plugin-transform-es2015-modules-commonjs@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe" dependencies: - babel-plugin-transform-strict-mode "^6.22.0" + babel-plugin-transform-strict-mode "^6.24.1" babel-runtime "^6.22.0" - babel-template "^6.23.0" - babel-types "^6.23.0" + babel-template "^6.24.1" + babel-types "^6.24.1" -babel-plugin-transform-es2015-modules-systemjs@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.23.0.tgz#ae3469227ffac39b0310d90fec73bfdc4f6317b0" +babel-plugin-transform-es2015-modules-systemjs@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" dependencies: - babel-helper-hoist-variables "^6.22.0" + babel-helper-hoist-variables "^6.24.1" babel-runtime "^6.22.0" - babel-template "^6.23.0" + babel-template "^6.24.1" -babel-plugin-transform-es2015-modules-umd@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.0.tgz#fd5fa63521cae8d273927c3958afd7c067733450" +babel-plugin-transform-es2015-modules-umd@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.0" + babel-plugin-transform-es2015-modules-amd "^6.24.1" babel-runtime "^6.22.0" - babel-template "^6.23.0" + babel-template "^6.24.1" -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz#daa60e114a042ea769dd53fe528fc82311eb98fc" +babel-plugin-transform-es2015-object-super@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" dependencies: - babel-helper-replace-supers "^6.22.0" + babel-helper-replace-supers "^6.24.1" babel-runtime "^6.22.0" -babel-plugin-transform-es2015-parameters@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz#3a2aabb70c8af945d5ce386f1a4250625a83ae3b" +babel-plugin-transform-es2015-parameters@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" dependencies: - babel-helper-call-delegate "^6.22.0" - babel-helper-get-function-arity "^6.22.0" + babel-helper-call-delegate "^6.24.1" + babel-helper-get-function-arity "^6.24.1" babel-runtime "^6.22.0" - babel-template "^6.23.0" - babel-traverse "^6.23.0" - babel-types "^6.23.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723" +babel-plugin-transform-es2015-shorthand-properties@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" dependencies: babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" babel-plugin-transform-es2015-spread@^6.22.0: version "6.22.0" @@ -742,13 +753,13 @@ babel-plugin-transform-es2015-spread@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz#ab316829e866ee3f4b9eb96939757d19a5bc4593" +babel-plugin-transform-es2015-sticky-regex@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" dependencies: - babel-helper-regex "^6.22.0" + babel-helper-regex "^6.24.1" babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" babel-plugin-transform-es2015-template-literals@^6.22.0: version "6.22.0" @@ -762,19 +773,19 @@ babel-plugin-transform-es2015-typeof-symbol@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz#8d9cc27e7ee1decfe65454fb986452a04a613d20" +babel-plugin-transform-es2015-unicode-regex@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" dependencies: - babel-helper-regex "^6.22.0" + babel-helper-regex "^6.24.1" babel-runtime "^6.22.0" regexpu-core "^2.0.0" -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.22.0.tgz#d57c8335281918e54ef053118ce6eb108468084d" +babel-plugin-transform-exponentiation-operator@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.22.0" + babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" babel-plugin-syntax-exponentiation-operator "^6.8.0" babel-runtime "^6.22.0" @@ -812,26 +823,26 @@ babel-plugin-transform-react-jsx-source@^6.22.0: babel-plugin-syntax-jsx "^6.8.0" babel-runtime "^6.22.0" -babel-plugin-transform-react-jsx@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.23.0.tgz#23e892f7f2e759678eb5e4446a8f8e94e81b3470" +babel-plugin-transform-react-jsx@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" dependencies: - babel-helper-builder-react-jsx "^6.23.0" + babel-helper-builder-react-jsx "^6.24.1" babel-plugin-syntax-jsx "^6.8.0" babel-runtime "^6.22.0" -babel-plugin-transform-regenerator@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6" +babel-plugin-transform-regenerator@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418" dependencies: - regenerator-transform "0.9.8" + regenerator-transform "0.9.11" -babel-plugin-transform-strict-mode@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c" +babel-plugin-transform-strict-mode@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" dependencies: babel-runtime "^6.22.0" - babel-types "^6.22.0" + babel-types "^6.24.1" babel-polyfill@^6.23.0, babel-polyfill@^6.7.4: version "6.23.0" @@ -841,34 +852,34 @@ babel-polyfill@^6.23.0, babel-polyfill@^6.7.4: core-js "^2.4.0" regenerator-runtime "^0.10.0" -babel-preset-es2015@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.0.tgz#c162d68b1932696e036cd3110dc1ccd303d2673a" +babel-preset-es2015@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939" dependencies: babel-plugin-check-es2015-constants "^6.22.0" babel-plugin-transform-es2015-arrow-functions "^6.22.0" babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.22.0" - babel-plugin-transform-es2015-classes "^6.22.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" + babel-plugin-transform-es2015-block-scoping "^6.24.1" + babel-plugin-transform-es2015-classes "^6.24.1" + babel-plugin-transform-es2015-computed-properties "^6.24.1" babel-plugin-transform-es2015-destructuring "^6.22.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" + babel-plugin-transform-es2015-duplicate-keys "^6.24.1" babel-plugin-transform-es2015-for-of "^6.22.0" - babel-plugin-transform-es2015-function-name "^6.22.0" + babel-plugin-transform-es2015-function-name "^6.24.1" babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.24.0" - babel-plugin-transform-es2015-modules-commonjs "^6.24.0" - babel-plugin-transform-es2015-modules-systemjs "^6.22.0" - babel-plugin-transform-es2015-modules-umd "^6.24.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.22.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" + babel-plugin-transform-es2015-modules-amd "^6.24.1" + babel-plugin-transform-es2015-modules-commonjs "^6.24.1" + babel-plugin-transform-es2015-modules-systemjs "^6.24.1" + babel-plugin-transform-es2015-modules-umd "^6.24.1" + babel-plugin-transform-es2015-object-super "^6.24.1" + babel-plugin-transform-es2015-parameters "^6.24.1" + babel-plugin-transform-es2015-shorthand-properties "^6.24.1" babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" + babel-plugin-transform-es2015-sticky-regex "^6.24.1" babel-plugin-transform-es2015-template-literals "^6.22.0" babel-plugin-transform-es2015-typeof-symbol "^6.22.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" + babel-plugin-transform-es2015-unicode-regex "^6.24.1" + babel-plugin-transform-regenerator "^6.24.1" babel-preset-flow@^6.23.0: version "6.23.0" @@ -876,47 +887,47 @@ babel-preset-flow@^6.23.0: dependencies: babel-plugin-transform-flow-strip-types "^6.22.0" -babel-preset-jest@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-19.0.0.tgz#22d67201d02324a195811288eb38294bb3cac396" +babel-preset-jest@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-20.0.3.tgz#cbacaadecb5d689ca1e1de1360ebfc66862c178a" dependencies: - babel-plugin-jest-hoist "^19.0.0" + babel-plugin-jest-hoist "^20.0.3" -babel-preset-react@^6.5.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.23.0.tgz#eb7cee4de98a3f94502c28565332da9819455195" +babel-preset-react@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380" dependencies: babel-plugin-syntax-jsx "^6.3.13" babel-plugin-transform-react-display-name "^6.23.0" - babel-plugin-transform-react-jsx "^6.23.0" + babel-plugin-transform-react-jsx "^6.24.1" babel-plugin-transform-react-jsx-self "^6.22.0" babel-plugin-transform-react-jsx-source "^6.22.0" babel-preset-flow "^6.23.0" -babel-preset-stage-2@^6.5.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.22.0.tgz#ccd565f19c245cade394b21216df704a73b27c07" +babel-preset-stage-2@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1" dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" - babel-plugin-transform-class-properties "^6.22.0" - babel-plugin-transform-decorators "^6.22.0" - babel-preset-stage-3 "^6.22.0" + babel-plugin-transform-class-properties "^6.24.1" + babel-plugin-transform-decorators "^6.24.1" + babel-preset-stage-3 "^6.24.1" -babel-preset-stage-3@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.22.0.tgz#a4e92bbace7456fafdf651d7a7657ee0bbca9c2e" +babel-preset-stage-3@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395" dependencies: babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-generator-functions "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" + babel-plugin-transform-async-generator-functions "^6.24.1" + babel-plugin-transform-async-to-generator "^6.24.1" + babel-plugin-transform-exponentiation-operator "^6.24.1" babel-plugin-transform-object-rest-spread "^6.22.0" -babel-register@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd" +babel-register@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f" dependencies: - babel-core "^6.24.0" + babel-core "^6.24.1" babel-runtime "^6.22.0" core-js "^2.4.0" home-or-tmp "^2.0.0" @@ -931,33 +942,33 @@ babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtim core-js "^2.4.0" regenerator-runtime "^0.10.0" -babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638" +babel-template@^6.16.0, babel-template@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333" dependencies: babel-runtime "^6.22.0" - babel-traverse "^6.23.0" - babel-types "^6.23.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" babylon "^6.11.0" lodash "^4.2.0" -babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1: - version "6.23.1" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48" +babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695" dependencies: babel-code-frame "^6.22.0" babel-messages "^6.23.0" babel-runtime "^6.22.0" - babel-types "^6.23.0" + babel-types "^6.24.1" babylon "^6.15.0" debug "^2.2.0" globals "^9.0.0" invariant "^2.2.0" lodash "^4.2.0" -babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf" +babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975" dependencies: babel-runtime "^6.22.0" esutils "^2.0.2" @@ -969,13 +980,13 @@ babel@^6.5.2: resolved "https://registry.yarnpkg.com/babel/-/babel-6.23.0.tgz#d0d1e7d803e974765beea3232d4e153c0efb90f4" babylon@^6.11.0: - version "6.15.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e" - -babylon@^6.13.0, babylon@^6.15.0, babylon@^6.16.1: version "6.16.1" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3" +babylon@^6.13.0, babylon@^6.15.0, babylon@^6.17.0: + version "6.17.1" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.1.tgz#17f14fddf361b695981fe679385e4f1c01ebd86f" + balanced-match@^0.4.1, balanced-match@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" @@ -1033,6 +1044,13 @@ brace-expansion@^1.0.0: balanced-match "^0.4.1" concat-map "0.0.1" +brace-expansion@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59" + dependencies: + balanced-match "^0.4.1" + concat-map "0.0.1" + brace@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/brace/-/brace-0.10.0.tgz#edef4eb9b0928ba1ee5f717ffc157749a6dd5d76" @@ -1340,9 +1358,9 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -codemirror@^5.11.0: - version "5.24.2" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.24.2.tgz#b55ca950fa009709c37df68eb133310ed89cf2fe" +codemirror@^5.23.0: + version "5.25.2" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.25.2.tgz#8c77677ca9c9248d757d3a07ed1e89a8404850b7" color-convert@^1.0.0, color-convert@^1.3.0: version "1.9.0" @@ -1459,7 +1477,7 @@ content-type@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" -convert-source-map@^1.1.0: +convert-source-map@^1.1.0, convert-source-map@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3" @@ -1506,7 +1524,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2: create-hash "^1.1.0" inherits "^2.0.1" -create-react-class@^15.5.1: +create-react-class@^15.5.3: version "15.5.3" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.3.tgz#fb0f7cae79339e9a179e194ef466efa3923820fe" dependencies: @@ -1552,9 +1570,9 @@ css-in-js-utils@^1.0.3: dependencies: hyphenate-style-name "^1.0.2" -css-loader@^0.28.0: - version "0.28.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.0.tgz#417cfa9789f8cde59a30ccbf3e4da7a806889bad" +css-loader@^0.28.2: + version "0.28.2" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.2.tgz#0ff48e1d6013afcdb585d46c1e61a5fcd036404e" dependencies: babel-code-frame "^6.11.0" css-selector-tokenizer "^0.7.0" @@ -1567,6 +1585,7 @@ css-loader@^0.28.0: postcss-modules-local-by-default "^1.0.1" postcss-modules-scope "^1.0.0" postcss-modules-values "^1.1.0" + postcss-value-parser "^3.3.0" source-list-map "^0.1.7" css-select@~1.2.0: @@ -1688,19 +1707,25 @@ debug@2.2.0, debug@~2.2.0: dependencies: ms "0.7.1" -debug@^2.1.1, debug@^2.2.0: +debug@^2.1.1, debug@^2.2.0, debug@^2.4.5: version "2.6.1" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" dependencies: ms "0.7.2" +debug@^2.6.3: + version "2.6.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e" + dependencies: + ms "2.0.0" + decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" -deep-diff@0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.4.tgz#aac5c39952236abe5f037a2349060ba01b00ae48" +deep-diff@^0.3.5: + version "0.3.8" + resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" deep-equal@^1.0.1: version "1.0.1" @@ -1772,7 +1797,7 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" -diff@^3.0.0: +diff@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" @@ -1797,7 +1822,7 @@ dnd-core@^2.4.0: lodash "^4.2.0" redux "^3.2.0" -doctrine@1.5.0, doctrine@^1.2.2: +doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: @@ -1912,9 +1937,9 @@ entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" -enzyme-to-json@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-1.5.0.tgz#bb94f21346866d68378adc9b26856dd6e2bfa60b" +enzyme-to-json@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-1.5.1.tgz#e34f4d126bb3f4696ce3800b51f9ed83df708799" dependencies: lodash.filter "^4.6.0" lodash.isnil "^4.0.0" @@ -2052,15 +2077,15 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-config-airbnb-base@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.1.0.tgz#dc9b3ec70b8c74dcbe6d6257c9da3992c39ca2ca" +eslint-config-airbnb-base@^11.2.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.2.0.tgz#19a9dc4481a26f70904545ec040116876018f853" -eslint-config-airbnb@^14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-14.1.0.tgz#355d290040bbf8e00bf8b4b19f4b70cbe7c2317f" +eslint-config-airbnb@^15.0.1: + version "15.0.1" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-15.0.1.tgz#7b5188e5b7c74b9b2ce639fd5e1daba8fd761aed" dependencies: - eslint-config-airbnb-base "^11.1.0" + eslint-config-airbnb-base "^11.2.0" eslint-import-resolver-node@^0.2.0: version "0.2.3" @@ -2108,30 +2133,29 @@ eslint-plugin-import@^2.0.1: minimatch "^3.0.3" pkg-up "^1.0.0" -eslint-plugin-jsx-a11y@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-4.0.0.tgz#779bb0fe7b08da564a422624911de10061e048ee" +eslint-plugin-jsx-a11y@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.0.3.tgz#4a939f76ec125010528823331bf948cc573380b6" dependencies: - aria-query "^0.3.0" + aria-query "^0.5.0" + array-includes "^3.0.3" ast-types-flow "0.0.7" + axobject-query "^0.1.0" damerau-levenshtein "^1.0.0" emoji-regex "^6.1.0" - jsx-ast-utils "^1.0.0" - object-assign "^4.0.1" + jsx-ast-utils "^1.4.0" -eslint-plugin-react@^6.10.3: - version "6.10.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78" +eslint-plugin-react@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.0.1.tgz#e78107e1e559c6e2b17786bb67c2e2a010ad0d2f" dependencies: - array.prototype.find "^2.0.1" - doctrine "^1.2.2" + doctrine "^2.0.0" has "^1.0.1" jsx-ast-utils "^1.3.4" - object.assign "^4.0.4" -eslint@^3.18.0: - version "3.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b" +eslint@^3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" @@ -2180,10 +2204,6 @@ esprima@^2.6.0, esprima@^2.7.1: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" -esprima@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" - esquery@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa" @@ -2444,11 +2464,11 @@ flux-standard-action@^0.6.1: dependencies: lodash.isplainobject "^3.2.0" -follow-redirects@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37" +follow-redirects@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.3.tgz#01abaeca85e3609837d9fcda3167a7e42fdaca21" dependencies: - debug "^2.2.0" + debug "^2.4.5" for-in@^0.1.3, for-in@^0.1.5: version "0.1.6" @@ -2584,14 +2604,14 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.2" + minimatch "^3.0.4" once "^1.3.0" path-is-absolute "^1.0.0" @@ -2618,7 +2638,7 @@ globule@^1.0.0: lodash "~4.16.4" minimatch "~3.0.2" -graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -2970,7 +2990,7 @@ is-callable@^1.1.1, is-callable@^1.1.2, is-callable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" -is-ci@^1.0.9: +is-ci@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e" dependencies: @@ -3174,33 +3194,37 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -istanbul-api@^1.1.0-alpha.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.1.tgz#d36e2f1560d1a43ce304c4ff7338182de61c8f73" +istanbul-api@^1.1.1: + version "1.1.8" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.8.tgz#a844e55c6f9aeee292e7f42942196f60b23dc93e" dependencies: async "^2.1.4" fileset "^2.0.2" - istanbul-lib-coverage "^1.0.0" - istanbul-lib-hook "^1.0.0" - istanbul-lib-instrument "^1.3.0" - istanbul-lib-report "^1.0.0-alpha.3" - istanbul-lib-source-maps "^1.1.0" - istanbul-reports "^1.0.0" + istanbul-lib-coverage "^1.1.0" + istanbul-lib-hook "^1.0.6" + istanbul-lib-instrument "^1.7.1" + istanbul-lib-report "^1.1.0" + istanbul-lib-source-maps "^1.2.0" + istanbul-reports "^1.1.0" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0: +istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212" -istanbul-lib-hook@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0.tgz#fc5367ee27f59268e8f060b0c7aaf051d9c425c5" +istanbul-lib-coverage@^1.0.0-alpha.0, istanbul-lib-coverage@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#caca19decaef3525b5d6331d701f3f3b7ad48528" + +istanbul-lib-hook@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.6.tgz#c0866d1e81cf2d5319249510131fc16dee49231f" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.3.0, istanbul-lib-instrument@^1.4.2: +istanbul-lib-instrument@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e" dependencies: @@ -3212,15 +3236,25 @@ istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.3.0, istanbul-lib-ins istanbul-lib-coverage "^1.0.0" semver "^5.3.0" -istanbul-lib-report@^1.0.0-alpha.3: - version "1.0.0-alpha.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af" +istanbul-lib-instrument@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.1.tgz#169e31bc62c778851a99439dd99c3cc12184d360" + dependencies: + babel-generator "^6.18.0" + babel-template "^6.16.0" + babel-traverse "^6.18.0" + babel-types "^6.18.0" + babylon "^6.13.0" + istanbul-lib-coverage "^1.1.0" + semver "^5.3.0" + +istanbul-lib-report@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.0.tgz#444c4ecca9afa93cf584f56b10f195bf768c0770" dependencies: - async "^1.4.2" - istanbul-lib-coverage "^1.0.0-alpha" + istanbul-lib-coverage "^1.1.0" mkdirp "^0.5.1" path-parse "^1.0.5" - rimraf "^2.4.3" supports-color "^3.1.2" istanbul-lib-source-maps@^1.1.0: @@ -3232,213 +3266,232 @@ istanbul-lib-source-maps@^1.1.0: rimraf "^2.4.4" source-map "^0.5.3" -istanbul-reports@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.1.tgz#9a17176bc4a6cbebdae52b2f15961d52fa623fbc" +istanbul-lib-source-maps@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.0.tgz#8c7706d497e26feeb6af3e0c28fd5b0669598d0e" + dependencies: + debug "^2.6.3" + istanbul-lib-coverage "^1.1.0" + mkdirp "^0.5.1" + rimraf "^2.6.1" + source-map "^0.5.3" + +istanbul-reports@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.0.tgz#1ef3b795889219cfb5fad16365f6ce108d5f8c66" dependencies: handlebars "^4.0.3" -jest-changed-files@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-19.0.2.tgz#16c54c84c3270be408e06d2e8af3f3e37a885824" +jest-changed-files@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8" -jest-cli@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-19.0.2.tgz#cc3620b62acac5f2d93a548cb6ef697d4ec85443" +jest-cli@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.3.tgz#fe88ddbb7a9f3a16d0ed55339a0a2424f7f0d361" dependencies: ansi-escapes "^1.4.0" callsites "^2.0.0" - chalk "^1.1.1" - graceful-fs "^4.1.6" - is-ci "^1.0.9" - istanbul-api "^1.1.0-alpha.1" - istanbul-lib-coverage "^1.0.0" - istanbul-lib-instrument "^1.1.1" - jest-changed-files "^19.0.2" - jest-config "^19.0.2" - jest-environment-jsdom "^19.0.2" - jest-haste-map "^19.0.0" - jest-jasmine2 "^19.0.2" - jest-message-util "^19.0.0" - jest-regex-util "^19.0.0" - jest-resolve-dependencies "^19.0.0" - jest-runtime "^19.0.2" - jest-snapshot "^19.0.2" - jest-util "^19.0.2" + chalk "^1.1.3" + graceful-fs "^4.1.11" + is-ci "^1.0.10" + istanbul-api "^1.1.1" + istanbul-lib-coverage "^1.0.1" + istanbul-lib-instrument "^1.4.2" + istanbul-lib-source-maps "^1.1.0" + jest-changed-files "^20.0.3" + jest-config "^20.0.3" + jest-docblock "^20.0.3" + jest-environment-jsdom "^20.0.3" + jest-haste-map "^20.0.3" + jest-jasmine2 "^20.0.3" + jest-message-util "^20.0.3" + jest-regex-util "^20.0.3" + jest-resolve-dependencies "^20.0.3" + jest-runtime "^20.0.3" + jest-snapshot "^20.0.3" + jest-util "^20.0.3" micromatch "^2.3.11" - node-notifier "^5.0.1" + node-notifier "^5.0.2" + pify "^2.3.0" slash "^1.0.0" string-length "^1.0.1" throat "^3.0.0" - which "^1.1.1" + which "^1.2.12" worker-farm "^1.3.1" - yargs "^6.3.0" + yargs "^7.0.2" -jest-config@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-19.0.2.tgz#1b9bd2db0ddd16df61c2b10a54009e1768da6411" +jest-config@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-20.0.3.tgz#a934f27eea764915801cdda26f6f8eec2ac79266" dependencies: - chalk "^1.1.1" - jest-environment-jsdom "^19.0.2" - jest-environment-node "^19.0.2" - jest-jasmine2 "^19.0.2" - jest-regex-util "^19.0.0" - jest-resolve "^19.0.2" - jest-validate "^19.0.2" - pretty-format "^19.0.0" - -jest-diff@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c" + chalk "^1.1.3" + glob "^7.1.1" + jest-environment-jsdom "^20.0.3" + jest-environment-node "^20.0.3" + jest-jasmine2 "^20.0.3" + jest-matcher-utils "^20.0.3" + jest-regex-util "^20.0.3" + jest-resolve "^20.0.3" + jest-validate "^20.0.3" + pretty-format "^20.0.3" + +jest-diff@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-20.0.3.tgz#81f288fd9e675f0fb23c75f1c2b19445fe586617" dependencies: chalk "^1.1.3" - diff "^3.0.0" - jest-matcher-utils "^19.0.0" - pretty-format "^19.0.0" + diff "^3.2.0" + jest-matcher-utils "^20.0.3" + pretty-format "^20.0.3" -jest-environment-jsdom@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-19.0.2.tgz#ceda859c4a4b94ab35e4de7dab54b926f293e4a3" - dependencies: - jest-mock "^19.0.0" - jest-util "^19.0.2" - jsdom "^9.11.0" +jest-docblock@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712" -jest-environment-node@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-19.0.2.tgz#6e84079db87ed21d0c05e1f9669f207b116fe99b" +jest-environment-jsdom@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz#048a8ac12ee225f7190417713834bb999787de99" dependencies: - jest-mock "^19.0.0" - jest-util "^19.0.2" + jest-mock "^20.0.3" + jest-util "^20.0.3" + jsdom "^9.12.0" -jest-file-exists@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8" +jest-environment-node@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-20.0.3.tgz#d488bc4612af2c246e986e8ae7671a099163d403" + dependencies: + jest-mock "^20.0.3" + jest-util "^20.0.3" -jest-haste-map@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-19.0.0.tgz#adde00b62b1fe04432a104b3254fc5004514b55e" +jest-haste-map@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.3.tgz#6377d537eaf34eb5f75121a691cae3fde82ba971" dependencies: fb-watchman "^2.0.0" - graceful-fs "^4.1.6" + graceful-fs "^4.1.11" + jest-docblock "^20.0.3" micromatch "^2.3.11" - sane "~1.5.0" + sane "~1.6.0" worker-farm "^1.3.1" -jest-jasmine2@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-19.0.2.tgz#167991ac825981fb1a800af126e83afcca832c73" +jest-jasmine2@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-20.0.3.tgz#18c4e9d029da7ed1ae727c55300064d1a0542974" dependencies: - graceful-fs "^4.1.6" - jest-matcher-utils "^19.0.0" - jest-matchers "^19.0.0" - jest-message-util "^19.0.0" - jest-snapshot "^19.0.2" + chalk "^1.1.3" + graceful-fs "^4.1.11" + jest-diff "^20.0.3" + jest-matcher-utils "^20.0.3" + jest-matchers "^20.0.3" + jest-message-util "^20.0.3" + jest-snapshot "^20.0.3" + once "^1.4.0" + p-map "^1.1.1" -jest-matcher-utils@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d" +jest-matcher-utils@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz#b3a6b8e37ca577803b0832a98b164f44b7815612" dependencies: chalk "^1.1.3" - pretty-format "^19.0.0" + pretty-format "^20.0.3" -jest-matchers@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-19.0.0.tgz#c74ecc6ebfec06f384767ba4d6fa4a42d6755754" +jest-matchers@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-20.0.3.tgz#ca69db1c32db5a6f707fa5e0401abb55700dfd60" dependencies: - jest-diff "^19.0.0" - jest-matcher-utils "^19.0.0" - jest-message-util "^19.0.0" - jest-regex-util "^19.0.0" + jest-diff "^20.0.3" + jest-matcher-utils "^20.0.3" + jest-message-util "^20.0.3" + jest-regex-util "^20.0.3" -jest-message-util@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-19.0.0.tgz#721796b89c0e4d761606f9ba8cb828a3b6246416" +jest-message-util@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-20.0.3.tgz#6aec2844306fcb0e6e74d5796c1006d96fdd831c" dependencies: - chalk "^1.1.1" + chalk "^1.1.3" micromatch "^2.3.11" + slash "^1.0.0" -jest-mock@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-19.0.0.tgz#67038641e9607ab2ce08ec4a8cb83aabbc899d01" +jest-mock@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-20.0.3.tgz#8bc070e90414aa155c11a8d64c869a0d5c71da59" -jest-regex-util@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-19.0.0.tgz#b7754587112aede1456510bb1f6afe74ef598691" +jest-regex-util@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-20.0.3.tgz#85bbab5d133e44625b19faf8c6aa5122d085d762" -jest-resolve-dependencies@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-19.0.0.tgz#a741ad1fa094140e64ecf2642a504f834ece22ee" +jest-resolve-dependencies@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-20.0.3.tgz#6e14a7b717af0f2cb3667c549de40af017b1723a" dependencies: - jest-file-exists "^19.0.0" + jest-regex-util "^20.0.3" -jest-resolve@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-19.0.2.tgz#5793575de4f07aec32f7d7ff0c6c181963eefb3c" +jest-resolve@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-20.0.3.tgz#375307aa40f78532d40ff8b17d5300b1519f8dd4" dependencies: browser-resolve "^1.11.2" - jest-haste-map "^19.0.0" - resolve "^1.2.0" + is-builtin-module "^1.0.0" + resolve "^1.3.2" -jest-runtime@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-19.0.2.tgz#d9a43e72de416d27d196fd9c7940d98fe6685407" +jest-runtime@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-20.0.3.tgz#dddd22bbc429e26e6a96d1acd46ca55714b09252" dependencies: babel-core "^6.0.0" - babel-jest "^19.0.0" + babel-jest "^20.0.3" babel-plugin-istanbul "^4.0.0" chalk "^1.1.3" - graceful-fs "^4.1.6" - jest-config "^19.0.2" - jest-file-exists "^19.0.0" - jest-haste-map "^19.0.0" - jest-regex-util "^19.0.0" - jest-resolve "^19.0.2" - jest-util "^19.0.2" + convert-source-map "^1.4.0" + graceful-fs "^4.1.11" + jest-config "^20.0.3" + jest-haste-map "^20.0.3" + jest-regex-util "^20.0.3" + jest-resolve "^20.0.3" + jest-util "^20.0.3" json-stable-stringify "^1.0.1" micromatch "^2.3.11" strip-bom "3.0.0" - yargs "^6.3.0" + yargs "^7.0.2" -jest-snapshot@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-19.0.2.tgz#9c1b216214f7187c38bfd5c70b1efab16b0ff50b" +jest-snapshot@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-20.0.3.tgz#5b847e1adb1a4d90852a7f9f125086e187c76566" dependencies: chalk "^1.1.3" - jest-diff "^19.0.0" - jest-file-exists "^19.0.0" - jest-matcher-utils "^19.0.0" - jest-util "^19.0.2" + jest-diff "^20.0.3" + jest-matcher-utils "^20.0.3" + jest-util "^20.0.3" natural-compare "^1.4.0" - pretty-format "^19.0.0" + pretty-format "^20.0.3" -jest-util@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-19.0.2.tgz#e0a0232a2ab9e6b2b53668bdb3534c2b5977ed41" +jest-util@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-20.0.3.tgz#0c07f7d80d82f4e5a67c6f8b9c3fe7f65cfd32ad" dependencies: - chalk "^1.1.1" - graceful-fs "^4.1.6" - jest-file-exists "^19.0.0" - jest-message-util "^19.0.0" - jest-mock "^19.0.0" - jest-validate "^19.0.2" - leven "^2.0.0" + chalk "^1.1.3" + graceful-fs "^4.1.11" + jest-message-util "^20.0.3" + jest-mock "^20.0.3" + jest-validate "^20.0.3" + leven "^2.1.0" mkdirp "^0.5.1" -jest-validate@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.2.tgz#dc534df5f1278d5b63df32b14241d4dbf7244c0c" +jest-validate@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-20.0.3.tgz#d0cfd1de4f579f298484925c280f8f1d94ec3cab" dependencies: - chalk "^1.1.1" - jest-matcher-utils "^19.0.0" - leven "^2.0.0" - pretty-format "^19.0.0" + chalk "^1.1.3" + jest-matcher-utils "^20.0.3" + leven "^2.1.0" + pretty-format "^20.0.3" -jest@^19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/jest/-/jest-19.0.2.tgz#b794faaf8ff461e7388f28beef559a54f20b2c10" +jest@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.3.tgz#e4fd054c4f1170a116a00761da4cfdb73f1cdc33" dependencies: - jest-cli "^19.0.2" + jest-cli "^20.0.3" jodid25519@^1.0.0: version "1.0.2" @@ -3454,7 +3507,7 @@ jquery@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" -js-base64@^2.1.9: +js-base64@^2.1.8, js-base64@^2.1.9: version "2.1.9" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" @@ -3462,14 +3515,7 @@ js-tokens@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" -js-yaml@^3.5.1, js-yaml@^3.7.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628" - dependencies: - argparse "^1.0.7" - esprima "^3.1.1" - -js-yaml@~3.7.0: +js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@~3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" dependencies: @@ -3480,9 +3526,9 @@ jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" -jsdom@^9.11.0: - version "9.11.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.11.0.tgz#a95b0304e521a2ca5a63c6ea47bf7708a7a84591" +jsdom@^9.12.0: + version "9.12.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4" dependencies: abab "^1.0.3" acorn "^4.0.4" @@ -3534,7 +3580,7 @@ json3@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" -json5@^0.5.0: +json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -3554,7 +3600,7 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.3.6" -jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4: +jsx-ast-utils@^1.3.4, jsx-ast-utils@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.0.tgz#5afe38868f56bc8cc7aeaef0100ba8c75bd12591" dependencies: @@ -3590,7 +3636,7 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -leven@^2.0.0: +leven@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" @@ -3657,7 +3703,7 @@ lodash._topath@^3.0.0: dependencies: lodash.isarray "^3.0.0" -lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0: +lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -3946,7 +3992,13 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@~3.0.2: +minimatch@^3.0.0, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimatch@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: @@ -3977,13 +4029,13 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkd dependencies: minimist "0.0.8" -moment-timezone@^0.5.11: - version "0.5.11" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.11.tgz#9b76c03d8ef514c7e4249a7bbce649eed39ef29f" +moment-timezone@^0.5.13: + version "0.5.13" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.13.tgz#99ce5c7d827262eb0f1f702044177f60745d7b90" dependencies: - moment ">= 2.6.0" + moment ">= 2.9.0" -"moment@>= 2.6.0", moment@>=2.14.0, moment@^2.18.1: +"moment@>= 2.9.0", moment@>=2.14.0, moment@^2.18.1: version "2.18.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" @@ -3995,6 +4047,10 @@ ms@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765" +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + mute-stream@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" @@ -4019,8 +4075,8 @@ node-fetch@^1.0.1: is-stream "^1.0.1" node-gyp@^3.3.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.5.0.tgz#a8fe5e611d079ec16348a3eb960e78e11c85274a" + version "3.6.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.1.tgz#19561067ff185464aded478212681f47fd578cbc" dependencies: fstream "^1.0.0" glob "^7.0.3" @@ -4032,7 +4088,7 @@ node-gyp@^3.3.1: osenv "0" request "2" rimraf "2" - semver "2.x || 3.x || 4 || 5" + semver "~5.3.0" tar "^2.0.0" which "1" @@ -4040,9 +4096,9 @@ node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" -node-libs-browser@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea" +node-libs-browser@2.0.0, node-libs-browser@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" dependencies: assert "^1.1.1" browserify-zlib "^0.1.4" @@ -4062,15 +4118,15 @@ node-libs-browser@^1.0.0: stream-browserify "^2.0.1" stream-http "^2.3.1" string_decoder "^0.10.25" - timers-browserify "^1.4.2" + timers-browserify "^2.0.2" tty-browserify "0.0.0" url "^0.11.0" util "^0.10.3" vm-browserify "0.0.4" -node-libs-browser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" +node-libs-browser@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea" dependencies: assert "^1.1.1" browserify-zlib "^0.1.4" @@ -4090,15 +4146,15 @@ node-libs-browser@^2.0.0: stream-browserify "^2.0.1" stream-http "^2.3.1" string_decoder "^0.10.25" - timers-browserify "^2.0.2" + timers-browserify "^1.4.2" tty-browserify "0.0.0" url "^0.11.0" util "^0.10.3" vm-browserify "0.0.4" -node-notifier@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.0.2.tgz#4438449fe69e321f941cef943986b0797032701b" +node-notifier@^5.0.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.1.2.tgz#2fa9e12605fa10009d44549d6fcd8a63dde0e4ff" dependencies: growly "^1.3.0" semver "^5.3.0" @@ -4119,9 +4175,9 @@ node-pre-gyp@^0.6.29: tar "~2.2.1" tar-pack "~3.3.0" -node-sass@^4.5.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.2.tgz#4012fa2bd129b1d6365117e88d9da0500d99da64" +node-sass@^4.5.3: + version "4.5.3" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568" dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -4358,6 +4414,10 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" +p-map@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz#05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a" + pako@~0.2.0: version "0.2.9" resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" @@ -4733,10 +4793,11 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -pretty-format@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84" +pretty-format@^20.0.3: + version "20.0.3" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-20.0.3.tgz#020e350a560a1fe1a98dc3beb6ccffb386de8b14" dependencies: + ansi-regex "^2.1.1" ansi-styles "^3.0.0" private@^0.1.6: @@ -4761,7 +4822,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7: +prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7: version "15.5.10" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" dependencies: @@ -4914,17 +4975,17 @@ react-intl@^2.3.0: intl-relativeformat "^1.3.0" invariant "^2.1.1" -react-redux@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.4.tgz#1563babadcfb2672f57f9ceaa439fb16bf85d55b" +react-redux@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.5.tgz#f8e8c7b239422576e52d6b7db06439469be9846a" dependencies: - create-react-class "^15.5.1" + create-react-class "^15.5.3" hoist-non-react-statics "^1.0.3" invariant "^2.0.0" lodash "^4.2.0" lodash-es "^4.2.0" loose-envify "^1.1.0" - prop-types "^15.0.0" + prop-types "^15.5.10" react-router-dom@^4.1.1: version "4.1.1" @@ -4954,11 +5015,12 @@ react-scroll@^1.5.2: object-assign "^4.1.1" prop-types "^15.5.8" -react-summernote@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/react-summernote/-/react-summernote-1.0.5.tgz#f4641624f40d0d27174745c4190fdb4a63970dfc" +react-summernote@^2.0.0-rc.1: + version "2.0.0-rc.1" + resolved "https://registry.yarnpkg.com/react-summernote/-/react-summernote-2.0.0-rc.1.tgz#f8439738925b54e84a93706d9d8b5f318c42ddd4" dependencies: - codemirror "^5.11.0" + codemirror "^5.23.0" + node-libs-browser "2.0.0" summernote "^0.8.2" react-tap-event-plugin@^2.0.1: @@ -5101,11 +5163,11 @@ redux-immutable@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/redux-immutable/-/redux-immutable-4.0.0.tgz#3a1a32df66366462b63691f0e1dc35e472bbc9f3" -redux-logger@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.1.tgz#ae8ae4c3c55ed3dd7aa31509f0856c5d3751057a" +redux-logger@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" dependencies: - deep-diff "0.3.4" + deep-diff "^0.3.5" redux-promise@^0.5.3: version "0.5.3" @@ -5134,9 +5196,9 @@ regenerator-runtime@^0.10.0: version "0.10.3" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e" -regenerator-transform@0.9.8: - version "0.9.8" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c" +regenerator-transform@0.9.11: + version "0.9.11" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283" dependencies: babel-runtime "^6.18.0" babel-types "^6.19.0" @@ -5249,6 +5311,12 @@ resolve@^1.1.6, resolve@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c" +resolve@^1.3.2: + version "1.3.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5" + dependencies: + path-parse "^1.0.5" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -5262,7 +5330,13 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4: +rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" + dependencies: + glob "^7.0.5" + +rimraf@~2.5.1, rimraf@~2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: @@ -5282,9 +5356,9 @@ rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" -sane@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/sane/-/sane-1.5.0.tgz#a4adeae764d048621ecb27d5f9ecf513101939f3" +sane@~1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-1.6.0.tgz#9610c452307a135d29c1fdfe2547034180c46775" dependencies: anymatch "^1.3.0" exec-sh "^0.2.0" @@ -5295,16 +5369,17 @@ sane@~1.5.0: watch "~0.10.0" sass-graph@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.1.2.tgz#965104be23e8103cb7e5f710df65935b317da57b" + version "2.2.4" + resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" dependencies: glob "^7.0.0" lodash "^4.0.0" - yargs "^4.7.1" + scss-tokenizer "^0.2.3" + yargs "^7.0.0" -sass-loader@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.3.tgz#33983b1f90d27ddab0e57d0dac403dce9bc7ecfd" +sass-loader@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.5.tgz#a847910f36442aa56c5985879d54eb519e24a328" dependencies: async "^2.1.5" clone-deep "^0.2.4" @@ -5316,11 +5391,24 @@ sax@^1.2.1, sax@~1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828" +schema-utils@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" + dependencies: + ajv "^5.0.0" + +scss-tokenizer@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + dependencies: + js-base64 "^2.1.8" + source-map "^0.4.2" + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.3.0, semver@~5.3.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -5466,7 +5554,7 @@ source-map-support@^0.4.2: dependencies: source-map "^0.5.3" -source-map@^0.4.4: +source-map@^0.4.2, source-map@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: @@ -5627,11 +5715,12 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -style-loader@^0.16.1: - version "0.16.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.16.1.tgz#50e325258d4e78421dd9680636b41e8661595d10" +style-loader@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.0.tgz#5b7a895860bda966286c8bb80ffd4ccbaf0411f5" dependencies: loader-utils "^1.0.2" + schema-utils "^0.3.0" summernote@^0.8.2: version "0.8.2" @@ -5983,18 +6072,18 @@ webidl-conversions@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0" -webpack-dev-middleware@^1.9.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893" +webpack-dev-middleware@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1" dependencies: memory-fs "~0.4.1" mime "^1.3.4" path-is-absolute "^1.0.0" range-parser "^1.0.3" -webpack-dev-server@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.2.tgz#cf595d6b40878452b6d2ad7229056b686f8a16be" +webpack-dev-server@^2.4.5: + version "2.4.5" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.5.tgz#31384ce81136be1080b4b4cde0eb9b90e54ee6cf" dependencies: ansi-html "0.0.7" chokidar "^1.6.0" @@ -6011,7 +6100,7 @@ webpack-dev-server@^2.4.2: spdy "^3.4.1" strip-ansi "^3.0.0" supports-color "^3.1.1" - webpack-dev-middleware "^1.9.0" + webpack-dev-middleware "^1.10.2" yargs "^6.0.0" webpack-sources@^0.2.3: @@ -6021,11 +6110,11 @@ webpack-sources@^0.2.3: source-list-map "^1.1.1" source-map "~0.5.3" -webpack@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.2.tgz#7d521e6f0777a3a58985c69425263fdfe977b458" +webpack@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.5.1.tgz#61742f0cf8af555b87460a9cd8bba2f1e3ee2fce" dependencies: - acorn "^4.0.4" + acorn "^5.0.0" acorn-dynamic-import "^2.0.0" ajv "^4.7.0" ajv-keywords "^1.1.1" @@ -6033,6 +6122,7 @@ webpack@^2.3.2: enhanced-resolve "^3.0.0" interpret "^1.0.0" json-loader "^0.5.4" + json5 "^0.5.1" loader-runner "^2.3.0" loader-utils "^0.2.16" memory-fs "~0.4.1" @@ -6081,7 +6171,7 @@ which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" -which@1, which@^1.1.1, which@^1.2.12, which@^1.2.9: +which@1, which@^1.2.12, which@^1.2.9: version "1.2.12" resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192" dependencies: @@ -6097,10 +6187,6 @@ window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" -window-size@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" - wordwrap@0.0.2, wordwrap@~0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -6146,15 +6232,8 @@ y18n@^3.2.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" yallist@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4" - -yargs-parser@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" - dependencies: - camelcase "^3.0.0" - lodash.assign "^4.0.6" + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" yargs-parser@^4.2.0: version "4.2.1" @@ -6162,28 +6241,33 @@ yargs-parser@^4.2.0: dependencies: camelcase "^3.0.0" -yargs@^4.7.1: - version "4.8.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" +yargs-parser@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" dependencies: + camelcase "^3.0.0" + +yargs@^6.0.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" + dependencies: + camelcase "^3.0.0" cliui "^3.2.0" decamelize "^1.1.1" get-caller-file "^1.0.1" - lodash.assign "^4.0.3" os-locale "^1.4.0" read-pkg-up "^1.0.1" require-directory "^2.1.1" require-main-filename "^1.0.1" set-blocking "^2.0.0" - string-width "^1.0.1" + string-width "^1.0.2" which-module "^1.0.0" - window-size "^0.2.0" y18n "^3.2.1" - yargs-parser "^2.4.1" + yargs-parser "^4.2.0" -yargs@^6.0.0, yargs@^6.3.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" +yargs@^7.0.0, yargs@^7.0.2: + version "7.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" dependencies: camelcase "^3.0.0" cliui "^3.2.0" @@ -6197,7 +6281,7 @@ yargs@^6.0.0, yargs@^6.3.0: string-width "^1.0.2" which-module "^1.0.0" y18n "^3.2.1" - yargs-parser "^4.2.0" + yargs-parser "^5.0.0" yargs@~3.10.0: version "3.10.0" From 32a40503565fcbf98037a6126852474aab4925b2 Mon Sep 17 00:00:00 2001 From: Brian Koh Date: Wed, 17 May 2017 16:17:25 +0800 Subject: [PATCH 7/8] Fix newly generated frontend lints --- .../components/ConditionList/index.jsx | 4 +- .../AssessmentForm/translations.intl.js | 6 ++- .../components/UploadedPackageView.jsx | 38 +++++++++---------- .../components/LessonPlanGroup.jsx | 4 +- .../components/LessonPlanIndex.jsx | 4 +- .../lesson-plan/components/LessonPlanItem.jsx | 4 +- .../SurveyResults/OptionsQuestionResults.jsx | 4 +- .../pages/SurveyResults/ResultsSection.jsx | 4 +- .../survey/pages/SurveyResults/index.jsx | 4 +- .../pages/SurveyShow/Section/SectionCard.jsx | 4 +- .../course/survey/pages/SurveyShow/index.jsx | 4 +- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/client/app/bundles/course/assessment/components/ConditionList/index.jsx b/client/app/bundles/course/assessment/components/ConditionList/index.jsx index aa3a55544f..cfe381c216 100644 --- a/client/app/bundles/course/assessment/components/ConditionList/index.jsx +++ b/client/app/bundles/course/assessment/components/ConditionList/index.jsx @@ -94,7 +94,7 @@ class ConditionList extends React.Component { renderConditionRows() { return ( this.props.conditions.map(condition => - + ( {condition.type} {condition.description} @@ -110,7 +110,7 @@ class ConditionList extends React.Component { - + ) ) ); } diff --git a/client/app/bundles/course/assessment/containers/AssessmentForm/translations.intl.js b/client/app/bundles/course/assessment/containers/AssessmentForm/translations.intl.js index 5a979ce449..8ebd39a80d 100644 --- a/client/app/bundles/course/assessment/containers/AssessmentForm/translations.intl.js +++ b/client/app/bundles/course/assessment/containers/AssessmentForm/translations.intl.js @@ -39,7 +39,8 @@ const translations = defineMessages({ }, showPrivateHint: { id: 'course.assessment.form.showPrivateHint', - defaultMessage: 'Show private tests to students after the submission is graded and published (For programming questions)', + defaultMessage: + 'Show private tests to students after the submission is graded and published (For programming questions)', }, showEvaluation: { id: 'course.assessment.form.showEvaluation', @@ -47,7 +48,8 @@ const translations = defineMessages({ }, showEvaluationHint: { id: 'course.assessment.form.showEvaluationHint', - defaultMessage: 'Show evaluation tests to students after the submission is graded and published (For programming questions)', + defaultMessage: + 'Show evaluation tests to students after the submission is graded and published (For programming questions)', }, published: { id: 'course.assessment.form.published', diff --git a/client/app/bundles/course/assessment/question/programming/components/UploadedPackageView.jsx b/client/app/bundles/course/assessment/question/programming/components/UploadedPackageView.jsx index e10f8e04b0..5d6589120c 100644 --- a/client/app/bundles/course/assessment/question/programming/components/UploadedPackageView.jsx +++ b/client/app/bundles/course/assessment/question/programming/components/UploadedPackageView.jsx @@ -24,27 +24,25 @@ const propTypes = { intl: intlShape.isRequired, }; -class UploadedPackageView extends React.Component { - render() { - const { data, intl } = this.props; - const packageUI = data.get('package_ui'); - const templates = packageUI.get('templates'); - const testCases = packageUI.get('test_cases'); - - if (data.get('question').get('package')) { - return ( -
-

{intl.formatMessage(translations.templateHeader)}

- -

{intl.formatMessage(translations.testCasesHeader)}

- -
- ); - } - - return null; +const UploadedPackageView = (props) => { + const { data, intl } = props; + const packageUI = data.get('package_ui'); + const templates = packageUI.get('templates'); + const testCases = packageUI.get('test_cases'); + + if (data.get('question').get('package')) { + return ( +
+

{intl.formatMessage(translations.templateHeader)}

+ +

{intl.formatMessage(translations.testCasesHeader)}

+ +
+ ); } -} + + return null; +}; UploadedPackageView.propTypes = propTypes; diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanGroup.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanGroup.jsx index 23b04165ca..a5c177d732 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanGroup.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanGroup.jsx @@ -14,10 +14,10 @@ const LessonPlanGroup = ({ milestone, items }) => { { items.map(item => - + />) ) } diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanIndex.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanIndex.jsx index 8826659bfd..0b924bdc57 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanIndex.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanIndex.jsx @@ -48,11 +48,11 @@ class LessonPlanIndex extends React.Component {
{ milestoneGroups.map(group => - + />) ) }
diff --git a/client/app/bundles/course/lesson-plan/components/LessonPlanItem.jsx b/client/app/bundles/course/lesson-plan/components/LessonPlanItem.jsx index 4ea6f1ddc0..b07844e64a 100644 --- a/client/app/bundles/course/lesson-plan/components/LessonPlanItem.jsx +++ b/client/app/bundles/course/lesson-plan/components/LessonPlanItem.jsx @@ -239,12 +239,12 @@ class LessonPlanItem extends React.Component {
{ item.get('materials').map(material => - ) ) }
diff --git a/client/app/bundles/course/survey/pages/SurveyResults/OptionsQuestionResults.jsx b/client/app/bundles/course/survey/pages/SurveyResults/OptionsQuestionResults.jsx index 79d6b1f8c0..42afc24013 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/OptionsQuestionResults.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/OptionsQuestionResults.jsx @@ -163,7 +163,7 @@ class OptionsQuestionResults extends React.Component {
{ students.map(student => - + ( { student.phantom ? @@ -171,7 +171,7 @@ class OptionsQuestionResults extends React.Component { student.name } - + ) ) }
diff --git a/client/app/bundles/course/survey/pages/SurveyResults/ResultsSection.jsx b/client/app/bundles/course/survey/pages/SurveyResults/ResultsSection.jsx index 41986471cc..63deded879 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/ResultsSection.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/ResultsSection.jsx @@ -19,10 +19,10 @@ const ResultsSection = ({ section, includePhantoms, anonymous }) => ( { section.questions.map((question, index) => - + />) ) } diff --git a/client/app/bundles/course/survey/pages/SurveyResults/index.jsx b/client/app/bundles/course/survey/pages/SurveyResults/index.jsx index 5a8902b3e2..64ac30f0c1 100644 --- a/client/app/bundles/course/survey/pages/SurveyResults/index.jsx +++ b/client/app/bundles/course/survey/pages/SurveyResults/index.jsx @@ -100,11 +100,11 @@ class SurveyResults extends React.Component { { this.props.sections.map((section, index) => - + />) ) }
diff --git a/client/app/bundles/course/survey/pages/SurveyShow/Section/SectionCard.jsx b/client/app/bundles/course/survey/pages/SurveyShow/Section/SectionCard.jsx index 3630762d09..a68700769f 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/Section/SectionCard.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/Section/SectionCard.jsx @@ -79,11 +79,11 @@ class SectionCard extends React.Component { } { section.questions.map((question, index) => - + />) ) } diff --git a/client/app/bundles/course/survey/pages/SurveyShow/index.jsx b/client/app/bundles/course/survey/pages/SurveyShow/index.jsx index c16ea1ab06..2a3820f20f 100644 --- a/client/app/bundles/course/survey/pages/SurveyShow/index.jsx +++ b/client/app/bundles/course/survey/pages/SurveyShow/index.jsx @@ -41,12 +41,12 @@ class SurveyShow extends React.Component { { intl.formatMessage(surveyTranslations.questions) } { sections.map((section, index) => -
+ />) ) }
From 3d21ee442c178bb3ddc32da9ecd797d47a4cb636 Mon Sep 17 00:00:00 2001 From: Brian Koh Date: Mon, 22 May 2017 15:53:14 +0800 Subject: [PATCH 8/8] Use latest webpack syntax and features --- client/app/index.js | 13 ++++++++----- client/webpack.config.js | 27 +++++++++++++++------------ 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/client/app/index.js b/client/app/index.js index 0d39a7ac90..90de2246e4 100644 --- a/client/app/index.js +++ b/client/app/index.js @@ -35,12 +35,15 @@ function loadModules() { } if (!global.Intl) { - require.ensure([], (require) => { - require('intl'); - require('intl/locale-data/jsonp/en'); - require('intl/locale-data/jsonp/zh'); + Promise.all([ + import(/* webpackChunkName: "intl" */ 'intl'), + import(/* webpackChunkName: "intl" */ 'intl/locale-data/jsonp/en'), + import(/* webpackChunkName: "intl" */ 'intl/locale-data/jsonp/zh'), + ]).then(() => { loadModules(); - }, 'intl'); + }).catch((e) => { + throw e; + }); } else { loadModules(); } diff --git a/client/webpack.config.js b/client/webpack.config.js index a6a264b035..5afc584ff5 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js @@ -16,7 +16,9 @@ const config = { 'axios', 'brace', 'immutable', + 'mirror-creator', 'moment', + 'moment-timezone', 'react', 'react-ace', 'react-dnd', @@ -33,6 +35,7 @@ const config = { 'redux-immutable', 'redux-promise', 'redux-thunk', + 'webfontloader', ], // Vendor contains the libraries that are not in a single bundle (size could change depends on // application code) @@ -51,9 +54,6 @@ const config = { externals: { jquery: 'jQuery', - 'react/addons': true, - 'react/lib/ExecutionEnvironment': true, - 'react/lib/ReactContext': true, }, resolve: { @@ -87,15 +87,15 @@ const config = { ], module: { - loaders: [ + rules: [ { test: /\.jsx?$/, - loader: 'babel-loader', + use: 'babel-loader', exclude: /node_modules/, }, { test: /\.scss$/, - loaders: [ + use: [ 'style-loader', 'css-loader', 'sass-loader', @@ -106,9 +106,16 @@ const config = { }, { test: /\.scss$/, - loaders: [ + use: [ 'style-loader', - 'css-loader?modules&importLoaders=1&localIdentName=[path]___[name]__[local]___[hash:base64:5]', + { + loader: 'css-loader', + options: { + importLoaders: 1, + modules: true, + localIdentName: '[path]___[name]__[local]___[hash:base64:5]', + }, + }, 'sass-loader', ], exclude: [ @@ -116,10 +123,6 @@ const config = { path.resolve(__dirname, 'app/lib/styles/MaterialSummernote.scss'), ], }, - { - test: /\.json$/, - loader: 'json-loader', - }, ], }, };