Big react upgrade (#41)

build.md

@@ -0,0 +1,46 @@
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.\
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).

package.json

@@ -3,25 +3,26 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.15.2",
+    "@fortawesome/fontawesome-free": "^6.4.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.34",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@fortawesome/free-brands-svg-icons": "^5.15.2",
+    "@fortawesome/free-brands-svg-icons": "^6.4.0",
-    "@fortawesome/free-solid-svg-icons": "^5.15.2",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
-    "@fortawesome/react-fontawesome": "^0.1.14",
+    "@fortawesome/react-fontawesome": "^0.2.0",
-    "@types/enzyme": "^3.9.4",
+    "@testing-library/jest-dom": "^5.16.5",
-    "@types/jest": "^24.0.15",
+    "@testing-library/react": "^13.4.0",
-    "@types/node": "^12.0.10",
+    "@testing-library/user-event": "^13.5.0",
-    "@types/react": "^16.8.22",
+    "@types/jest": "^27.5.2",
-    "@types/react-dom": "^16.8.4",
+    "@types/node": "^16.18.25",
-    "@types/uuid": "^3.4.4",
+    "@types/react": "^18.2.4",
-    "enzyme": "^3.10.0",
+    "@types/react-dom": "^18.2.3",
-    "enzyme-adapter-react-16": "^1.14.0",
+    "@types/uuid": "^9.0.1",
-    "react": "^16.8.6",
+    "loglevel": "^1.8.1",
-    "react-dom": "^16.8.6",
+    "react": "^18.2.0",
-    "react-scripts": "3.0.1",
+    "react-dom": "^18.2.0",
-    "react-test-renderer": "^16.8.6",
+    "react-scripts": "5.0.1",
-    "typescript": "^3.5.2",
+    "typescript": "^4.9.5",
-    "uuid": "^3.3.2"
+    "uuid": "^9.0.0",
+    "web-vitals": "^2.1.4"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -31,7 +32,10 @@
     "serve-build": "npx http-server ./build -p 3030"
   },
   "eslintConfig": {
-    "extends": "react-app"
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
   },
   "browserslist": {
     "production": [
@@ -46,7 +50,6 @@
     ]
   },
   "devDependencies": {
-    "@types/enzyme-adapter-react-16": "^1.0.5",
+    "http-server": "^14.1.1"
-    "http-server": "^0.12.3"
   }
 }

public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

src/expression/expression.test.ts

@@ -1,3 +1,4 @@
+import { OperationCanceledException } from "typescript";
 import { parser, ListOfNumbersExpression, BitwiseOperationExpression, NumericOperand, ExpressionOperand } from "./expression";
 
 describe("expression parser", () => {
@@ -21,11 +22,16 @@ describe("expression parser", () => {
         const second = result.expressionItems[1];
 
         expect(first).toBeInstanceOf(NumericOperand);
-        expect(first.value).toBe(1);
+
+        expect((first as NumericOperand).value).toBe(1);
 
         expect(second).toBeInstanceOf(ExpressionOperand);
-        expect(second.sign).toBe("^");
+        var secondOp = second as ExpressionOperand;
-        expect(second.operand.value).toBe(2);
+        expect(secondOp.sign).toBe("^");
+
+        expect(secondOp.operand).toBeInstanceOf(NumericOperand);
+        var childOp = secondOp.operand as NumericOperand;
+        expect(childOp.value).toBe(2);
     });
 
     it("bug", () => {       

src/index.tsx

@@ -1,8 +1,10 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import './index.css';
+import reportWebVitals from './reportWebVitals';
 import cmd, { CommandInput } from './shell/cmd';
 import AppRoot from './shell/components/AppRoot';
 import log from 'loglevel';
-import React from 'react';
-import ReactDOM from 'react-dom';
 import './index.css';
 import networkingAppModule from './networking/module';
 import expressionAppModule from './expression/module';
@@ -10,13 +12,11 @@ import shellModule from './shell/module';
 import bootstrapAppData from './shell/startup';
 import UnknownInputResultView from './shell/components/UnknownInputResultView';
 
+
 const appData = bootstrapAppData();
 
 initializeModules();
 
-var root = <AppRoot appState={appData.appState} />;
-ReactDOM.render(root, document.getElementById('root'));
-
 executeStartupCommands();
 
 appData.appState.registerVisit();
@@ -40,5 +40,18 @@ function  initializeModules() {
     });
 }
 
+const root = ReactDOM.createRoot(
+  document.getElementById('root') as HTMLElement
+);
 
 
+root.render(
+  <React.StrictMode>
+    <AppRoot appState={appData.appState} />
+  </React.StrictMode>
+);
+
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+//eportWebVitals();

src/reportWebVitals.ts

@@ -0,0 +1,15 @@
+import { ReportHandler } from 'web-vitals';
+
+const reportWebVitals = (onPerfEntry?: ReportHandler) => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;

src/setupTests.ts

@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';

src/shell/cmd.test.ts

@@ -8,8 +8,8 @@ describe("CmdShell", () => {
             test2() { }
         };
 
-        spyOn(handler, "test1");
+        jest.spyOn(handler, "test1");
-        spyOn(handler, "test2");
+        jest.spyOn(handler, "test2");
 
         var sut = new CmdShell();
         sut.command("test1", handler.test1);
@@ -32,7 +32,7 @@ describe("CmdShell", () => {
             handle: function (input: string)  { }
         };
 
-        spyOn(handler, "handle");
+        jest.spyOn(handler, "handle");
 
         var sut = new CmdShell();
         sut.command(handler);

src/shell/cmd.ts

@@ -48,7 +48,7 @@ export class CmdShell {
                 try {
                     this.invokeHandler(input, handler, ops);
                 } catch (e) {
-                     this.handleError(input, e);
+                     this.handleError(input, e as Error);
                 }
             }
         }

src/shell/components/DisplayResultView.tsx

@@ -10,7 +10,8 @@ type DisplayResultProps = {
     input: string,
     resultKey: number,
     resultIndex: number,
-    onRemove?: (i: number) => void;
+    onRemove?: (i: number) => void,
+    children: JSX.Element
 }
 
 const DisplayResultView: React.FunctionComponent<DisplayResultProps> = (props) => {

src/shell/components/Toggle.tsx

@@ -6,7 +6,8 @@ export type ToggleProps = {
     isOn: boolean,
     title: string,
     elementId?: string
-    onClick: () => void
+    onClick: () => void,
+    children?: React.ReactNode
 };
 
 const Toggle: React.FunctionComponent<ToggleProps> = (props) => {

src/shell/module.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import uuid from 'uuid';
+import {v4 as uuid} from 'uuid';
 import { sendAnalyticsEvent } from './analytics';
 import AppState from './AppState';
 import { CmdShell, CommandInput } from './cmd';

tsconfig.json

@@ -12,14 +12,15 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
     "module": "esnext",
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "preserve"
+    "jsx": "react-jsx"
   },
   "include": [
     "src"
-, "public/analytics.js"  ]
+  ]
 }