Merge pull request #20 from PDFTron/hot-loader

justinjung04 · web-flow · commit fe38b41224c7 · 2018-10-22T09:36:18.000-07:00
[update] resolves #19
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,4 @@
 {
-  "presets": [ "react", "env", "stage-2" ]
+  "presets": [ "react", "env", "stage-2" ],
+  "plugins": [ "react-hot-loader/babel" ]
 }
diff --git a/package.json b/package.json
@@ -21,7 +21,6 @@
     "babel-core": "^6.24.1",
     "babel-eslint": "^8.2.3",
     "babel-loader": "^7.1.4",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.15",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
@@ -39,14 +38,12 @@
     "i18next": "^11.3.2",
     "i18next-xhr-backend": "^1.5.1",
     "ip": "^1.1.5",
-    "jest": "^23.4.2",
     "mini-css-extract-plugin": "^0.4.2",
     "node-sass": "^4.5.3",
     "opn": "^5.4.0",
     "postcss-loader": "^2.1.5",
     "prop-types": "^15.6.2",
     "react": "^16.4.2",
-    "react-color": "^2.14.1",
     "react-dom": "^16.3.2",
     "react-hot-loader": "^4.3.0",
     "react-i18next": "^7.6.1",
@@ -55,18 +52,16 @@
     "react-tooltip": "^3.6.0",
     "redux": "^4.0.0",
     "redux-logger": "^3.0.6",
-    "redux-mock-store": "^1.5.3",
     "redux-thunk": "^2.3.0",
     "rimraf": "^2.6.1",
     "sass-loader": "^7.0.1",
     "style-loader": "^0.21.0",
     "svg-sprite-loader": "^3.9.2",
     "webpack": "^4.8.1",
     "webpack-bundle-analyzer": "^2.13.1",
-    "webpack-cli": "^2.1.3",
+    "webpack-cli": "^3.1.2",
     "webpack-dev-middleware": "^3.1.3",
-    "webpack-hot-middleware": "^2.18.0",
-    "webpack-version-file": "^0.1.3"
+    "webpack-hot-middleware": "^2.18.0"
   },
   "dependencies": {},
   "author": "PDFTron Systems Inc.",
diff --git a/src/components/ActionButton/ActionButton.js b/src/components/ActionButton/ActionButton.js
@@ -12,7 +12,6 @@ const mapStateToProps = (state, ownProps) => ({
 const mapDispatchToProps = (dispatch, ownProps) => ({
   onClick: e => {
     e.stopPropagation();
-    
     ownProps.onClick(dispatch);
   }
 });
diff --git a/src/components/AnnotationPopup/AnnotationPopup.js b/src/components/AnnotationPopup/AnnotationPopup.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 import ReactTooltip from 'react-tooltip';
 
 import ActionButton from 'components/ActionButton';
@@ -184,4 +183,4 @@ const mapDispatchToProps = {
   setActiveLeftPanel: actions.setActiveLeftPanel
 };
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(AnnotationPopup));
+export default connect(mapStateToProps, mapDispatchToProps)(AnnotationPopup);
diff --git a/src/components/App/App.js b/src/components/App/App.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { translate } from 'react-i18next';
+import { hot } from 'react-hot-loader';
 import ReactTooltip from 'react-tooltip';
 
 import Header from 'components/Header';
@@ -128,4 +129,4 @@ const mapDispatchToProps = {
   closeElements: actions.closeElements
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(translate()(App));
+export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(translate()(App)));
diff --git a/src/components/ContextMenuPopup/ContextMenuPopup.js b/src/components/ContextMenuPopup/ContextMenuPopup.js
@@ -1,8 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
-
 import ActionButton from 'components/ActionButton';
 
 import getClassName from 'helpers/getClassName';
@@ -129,4 +127,4 @@ const mapDispatchToProps = dispatch => ({
   closeElements: dataElements => dispatch(actions.closeElements(dataElements))
 });
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(ContextMenuPopup));
+export default connect(mapStateToProps, mapDispatchToProps)(ContextMenuPopup);
diff --git a/src/components/ErrorModal/ErrorModal.js b/src/components/ErrorModal/ErrorModal.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { translate } from 'react-i18next';
-import { hot } from 'react-hot-loader';
 
 import getClassName from 'helpers/getClassName';
 import actions from 'actions';
@@ -74,4 +73,4 @@ const mapDispatchToProps = {
   closeElements: actions.closeElements,
 };
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(translate()(ErrorModal)));
+export default connect(mapStateToProps, mapDispatchToProps)(translate()(ErrorModal));
diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import HeaderItems from 'components/HeaderItems';
 
