(hotfix) Fixing package.json and adding eslint recommendations to .es…

…lintrc.js
gbowne1 · Jul 24, 2023 · 6e9232b · 6e9232b
1 parent d954238
commit 6e9232b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 69 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -13,6 +13,7 @@ module.exports = {
         'plugin:prettier/recommended',
         'react-app',
         'react-app/jest',
+        'eslint:recommended',
     ],
     overrides: [
         {

diff --git a/package.json b/package.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
     "name": "codebooker",
     "version": "0.1.0",
     "private": true,
@@ -14,6 +13,7 @@
         "axios": "^1.4.0",
         "isbn-validate": "^1.0.3",
         "lodash": "^4.17.21",
+        "material-ui-popup-state": "^5.0.9",
         "prop-types": "^15.8.1",
         "react": "^18.2.0",
         "react-barcode-reader": "^0.0.2",
@@ -29,9 +29,7 @@
         "start": "react-scripts start",
         "build": "react-scripts build",
         "test": "react-scripts test",
-        "eject": "react-scripts eject",
-        "lint": "eslint .",
-        "lint:fix": "eslint --fix ."
+        "eject": "react-scripts eject"
     },
     "eslintConfig": {
         "extends": [
@@ -55,69 +53,5 @@
     "main": "svgr.config.js",
     "keywords": [],
     "author": "Gregory K Bowne",
-    "license": "MIT",
-    "devDependencies": {
-        "eslint": "^8.45.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-prettier": "^5.0.0",
-        "eslint-plugin-react": "^7.33.0",
-        "prettier": "^3.0.0"
-    }
-=======
-  "name": "codebooker",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.11.16",
-    "@mui/material": "^5.13.5",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^14.4.3",
-    "axios": "^1.4.0",
-    "isbn-validate": "^1.0.3",
-    "lodash": "^4.17.21",
-    "material-ui-popup-state": "^5.0.9",
-    "prop-types": "^15.8.1",
-    "react": "^18.2.0",
-    "react-barcode-reader": "^0.0.2",
-    "react-dom": "^18.2.0",
-    "react-router": "^6.13.0",
-    "react-router-dom": "^6.13.0",
-    "react-scripts": "5.0.1",
-    "react-simple-star-rating": "^5.1.7",
-    "styled-components": "^5.3.11",
-    "web-vitals": "^3.3.2"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "description": "This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).",
-  "main": "svgr.config.js",
-  "keywords": [],
-  "author": "Gregory K Bowne",
-  "license": "MIT"
->>>>>>> 3c302a6 (responsiveness added)
+    "license": "MIT"
 }