Merge pull request #1 from oslabs-beta/dev

Merge dev with master

Author: jrosengrant

.babelrc

@@ -1,6 +1,5 @@
 {
   "extends": [
-    "airbnb",
     "plugin:jest/recommended",
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",

.eslintrc

@@ -1,6 +1,3 @@
-[submodule "tests/manual-tests/recoilTest"]
-	path = tests/manual-tests/recoilTest
-	url = https://github.com/kevinfey/recoilTest
 [submodule "reactime-website"]
 	path = reactime-website
 	url = https://github.com/reactimetravel/reactime-website

.gitmodules

@@ -0,0 +1,10 @@
+{"depcheck": 
+  {
+    "ignoreMatches": [
+      "css-loader",
+      "sass-loader", 
+      "style-loader",
+      "typedoc-webpack-plugin"
+    ]
+  }
+}

.npmcheckrc

@@ -3,15 +3,15 @@
   "description": "build web extension bundle.js",
   "scripts": {
     "build": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production",
-    "dev": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode development --watch",
+    "dev": "cross-env NODE_ENV=development webpack --mode development --watch",
     "buildlegacy": "webpack --mode production",
     "devlegacy": "webpack --mode development --watch",
     "test": "jest --verbose --coverage",
     "test-backend": "jest --verbose --coverage src/backend",
     "test-frontend": "jest --verbose --coverage src/app",
     "test-on": "./node_modules/.bin/jest $1",
     "docker-test-lint": "eslint --ext .js --ext .jsx src",
-    "docs": "typedoc --json docs --inputFiles src/app --inputFiles src/backend --readme docs/readme.md",
+    "docs": "npx typedoc --tsconfig tsconfig.json",
     "format": "prettier --config .prettierrc './**/*.{ts,tsx,js,jsx}' --write"
   },
   "keywords": [
@@ -119,131 +119,76 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-decorators": "^7.10.5",
-    "@babel/preset-env": "^7.12.7",
-    "@babel/preset-react": "^7.12.7",
-    "@babel/preset-typescript": "^7.21.5",
-    "@inrupt/jest-jsdom-polyfills": "^1.6.2",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^14.4.3",
-    "@types/chai": "^4.2.14",
-    "@types/chrome": "^0.0.119",
-    "@types/d3": "^7.4.0",
-    "@types/d3-scale-chromatic": "^2.0.0",
-    "@types/jest": "^29.5.0",
-    "@types/lodash.isequal": "^4.5.5",
-    "@types/node": "^12.19.6",
-    "@types/react": "^17.0.43",
-    "@types/react-router": "^5.1.20",
-    "@typescript-eslint/eslint-plugin": "^3.6.1",
-    "@typescript-eslint/parser": "^3.6.1",
-    "babel-loader": "^8.1.0",
-    "babel-preset-airbnb": "^5.0.0",
-    "core-js": "^3.6.5",
-    "css-loader": "^3.6.0",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.6",
-    "eslint": "^8.36.0",
-    "eslint-config-airbnb": "^18.2.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jest": "^22.21.0",
-    "eslint-plugin-jest-dom": "^4.0.3",
-    "eslint-plugin-jsx-a11y": "^6.3.1",
-    "eslint-plugin-react": "^7.20.3",
-    "eslint-plugin-react-hooks": "^1.7.0",
-    "eslint-plugin-testing-library": "^5.10.3",
-    "express": "^4.17.1",
-    "jest": "^29.5.0",
-    "jest-cli": "^26.1.0",
-    "jest-diff": "^26.1.0",
-    "jest-environment-jsdom": "^29.5.0",
-    "jest-runner-eslint": "^2.0.0",
-    "jscharting-react": "^1.2.1",
-    "jsdom": "^21.1.2",
-    "prettier": "2.8.4",
-    "puppeteer": "^14.3.0",
-    "react-devtools-core": "^4.27.3",
-    "sass": "^1.26.10",
-    "sass-loader": "^7.3.1",
-    "sinon-chrome": "^3.0.1",
-    "style-loader": "^0.23.1",
-    "ts-jest": "^29.0.5",
-    "ts-loader": "^8.0.0",
-    "ts-node": "^9.1.1",
-    "typedoc": "^0.5.0",
-    "typedoc-webpack-plugin": "^1.1.4",
-    "typescript": "^4.9.0",
-    "webpack": "^4.43.0",
-    "webpack-chrome-extension-reloader": "^1.3.0",
-    "webpack-cli": "^3.3.12"
+    "@testing-library/jest-dom": "^6.1.5",
+    "@testing-library/react": "^14.1.2",
+    "@testing-library/user-event": "^14.5.1",
+    "@types/chrome": "^0.0.254",
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.10.5",
+    "@typescript-eslint/eslint-plugin": "^6.15.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.8.1",
+    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-jest-dom": "^5.1.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-testing-library": "^6.2.0",
+    "html-webpack-plugin": "^5.5.4",
+    "identity-obj-proxy": "^3.0.0",
+    "jsdom": "^23.0.1",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.21.1",
+    "sass-loader": "^13.3.2",
+    "style-loader": "^3.3.3",
+    "ts-loader": "^9.5.1",
+    "typedoc": "^0.25.4",
+    "typescript": "^5.3.3",
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@fortawesome/fontawesome-free": "^5.15.1",
-    "@fortawesome/fontawesome-svg-core": "^1.2.32",
-    "@fortawesome/free-regular-svg-icons": "^5.15.1",
-    "@fortawesome/free-solid-svg-icons": "^5.15.1",
-    "@fortawesome/react-fontawesome": "^0.1.12",
-    "@mui/icons-material": "^5.14.1",
-    "@mui/material": "^5.14.12",
-    "@mui/styled-engine-sc": "^5.12.0",
-    "@mui/system": "^5.14.12",
-    "@reduxjs/toolkit": "^1.9.6",
-    "@types/react-dom": "^17.0.14",
-    "@types/react-router-dom": "^5.3.3",
-    "@visx/axis": "^1.0.0",
-    "@visx/brush": "^1.2.0",
-    "@visx/clip-path": "^1.0.0",
-    "@visx/event": "^1.0.0",
-    "@visx/glyph": "^1.0.0",
-    "@visx/gradient": "^1.0.0",
-    "@visx/grid": "^1.0.0",
-    "@visx/group": "^3.0.0",
-    "@visx/hierarchy": "^1.0.0",
-    "@visx/legend": "^1.0.0",
-    "@visx/responsive": "^1.0.0",
-    "@visx/scale": "^1.0.0",
-    "@visx/shape": "^3.0.0",
-    "@visx/text": "^3.0.0",
-    "@visx/tooltip": "^1.0.0",
-    "@visx/zoom": "^1.0.0",
-    "acorn": "^7.3.1",
-    "acorn-jsx": "^5.2.0",
-    "apexcharts": "^3.23.1",
-    "chai": "^4.2.0",
-    "d3": "^7.6.1",
+    "@mui/icons-material": "^5.15.1",
+    "@mui/material": "^5.15.1",
+    "@mui/system": "^5.15.1",
+    "@reduxjs/toolkit": "^2.0.1",
+    "@visx/axis": "^3.5.0",
+    "@visx/event": "^3.3.0",
+    "@visx/gradient": "^3.3.0",
+    "@visx/grid": "^3.5.0",
+    "@visx/group": "^3.3.0",
+    "@visx/hierarchy": "^3.3.0",
+    "@visx/responsive": "^3.3.0",
+    "@visx/scale": "^3.5.0",
+    "@visx/shape": "^3.5.0",
+    "@visx/text": "^3.3.0",
+    "@visx/tooltip": "^3.3.0",
+    "cross-env": "^7.0.3",
+    "d3": "^7.8.5",
     "d3-scale-chromatic": "^3.0.0",
-    "d3-shape": "^2.0.0",
-    "d3-zoom": "^3.0.0",
-    "identity-obj-proxy": "^3.0.0",
-    "intro.js": "^5.0.0",
-    "intro.js-react": "^0.6.0",
-    "jest-runner": "^26.1.0",
-    "jscharting": "^3.0.2",
-    "jsondiffpatch": "^0.3.11",
+    "d3-shape": "^3.2.0",
+    "dotenv": "^16.3.1",
+    "express": "^4.18.2",
+    "html-react-parser": "^5.0.11",
+    "intro.js": "^7.2.0",
+    "intro.js-react": "^1.0.0",
+    "jsondiffpatch": "^0.6.0",
     "lodash": "^4.17.21",
-    "prop-types": "^15.7.2",
-    "rc-slider": "^8.7.1",
-    "rc-tooltip": "^3.7.3",
-    "react": "^18.0.0",
-    "react-apexcharts": "^1.3.7",
-    "react-dom": "^18.2.0",
-    "react-hover": "^2.0.0",
-    "react-html-parser": "^2.0.2",
-    "react-json-tree": "^0.11.2",
-    "react-redux": "^8.1.3",
-    "react-router-dom": "^5.2.0",
-    "react-select": "^3.2.0",
-    "react-spinners": "^0.11.0",
-    "recoil": "0.0.10",
-    "redux": "^4.2.1",
-    "redux-mock-store": "^1.5.4",
-    "styled-components": "^6.0.4",
-    "util": "^0.12.4",
-    "web-vitals": "^3.5.0",
-    "yarn": "^1.22.19"
+    "node": "^18.12.1",
+    "rc-slider": "^10.5.0",
+    "rc-tooltip": "^6.1.3",
+    "react": "^18.2.0",
+    "react-apexcharts": "^1.4.1",
+    "react-hover": "^3.0.1",
+    "react-json-tree": "^0.18.0",
+    "react-redux": "^9.0.4",
+    "react-select": "^5.8.0",
+    "react-spinners": "^0.13.8",
+    "redux": "^5.0.0",
+    "regenerator-runtime": "^0.14.1",
+    "sass": "^1.69.5",
+    "styled-components": "^6.1.2",
+    "web-vitals": "^3.5.0"
   }
 }

package.json

@@ -247,6 +247,7 @@ export interface HandleProps {
 }
 
 export interface MainSliderProps {
+  className: string;
   snapshotsLength: number;
 }
 
@@ -309,13 +310,12 @@ export interface LinkControlProps {
 }
 
 export interface ControlStyles {
-  fontSize: string;
+  //fontSize: string;
   padding: string;
 }
 
 export interface DropDownStyle {
   margin: string;
-  fontSize: string;
   fontFamily: string;
   borderRadius: string;
   borderStyle: string;
@@ -379,3 +379,7 @@ export interface Snapshots {
   component3: number;
   'all others': number;
 }
+
+export interface ErrorContainerProps {
+  port: chrome.runtime.Port | null;
+}

src/app/FrontendTypes.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render as rtlRender, screen, fireEvent } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import ActionContainer from '../containers/ActionContainer';
 import TravelContainer from '../containers/TravelContainer';
 import { Provider } from 'react-redux';

src/app/__tests__/ActionContainer.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render as rtlRender, screen, fireEvent } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { TextEncoder } from 'util';
 global.TextEncoder = TextEncoder;
 import ButtonsContainer from '../containers/ButtonsContainer';

src/app/__tests__/ButtonContainer.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render as rtlRender, screen } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect'; // needed this to extend the jest-dom assertions  (ex toHaveTextContent)
+import '@testing-library/jest-dom'; // needed this to extend the jest-dom assertions  (ex toHaveTextContent)
 import ErrorContainer from '../containers/ErrorContainer';
 import { configureStore } from '@reduxjs/toolkit';
 import { mainSlice } from '../slices/mainSlice';

src/app/__tests__/ErrorContainer.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect'; // needed this to extend the jest-dom assertions  (ex toHaveTextContent)
+import '@testing-library/jest-dom'; // needed this to extend the jest-dom assertions  (ex toHaveTextContent)
 import ErrorMsg from '../components/ErrorMsg';
 
 const props = {
@@ -11,6 +11,7 @@ const props = {
     targetPageisaReactApp: true,
   },
   launchContent: null,
+  reinitialize: null,
 };
 
 describe('unit testing for ErrorContainer.tsx', () => {