diff --git a/package.json b/package.json index 4dc933ae5a..60ccf2f831 100644 --- a/package.json +++ b/package.json @@ -72,8 +72,8 @@ "devtools-components": "^0.0.2", "devtools-launchpad": "^0.0.100", "devtools-linters": "^0.0.3", - "devtools-reps": "^0.12.3", "devtools-map-bindings": "^0.2.0", + "devtools-reps": "^0.12.3", "devtools-source-editor": "0.0.6", "devtools-source-map": "^0.14.2", "devtools-splitter": "^0.0.3", @@ -85,6 +85,7 @@ "md5": "^2.2.1", "parse-script-tags": "^0.1.1", "pretty-fast": "^0.2.2", + "prop-types": "^15.6.0", "react": "^15.6.2", "react-dom": "^15.6.2", "react-immutable-proptypes": "^2.1.0", @@ -113,14 +114,11 @@ "enzyme": "^2.9.1", "eslint": "^4.2.0", "eslint-config-prettier": "^2.3.0", - "eslint-plugin-babel": "^3.3.0", - "eslint-plugin-flowtype": "^2.20.0", - "eslint-plugin-mozilla": "0.4.3", - "eslint-plugin-prettier": "^2.3.1", - "eslint-plugin-react": "^7.2.1", "eslint-plugin-babel": "^4.1.2", "eslint-plugin-flowtype": "^2.36.0", "eslint-plugin-mozilla": "^0.4.4", + "eslint-plugin-prettier": "^2.3.1", + "eslint-plugin-react": "^7.2.1", "expect.js": "^0.3.1", "flow-bin": "^0.52.0", "glob": "^7.0.3", diff --git a/src/components/App.js b/src/components/App.js index e4543fbb9a..1dd5132a7c 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,6 +1,7 @@ // @flow -import React, { PropTypes, Component } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import { connect } from "react-redux"; import { bindActionCreators } from "redux"; import { features } from "../utils/prefs"; diff --git a/src/components/Editor/SearchBar.js b/src/components/Editor/SearchBar.js index a383502f1d..321da65371 100644 --- a/src/components/Editor/SearchBar.js +++ b/src/components/Editor/SearchBar.js @@ -1,6 +1,7 @@ // @flow -import React, { Component, PropTypes } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import { findDOMNode } from "react-dom"; import { connect } from "react-redux"; import { bindActionCreators } from "redux"; diff --git a/src/components/Editor/index.js b/src/components/Editor/index.js index 81e5e792f7..3098daa23f 100644 --- a/src/components/Editor/index.js +++ b/src/components/Editor/index.js @@ -1,5 +1,6 @@ // @flow -import React, { PropTypes, PureComponent } from "react"; +import PropTypes from "prop-types"; +import React, { PureComponent } from "react"; import ReactDOM from "react-dom"; import ImPropTypes from "react-immutable-proptypes"; import { bindActionCreators } from "redux"; diff --git a/src/components/PrimaryPanes/SourcesTree.js b/src/components/PrimaryPanes/SourcesTree.js index 151a774c91..35b58d90c2 100644 --- a/src/components/PrimaryPanes/SourcesTree.js +++ b/src/components/PrimaryPanes/SourcesTree.js @@ -2,7 +2,8 @@ import { bindActionCreators } from "redux"; import { connect } from "react-redux"; -import React, { PropTypes, Component } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import classnames from "classnames"; import ImPropTypes from "react-immutable-proptypes"; import { Set } from "immutable"; diff --git a/src/components/ProjectSearch/SourceSearch.js b/src/components/ProjectSearch/SourceSearch.js index 59fd54d9b5..ea36143c53 100644 --- a/src/components/ProjectSearch/SourceSearch.js +++ b/src/components/ProjectSearch/SourceSearch.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import { isPretty, getSourcePath, isThirdParty } from "../../utils/source"; import { endTruncateStr } from "../../utils/utils"; diff --git a/src/components/ProjectSearch/TextSearch.js b/src/components/ProjectSearch/TextSearch.js index 823f886174..1561eec0d2 100644 --- a/src/components/ProjectSearch/TextSearch.js +++ b/src/components/ProjectSearch/TextSearch.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import classnames from "classnames"; import Svg from "../shared/Svg"; diff --git a/src/components/ProjectSearch/ToggleSearch.js b/src/components/ProjectSearch/ToggleSearch.js index e252cf5724..ce0fafa157 100644 --- a/src/components/ProjectSearch/ToggleSearch.js +++ b/src/components/ProjectSearch/ToggleSearch.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import classnames from "classnames"; export default class ToggleSearch extends Component { diff --git a/src/components/ProjectSearch/index.js b/src/components/ProjectSearch/index.js index d1d4a1a3b5..859b79f1fd 100644 --- a/src/components/ProjectSearch/index.js +++ b/src/components/ProjectSearch/index.js @@ -1,6 +1,7 @@ // @flow -import React, { PropTypes, Component } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import { connect } from "react-redux"; import { bindActionCreators } from "redux"; import actions from "../../actions"; diff --git a/src/components/SecondaryPanes/CommandBar.js b/src/components/SecondaryPanes/CommandBar.js index 16214d5869..0b4ba3bafc 100644 --- a/src/components/SecondaryPanes/CommandBar.js +++ b/src/components/SecondaryPanes/CommandBar.js @@ -1,5 +1,6 @@ // @flow -import React, { Component, PropTypes } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import { connect } from "react-redux"; import { bindActionCreators } from "redux"; import classnames from "classnames"; diff --git a/src/components/SecondaryPanes/Frames/index.js b/src/components/SecondaryPanes/Frames/index.js index f66e75e30e..c0261d4821 100644 --- a/src/components/SecondaryPanes/Frames/index.js +++ b/src/components/SecondaryPanes/Frames/index.js @@ -1,6 +1,7 @@ // @flow -import React, { PropTypes, Component, createFactory } from "react"; +import PropTypes from "prop-types"; +import React, { Component, createFactory } from "react"; import { bindActionCreators } from "redux"; import { connect } from "react-redux"; import { createSelector } from "reselect"; diff --git a/src/components/SecondaryPanes/index.js b/src/components/SecondaryPanes/index.js index 363c9776b5..55cd6f9a03 100644 --- a/src/components/SecondaryPanes/index.js +++ b/src/components/SecondaryPanes/index.js @@ -1,5 +1,6 @@ // @flow -import React, { PropTypes, Component } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import { connect } from "react-redux"; import { bindActionCreators } from "redux"; import { features } from "../../utils/prefs"; diff --git a/src/components/SymbolModal.js b/src/components/SymbolModal.js index 80e4dcb04f..e515a1bfa9 100644 --- a/src/components/SymbolModal.js +++ b/src/components/SymbolModal.js @@ -1,6 +1,7 @@ // @flow -import React, { Component, PropTypes } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import { connect } from "react-redux"; import { bindActionCreators } from "redux"; import { filter } from "fuzzaldrin-plus"; diff --git a/src/components/shared/Modal.js b/src/components/shared/Modal.js index a989f79ecd..086564d94f 100644 --- a/src/components/shared/Modal.js +++ b/src/components/shared/Modal.js @@ -1,6 +1,7 @@ // @flow -import React, { PropTypes, Component } from "react"; +import PropTypes from "prop-types"; +import React, { Component } from "react"; import type { Children } from "react"; import classnames from "classnames"; import Transition from "react-transition-group/Transition"; diff --git a/src/components/stories/ManagedTree.js b/src/components/stories/ManagedTree.js index 26e1c79122..5c3d0311c3 100644 --- a/src/components/stories/ManagedTree.js +++ b/src/components/stories/ManagedTree.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import { storiesOf } from "@storybook/react"; import ManagedTree from "../shared/ManagedTree"; import { L10N } from "devtools-launchpad"; diff --git a/src/components/stories/Outline.js b/src/components/stories/Outline.js index 40b13738d6..98df829f4e 100644 --- a/src/components/stories/Outline.js +++ b/src/components/stories/Outline.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import { storiesOf } from "@storybook/react"; import { action } from "@storybook/addon-actions"; diff --git a/src/components/stories/Preview.js b/src/components/stories/Preview.js index 7db662d48c..f6c694ac35 100644 --- a/src/components/stories/Preview.js +++ b/src/components/stories/Preview.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import { storiesOf } from "@storybook/react"; import { action } from "@storybook/addon-actions"; diff --git a/src/components/stories/ResultList.js b/src/components/stories/ResultList.js index 9e3825381b..3503fb13f9 100644 --- a/src/components/stories/ResultList.js +++ b/src/components/stories/ResultList.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import { storiesOf } from "@storybook/react"; import { action } from "@storybook/addon-actions"; diff --git a/src/components/stories/SearchInput.js b/src/components/stories/SearchInput.js index 088be097a0..084c71cdae 100644 --- a/src/components/stories/SearchInput.js +++ b/src/components/stories/SearchInput.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import { storiesOf } from "@storybook/react"; import { action } from "@storybook/addon-actions"; diff --git a/src/components/stories/TextSearch.js b/src/components/stories/TextSearch.js index b701041ad9..3846101fcb 100644 --- a/src/components/stories/TextSearch.js +++ b/src/components/stories/TextSearch.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import { storiesOf } from "@storybook/react"; import { L10N } from "devtools-launchpad"; diff --git a/src/components/stories/Workers.js b/src/components/stories/Workers.js index 4b0d261796..fd0e78420e 100644 --- a/src/components/stories/Workers.js +++ b/src/components/stories/Workers.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import { storiesOf } from "@storybook/react"; import { Workers } from "../SecondaryPanes/Workers"; import { L10N } from "devtools-launchpad"; diff --git a/src/components/stories/frames.js b/src/components/stories/frames.js index 282c6a63b2..e467fa21af 100644 --- a/src/components/stories/frames.js +++ b/src/components/stories/frames.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import classnames from "classnames"; import { storiesOf } from "@storybook/react"; import { action } from "@storybook/addon-actions"; diff --git a/src/components/stories/helpers/shortcuts.js b/src/components/stories/helpers/shortcuts.js index 5579a01baf..d7e8a4e822 100644 --- a/src/components/stories/helpers/shortcuts.js +++ b/src/components/stories/helpers/shortcuts.js @@ -1,4 +1,5 @@ -import { PropTypes, Component } from "react"; +import PropTypes from "prop-types"; +import { Component } from "react"; import { KeyShortcuts } from "devtools-modules"; const shortcuts = new KeyShortcuts({ window }); diff --git a/src/components/stories/tabs.js b/src/components/stories/tabs.js index 76dda3a0bc..d258462ae2 100644 --- a/src/components/stories/tabs.js +++ b/src/components/stories/tabs.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import PropTypes from "prop-types"; +import React from "react"; import { storiesOf } from "@storybook/react"; import { action } from "@storybook/addon-actions"; diff --git a/yarn.lock b/yarn.lock index 94942f4cfe..14dfdf9fdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7700,7 +7700,7 @@ prop-types@15.5.8: dependencies: fbjs "^0.8.9" -prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.5.9: +prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: