diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index d944ed18..1323c514 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import _ from 'lodash' import CodeMirror from 'codemirror' import path from 'path' diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index b94a64a6..d4fa6e89 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './MarkdownEditor.styl' import CodeEditor from 'browser/components/CodeEditor' diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 959d9339..95839ad6 100644 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import markdown from 'browser/lib/markdown' import _ from 'lodash' import CodeMirror from 'codemirror' diff --git a/browser/components/ModalEscButton.js b/browser/components/ModalEscButton.js index 42fe9100..836c0052 100644 --- a/browser/components/ModalEscButton.js +++ b/browser/components/ModalEscButton.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './ModalEscButton.styl' diff --git a/browser/components/NavToggleButton.js b/browser/components/NavToggleButton.js index bf50fe90..ad0ff54c 100644 --- a/browser/components/NavToggleButton.js +++ b/browser/components/NavToggleButton.js @@ -1,7 +1,8 @@ /** * @fileoverview Micro component for toggle SideNav */ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import styles from './NavToggleButton.styl' import CSSModules from 'browser/lib/CSSModules' diff --git a/browser/components/NoteItem.js b/browser/components/NoteItem.js index 5df2d646..3e703f18 100644 --- a/browser/components/NoteItem.js +++ b/browser/components/NoteItem.js @@ -1,7 +1,8 @@ /** * @fileoverview Note item component. */ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import { isArray } from 'lodash' import CSSModules from 'browser/lib/CSSModules' import { getTodoStatus } from 'browser/lib/getTodoStatus' diff --git a/browser/components/NoteItemSimple.js b/browser/components/NoteItemSimple.js index bbd21919..04c6690e 100644 --- a/browser/components/NoteItemSimple.js +++ b/browser/components/NoteItemSimple.js @@ -1,7 +1,8 @@ /** * @fileoverview Note item component with simple display mode. */ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './NoteItemSimple.styl' diff --git a/browser/components/SideNavFilter.js b/browser/components/SideNavFilter.js index 4296380b..a3fc1ff9 100644 --- a/browser/components/SideNavFilter.js +++ b/browser/components/SideNavFilter.js @@ -1,7 +1,8 @@ /** * @fileoverview Filter for all notes. */ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './SideNavFilter.styl' diff --git a/browser/components/StorageItem.js b/browser/components/StorageItem.js index b01bb920..7e8858e4 100644 --- a/browser/components/StorageItem.js +++ b/browser/components/StorageItem.js @@ -1,7 +1,8 @@ /** * @fileoverview Micro component for showing storage. */ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import styles from './StorageItem.styl' import CSSModules from 'browser/lib/CSSModules' import { isNumber } from 'lodash' diff --git a/browser/components/StorageList.js b/browser/components/StorageList.js index 3e28e18b..dd9305b3 100644 --- a/browser/components/StorageList.js +++ b/browser/components/StorageList.js @@ -1,8 +1,9 @@ /** * @fileoverview Micro component for showing StorageList */ -import React, { PropTypes } from 'react' -import styles from './StorageList.styl' +import PropTypes from 'prop-types' +import React from 'react' +import styles from './StorgaeList.styl' import CSSModules from 'browser/lib/CSSModules' /** diff --git a/browser/components/TagListItem.js b/browser/components/TagListItem.js index 206fcf24..2625412a 100644 --- a/browser/components/TagListItem.js +++ b/browser/components/TagListItem.js @@ -1,7 +1,8 @@ /** * @fileoverview Micro component for showing TagList. */ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import styles from './TagListItem.styl' import CSSModules from 'browser/lib/CSSModules' diff --git a/browser/components/TodoListPercentage.js b/browser/components/TodoListPercentage.js index 16de7277..f152130c 100644 --- a/browser/components/TodoListPercentage.js +++ b/browser/components/TodoListPercentage.js @@ -2,7 +2,8 @@ * @fileoverview Percentage of todo achievement. */ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './TodoListPercentage.styl' diff --git a/browser/components/TodoProcess.js b/browser/components/TodoProcess.js index 64553fb6..251fd5b9 100644 --- a/browser/components/TodoProcess.js +++ b/browser/components/TodoProcess.js @@ -2,7 +2,8 @@ * @fileoverview Percentage of todo achievement. */ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './TodoProcess.styl' diff --git a/browser/finder/index.js b/browser/finder/index.js index fa582cff..85a30ac7 100644 --- a/browser/finder/index.js +++ b/browser/finder/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import ReactDOM from 'react-dom' import { connect, Provider } from 'react-redux' import _ from 'lodash' diff --git a/browser/main/Detail/FolderSelect.js b/browser/main/Detail/FolderSelect.js index 9aa34e5d..ed76c5dd 100644 --- a/browser/main/Detail/FolderSelect.js +++ b/browser/main/Detail/FolderSelect.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './FolderSelect.styl' import _ from 'lodash' diff --git a/browser/main/Detail/InfoButton.js b/browser/main/Detail/InfoButton.js index 3b3b87f9..02d8dfe4 100644 --- a/browser/main/Detail/InfoButton.js +++ b/browser/main/Detail/InfoButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './InfoButton.styl' diff --git a/browser/main/Detail/InfoPanel.js b/browser/main/Detail/InfoPanel.js index b271e306..e718fbf3 100644 --- a/browser/main/Detail/InfoPanel.js +++ b/browser/main/Detail/InfoPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './InfoPanel.styl' diff --git a/browser/main/Detail/InfoPanelTrashed.js b/browser/main/Detail/InfoPanelTrashed.js index 5e06e2ac..77ecea22 100644 --- a/browser/main/Detail/InfoPanelTrashed.js +++ b/browser/main/Detail/InfoPanelTrashed.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './InfoPanel.styl' diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index e84a94e8..f4c805c1 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './MarkdownNoteDetail.styl' import MarkdownEditor from 'browser/components/MarkdownEditor' diff --git a/browser/main/Detail/PermanentDeleteButton.js b/browser/main/Detail/PermanentDeleteButton.js index d79f61c7..f0b10009 100644 --- a/browser/main/Detail/PermanentDeleteButton.js +++ b/browser/main/Detail/PermanentDeleteButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './TrashButton.styl' diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index c48a178b..51f14fae 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './SnippetNoteDetail.styl' import CodeEditor from 'browser/components/CodeEditor' diff --git a/browser/main/Detail/StarButton.js b/browser/main/Detail/StarButton.js index be751589..0616a1e0 100644 --- a/browser/main/Detail/StarButton.js +++ b/browser/main/Detail/StarButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './StarButton.styl' import _ from 'lodash' diff --git a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js index df0eaddb..49616d16 100644 --- a/browser/main/Detail/TagSelect.js +++ b/browser/main/Detail/TagSelect.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './TagSelect.styl' import _ from 'lodash' diff --git a/browser/main/Detail/TrashButton.js b/browser/main/Detail/TrashButton.js index c11dd04a..bfaafe1e 100644 --- a/browser/main/Detail/TrashButton.js +++ b/browser/main/Detail/TrashButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './TrashButton.styl' diff --git a/browser/main/Detail/index.js b/browser/main/Detail/index.js index afa72a8f..70f37a41 100644 --- a/browser/main/Detail/index.js +++ b/browser/main/Detail/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './Detail.styl' import _ from 'lodash' diff --git a/browser/main/Main.js b/browser/main/Main.js index 4f0e3184..39292e35 100644 --- a/browser/main/Main.js +++ b/browser/main/Main.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './Main.styl' import { connect } from 'react-redux' diff --git a/browser/main/NewNoteButton/index.js b/browser/main/NewNoteButton/index.js index 0f04d060..3adf3369 100644 --- a/browser/main/NewNoteButton/index.js +++ b/browser/main/NewNoteButton/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './NewNoteButton.styl' import _ from 'lodash' diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index df47c1c4..74a2d703 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './NoteList.styl' import moment from 'moment' diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js index ac1209cf..78257922 100644 --- a/browser/main/SideNav/StorageItem.js +++ b/browser/main/SideNav/StorageItem.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './StorageItem.styl' import { hashHistory } from 'react-router' diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js index 41a1b93f..05361ea4 100644 --- a/browser/main/SideNav/index.js +++ b/browser/main/SideNav/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './SideNav.styl' import { openModal } from 'browser/main/lib/modal' diff --git a/browser/main/StatusBar/index.js b/browser/main/StatusBar/index.js index 36b36bab..2106a230 100644 --- a/browser/main/StatusBar/index.js +++ b/browser/main/StatusBar/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './StatusBar.styl' import ZoomManager from 'browser/main/lib/ZoomManager' diff --git a/browser/main/TopBar/index.js b/browser/main/TopBar/index.js index 4ac48a80..11d31abd 100644 --- a/browser/main/TopBar/index.js +++ b/browser/main/TopBar/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './TopBar.styl' import _ from 'lodash' diff --git a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/CreateFolderModal.js index 5ef18ac9..e623ad8d 100644 --- a/browser/main/modals/CreateFolderModal.js +++ b/browser/main/modals/CreateFolderModal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './CreateFolderModal.styl' import dataApi from 'browser/main/lib/dataApi' diff --git a/browser/main/modals/PreferencesModal/FolderItem.js b/browser/main/modals/PreferencesModal/FolderItem.js index f30f113a..9d1cd08f 100644 --- a/browser/main/modals/PreferencesModal/FolderItem.js +++ b/browser/main/modals/PreferencesModal/FolderItem.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import ReactDOM from 'react-dom' import styles from './FolderItem.styl' diff --git a/browser/main/modals/PreferencesModal/FolderList.js b/browser/main/modals/PreferencesModal/FolderList.js index a3313d35..8585f641 100644 --- a/browser/main/modals/PreferencesModal/FolderList.js +++ b/browser/main/modals/PreferencesModal/FolderList.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import dataApi from 'browser/main/lib/dataApi' import styles from './FolderList.styl' diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index 49f476de..9a15e79f 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './ConfigTab.styl' import ConfigManager from 'browser/main/lib/ConfigManager' diff --git a/browser/main/modals/PreferencesModal/StorageItem.js b/browser/main/modals/PreferencesModal/StorageItem.js index 0e8388c2..f2092835 100644 --- a/browser/main/modals/PreferencesModal/StorageItem.js +++ b/browser/main/modals/PreferencesModal/StorageItem.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './StorageItem.styl' import consts from 'browser/lib/consts' diff --git a/browser/main/modals/PreferencesModal/StoragesTab.js b/browser/main/modals/PreferencesModal/StoragesTab.js index 41a7cc24..e33bb0fd 100644 --- a/browser/main/modals/PreferencesModal/StoragesTab.js +++ b/browser/main/modals/PreferencesModal/StoragesTab.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './StoragesTab.styl' import dataApi from 'browser/main/lib/dataApi' diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index 8c670623..eebb2e0c 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './ConfigTab.styl' import ConfigManager from 'browser/main/lib/ConfigManager' diff --git a/browser/main/modals/PreferencesModal/index.js b/browser/main/modals/PreferencesModal/index.js index 0550c2b3..2fff0364 100644 --- a/browser/main/modals/PreferencesModal/index.js +++ b/browser/main/modals/PreferencesModal/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import ReactDOM from 'react-dom' import { connect } from 'react-redux' import HotkeyTab from './HotkeyTab' diff --git a/browser/main/modals/RenameFolderModal.js b/browser/main/modals/RenameFolderModal.js index 0386b538..bb08f36d 100644 --- a/browser/main/modals/RenameFolderModal.js +++ b/browser/main/modals/RenameFolderModal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './RenameFolderModal.styl' import dataApi from 'browser/main/lib/dataApi' diff --git a/package.json b/package.json index 974f7885..29911641 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "moment": "^2.10.3", "node-ipc": "^8.1.0", "raphael": "^2.2.7", - "react": "^15.0.2", + "react": "^15.5.4", "react-codemirror": "^0.3.0", "react-dom": "^15.0.2", "react-redux": "^4.4.5", diff --git a/yarn.lock b/yarn.lock index 7c10115c..6f186773 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1716,6 +1716,14 @@ create-react-class@^15.5.1, create-react-class@^15.5.2: loose-envify "^1.3.1" object-assign "^4.1.1" +create-react-class@^15.6.0: + version "15.6.2" + resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.3.1" + object-assign "^4.1.1" + cross-spawn@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" @@ -2645,6 +2653,18 @@ faye-websocket@~0.11.0: dependencies: websocket-driver ">=0.5.1" +fbjs@^0.8.16: + version "0.8.16" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" + dependencies: + core-js "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.9" + fbjs@^0.8.9: version "0.8.12" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04" @@ -5165,6 +5185,14 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types@^15.5.10: + version "15.6.0" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.3.1" + object-assign "^4.1.1" + prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7: version "15.5.10" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" @@ -5374,14 +5402,15 @@ react-transform-hmr@^1.0.3: global "^4.3.0" react-proxy "^1.1.7" -react@^15.0.2: - version "15.5.4" - resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047" +react@^15.5.4: + version "15.6.2" + resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" dependencies: + create-react-class "^15.6.0" fbjs "^0.8.9" loose-envify "^1.1.0" object-assign "^4.1.0" - prop-types "^15.5.7" + prop-types "^15.5.10" reactcss@^1.2.0: version "1.2.2"