add latest changes, babelrc

Author: ElDuke717

.babelrc

@@ -1,4 +1,8 @@
 {
+<<<<<<< HEAD
   "presets": ["airbnb", "@babel/preset-typescript"],
   // "plugins": ["@emotion"]
+=======
+  "presets": ["airbnb", "@babel/preset-typescript"]
+>>>>>>> dev
 }

package.json

@@ -95,7 +95,6 @@
     "@babel/preset-env": "^7.12.7",
     "@babel/preset-react": "^7.12.7",
     "@babel/preset-typescript": "^7.21.5",
-    "@emotion/babel-plugin": "^11.7.2",
     "@inrupt/jest-jsdom-polyfills": "^1.6.2",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^13.4.0",
@@ -152,8 +151,6 @@
     "webpack-cli": "^3.3.12"
   },
   "dependencies": {
-    "@emotion/react": "^11.9.0",
-    "@emotion/styled": "^11.8.1",
     "@fortawesome/fontawesome-free": "^5.15.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.32",
     "@fortawesome/free-regular-svg-icons": "^5.15.1",

src/app/components/Loader.tsx

@@ -1,16 +1,10 @@
 // /* eslint-disable react/prop-types */
 
 import React from 'react';
-import { css, SerializedStyles } from '@emotion/react';
 import { ClipLoader } from 'react-spinners';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faCheck, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
 
-const override: SerializedStyles = css`
-  display: inline;
-  margin: 0 auto;
-`;
-
 // Displays the result of the check when loading is done
 const handleResult = (result: boolean): JSX.Element =>
   result ? (
@@ -23,7 +17,7 @@ const handleResult = (result: boolean): JSX.Element =>
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 const Loader = ({ loading, result }): JSX.Element =>
   loading ? (
-    <ClipLoader color='#123abc' css={override} size={30} loading={loading} />
+    <ClipLoader color='#123abc' size={30} loading={loading} style={{ display: "inline", margin: "0 auto" }}/>
   ) : (
     handleResult(result)
   );

src/backend/__tests__/linkFiber.test.ts

@@ -1,3 +1,6 @@
+/**
+ * @jest-environment node
+ */
 import linkFiberInitialization from '../routers/linkFiber';
 import timeJumpInitialization from '../controllers/timeJump';
 import componentActionsRecord from '../models/masterState';

src/backend/__tests__/routes.test.ts

@@ -1,3 +1,6 @@
+/**
+ * @jest-environment node
+ */
 import { JSDOM } from 'jsdom';
 
 import { Routes, Route } from '../models/routes';

src/backend/controllers/createTree.ts

@@ -32,7 +32,7 @@ import {
  * @param currentFiberNode A Fiber object
  * @return An instance of a Tree object
  */
-// TODO: Not sure why the ritd need to be outside of the _createTree function. Want to put inside, but in case this need to be keep track for front end.
+// TODO: Not sure why the ritd need to be outside of the _createTree function. Want to put inside, but in case this need to be keep track for front end. 
 export default function createTree(currentFiberNode: Fiber): Tree {
   let rtidCounter: number = 0;
   return _createTree(currentFiberNode, new Tree('root', 'root'));