Merge pull request #362 from BIDMCDigitalPsychiatry/issue-798

dependency fixes
BIDMCDigitalPsychiatry · Feb 20, 2024 · 23c55a4 · 23c55a4
2 parents 02abb70 + 5fc122e
commit 23c55a4
Show file tree

Hide file tree

Showing 9 changed files with 13,328 additions and 13,270 deletions.
diff --git a/BoxGame/package-lock.json b/BoxGame/package-lock.json
diff --git a/BoxGame/package.json b/BoxGame/package.json
@@ -8,13 +8,14 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@hot-loader/react-dom": "^17.0.2",
     "@material-ui/core": "^4.12.4",
+    "@types/react-hot-loader": "^4.1.1",
     "i18next": "^23.8.2",
     "i18next-http-backend": "^2.4.3",
     "material-icons": "^1.13.12",
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.0",
     "react-dom": "^18.2.0",
-    "react-hot-loader": "^4.13.1",
+    "react-hot-loader": "^3.1.1",
     "react-i18next": "^14.0.3",
     "react-scripts": "5.0.1",
     "typescript": "^5.3.3",
@@ -26,7 +27,7 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
-  },  
+  },
   "overrides": {
     "nth-check": "2.1.1",
     "postcss": "8.4.32"

diff --git a/BoxGame/src/index.tsx b/BoxGame/src/index.tsx
@@ -5,6 +5,8 @@
  * @author ZCO Engineer
  * @copyright (c) 2020, ZCO
  */
+require("react-hot-loader/patch") 
+
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { AppContainer } from "react-hot-loader";

diff --git a/CatsnDogs/src/index.tsx b/CatsnDogs/src/index.tsx
@@ -5,6 +5,8 @@
  * @author ZCO Engineer
  * @copyright (c) 2020, ZCO
  */
+require("react-hot-loader/patch") 
+
 import 'bootstrap/dist/css/bootstrap.min.css';
 
 import * as React from 'react';

diff --git a/JewelsPro/package-lock.json b/JewelsPro/package-lock.json
diff --git a/JewelsPro/package.json b/JewelsPro/package.json
@@ -9,6 +9,7 @@
     "@hot-loader/react-dom": "^17.0.2",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
+    "@types/react-hot-loader": "^4.1.1",
     "bootstrap": "^5.3.2",
     "i18next": "^23.8.2",
     "i18next-http-backend": "^2.4.3",
@@ -40,8 +41,5 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ],
-  "devDependencies": {
-    "@types/react-hot-loader": "^4.1.1"
-  }
+  ]
 }
diff --git a/JewelsPro/src/components/jewels/Jewels.tsx b/JewelsPro/src/components/jewels/Jewels.tsx
@@ -60,9 +60,9 @@ class Jewels extends React.Component<{}, AppState> {
   }
 
   messageEvent = () => {
-    const eventMethod = !!window.addEventListener ? "addEventListener" : "attachEvent"
+    const eventMethod ="addEventListener"
     const eventer = window[eventMethod]
-    const messageEvent = eventMethod === "attachEvent" ? "onmessage" : "message"
+    const messageEvent =  "onmessage"
     // Listen to message from child window
     eventer(
       messageEvent,

diff --git a/JewelsPro/src/index.tsx b/JewelsPro/src/index.tsx
@@ -5,7 +5,8 @@
  * @author ZCO Engineer
  * @copyright (c) 2020, ZCO
  */
- import 'bootstrap/dist/css/bootstrap.min.css';
+require("react-hot-loader/patch") 
+import 'bootstrap/dist/css/bootstrap.min.css';
 
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';