diff --git a/.gitignore b/.gitignore index afaf0dc0f..92fcb7e2a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ cypress/videos cypress/screenshots .nyc_output +dist # Ignore env local files - https://create-react-app.dev/docs/adding-custom-environment-variables/#what-other-env-files-can-be-used .env*.local diff --git a/index.html b/index.html new file mode 100644 index 000000000..3a1463957 --- /dev/null +++ b/index.html @@ -0,0 +1,41 @@ + + + + + + + + + + + + + React App + + + +
+ + + + diff --git a/package.json b/package.json index 4afa58c0e..2183cc925 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "dinero.js": "1.8.1", "formik": "2.2.6", "history": "4.10.1", + "lodash": "4.17.21", "react": "17.0.2", "react-dom": "17.0.2", "react-google-login": "5.2.2", @@ -79,6 +80,7 @@ "@types/validator": "13.1.3", "@types/webpack-env": "1.16.0", "@types/yup": "0.29.11", + "@vitejs/plugin-react-refresh": "1.3.1", "aws-amplify": "3.0.23", "aws-sdk": "2.874.0", "bcryptjs": "2.4.3", @@ -107,11 +109,14 @@ "nyc": "15.1.0", "passport": "0.4.1", "passport-local": "1.0.0", + "patch-package": "^6.2.2", + "postinstall-postinstall": "^2.1.0", "prettier": "2.2.1", "react-scripts": "4.0.2", "start-server-and-test": "1.12.1", "ts-node": "9.1.1", - "typescript": "4.2.3" + "typescript": "4.2.3", + "vite": "2.1.3" }, "resolutions": { "@babel/compat-data": "7.9.0", @@ -120,6 +125,7 @@ }, "scripts": { "dev": "cross-env NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch", + "dev:vite": "NODE_ENV=development concurrently vite yarn:start:api:watch", "dev:auth0": "cross-env REACT_APP_AUTH0=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch", "dev:okta": "cross-env REACT_APP_OKTA=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch", "dev:cognito": "cross-env REACT_APP_AWS_COGNITO=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch", @@ -164,10 +170,11 @@ "prebuild:ci": "yarn predev:cognito:ci", "build:ci": "react-scripts build", "build": "react-scripts build", + "build:vite": "vite build", "eject": "react-scripts eject", "codesandbox:start:api": "yarn tsnode:not-instrumented --files backend/app.ts", "codesandbox:start": "NODE_ENV=development TSC_COMPILE_ON_ERROR=true concurrently \"react-scripts start\" yarn:start:api:codesandbox", - "postinstall": "husky install" + "postinstall": "patch-package && husky install" }, "eslintConfig": { "env": { diff --git a/patches/react-virtualized+9.22.3.patch b/patches/react-virtualized+9.22.3.patch new file mode 100644 index 000000000..68db8584c --- /dev/null +++ b/patches/react-virtualized+9.22.3.patch @@ -0,0 +1,11 @@ +diff --git a/node_modules/react-virtualized/dist/es/WindowScroller/utils/onScroll.js b/node_modules/react-virtualized/dist/es/WindowScroller/utils/onScroll.js +index d00f0f1..c8496e8 100644 +--- a/node_modules/react-virtualized/dist/es/WindowScroller/utils/onScroll.js ++++ b/node_modules/react-virtualized/dist/es/WindowScroller/utils/onScroll.js +@@ -71,4 +71,3 @@ export function unregisterScrollListener(component, element) { + } + } + } +\ No newline at end of file +-import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js"; +\ No newline at end of file diff --git a/public/index.html b/public/index.html index 26cc914ce..5e8e56d9d 100644 --- a/public/index.html +++ b/public/index.html @@ -25,6 +25,7 @@
+