From 92ac792b7b04224c410ec79c8f884c28fd1c6756 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Tue, 3 Dec 2019 22:59:44 -0500
Subject: [PATCH] BUG: Fixed React/ReactDOM imports

---
 app/plugins/templates/webpack.config.js.tmpl   | 4 ++--
 app/static/app/js/components/LayersControl.jsx | 4 ++--
 jest.config.js                                 | 3 ++-
 plugins/contours/public/Contours.jsx           | 4 ++--
 plugins/elevationmap/public/ElevationMap.jsx   | 4 ++--
 plugins/measure/public/app.jsx                 | 4 ++--
 webpack.config.js                              | 4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/plugins/templates/webpack.config.js.tmpl b/app/plugins/templates/webpack.config.js.tmpl
index 0ea8d9ae..0817dc92 100644
--- a/app/plugins/templates/webpack.config.js.tmpl
+++ b/app/plugins/templates/webpack.config.js.tmpl
@@ -80,8 +80,8 @@ module.exports = {
     "SystemJS": "SystemJS",
     "PluginsAPI": "PluginsAPI",
     "leaflet": "leaflet",
-    "react-dom": "ReactDOM",
-    "react": "React"
+    "ReactDOM": "ReactDOM",
+    "React": "React"
   },
 
   watchOptions: {
diff --git a/app/static/app/js/components/LayersControl.jsx b/app/static/app/js/components/LayersControl.jsx
index c2a1d497..b82542d9 100644
--- a/app/static/app/js/components/LayersControl.jsx
+++ b/app/static/app/js/components/LayersControl.jsx
@@ -1,6 +1,6 @@
-import L from 'leaflet';
-import ReactDOM from 'react-dom';
 import React from 'react';
+import ReactDOM from 'react-dom';
+import L from 'leaflet';
 import PropTypes from 'prop-types';
 import '../css/LayersControl.scss';
 import LayersControlPanel from './LayersControlPanel';
diff --git a/jest.config.js b/jest.config.js
index 978a7799..5834ffc0 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -3,7 +3,8 @@ module.exports = {
   moduleNameMapper: {
     "^.*\\.s?css$": "<rootDir>/app/static/app/js/tests/mocks/empty.scss.js",
     "jquery": "<rootDir>/app/static/app/js/vendor/jquery-1.11.2.min.js",
-    "SystemJS": "<rootDir>/app/static/app/js/tests/mocks/system.js"
+    "SystemJS": "<rootDir>/app/static/app/js/tests/mocks/system.js",
+    "ReactDOM": "react-dom"
   },
   setupFiles: ["<rootDir>/app/static/app/js/tests/setup/shims.js",
   				"<rootDir>/app/static/app/js/tests/setup/setupTests.js", 
diff --git a/plugins/contours/public/Contours.jsx b/plugins/contours/public/Contours.jsx
index 3e64e422..971e4d8c 100644
--- a/plugins/contours/public/Contours.jsx
+++ b/plugins/contours/public/Contours.jsx
@@ -1,6 +1,6 @@
 import L from 'leaflet';
-import ReactDOM from 'react-dom';
-import React from 'react';
+import ReactDOM from 'ReactDOM';
+import React from 'React';
 import PropTypes from 'prop-types';
 import './Contours.scss';
 import ContoursPanel from './ContoursPanel';
diff --git a/plugins/elevationmap/public/ElevationMap.jsx b/plugins/elevationmap/public/ElevationMap.jsx
index 501f24c7..0b9a9c23 100644
--- a/plugins/elevationmap/public/ElevationMap.jsx
+++ b/plugins/elevationmap/public/ElevationMap.jsx
@@ -1,6 +1,6 @@
 import L from 'leaflet';
-import ReactDOM from 'react-dom';
-import React from 'react';
+import ReactDOM from 'ReactDOM';
+import React from 'React';
 import PropTypes from 'prop-types';
 import './ElevationMap.scss';
 import ElevationMapPanel from './ElevationMapPanel';
diff --git a/plugins/measure/public/app.jsx b/plugins/measure/public/app.jsx
index 50c82ab3..3ec7348e 100644
--- a/plugins/measure/public/app.jsx
+++ b/plugins/measure/public/app.jsx
@@ -4,8 +4,8 @@ import 'leaflet-measure-ex/dist/leaflet-measure';
 import 'leaflet-measure-ex/dist/leaflet-measure.css';
 import MeasurePopup from './MeasurePopup';
 import Utils from 'webodm/classes/Utils';
-import ReactDOM from 'react-dom';
-import React from 'react';
+import ReactDOM from 'ReactDOM';
+import React from 'React';
 import $ from 'jquery';
 
 export default class App{
diff --git a/webpack.config.js b/webpack.config.js
index e7d44c7d..c6403bc2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -89,8 +89,8 @@ module.exports = {
     //  on the global let jQuery
     "jquery": "jQuery",
     "SystemJS": "SystemJS",
-    "react": "React",
-    "react-dom": "ReactDOM"
+    "React": "React",
+    "ReactDOM": "ReactDOM"
   },
 
   watchOptions: {