Merge pull request #7 from x-team/fix/react-router-to-dom

Fixing Import causing App to Crash on Deploy

Author: ccmoralesj

Diff for: craco.config.js

@@ -1,8 +1,8 @@
 // craco.config.js
 module.exports = {
-    style: {
-        postcss: {
-            plugins: [require("tailwindcss"), require("autoprefixer")],
-        },
+  style: {
+    postcssOptions: {
+        plugins: [require('tailwindcss'), require('autoprefixer')],
     },
-};
+  },
+};

Diff for: package-lock.json

@@ -1,31 +1,27 @@
 {
   "name": "gameshq-fe",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "@craco/craco": "^6.1.2",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^12.0.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "axios": "^0.21.1",
-    "firebase": "^9.6.0",
-    "formik": "^2.2.9",
-    "lodash": "^4.17.21",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-firebaseui": "^6.0.0",
-    "react-router-dom": "^6.3.0",
-    "react-scripts": "4.0.3",
-    "react-spinners": "^0.11.0",
-    "recharts": "^2.0.9",
-    "sweetalert2": "^11.1.8",
-    "typescript": "^4.1.2",
-    "web-vitals": "^1.0.1",
-    "yup": "^0.32.9"
+    "@craco/craco": "6.4.3",
+    "@testing-library/jest-dom": "5.16.4",
+    "@testing-library/react": "12.1.5",
+    "@testing-library/user-event": "14.2.0",
+    "axios": "0.27.2",
+    "firebase": "9.8.3",
+    "formik": "2.2.9",
+    "lodash": "4.17.21",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "react-firebaseui": "6.0.0",
+    "react-router-dom": "6.3.0",
+    "react-scripts": "5.0.1",
+    "react-spinners": "0.12.0",
+    "recharts": "2.1.10",
+    "sweetalert2": "11.4.17",
+    "typescript": "4.7.3",
+    "web-vitals": "2.1.4",
+    "yup": "0.32.11"
   },
   "scripts": {
     "start": "craco start",
@@ -52,10 +48,15 @@
     ]
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.172",
-    "@types/react-router-dom": "^5.1.7",
-    "autoprefixer": "^9.8.6",
-    "postcss": "^7.0.36",
-    "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.4"
+    "@types/jest": "28.1.1",
+    "@types/lodash": "4.14.182",
+    "@types/node": "17.0.44",
+    "@types/react": "18.0.12",
+    "@types/react-dom": "18.0.5",
+    "@types/react-router-dom": "5.3.3",
+    "autoprefixer": "9.8.6",
+    "postcss": "8.4.14",
+    "postcss-loader": "7.0.0",
+    "tailwindcss": "3.1.3"
   }
 }

Diff for: package.json

@@ -1,6 +1,6 @@
 import { FormikHelpers, useFormik } from "formik";
 import { useEffect, useState } from "react";
-import { useNavigate, useParams } from "react-router";
+import { useNavigate, useParams } from "react-router-dom";
 import { SyncLoader } from "react-spinners";
 import * as Yup from "yup";
 

Diff for: src/assets/icons/games.svg

@@ -1,6 +1,6 @@
 import { FormikHelpers, useFormik } from "formik";
 import { useEffect, useState } from "react";
-import { useParams, useNavigate } from "react-router";
+import { useParams, useNavigate } from "react-router-dom";
 import { SyncLoader } from "react-spinners";
 import * as Yup from "yup";
 import { getGameType, upsertGameType } from "../api/gamedev";

Diff for: src/pages/EnemyEditorPage.tsx

@@ -1,6 +1,6 @@
 import { FormikHelpers, useFormik } from "formik";
 import { useEffect, useState } from "react";
-import { useNavigate, useParams } from "react-router";
+import { useNavigate, useParams } from "react-router-dom";
 import { SyncLoader } from "react-spinners";
 import * as Yup from "yup";
 

Diff for: src/pages/GameEditorPage.tsx

@@ -1,6 +1,6 @@
 import { FormikHelpers, useFormik } from "formik";
 import { useEffect, useState } from "react";
-import { useNavigate, useParams } from "react-router";
+import { useNavigate, useParams } from "react-router-dom";
 import { SyncLoader } from "react-spinners";
 import * as Yup from "yup";
 import { getZone, upsertZone } from "../api/admin";