@@ -39,4 +38,4 @@ const mapStateToProps = state => ({
   activeHeaderItems: selectors.getActiveHeaderItems(state),
 });
 
-export default hot(module)(connect(mapStateToProps)(Header));
+export default connect(mapStateToProps)(Header);
diff --git a/src/components/LeftPanel/LeftPanel.js b/src/components/LeftPanel/LeftPanel.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import LeftPanelTabs from 'components/LeftPanelTabs';
 import NotesPanel from 'components/NotesPanel';
@@ -70,4 +69,4 @@ const mapDispatchToProps = {
   closeElement: actions.closeElement,
 };
 
-export default hot(module)(connect(mapStatesToProps, mapDispatchToProps)(LeftPanel));
+export default connect(mapStatesToProps, mapDispatchToProps)(LeftPanel);
diff --git a/src/components/LeftPanelTabs/LeftPanelTabs.js b/src/components/LeftPanelTabs/LeftPanelTabs.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 import { translate } from 'react-i18next';
 
 import Button from 'components/Button';
@@ -87,4 +86,4 @@ const mapDispatchToProps = {
   setActiveLeftPanel: actions.setActiveLeftPanel
 };
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(translate()(LeftPanelTabs)));
+export default connect(mapStateToProps, mapDispatchToProps)(translate()(LeftPanelTabs));
diff --git a/src/components/LoadingModal/LoadingModal.js b/src/components/LoadingModal/LoadingModal.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import getClassName from 'helpers/getClassName';
 import actions from 'actions';
@@ -51,4 +50,4 @@ const mapDispatchToProps = {
   closeElements: actions.closeElements
 };
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(LoadingModal));
+export default connect(mapStateToProps, mapDispatchToProps)(LoadingModal);
diff --git a/src/components/MenuOverlay/MenuOverlay.js b/src/components/MenuOverlay/MenuOverlay.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { translate } from 'react-i18next';
-import { hot } from 'react-hot-loader';
 
 import ActionButton from 'components/ActionButton';
 
@@ -101,4 +100,4 @@ const mapDispatchToProps = dispatch => ({
   closeElements: dataElements => dispatch(actions.closeElements(dataElements))
 });
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(translate()(MenuOverlay)));
+export default connect(mapStateToProps, mapDispatchToProps)(translate()(MenuOverlay));
diff --git a/src/components/Note/Note.js b/src/components/Note/Note.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 import { translate } from 'react-i18next';
 import Autolinker from 'autolinker';
 
@@ -257,4 +256,4 @@ const matDispatchToProps = {
   setIsNoteEditing: actions.setIsNoteEditing,
 };
 
-export default hot(module)(connect(mapStateToProps, matDispatchToProps)(translate()(Note)));
+export default connect(mapStateToProps, matDispatchToProps)(translate()(Note));
diff --git a/src/components/NotesPanel/NotesPanel.js b/src/components/NotesPanel/NotesPanel.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 import { translate } from 'react-i18next';
 
 import Dropdown from 'components/Dropdown';
@@ -201,4 +200,4 @@ const mapStatesToProps = state => ({
   isDisabled: selectors.isElementDisabled(state, 'notesPanel'),
 });
 
-export default hot(module)(connect(mapStatesToProps)(translate()(NotesPanel)));
+export default connect(mapStatesToProps)(translate()(NotesPanel));
diff --git a/src/components/Outline/Outline.js b/src/components/Outline/Outline.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import Icon from 'components/Icon';
 
@@ -67,4 +66,4 @@ const mapDispatchToProps = {
   closeElement: actions.closeElement
 };
 
-export default hot(module)(connect(null, mapDispatchToProps)(Outline));
+export default connect(null, mapDispatchToProps)(Outline);
diff --git a/src/components/OutlinesPanel/OutlinesPanel.js b/src/components/OutlinesPanel/OutlinesPanel.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { translate } from 'react-i18next';
-import { hot } from 'react-hot-loader';
 
 import Outline from 'components/Outline';
 
@@ -49,4 +48,4 @@ const mapStateToProps = state => ({
   isOpen: selectors.isElementOpen(state, 'outlinePanel'),
 });
 
-export default hot(module)(connect(mapStateToProps)(translate()(OutlinesPanel)));
+export default connect(mapStateToProps)(translate()(OutlinesPanel));
diff --git a/src/components/PageNavOverlay/PageNavOverlay.js b/src/components/PageNavOverlay/PageNavOverlay.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import core from 'core';
 import getClassName from 'helpers/getClassName';
