From dc4b97d15f65ff5633c151afce6fd4fb7467e5f1 Mon Sep 17 00:00:00 2001 From: Zachary Wasserman Date: Sun, 6 Jan 2019 17:25:33 -0800 Subject: [PATCH] Fix React deprecation warnings (#1976) - Refactor imports of PropTypes to use the prop-types package - Upgrade dependencies that were setting off deprecation warnings --- frontend/components/App/App.jsx | 3 +- .../AuthenticatedAdminRoutes.jsx | 3 +- .../AuthenticatedRoutes.jsx | 3 +- .../AuthenticationFormWrapper.jsx | 3 +- .../components/ClickableTableRow/index.jsx | 3 +- .../EmailTokenRedirect/EmailTokenRedirect.jsx | 3 +- .../EnsureUnauthenticated.jsx | 3 +- frontend/components/KolideAce/KolideAce.jsx | 3 +- .../components/LoginRoutes/LoginRoutes.jsx | 3 +- frontend/components/NumberPill/NumberPill.jsx | 3 +- .../components/SmtpWarning/SmtpWarning.jsx | 3 +- .../StackedWhiteBoxes/StackedWhiteBoxes.jsx | 3 +- frontend/components/UserBlock/UserBlock.jsx | 3 +- frontend/components/UserBlock/_styles.scss | 2 +- .../buttons/DropdownButton/DropdownButton.jsx | 3 +- .../buttons/EllipsisMenu/EllipsisMenu.jsx | 3 +- .../FlashMessage/FlashMessage.jsx | 3 +- .../PersistentFlash/PersistentFlash.jsx | 3 +- .../forms/ChangeEmailForm/ChangeEmailForm.jsx | 3 +- .../ChangePasswordForm/ChangePasswordForm.jsx | 3 +- .../ConfigurePackQueryForm.jsx | 3 +- .../ConfirmInviteForm/ConfirmInviteForm.jsx | 3 +- .../ConfirmSSOInviteForm.jsx | 3 +- .../ForgotPasswordForm/ForgotPasswordForm.jsx | 3 +- frontend/components/forms/Form.jsx | 3 +- .../components/forms/FormField/FormField.jsx | 3 +- .../forms/InviteUserForm/InviteUserForm.jsx | 3 +- .../components/forms/LabelForm/LabelForm.jsx | 3 +- .../components/forms/LoginForm/LoginForm.jsx | 3 +- .../forms/LogoutForm/LogoutForm.jsx | 3 +- .../AdminDetails/AdminDetails.jsx | 3 +- .../ConfirmationPage/ConfirmationPage.jsx | 3 +- .../KolideDetails/KolideDetails.jsx | 3 +- .../OrgDetails/OrgDetails.jsx | 3 +- .../RegistrationForm/RegistrationForm.jsx | 3 +- .../ResetPasswordForm/ResetPasswordForm.jsx | 3 +- .../UserSettingsForm/UserSettingsForm.jsx | 3 +- .../admin/AppConfigForm/AppConfigForm.jsx | 3 +- .../forms/admin/EditUserForm/EditUserForm.jsx | 3 +- .../forms/fields/Checkbox/Checkbox.jsx | 3 +- .../forms/fields/Dropdown/Dropdown.jsx | 3 +- .../forms/fields/InputField/InputField.jsx | 3 +- .../InputFieldWithIcon/InputFieldWithIcon.jsx | 3 +- .../SelectTargetsDropdown.jsx | 3 +- .../SelectTargetsInput/SelectTargetsInput.jsx | 3 +- .../SelectTargetsMenu/SelectTargetsMenu.jsx | 3 +- .../SelectTargetsMenu.tests.jsx | 3 +- .../TargetDetails/TargetDetails.jsx | 3 +- .../TargetOption/TargetOption.jsx | 3 +- .../components/forms/fields/Slider/Slider.jsx | 3 +- .../forms/packs/EditPackForm/EditPackForm.jsx | 3 +- .../forms/packs/PackForm/PackForm.jsx | 3 +- .../forms/queries/QueryForm/QueryForm.jsx | 3 +- .../hosts/AddHostModal/AddHostModal.jsx | 3 +- .../hosts/HostContainer/HostContainer.jsx | 3 +- .../hosts/HostDetails/HostDetails.jsx | 3 +- .../hosts/HostPagination/HostPagination.jsx | 3 +- .../hosts/HostsTable/HostsTable.jsx | 3 +- .../hosts/LonelyHost/LonelyHost.jsx | 3 +- frontend/components/icons/Icon/Icon.jsx | 3 +- .../icons/OrgLogoIcon/OrgLogoIcon.jsx | 3 +- .../icons/PlatformIcon/PlatformIcon.jsx | 3 +- .../loaders/ProgressBar/ProgressBar.jsx | 3 +- frontend/components/loaders/Timer/Timer.jsx | 3 +- frontend/components/modals/Modal/Modal.jsx | 3 +- .../EditPackFormWrapper.jsx | 3 +- .../packs/PackPageWrapper/PackPageWrapper.jsx | 3 +- .../components/packs/PacksList/PacksList.jsx | 3 +- .../components/packs/PacksList/Row/Row.jsx | 3 +- .../queries/QueriesList/QueriesList.jsx | 3 +- .../QueriesListRow/QueriesListRow.jsx | 3 +- .../QueryPageSelectTargets.jsx | 3 +- .../QueryPageWrapper/QueryPageWrapper.jsx | 3 +- .../QueryProgressDetails.jsx | 3 +- .../QueryResultsTable/QueryResultsRow.jsx | 3 +- .../QueryResultsTable/QueryResultsTable.jsx | 3 +- .../ScheduledQueriesList.jsx | 3 +- .../ScheduledQueriesListItem.jsx | 3 +- .../ScheduledQueriesListWrapper.jsx | 3 +- .../HostSidePanel/HostSidePanel.jsx | 3 +- .../HostSidePanel/PanelGroup/PanelGroup.jsx | 3 +- .../PanelGroupItem/PanelGroupItem.jsx | 3 +- .../PackDetailsSidePanel.jsx | 3 +- .../ScheduledQueriesSection.jsx | 3 +- .../QueryDetailsSidePanel.jsx | 3 +- .../QuerySidePanel/QuerySidePanel.jsx | 3 +- .../ScheduleQuerySidePanel.jsx | 3 +- .../SearchPackQuery/SearchPackQuery.jsx | 3 +- .../SecondarySidePanelContainer.jsx | 3 +- .../components/side_panels/ShowSidePanel.jsx | 3 +- .../SiteNavHeader/SiteNavHeader.jsx | 3 +- .../side_panels/SiteNavHeader/UserMenu.jsx | 3 +- .../SiteNavSidePanel/SiteNavSidePanel.jsx | 3 +- frontend/interfaces/campaign.js | 2 +- frontend/interfaces/config.js | 2 +- frontend/interfaces/config_option.js | 2 +- frontend/interfaces/decorators.js | 2 +- frontend/interfaces/dropdownOption.js | 2 +- frontend/interfaces/form_field.js | 2 +- frontend/interfaces/host.js | 2 +- frontend/interfaces/invite.js | 2 +- frontend/interfaces/label.js | 2 +- frontend/interfaces/license.js | 2 +- frontend/interfaces/notification.js | 2 +- frontend/interfaces/osquery_table.js | 2 +- frontend/interfaces/pack.js | 2 +- frontend/interfaces/query.js | 2 +- frontend/interfaces/query_result.js | 2 +- frontend/interfaces/redirect_location.js | 2 +- frontend/interfaces/registration_form_data.js | 2 +- frontend/interfaces/scheduled_query.js | 2 +- frontend/interfaces/ssoSettings.js | 2 +- frontend/interfaces/status_labels.js | 2 +- frontend/interfaces/target.js | 2 +- frontend/interfaces/user.js | 2 +- frontend/layouts/CoreLayout/CoreLayout.jsx | 3 +- .../Admin/AppSettingsPage/AppSettingsPage.jsx | 3 +- .../UserManagementPage/UserManagementPage.jsx | 3 +- .../ConfirmInvitePage/ConfirmInvitePage.jsx | 3 +- .../ConfirmSSOInvitePage.jsx | 3 +- .../ForgotPasswordPage/ForgotPasswordPage.jsx | 3 +- frontend/pages/LoginPage/LoginPage.jsx | 3 +- .../LoginSuccessfulPage.jsx | 3 +- frontend/pages/LogoutPage/LogoutPage.jsx | 3 +- .../Breadcrumbs/Breadcrumbs.jsx | 3 +- .../RegistrationPage/RegistrationPage.jsx | 3 +- .../ResetPasswordPage/ResetPasswordPage.jsx | 3 +- .../UserSettingsPage/UserSettingsPage.jsx | 3 +- .../hosts/ManageHostsPage/ManageHostsPage.jsx | 3 +- .../pages/packs/AllPacksPage/AllPacksPage.jsx | 3 +- .../pages/packs/EditPackPage/EditPackPage.jsx | 3 +- .../PackComposerPage/PackComposerPage.jsx | 3 +- .../ManageQueriesPage/ManageQueriesPage.jsx | 3 +- .../pages/queries/QueryPage/QueryPage.jsx | 3 +- frontend/test/helpers.jsx | 8 +- package.json | 5 +- yarn.lock | 84 +++++++++++-------- 137 files changed, 306 insertions(+), 170 deletions(-) diff --git a/frontend/components/App/App.jsx b/frontend/components/App/App.jsx index 875f2797b5..490715dc63 100644 --- a/frontend/components/App/App.jsx +++ b/frontend/components/App/App.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { noop } from 'lodash'; import classnames from 'classnames'; diff --git a/frontend/components/AuthenticatedAdminRoutes/AuthenticatedAdminRoutes.jsx b/frontend/components/AuthenticatedAdminRoutes/AuthenticatedAdminRoutes.jsx index eee357bb52..ab92993272 100644 --- a/frontend/components/AuthenticatedAdminRoutes/AuthenticatedAdminRoutes.jsx +++ b/frontend/components/AuthenticatedAdminRoutes/AuthenticatedAdminRoutes.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { push } from 'react-router-redux'; diff --git a/frontend/components/AuthenticatedRoutes/AuthenticatedRoutes.jsx b/frontend/components/AuthenticatedRoutes/AuthenticatedRoutes.jsx index 203fba6733..4140cee31f 100644 --- a/frontend/components/AuthenticatedRoutes/AuthenticatedRoutes.jsx +++ b/frontend/components/AuthenticatedRoutes/AuthenticatedRoutes.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { isEqual } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/components/AuthenticationFormWrapper/AuthenticationFormWrapper.jsx b/frontend/components/AuthenticationFormWrapper/AuthenticationFormWrapper.jsx index f4a615515a..0b800f785a 100644 --- a/frontend/components/AuthenticationFormWrapper/AuthenticationFormWrapper.jsx +++ b/frontend/components/AuthenticationFormWrapper/AuthenticationFormWrapper.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; const baseClass = 'auth-form-wrapper'; diff --git a/frontend/components/ClickableTableRow/index.jsx b/frontend/components/ClickableTableRow/index.jsx index c995b3557e..2408ef02d2 100644 --- a/frontend/components/ClickableTableRow/index.jsx +++ b/frontend/components/ClickableTableRow/index.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; const ClickableTableRow = ({ children, className, onClick, onDoubleClick }) => { /* eslint-disable jsx-a11y/no-static-element-interactions */ diff --git a/frontend/components/EmailTokenRedirect/EmailTokenRedirect.jsx b/frontend/components/EmailTokenRedirect/EmailTokenRedirect.jsx index c8b7880223..a1597b274f 100644 --- a/frontend/components/EmailTokenRedirect/EmailTokenRedirect.jsx +++ b/frontend/components/EmailTokenRedirect/EmailTokenRedirect.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import helpers from 'components/EmailTokenRedirect/helpers'; diff --git a/frontend/components/EnsureUnauthenticated/EnsureUnauthenticated.jsx b/frontend/components/EnsureUnauthenticated/EnsureUnauthenticated.jsx index 7e324dc6b9..0eebf9764b 100644 --- a/frontend/components/EnsureUnauthenticated/EnsureUnauthenticated.jsx +++ b/frontend/components/EnsureUnauthenticated/EnsureUnauthenticated.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { noop } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/components/KolideAce/KolideAce.jsx b/frontend/components/KolideAce/KolideAce.jsx index 62df4cbb8e..877d3639e9 100644 --- a/frontend/components/KolideAce/KolideAce.jsx +++ b/frontend/components/KolideAce/KolideAce.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import AceEditor from 'react-ace'; import classnames from 'classnames'; import 'brace/mode/sql'; diff --git a/frontend/components/LoginRoutes/LoginRoutes.jsx b/frontend/components/LoginRoutes/LoginRoutes.jsx index b4c7b17ac9..fa37cabd45 100644 --- a/frontend/components/LoginRoutes/LoginRoutes.jsx +++ b/frontend/components/LoginRoutes/LoginRoutes.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { hideBackgroundImage } from 'redux/nodes/app/actions'; diff --git a/frontend/components/NumberPill/NumberPill.jsx b/frontend/components/NumberPill/NumberPill.jsx index 957ba4000c..12256896b2 100644 --- a/frontend/components/NumberPill/NumberPill.jsx +++ b/frontend/components/NumberPill/NumberPill.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; const NumberPill = ({ number }) => { return {number}; diff --git a/frontend/components/SmtpWarning/SmtpWarning.jsx b/frontend/components/SmtpWarning/SmtpWarning.jsx index 5b93f3aaa4..664bd88d7e 100644 --- a/frontend/components/SmtpWarning/SmtpWarning.jsx +++ b/frontend/components/SmtpWarning/SmtpWarning.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/StackedWhiteBoxes/StackedWhiteBoxes.jsx b/frontend/components/StackedWhiteBoxes/StackedWhiteBoxes.jsx index 03d94fa5c3..4363612ee3 100644 --- a/frontend/components/StackedWhiteBoxes/StackedWhiteBoxes.jsx +++ b/frontend/components/StackedWhiteBoxes/StackedWhiteBoxes.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Link } from 'react-router'; import classnames from 'classnames'; diff --git a/frontend/components/UserBlock/UserBlock.jsx b/frontend/components/UserBlock/UserBlock.jsx index e45e145efa..6d904e6f45 100644 --- a/frontend/components/UserBlock/UserBlock.jsx +++ b/frontend/components/UserBlock/UserBlock.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Avatar from 'components/Avatar'; diff --git a/frontend/components/UserBlock/_styles.scss b/frontend/components/UserBlock/_styles.scss index ffba259b06..85328efc2a 100644 --- a/frontend/components/UserBlock/_styles.scss +++ b/frontend/components/UserBlock/_styles.scss @@ -20,7 +20,7 @@ } &__header { - transition: color 300ms ease-in-out, background-color 300ms ease-in-out; + transition: color 300ms ease-in-out, background-color 300ms ease-in-out; background-color: $bg-light; border-bottom: 1px solid $accent-light; color: $text-ultradark; diff --git a/frontend/components/buttons/DropdownButton/DropdownButton.jsx b/frontend/components/buttons/DropdownButton/DropdownButton.jsx index cdedc52192..7e3b05cabd 100644 --- a/frontend/components/buttons/DropdownButton/DropdownButton.jsx +++ b/frontend/components/buttons/DropdownButton/DropdownButton.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { noop } from 'lodash'; import classnames from 'classnames'; diff --git a/frontend/components/buttons/EllipsisMenu/EllipsisMenu.jsx b/frontend/components/buttons/EllipsisMenu/EllipsisMenu.jsx index d72d2a4ad8..1d997b6650 100644 --- a/frontend/components/buttons/EllipsisMenu/EllipsisMenu.jsx +++ b/frontend/components/buttons/EllipsisMenu/EllipsisMenu.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { calculateTooltipDirection } from './helpers'; import ClickOutside from '../../ClickOutside'; diff --git a/frontend/components/flash_messages/FlashMessage/FlashMessage.jsx b/frontend/components/flash_messages/FlashMessage/FlashMessage.jsx index 0978503b4a..0910921b07 100644 --- a/frontend/components/flash_messages/FlashMessage/FlashMessage.jsx +++ b/frontend/components/flash_messages/FlashMessage/FlashMessage.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import notificationInterface from 'interfaces/notification'; diff --git a/frontend/components/flash_messages/PersistentFlash/PersistentFlash.jsx b/frontend/components/flash_messages/PersistentFlash/PersistentFlash.jsx index b39bad508f..4e49ca3e5e 100644 --- a/frontend/components/flash_messages/PersistentFlash/PersistentFlash.jsx +++ b/frontend/components/flash_messages/PersistentFlash/PersistentFlash.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/forms/ChangeEmailForm/ChangeEmailForm.jsx b/frontend/components/forms/ChangeEmailForm/ChangeEmailForm.jsx index d6e29e02cf..ce7f0e2bd2 100644 --- a/frontend/components/forms/ChangeEmailForm/ChangeEmailForm.jsx +++ b/frontend/components/forms/ChangeEmailForm/ChangeEmailForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Form from 'components/forms/Form'; diff --git a/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx b/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx index 4b5795e7bd..23528ed98e 100644 --- a/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx +++ b/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Form from 'components/forms/Form'; diff --git a/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx b/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx index 597234f97f..ada2bbe021 100644 --- a/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx +++ b/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { pull } from 'lodash'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/forms/ConfirmInviteForm/ConfirmInviteForm.jsx b/frontend/components/forms/ConfirmInviteForm/ConfirmInviteForm.jsx index 17944645f4..f62225c553 100644 --- a/frontend/components/forms/ConfirmInviteForm/ConfirmInviteForm.jsx +++ b/frontend/components/forms/ConfirmInviteForm/ConfirmInviteForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Form from 'components/forms/Form'; import formFieldInterface from 'interfaces/form_field'; diff --git a/frontend/components/forms/ConfirmSSOInviteForm/ConfirmSSOInviteForm.jsx b/frontend/components/forms/ConfirmSSOInviteForm/ConfirmSSOInviteForm.jsx index b103f7d628..34b74978ac 100644 --- a/frontend/components/forms/ConfirmSSOInviteForm/ConfirmSSOInviteForm.jsx +++ b/frontend/components/forms/ConfirmSSOInviteForm/ConfirmSSOInviteForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Form from 'components/forms/Form'; import formFieldInterface from 'interfaces/form_field'; diff --git a/frontend/components/forms/ForgotPasswordForm/ForgotPasswordForm.jsx b/frontend/components/forms/ForgotPasswordForm/ForgotPasswordForm.jsx index 856dbaa02b..dab733cdd8 100644 --- a/frontend/components/forms/ForgotPasswordForm/ForgotPasswordForm.jsx +++ b/frontend/components/forms/ForgotPasswordForm/ForgotPasswordForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Form from 'components/forms/Form'; diff --git a/frontend/components/forms/Form.jsx b/frontend/components/forms/Form.jsx index 668a59e069..f5d23a2761 100644 --- a/frontend/components/forms/Form.jsx +++ b/frontend/components/forms/Form.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { isEqual, noop } from 'lodash'; const defaultValidate = () => { return { valid: true, errors: {} }; }; diff --git a/frontend/components/forms/FormField/FormField.jsx b/frontend/components/forms/FormField/FormField.jsx index a164727378..4072ade9ac 100644 --- a/frontend/components/forms/FormField/FormField.jsx +++ b/frontend/components/forms/FormField/FormField.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; const baseClass = 'form-field'; diff --git a/frontend/components/forms/InviteUserForm/InviteUserForm.jsx b/frontend/components/forms/InviteUserForm/InviteUserForm.jsx index d6c7733769..33d99a0a73 100644 --- a/frontend/components/forms/InviteUserForm/InviteUserForm.jsx +++ b/frontend/components/forms/InviteUserForm/InviteUserForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import InputFieldWithIcon from 'components/forms/fields/InputFieldWithIcon'; diff --git a/frontend/components/forms/LabelForm/LabelForm.jsx b/frontend/components/forms/LabelForm/LabelForm.jsx index 41feaa5ef1..a38dc1e305 100644 --- a/frontend/components/forms/LabelForm/LabelForm.jsx +++ b/frontend/components/forms/LabelForm/LabelForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Dropdown from 'components/forms/fields/Dropdown'; diff --git a/frontend/components/forms/LoginForm/LoginForm.jsx b/frontend/components/forms/LoginForm/LoginForm.jsx index b0675400ab..f7cfcfad99 100644 --- a/frontend/components/forms/LoginForm/LoginForm.jsx +++ b/frontend/components/forms/LoginForm/LoginForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Link } from 'react-router'; import classnames from 'classnames'; diff --git a/frontend/components/forms/LogoutForm/LogoutForm.jsx b/frontend/components/forms/LogoutForm/LogoutForm.jsx index 020682e273..952853ce5a 100644 --- a/frontend/components/forms/LogoutForm/LogoutForm.jsx +++ b/frontend/components/forms/LogoutForm/LogoutForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from '../../buttons/Button'; import userInterface from '../../../interfaces/user'; diff --git a/frontend/components/forms/RegistrationForm/AdminDetails/AdminDetails.jsx b/frontend/components/forms/RegistrationForm/AdminDetails/AdminDetails.jsx index 8c8e38e570..ff725df4b6 100644 --- a/frontend/components/forms/RegistrationForm/AdminDetails/AdminDetails.jsx +++ b/frontend/components/forms/RegistrationForm/AdminDetails/AdminDetails.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Form from 'components/forms/Form'; import formFieldInterface from 'interfaces/form_field'; diff --git a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx index df09cd6e07..da2f7cf290 100644 --- a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx +++ b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/forms/RegistrationForm/KolideDetails/KolideDetails.jsx b/frontend/components/forms/RegistrationForm/KolideDetails/KolideDetails.jsx index b570765425..b5ff04bb02 100644 --- a/frontend/components/forms/RegistrationForm/KolideDetails/KolideDetails.jsx +++ b/frontend/components/forms/RegistrationForm/KolideDetails/KolideDetails.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Form from 'components/forms/Form'; import formFieldInterface from 'interfaces/form_field'; diff --git a/frontend/components/forms/RegistrationForm/OrgDetails/OrgDetails.jsx b/frontend/components/forms/RegistrationForm/OrgDetails/OrgDetails.jsx index 6e7828a9a2..ffa997a7dc 100644 --- a/frontend/components/forms/RegistrationForm/OrgDetails/OrgDetails.jsx +++ b/frontend/components/forms/RegistrationForm/OrgDetails/OrgDetails.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Form from 'components/forms/Form'; import formFieldInterface from 'interfaces/form_field'; diff --git a/frontend/components/forms/RegistrationForm/RegistrationForm.jsx b/frontend/components/forms/RegistrationForm/RegistrationForm.jsx index a541261da9..3722f45fb2 100644 --- a/frontend/components/forms/RegistrationForm/RegistrationForm.jsx +++ b/frontend/components/forms/RegistrationForm/RegistrationForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import AdminDetails from 'components/forms/RegistrationForm/AdminDetails'; diff --git a/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx b/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx index 8f53f76343..7cf88358ba 100644 --- a/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx +++ b/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Form from 'components/forms/Form'; diff --git a/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx b/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx index e86d3072e6..33d0c345bf 100644 --- a/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx +++ b/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Form from 'components/forms/Form'; diff --git a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx index 76b7d47c29..82ee968e8c 100644 --- a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx +++ b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Checkbox from 'components/forms/fields/Checkbox'; diff --git a/frontend/components/forms/admin/EditUserForm/EditUserForm.jsx b/frontend/components/forms/admin/EditUserForm/EditUserForm.jsx index 87993a88d3..feb20ef370 100644 --- a/frontend/components/forms/admin/EditUserForm/EditUserForm.jsx +++ b/frontend/components/forms/admin/EditUserForm/EditUserForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Checkbox from 'components/forms/fields/Checkbox'; import Button from 'components/buttons/Button'; import Form from 'components/forms/Form'; diff --git a/frontend/components/forms/fields/Checkbox/Checkbox.jsx b/frontend/components/forms/fields/Checkbox/Checkbox.jsx index 0ca0793dac..8f68a47004 100644 --- a/frontend/components/forms/fields/Checkbox/Checkbox.jsx +++ b/frontend/components/forms/fields/Checkbox/Checkbox.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { noop, pick } from 'lodash'; diff --git a/frontend/components/forms/fields/Dropdown/Dropdown.jsx b/frontend/components/forms/fields/Dropdown/Dropdown.jsx index c7fd9fa938..5384ca5ffa 100644 --- a/frontend/components/forms/fields/Dropdown/Dropdown.jsx +++ b/frontend/components/forms/fields/Dropdown/Dropdown.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { noop, pick } from 'lodash'; import Select from 'react-select'; diff --git a/frontend/components/forms/fields/InputField/InputField.jsx b/frontend/components/forms/fields/InputField/InputField.jsx index b382979c40..5b465868fc 100644 --- a/frontend/components/forms/fields/InputField/InputField.jsx +++ b/frontend/components/forms/fields/InputField/InputField.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { noop, pick } from 'lodash'; diff --git a/frontend/components/forms/fields/InputFieldWithIcon/InputFieldWithIcon.jsx b/frontend/components/forms/fields/InputFieldWithIcon/InputFieldWithIcon.jsx index 3addb030d5..5bab95866b 100644 --- a/frontend/components/forms/fields/InputFieldWithIcon/InputFieldWithIcon.jsx +++ b/frontend/components/forms/fields/InputFieldWithIcon/InputFieldWithIcon.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx index a42f0a21c1..6c4ac4392f 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx +++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { isEqual, noop } from 'lodash'; diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsInput/SelectTargetsInput.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsInput/SelectTargetsInput.jsx index 400ad51264..b6b479e9ab 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsInput/SelectTargetsInput.jsx +++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsInput/SelectTargetsInput.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { difference } from 'lodash'; import Select from 'react-select'; import 'react-select/dist/react-select.css'; diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.jsx index e6d94bbd41..4a66a115fd 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.jsx +++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { filter, includes, isEqual, noop } from 'lodash'; diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.tests.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.tests.jsx index c6bb29070c..76562c12a0 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.tests.jsx +++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.tests.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import expect, { createSpy, restoreSpies } from 'expect'; import { mount } from 'enzyme'; import { noop } from 'lodash'; diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/TargetDetails/TargetDetails.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/TargetDetails/TargetDetails.jsx index 6ba2989964..e363230902 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/TargetDetails/TargetDetails.jsx +++ b/frontend/components/forms/fields/SelectTargetsDropdown/TargetDetails/TargetDetails.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { noop } from 'lodash'; import AceEditor from 'react-ace'; import classnames from 'classnames'; diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.jsx index c59d749660..46f4faca17 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.jsx +++ b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/forms/fields/Slider/Slider.jsx b/frontend/components/forms/fields/Slider/Slider.jsx index 570868d813..ba7d9b84fc 100644 --- a/frontend/components/forms/fields/Slider/Slider.jsx +++ b/frontend/components/forms/fields/Slider/Slider.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { pick } from 'lodash'; diff --git a/frontend/components/forms/packs/EditPackForm/EditPackForm.jsx b/frontend/components/forms/packs/EditPackForm/EditPackForm.jsx index a317b1939a..ce51bfa50e 100644 --- a/frontend/components/forms/packs/EditPackForm/EditPackForm.jsx +++ b/frontend/components/forms/packs/EditPackForm/EditPackForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Form from 'components/forms/Form'; diff --git a/frontend/components/forms/packs/PackForm/PackForm.jsx b/frontend/components/forms/packs/PackForm/PackForm.jsx index 0bad2251a7..a5789740dd 100644 --- a/frontend/components/forms/packs/PackForm/PackForm.jsx +++ b/frontend/components/forms/packs/PackForm/PackForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/forms/queries/QueryForm/QueryForm.jsx b/frontend/components/forms/queries/QueryForm/QueryForm.jsx index 605ab03e90..56d8b2e09d 100644 --- a/frontend/components/forms/queries/QueryForm/QueryForm.jsx +++ b/frontend/components/forms/queries/QueryForm/QueryForm.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { size } from 'lodash'; import DropdownButton from 'components/buttons/DropdownButton'; diff --git a/frontend/components/hosts/AddHostModal/AddHostModal.jsx b/frontend/components/hosts/AddHostModal/AddHostModal.jsx index c4c534fd4c..ed7b4dd46d 100644 --- a/frontend/components/hosts/AddHostModal/AddHostModal.jsx +++ b/frontend/components/hosts/AddHostModal/AddHostModal.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/hosts/HostContainer/HostContainer.jsx b/frontend/components/hosts/HostContainer/HostContainer.jsx index 91784aa2ed..d3741d16c9 100644 --- a/frontend/components/hosts/HostContainer/HostContainer.jsx +++ b/frontend/components/hosts/HostContainer/HostContainer.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import hostInterface from 'interfaces/host'; import labelInterface from 'interfaces/label'; diff --git a/frontend/components/hosts/HostDetails/HostDetails.jsx b/frontend/components/hosts/HostDetails/HostDetails.jsx index 6b7b903af4..da543ec64d 100644 --- a/frontend/components/hosts/HostDetails/HostDetails.jsx +++ b/frontend/components/hosts/HostDetails/HostDetails.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Button from 'components/buttons/Button'; import hostInterface from 'interfaces/host'; diff --git a/frontend/components/hosts/HostPagination/HostPagination.jsx b/frontend/components/hosts/HostPagination/HostPagination.jsx index a31d69ebad..e7d1b4aa00 100644 --- a/frontend/components/hosts/HostPagination/HostPagination.jsx +++ b/frontend/components/hosts/HostPagination/HostPagination.jsx @@ -1,4 +1,5 @@ -import React, { PureComponent, PropTypes } from 'react'; +import React, { PureComponent } from 'react'; +import PropTypes from 'prop-types'; import Pagination from 'rc-pagination'; import Select from 'react-select'; import 'rc-pagination/assets/index.css'; diff --git a/frontend/components/hosts/HostsTable/HostsTable.jsx b/frontend/components/hosts/HostsTable/HostsTable.jsx index 3ccd7c1d2b..324197b8e4 100644 --- a/frontend/components/hosts/HostsTable/HostsTable.jsx +++ b/frontend/components/hosts/HostsTable/HostsTable.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/hosts/LonelyHost/LonelyHost.jsx b/frontend/components/hosts/LonelyHost/LonelyHost.jsx index aba336648e..0f0fc09b5e 100644 --- a/frontend/components/hosts/LonelyHost/LonelyHost.jsx +++ b/frontend/components/hosts/LonelyHost/LonelyHost.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { noop } from 'lodash'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/icons/Icon/Icon.jsx b/frontend/components/icons/Icon/Icon.jsx index 5a80ef9c39..9b49ef259c 100644 --- a/frontend/components/icons/Icon/Icon.jsx +++ b/frontend/components/icons/Icon/Icon.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; const baseClass = 'kolidecon'; diff --git a/frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx b/frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx index 5ab62fc74a..fc5023a40c 100644 --- a/frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx +++ b/frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import kolideLogo from '../../../../assets/images/kolide-logo.svg'; diff --git a/frontend/components/icons/PlatformIcon/PlatformIcon.jsx b/frontend/components/icons/PlatformIcon/PlatformIcon.jsx index db5f182217..ffe00f3fe7 100644 --- a/frontend/components/icons/PlatformIcon/PlatformIcon.jsx +++ b/frontend/components/icons/PlatformIcon/PlatformIcon.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/loaders/ProgressBar/ProgressBar.jsx b/frontend/components/loaders/ProgressBar/ProgressBar.jsx index 81e208a72b..36cc38aac4 100644 --- a/frontend/components/loaders/ProgressBar/ProgressBar.jsx +++ b/frontend/components/loaders/ProgressBar/ProgressBar.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { round } from 'lodash'; diff --git a/frontend/components/loaders/Timer/Timer.jsx b/frontend/components/loaders/Timer/Timer.jsx index 93265d70d7..d670108807 100644 --- a/frontend/components/loaders/Timer/Timer.jsx +++ b/frontend/components/loaders/Timer/Timer.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { convertSeconds } from './helpers'; diff --git a/frontend/components/modals/Modal/Modal.jsx b/frontend/components/modals/Modal/Modal.jsx index 4d0414afaa..4fb94b14be 100644 --- a/frontend/components/modals/Modal/Modal.jsx +++ b/frontend/components/modals/Modal/Modal.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.jsx b/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.jsx index f9b3c7ef8b..ec3fbabd4b 100644 --- a/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.jsx +++ b/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { noop } from 'lodash'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/packs/PackPageWrapper/PackPageWrapper.jsx b/frontend/components/packs/PackPageWrapper/PackPageWrapper.jsx index fbb9693fd8..ef0b87e293 100644 --- a/frontend/components/packs/PackPageWrapper/PackPageWrapper.jsx +++ b/frontend/components/packs/PackPageWrapper/PackPageWrapper.jsx @@ -1,8 +1,9 @@ import React from 'react'; +import PropTypes from 'prop-types'; class PackPageWrapper extends React.Component { static propTypes = { - children: React.PropTypes.node, + children: PropTypes.node, }; render () { diff --git a/frontend/components/packs/PacksList/PacksList.jsx b/frontend/components/packs/PacksList/PacksList.jsx index 6f1aade9e1..3ff39f7894 100644 --- a/frontend/components/packs/PacksList/PacksList.jsx +++ b/frontend/components/packs/PacksList/PacksList.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { includes, orderBy } from 'lodash'; diff --git a/frontend/components/packs/PacksList/Row/Row.jsx b/frontend/components/packs/PacksList/Row/Row.jsx index 8ea5835d55..eb437f7afe 100644 --- a/frontend/components/packs/PacksList/Row/Row.jsx +++ b/frontend/components/packs/PacksList/Row/Row.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { isEqual } from 'lodash'; import moment from 'moment'; diff --git a/frontend/components/queries/QueriesList/QueriesList.jsx b/frontend/components/queries/QueriesList/QueriesList.jsx index db37c6ab90..1fdd9c34c8 100644 --- a/frontend/components/queries/QueriesList/QueriesList.jsx +++ b/frontend/components/queries/QueriesList/QueriesList.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { includes, sortBy, size } from 'lodash'; diff --git a/frontend/components/queries/QueriesList/QueriesListRow/QueriesListRow.jsx b/frontend/components/queries/QueriesList/QueriesListRow/QueriesListRow.jsx index 639f250645..12076458a8 100644 --- a/frontend/components/queries/QueriesList/QueriesListRow/QueriesListRow.jsx +++ b/frontend/components/queries/QueriesList/QueriesListRow/QueriesListRow.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import moment from 'moment'; diff --git a/frontend/components/queries/QueryPageSelectTargets/QueryPageSelectTargets.jsx b/frontend/components/queries/QueryPageSelectTargets/QueryPageSelectTargets.jsx index c0f80ee3d7..edf91e3b73 100644 --- a/frontend/components/queries/QueryPageSelectTargets/QueryPageSelectTargets.jsx +++ b/frontend/components/queries/QueryPageSelectTargets/QueryPageSelectTargets.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import campaignInterface from 'interfaces/campaign'; import QueryProgressDetails from 'components/queries/QueryProgressDetails'; diff --git a/frontend/components/queries/QueryPageWrapper/QueryPageWrapper.jsx b/frontend/components/queries/QueryPageWrapper/QueryPageWrapper.jsx index 1ddf639f84..56a523340c 100644 --- a/frontend/components/queries/QueryPageWrapper/QueryPageWrapper.jsx +++ b/frontend/components/queries/QueryPageWrapper/QueryPageWrapper.jsx @@ -1,4 +1,5 @@ -import { Component, PropTypes } from 'react'; +import { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import entityGetter from 'redux/utilities/entityGetter'; diff --git a/frontend/components/queries/QueryProgressDetails/QueryProgressDetails.jsx b/frontend/components/queries/QueryProgressDetails/QueryProgressDetails.jsx index e8984a293f..6d1d25a9f9 100644 --- a/frontend/components/queries/QueryProgressDetails/QueryProgressDetails.jsx +++ b/frontend/components/queries/QueryProgressDetails/QueryProgressDetails.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { get } from 'lodash'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/queries/QueryResultsTable/QueryResultsRow.jsx b/frontend/components/queries/QueryResultsTable/QueryResultsRow.jsx index a55125cebc..004acfe0f3 100644 --- a/frontend/components/queries/QueryResultsTable/QueryResultsRow.jsx +++ b/frontend/components/queries/QueryResultsTable/QueryResultsRow.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { isEqual, omit, values } from 'lodash'; import queryResultInterface from 'interfaces/query_result'; diff --git a/frontend/components/queries/QueryResultsTable/QueryResultsTable.jsx b/frontend/components/queries/QueryResultsTable/QueryResultsTable.jsx index 97536edcd7..1b21855004 100644 --- a/frontend/components/queries/QueryResultsTable/QueryResultsTable.jsx +++ b/frontend/components/queries/QueryResultsTable/QueryResultsTable.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { keys, omit } from 'lodash'; diff --git a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx index 551e22aec3..fa0fa8972a 100644 --- a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx +++ b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { includes, sortBy, size } from 'lodash'; diff --git a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.jsx b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.jsx index 494a304b7c..e264507d3d 100644 --- a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.jsx +++ b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Checkbox from 'components/forms/fields/Checkbox'; diff --git a/frontend/components/queries/ScheduledQueriesListWrapper/ScheduledQueriesListWrapper.jsx b/frontend/components/queries/ScheduledQueriesListWrapper/ScheduledQueriesListWrapper.jsx index 46135f169e..dee255bd03 100644 --- a/frontend/components/queries/ScheduledQueriesListWrapper/ScheduledQueriesListWrapper.jsx +++ b/frontend/components/queries/ScheduledQueriesListWrapper/ScheduledQueriesListWrapper.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { pull } from 'lodash'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/side_panels/HostSidePanel/HostSidePanel.jsx b/frontend/components/side_panels/HostSidePanel/HostSidePanel.jsx index 10a6fdd642..070d25651e 100644 --- a/frontend/components/side_panels/HostSidePanel/HostSidePanel.jsx +++ b/frontend/components/side_panels/HostSidePanel/HostSidePanel.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { filter } from 'lodash'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/side_panels/HostSidePanel/PanelGroup/PanelGroup.jsx b/frontend/components/side_panels/HostSidePanel/PanelGroup/PanelGroup.jsx index 9016c38e79..5db3018e5e 100644 --- a/frontend/components/side_panels/HostSidePanel/PanelGroup/PanelGroup.jsx +++ b/frontend/components/side_panels/HostSidePanel/PanelGroup/PanelGroup.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { isEqual, noop } from 'lodash'; import labelInterface from 'interfaces/label'; diff --git a/frontend/components/side_panels/HostSidePanel/PanelGroupItem/PanelGroupItem.jsx b/frontend/components/side_panels/HostSidePanel/PanelGroupItem/PanelGroupItem.jsx index ea17eb54fc..eaed6013d1 100644 --- a/frontend/components/side_panels/HostSidePanel/PanelGroupItem/PanelGroupItem.jsx +++ b/frontend/components/side_panels/HostSidePanel/PanelGroupItem/PanelGroupItem.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/side_panels/PackDetailsSidePanel/PackDetailsSidePanel.jsx b/frontend/components/side_panels/PackDetailsSidePanel/PackDetailsSidePanel.jsx index 5de7383ef9..ea350063af 100644 --- a/frontend/components/side_panels/PackDetailsSidePanel/PackDetailsSidePanel.jsx +++ b/frontend/components/side_panels/PackDetailsSidePanel/PackDetailsSidePanel.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Icon from 'components/icons/Icon'; import { Link } from 'react-router'; diff --git a/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.jsx b/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.jsx index 03a34774ae..8720b3ca6d 100644 --- a/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.jsx +++ b/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Link } from 'react-router'; import Icon from 'components/icons/Icon'; diff --git a/frontend/components/side_panels/QueryDetailsSidePanel/QueryDetailsSidePanel.jsx b/frontend/components/side_panels/QueryDetailsSidePanel/QueryDetailsSidePanel.jsx index 9920116369..ec33cac1dc 100644 --- a/frontend/components/side_panels/QueryDetailsSidePanel/QueryDetailsSidePanel.jsx +++ b/frontend/components/side_panels/QueryDetailsSidePanel/QueryDetailsSidePanel.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Link } from 'react-router'; import Button from 'components/buttons/Button'; diff --git a/frontend/components/side_panels/QuerySidePanel/QuerySidePanel.jsx b/frontend/components/side_panels/QuerySidePanel/QuerySidePanel.jsx index 8235c5498f..889ce1ff37 100644 --- a/frontend/components/side_panels/QuerySidePanel/QuerySidePanel.jsx +++ b/frontend/components/side_panels/QuerySidePanel/QuerySidePanel.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import osqueryTableInterface from 'interfaces/osquery_table'; import { osqueryTableNames } from 'utilities/osquery_tables'; diff --git a/frontend/components/side_panels/ScheduleQuerySidePanel/ScheduleQuerySidePanel.jsx b/frontend/components/side_panels/ScheduleQuerySidePanel/ScheduleQuerySidePanel.jsx index 421400e4bf..e380494eae 100644 --- a/frontend/components/side_panels/ScheduleQuerySidePanel/ScheduleQuerySidePanel.jsx +++ b/frontend/components/side_panels/ScheduleQuerySidePanel/ScheduleQuerySidePanel.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import ConfigurePackQueryForm from 'components/forms/ConfigurePackQueryForm'; import queryInterface from 'interfaces/query'; diff --git a/frontend/components/side_panels/ScheduleQuerySidePanel/SearchPackQuery/SearchPackQuery.jsx b/frontend/components/side_panels/ScheduleQuerySidePanel/SearchPackQuery/SearchPackQuery.jsx index f1986b5f93..c5ab77944d 100644 --- a/frontend/components/side_panels/ScheduleQuerySidePanel/SearchPackQuery/SearchPackQuery.jsx +++ b/frontend/components/side_panels/ScheduleQuerySidePanel/SearchPackQuery/SearchPackQuery.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import AceEditor from 'react-ace'; import { isEqual, sortBy } from 'lodash'; diff --git a/frontend/components/side_panels/SecondarySidePanelContainer/SecondarySidePanelContainer.jsx b/frontend/components/side_panels/SecondarySidePanelContainer/SecondarySidePanelContainer.jsx index e6977f014f..96b4930854 100644 --- a/frontend/components/side_panels/SecondarySidePanelContainer/SecondarySidePanelContainer.jsx +++ b/frontend/components/side_panels/SecondarySidePanelContainer/SecondarySidePanelContainer.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; class SecondarySidePanelContainer extends Component { static propTypes = { diff --git a/frontend/components/side_panels/ShowSidePanel.jsx b/frontend/components/side_panels/ShowSidePanel.jsx index b253ea1bc8..dcc94a2b61 100644 --- a/frontend/components/side_panels/ShowSidePanel.jsx +++ b/frontend/components/side_panels/ShowSidePanel.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { noop } from 'lodash'; diff --git a/frontend/components/side_panels/SiteNavHeader/SiteNavHeader.jsx b/frontend/components/side_panels/SiteNavHeader/SiteNavHeader.jsx index 45c152a11a..111da9c112 100644 --- a/frontend/components/side_panels/SiteNavHeader/SiteNavHeader.jsx +++ b/frontend/components/side_panels/SiteNavHeader/SiteNavHeader.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import configInterface from 'interfaces/config'; diff --git a/frontend/components/side_panels/SiteNavHeader/UserMenu.jsx b/frontend/components/side_panels/SiteNavHeader/UserMenu.jsx index 60a15b8206..1d97bc438f 100644 --- a/frontend/components/side_panels/SiteNavHeader/UserMenu.jsx +++ b/frontend/components/side_panels/SiteNavHeader/UserMenu.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import Avatar from 'components/Avatar'; diff --git a/frontend/components/side_panels/SiteNavSidePanel/SiteNavSidePanel.jsx b/frontend/components/side_panels/SiteNavSidePanel/SiteNavSidePanel.jsx index af12bbba4a..9d4feef1e5 100644 --- a/frontend/components/side_panels/SiteNavSidePanel/SiteNavSidePanel.jsx +++ b/frontend/components/side_panels/SiteNavSidePanel/SiteNavSidePanel.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import userInterface from 'interfaces/user'; diff --git a/frontend/interfaces/campaign.js b/frontend/interfaces/campaign.js index 165de655aa..a383eb4d40 100644 --- a/frontend/interfaces/campaign.js +++ b/frontend/interfaces/campaign.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ count: PropTypes.number, diff --git a/frontend/interfaces/config.js b/frontend/interfaces/config.js index a3c43a274c..22b4ae6c15 100644 --- a/frontend/interfaces/config.js +++ b/frontend/interfaces/config.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ authentication_method: PropTypes.string, diff --git a/frontend/interfaces/config_option.js b/frontend/interfaces/config_option.js index ceb147a658..9b6fedcc7b 100644 --- a/frontend/interfaces/config_option.js +++ b/frontend/interfaces/config_option.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ id: PropTypes.number, diff --git a/frontend/interfaces/decorators.js b/frontend/interfaces/decorators.js index 86fb27e952..712c817d0f 100644 --- a/frontend/interfaces/decorators.js +++ b/frontend/interfaces/decorators.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ id: PropTypes.number, diff --git a/frontend/interfaces/dropdownOption.js b/frontend/interfaces/dropdownOption.js index b289527a1f..a093ee434f 100644 --- a/frontend/interfaces/dropdownOption.js +++ b/frontend/interfaces/dropdownOption.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ disabled: PropTypes.bool, diff --git a/frontend/interfaces/form_field.js b/frontend/interfaces/form_field.js index 2149e94f05..13fd865ff8 100644 --- a/frontend/interfaces/form_field.js +++ b/frontend/interfaces/form_field.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ error: PropTypes.string, diff --git a/frontend/interfaces/host.js b/frontend/interfaces/host.js index 5440716255..682001a223 100644 --- a/frontend/interfaces/host.js +++ b/frontend/interfaces/host.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ detail_updated_at: PropTypes.string, diff --git a/frontend/interfaces/invite.js b/frontend/interfaces/invite.js index f40286d9de..a9da83e529 100644 --- a/frontend/interfaces/invite.js +++ b/frontend/interfaces/invite.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ admin: PropTypes.bool, diff --git a/frontend/interfaces/label.js b/frontend/interfaces/label.js index f5e56ad15d..edc1aee405 100644 --- a/frontend/interfaces/label.js +++ b/frontend/interfaces/label.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ hosts_count: PropTypes.number, diff --git a/frontend/interfaces/license.js b/frontend/interfaces/license.js index a33b8fddc7..b7dee7054e 100644 --- a/frontend/interfaces/license.js +++ b/frontend/interfaces/license.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ allowed_hosts: PropTypes.oneOfType([ diff --git a/frontend/interfaces/notification.js b/frontend/interfaces/notification.js index 483db91794..0456d80d41 100644 --- a/frontend/interfaces/notification.js +++ b/frontend/interfaces/notification.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ alertType: PropTypes.string, diff --git a/frontend/interfaces/osquery_table.js b/frontend/interfaces/osquery_table.js index e349c11b94..8f38c992ce 100644 --- a/frontend/interfaces/osquery_table.js +++ b/frontend/interfaces/osquery_table.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ columns: PropTypes.arrayOf(PropTypes.shape({ diff --git a/frontend/interfaces/pack.js b/frontend/interfaces/pack.js index 4df4491130..26823f5ace 100644 --- a/frontend/interfaces/pack.js +++ b/frontend/interfaces/pack.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ description: PropTypes.string, diff --git a/frontend/interfaces/query.js b/frontend/interfaces/query.js index 1481fd0a62..6370b5f591 100644 --- a/frontend/interfaces/query.js +++ b/frontend/interfaces/query.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ description: PropTypes.string, diff --git a/frontend/interfaces/query_result.js b/frontend/interfaces/query_result.js index 459477d1e5..450e0752a6 100644 --- a/frontend/interfaces/query_result.js +++ b/frontend/interfaces/query_result.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ cmdline: PropTypes.string, diff --git a/frontend/interfaces/redirect_location.js b/frontend/interfaces/redirect_location.js index 230c6416d1..66f08ca5d6 100644 --- a/frontend/interfaces/redirect_location.js +++ b/frontend/interfaces/redirect_location.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ action: PropTypes.string, diff --git a/frontend/interfaces/registration_form_data.js b/frontend/interfaces/registration_form_data.js index f9a8fedc41..2f8af0dae0 100644 --- a/frontend/interfaces/registration_form_data.js +++ b/frontend/interfaces/registration_form_data.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ username: PropTypes.string, diff --git a/frontend/interfaces/scheduled_query.js b/frontend/interfaces/scheduled_query.js index c0315d4eac..7431ee7d49 100644 --- a/frontend/interfaces/scheduled_query.js +++ b/frontend/interfaces/scheduled_query.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ id: PropTypes.number.isRequired, diff --git a/frontend/interfaces/ssoSettings.js b/frontend/interfaces/ssoSettings.js index ccc932a5d9..426120a437 100644 --- a/frontend/interfaces/ssoSettings.js +++ b/frontend/interfaces/ssoSettings.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ idp_image_url: PropTypes.string, diff --git a/frontend/interfaces/status_labels.js b/frontend/interfaces/status_labels.js index 610383979b..3c9eec35e3 100644 --- a/frontend/interfaces/status_labels.js +++ b/frontend/interfaces/status_labels.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ loading_counts: PropTypes.bool, diff --git a/frontend/interfaces/target.js b/frontend/interfaces/target.js index 993d3a7926..1c76b15f15 100644 --- a/frontend/interfaces/target.js +++ b/frontend/interfaces/target.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; import hostInterface from 'interfaces/host'; import labelInterface from 'interfaces/label'; diff --git a/frontend/interfaces/user.js b/frontend/interfaces/user.js index 4e71b086d2..7bb5e4e8c9 100644 --- a/frontend/interfaces/user.js +++ b/frontend/interfaces/user.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export default PropTypes.shape({ admin: PropTypes.bool, diff --git a/frontend/layouts/CoreLayout/CoreLayout.jsx b/frontend/layouts/CoreLayout/CoreLayout.jsx index bd43cb0423..278a15da07 100644 --- a/frontend/layouts/CoreLayout/CoreLayout.jsx +++ b/frontend/layouts/CoreLayout/CoreLayout.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import LoadingBar from 'react-redux-loading-bar'; import { logoutUser } from 'redux/nodes/auth/actions'; diff --git a/frontend/pages/Admin/AppSettingsPage/AppSettingsPage.jsx b/frontend/pages/Admin/AppSettingsPage/AppSettingsPage.jsx index cee2c2aeda..64b3e434ba 100644 --- a/frontend/pages/Admin/AppSettingsPage/AppSettingsPage.jsx +++ b/frontend/pages/Admin/AppSettingsPage/AppSettingsPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { size } from 'lodash'; diff --git a/frontend/pages/Admin/UserManagementPage/UserManagementPage.jsx b/frontend/pages/Admin/UserManagementPage/UserManagementPage.jsx index dab29cb461..eb1050235d 100644 --- a/frontend/pages/Admin/UserManagementPage/UserManagementPage.jsx +++ b/frontend/pages/Admin/UserManagementPage/UserManagementPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { concat, includes, difference } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/ConfirmInvitePage/ConfirmInvitePage.jsx b/frontend/pages/ConfirmInvitePage/ConfirmInvitePage.jsx index f132e8cd06..d05e6a6f99 100644 --- a/frontend/pages/ConfirmInvitePage/ConfirmInvitePage.jsx +++ b/frontend/pages/ConfirmInvitePage/ConfirmInvitePage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/ConfirmSSOInvitePage/ConfirmSSOInvitePage.jsx b/frontend/pages/ConfirmSSOInvitePage/ConfirmSSOInvitePage.jsx index 4fe46e87f8..4e3ae59e7c 100644 --- a/frontend/pages/ConfirmSSOInvitePage/ConfirmSSOInvitePage.jsx +++ b/frontend/pages/ConfirmSSOInvitePage/ConfirmSSOInvitePage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import AuthenticationFormWrapper from 'components/AuthenticationFormWrapper'; import ConfirmSSOInviteForm from 'components/forms/ConfirmSSOInviteForm'; diff --git a/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx b/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx index 7d76f69f84..31f25638b0 100644 --- a/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx +++ b/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { push } from 'react-router-redux'; import { noop } from 'lodash'; diff --git a/frontend/pages/LoginPage/LoginPage.jsx b/frontend/pages/LoginPage/LoginPage.jsx index 72958f88b5..fe8fc0dc2a 100644 --- a/frontend/pages/LoginPage/LoginPage.jsx +++ b/frontend/pages/LoginPage/LoginPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { size } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/LoginSuccessfulPage/LoginSuccessfulPage.jsx b/frontend/pages/LoginSuccessfulPage/LoginSuccessfulPage.jsx index e0bfb5fa2e..cc560c7a9e 100644 --- a/frontend/pages/LoginSuccessfulPage/LoginSuccessfulPage.jsx +++ b/frontend/pages/LoginSuccessfulPage/LoginSuccessfulPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import Icon from 'components/icons/Icon'; diff --git a/frontend/pages/LogoutPage/LogoutPage.jsx b/frontend/pages/LogoutPage/LogoutPage.jsx index fe5944a452..2ad734178b 100644 --- a/frontend/pages/LogoutPage/LogoutPage.jsx +++ b/frontend/pages/LogoutPage/LogoutPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { noop } from 'lodash'; diff --git a/frontend/pages/RegistrationPage/Breadcrumbs/Breadcrumbs.jsx b/frontend/pages/RegistrationPage/Breadcrumbs/Breadcrumbs.jsx index de6b5601db..7fc3593506 100644 --- a/frontend/pages/RegistrationPage/Breadcrumbs/Breadcrumbs.jsx +++ b/frontend/pages/RegistrationPage/Breadcrumbs/Breadcrumbs.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; class Breadcrumbs extends Component { diff --git a/frontend/pages/RegistrationPage/RegistrationPage.jsx b/frontend/pages/RegistrationPage/RegistrationPage.jsx index 839ec40af0..f42ac2f081 100644 --- a/frontend/pages/RegistrationPage/RegistrationPage.jsx +++ b/frontend/pages/RegistrationPage/RegistrationPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { max, noop } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/ResetPasswordPage/ResetPasswordPage.jsx b/frontend/pages/ResetPasswordPage/ResetPasswordPage.jsx index 9ec6d35832..21ad5b6bb8 100644 --- a/frontend/pages/ResetPasswordPage/ResetPasswordPage.jsx +++ b/frontend/pages/ResetPasswordPage/ResetPasswordPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { noop, size } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/UserSettingsPage/UserSettingsPage.jsx b/frontend/pages/UserSettingsPage/UserSettingsPage.jsx index f5adc8eee2..7bf5a16ad8 100644 --- a/frontend/pages/UserSettingsPage/UserSettingsPage.jsx +++ b/frontend/pages/UserSettingsPage/UserSettingsPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { goBack } from 'react-router-redux'; import moment from 'moment'; diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx index 726ec3feb2..4a48a7d8a8 100644 --- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx +++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import AceEditor from 'react-ace'; import { connect } from 'react-redux'; import FileSaver from 'file-saver'; diff --git a/frontend/pages/packs/AllPacksPage/AllPacksPage.jsx b/frontend/pages/packs/AllPacksPage/AllPacksPage.jsx index 4a16f1ec08..829dcbe67e 100644 --- a/frontend/pages/packs/AllPacksPage/AllPacksPage.jsx +++ b/frontend/pages/packs/AllPacksPage/AllPacksPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { filter, find, get, includes, isEqual, noop, pull } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/packs/EditPackPage/EditPackPage.jsx b/frontend/pages/packs/EditPackPage/EditPackPage.jsx index c714cc41ab..ef50fee842 100644 --- a/frontend/pages/packs/EditPackPage/EditPackPage.jsx +++ b/frontend/pages/packs/EditPackPage/EditPackPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { filter, includes, isEqual, noop, size, find } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/packs/PackComposerPage/PackComposerPage.jsx b/frontend/pages/packs/PackComposerPage/PackComposerPage.jsx index 80c5b062e6..a87bd7b9f2 100644 --- a/frontend/pages/packs/PackComposerPage/PackComposerPage.jsx +++ b/frontend/pages/packs/PackComposerPage/PackComposerPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { noop } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.jsx b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.jsx index b8a5f9257c..a841dd61cc 100644 --- a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.jsx +++ b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { filter, get, includes, pull } from 'lodash'; import { push } from 'react-router-redux'; diff --git a/frontend/pages/queries/QueryPage/QueryPage.jsx b/frontend/pages/queries/QueryPage/QueryPage.jsx index d80e8d55a5..90d46bc75f 100644 --- a/frontend/pages/queries/QueryPage/QueryPage.jsx +++ b/frontend/pages/queries/QueryPage/QueryPage.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { connect } from 'react-redux'; import FileSaver from 'file-saver'; diff --git a/frontend/test/helpers.jsx b/frontend/test/helpers.jsx index 8cb9f4e451..8947a80958 100644 --- a/frontend/test/helpers.jsx +++ b/frontend/test/helpers.jsx @@ -70,17 +70,24 @@ export const createAceSpy = () => { getSession: () => { return { getMarkers: noop, + selection: { + on: noop, + }, setAnnotations: noop, setMode: noop, setUseWrapMode: noop, + setValue: noop, }; }, handleOptions: noop, handleMarkers: noop, + navigateFileEnd: noop, on: noop, renderer: { setShowGutter: noop, + setScrollMargin: noop, }, + resize: noop, session: { on: noop, selection: { @@ -132,4 +139,3 @@ export default { reduxMockStore, stubbedOsqueryTable, }; - diff --git a/package.json b/package.json index 19c68d457f..12464bdab4 100644 --- a/package.json +++ b/package.json @@ -32,16 +32,17 @@ "node-sass": "4.9.0", "normalizr": "2.3.1", "postcss-loader": "^3.0.0", + "prop-types": "^15.0.0", "proxy-middleware": "0.15.0", "rc-pagination": "1.16.3", "react": "15.6.2", - "react-ace": "3.7.0", + "react-ace": "^6.3.2", "react-addons-css-transition-group": "15.6.2", "react-dom": "15.6.2", "react-entity-getter": "0.0.8", "react-redux": "4.4.9", "react-redux-loading-bar": "2.9.3", - "react-router": "2.8.1", + "react-router": "^3.0.0", "react-router-redux": "4.0.8", "react-router-transition": "0.1.1", "react-select": "1.2.1", diff --git a/yarn.lock b/yarn.lock index 8d499de1a0..88674161ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1178,16 +1178,10 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -brace@0.11.1: +brace@0.11.1, brace@^0.11.1: version "0.11.1" resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" -brace@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/brace/-/brace-0.8.0.tgz#e826c6d5054cae5f607ad7b1c81236dd2cf01978" - dependencies: - w3c-blob "0.0.1" - braces@^2.3.0, braces@^2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" @@ -2016,6 +2010,11 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" +diff-match-patch@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1" + integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg== + diff@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" @@ -3157,14 +3156,15 @@ history@2.1.0: query-string "^3.0.0" warning "^2.0.0" -history@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/history/-/history-2.1.2.tgz#4aa2de897a0e4867e4539843be6ecdb2986bfdec" +history@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c" + integrity sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw= dependencies: - deep-equal "^1.0.0" - invariant "^2.0.0" - query-string "^3.0.0" - warning "^2.0.0" + invariant "^2.2.1" + loose-envify "^1.2.0" + query-string "^4.2.2" + warning "^3.0.0" hmac-drbg@^1.0.0: version "1.0.1" @@ -3178,9 +3178,10 @@ hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" -hoist-non-react-statics@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" +hoist-non-react-statics@^2.3.1: + version "2.5.5" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" + integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw== hoist-non-react-statics@^2.5.0: version "2.5.0" @@ -4014,6 +4015,11 @@ lodash.findindex@^4.3.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106" +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= + lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" @@ -4022,9 +4028,10 @@ lodash.isarray@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" -lodash.isequal@^4.1.1: +lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= lodash.isplainobject@^4.0.6: version "4.0.6" @@ -5156,6 +5163,14 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types@^15.0.0, prop-types@^15.6.2: + version "15.6.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" + integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ== + dependencies: + loose-envify "^1.3.1" + object-assign "^4.1.1" + 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: version "15.6.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" @@ -5231,7 +5246,7 @@ query-string@^3.0.0: dependencies: strict-uri-encode "^1.0.0" -query-string@^4.1.0: +query-string@^4.1.0, query-string@^4.2.2: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" dependencies: @@ -5302,12 +5317,16 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-ace@3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-3.7.0.tgz#274246ea9b405122b71be230f56d647ee5091c77" +react-ace@^6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-6.3.2.tgz#4fc75edce17d79c3169791dc184744950aca4794" + integrity sha512-eSk0fWvrBe2oqYIYX0njLddLG5H0hemWv5VVoQi5yDSPTjGlSSnzFwdgPyfuwRe8mSARZuRdprPQa5p61hKirw== dependencies: - brace "^0.8.0" - lodash.isequal "^4.1.1" + brace "^0.11.1" + diff-match-patch "^1.0.4" + lodash.get "^4.4.2" + lodash.isequal "^4.5.0" + prop-types "^15.6.2" react-addons-css-transition-group@15.6.2: version "15.6.2" @@ -5396,14 +5415,17 @@ react-router-transition@0.1.1: prop-types "^15.5.8" react-motion "^0.4.8" -react-router@2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-2.8.1.tgz#73e9491f6ceb316d0f779829081863e378ee4ed7" +react-router@^3.0.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.2.1.tgz#b9a3279962bdfbe684c8bd0482b81ef288f0f244" + integrity sha512-SXkhC0nr3G0ltzVU07IN8jYl0bB6FsrDIqlLC9dK3SITXqyTJyM7yhXlUqs89w3Nqi5OkXsfRUeHX+P874HQrg== dependencies: - history "^2.1.2" - hoist-non-react-statics "^1.2.0" + create-react-class "^15.5.1" + history "^3.0.0" + hoist-non-react-statics "^2.3.1" invariant "^2.2.1" loose-envify "^1.2.0" + prop-types "^15.5.6" warning "^3.0.0" react-select@1.2.1: @@ -6758,10 +6780,6 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" -w3c-blob@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/w3c-blob/-/w3c-blob-0.0.1.tgz#b0cd352a1a50f515563420ffd5861f950f1d85b8" - warning@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/warning/-/warning-2.1.0.tgz#21220d9c63afc77a8c92111e011af705ce0c6901"