Merge pull request #200 from EEVengers/features/npm-updates

Features/npm updates

Software/waveview/README.md

@@ -1,3 +1,17 @@
+# TL;DR for Windows Testing
+
+All commands need to be run from the `Software/waveview` directory in PowerShell.
+
+1. Initial setup of node_modules folder (first time only)
+    - `npm install`
+2. Building the backend
+    - `npm run make-cpp-win`
+3. Running the backend
+    - `.\build\Release\scope.exe -c`
+4. Run the electron
+    - `npm run electron-dev-win`
+
+
 # Custom Script Info
 
 Skip to "Scope Link Build Commands" for building the `scope_link` (C++) portion.
@@ -70,7 +84,7 @@ This project was bootstrapped with [Create React App](https://github.com/faceboo
 
 In the project directory, you can run:
 
-### 'npm install'
+### `npm install`
 
 Runs the MakeFile and compiles the NAPI addon.
 

Software/waveview/package.json

@@ -8,32 +8,32 @@
   "homepage": "./",
   "private": true,
   "dependencies": {
-    "@reduxjs/toolkit": "^1.4.0",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.5.0",
-    "@testing-library/user-event": "^7.2.1",
+    "@reduxjs/toolkit": "^1.6.0",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@testing-library/react": "^11.2.7",
+    "@testing-library/user-event": "^13.1.9",
     "@types/electron-devtools-installer": "^2.2.0",
-    "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.22",
-    "@types/react": "^16.9.53",
-    "@types/react-dom": "^16.9.8",
-    "@types/react-redux": "^7.1.15",
-    "@types/react-vis": "^1.11.5",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.12.4",
+    "@types/react": "^17.0.11",
+    "@types/react-dom": "^17.0.8",
+    "@types/react-redux": "^7.1.16",
+    "@types/react-vis": "^1.11.6",
     "@types/redux": "^3.6.0",
     "core-util-is": "^1.0.2",
     "debug": "^4.3.1",
-    "electron-devtools-installer": "^3.1.1",
-    "electron-is-dev": "^1.2.0",
+    "electron-devtools-installer": "^3.2.0",
+    "electron-is-dev": "^2.0.0",
     "electron-reload": "^1.5.0",
-    "node-addon-api": "^3.0.0",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-redux": "^7.2.2",
+    "node-addon-api": "^4.0.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-redux": "^7.2.4",
     "react-scripts": "^4.0.3",
     "react-vis": "^1.11.7",
-    "redux": "^4.0.5",
+    "redux": "^4.1.0",
     "run": "^1.4.0",
-    "typescript": "^4.1.3"
+    "typescript": "^4.3.4"
   },
   "scripts": {
     "start": "react-scripts start",