@@ -91,4 +90,4 @@ const mapStateToProps = state => ({
   totalPages: selectors.getTotalPages(state),
 });
 
-export default hot(module)(connect(mapStateToProps)(PageNavOverlay));
+export default connect(mapStateToProps)(PageNavOverlay);
diff --git a/src/components/PrintModal/PrintModal.js b/src/components/PrintModal/PrintModal.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { translate } from 'react-i18next';
-import { hot } from 'react-hot-loader';
 
 import Input from 'components/Input';
 
@@ -308,4 +307,4 @@ const mapDispatchToProps = dispatch => ({
   closeElements: dataElements => dispatch(actions.closeElements(dataElements))
 });
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(translate()(PrintModal)));
+export default connect(mapStateToProps, mapDispatchToProps)(translate()(PrintModal));
diff --git a/src/components/SearchOverlay/SearchOverlay.js b/src/components/SearchOverlay/SearchOverlay.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { translate } from 'react-i18next';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import Icon from 'components/Icon';
 import Input from 'components/Input';
@@ -377,4 +376,4 @@ const mapDispatchToProps = {
   setIsProgrammaticSearchFull: actions.setIsProgrammaticSearchFull
 };
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(translate()(SearchOverlay)));
+export default connect(mapStateToProps, mapDispatchToProps)(translate()(SearchOverlay));
diff --git a/src/components/SearchPanel/SearchPanel.js b/src/components/SearchPanel/SearchPanel.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { translate } from 'react-i18next';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import SearchResult from 'components/SearchResult';
 import ListSeparator from 'components/ListSeparator';
@@ -112,4 +111,4 @@ const mapDispatchToProps = {
   closeElement: actions.closeElement,
 };
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(translate()(SearchPanel)));
+export default connect(mapStateToProps, mapDispatchToProps)(translate()(SearchPanel));
diff --git a/src/components/TextPopup/TextPopup.js b/src/components/TextPopup/TextPopup.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import ActionButton from 'components/ActionButton';
 
@@ -106,4 +105,4 @@ const mapDispatchToProps = dispatch => ({
   closeElements: dataElements => dispatch(actions.closeElements(dataElements)),
 });
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(TextPopup));
+export default connect(mapStateToProps, mapDispatchToProps)(TextPopup);
diff --git a/src/components/ThumbnailsPanel/ThumbnailsPanel.js b/src/components/ThumbnailsPanel/ThumbnailsPanel.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ReactList from 'react-list';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 
 import Thumbnail from 'components/Thumbnail';
 
@@ -288,4 +287,4 @@ const mapStateToProps = state => ({
   totalPages: selectors.getTotalPages(state),
 });
 
-export default hot(module)(connect(mapStateToProps)(ThumbnailsPanel));
+export default connect(mapStateToProps)(ThumbnailsPanel);
diff --git a/src/components/ToolTip/ToolTip.js b/src/components/ToolTip/ToolTip.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import { hot } from 'react-hot-loader'; 
 import ReactToolTip from 'react-tooltip';
 
 import './ToolTip.scss';
@@ -40,4 +39,4 @@ class ToolTip extends React.PureComponent {
   }
 }
 
-export default hot(module)(ToolTip);
+export default ToolTip;
diff --git a/src/components/ToolsOverlay/ToolsOverlay.js b/src/components/ToolsOverlay/ToolsOverlay.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
 import ReactTooltip from 'react-tooltip';
 
 import ToolButton from 'components/ToolButton';
@@ -114,4 +113,4 @@ const mapDispatchToProps = {
   setActiveToolGroup: actions.setActiveToolGroup
 };
 
-export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(ToolsOverlay));
+export default connect(mapStateToProps, mapDispatchToProps)(ToolsOverlay);
diff --git a/src/components/ViewControlsOverlay/ViewControlsOverlay.js b/src/components/ViewControlsOverlay/ViewControlsOverlay.js
diff --git a/webpack.config.prod.js b/webpack.config.prod.js

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`		`- "presets": [ "react", "env", "stage-2" ]`
	`2`	`+ "presets": [ "react", "env", "stage-2" ],`
	`3`	`+ "plugins": [ "react-hot-loader/babel" ]`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ const mapStateToProps = (state, ownProps) => ({`
`12`	`12`	`const mapDispatchToProps = (dispatch, ownProps) => ({`
`13`	`13`	`onClick: e => {`
`14`	`14`	`e.stopPropagation();`
`15`		`-`
`16`	`15`	`ownProps.onClick(dispatch);`
`17`	`16`	`}`
`18`	`17`	`});`