update frontend deps

README.md

@@ -20,16 +20,16 @@ Read the latest updates on Mastodon: [@fediversespace](https://mastodon.social/@
 
 ## Requirements
 
-Though containerized, backend development is easiest if you have the following installed.
+You'll need the following to work on fediverse.space:
 
 - For the crawler + API:
   - Elixir
   - Postgres
+  - Elasticsearch
 - For laying out the graph:
   - Java
 - For the frontend:
   - Node.js
-  - Yarn
 
 ## Running it
 
@@ -43,8 +43,8 @@ Though containerized, backend development is easiest if you have the following i
 
 ### Frontend
 
-- `cd frontend && yarn install`
-- `yarn start`
+- `cd frontend && npm install`
+- `npm start`
 
 ## Commands
 
@@ -54,7 +54,7 @@ Though containerized, backend development is easiest if you have the following i
 
 ### Frontend
 
-- `yarn build` creates an optimized build for deployment
+- `npm run build` creates an optimized build for deployment
 
 ## Privacy
 
@@ -86,7 +86,7 @@ You don't have to follow these instructions, but it's one way to set up a contin
 7. Push the apps, e.g. `git push dokku@<DOMAIN>:phoenix` (note that the first push cannot be from the CD pipeline).
 8. Set up SSL for the Phoenix app
 
-- `dokku letsencrypt phoenix`
+- `dokku letsencrypt:enable phoenix`
 - `dokku letsencrypt:cron-job --add`
 
 9. Set up a cron job for the graph layout (use the `dokku` user). E.g.

backend/package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "backend",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

frontend/.eslintrc.cjs

@@ -12,6 +12,7 @@ module.exports = {
     "plugin:@typescript-eslint/recommended",
     "plugin:react/recommended",
     "plugin:react-hooks/recommended",
+    "prettier",
   ],
   rules: {
     "@typescript-eslint/no-explicit-any": 0,

frontend/.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/_/husky.sh"
+
+cd frontend
+npx lint-staged

frontend/package.json

@@ -9,12 +9,8 @@
     "typecheck": "tsc --noemit",
     "lint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "npm run lint --fix",
-    "pretty": "prettier --write \"src/**/*.{ts,tsx}\""
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+    "pretty": "prettier --write \"src/**/*.{ts,tsx}\"",
+    "prepare": "cd .. && husky install frontend/.husky"
   },
   "lint-staged": {
     "src/**/*.{ts,tsx}": [
@@ -29,42 +25,42 @@
     "@blueprintjs/core": "^4.20.1",
     "@blueprintjs/icons": "^4.16.0",
     "@blueprintjs/select": "^4.9.22",
-    "classnames": "^2.2.6",
-    "connected-react-router": "^6.5.2",
-    "cross-fetch": "^3.0.6",
-    "cytoscape": "^3.16.1",
-    "cytoscape-popper": "^1.0.7",
-    "inflection": "^1.12.0",
-    "lodash": "^4.17.20",
-    "moment": "^2.29.1",
-    "normalize.css": "^8.0.0",
+    "classnames": "^2.3.2",
+    "connected-react-router": "^6.9.3",
+    "cross-fetch": "^3.1.6",
+    "cytoscape": "^3.25.0",
+    "cytoscape-popper": "^2.0.0",
+    "inflection": "^2.0.1",
+    "lodash": "^4.17.21",
+    "moment": "^2.29.4",
+    "normalize.css": "^8.0.1",
     "numeral": "^2.0.6",
-    "react": "^16.10.2",
-    "react-dom": "^16.10.2",
-    "react-redux": "^7.2.1",
-    "react-router-dom": "^5.2.0",
-    "react-virtualized": "^9.22.2",
-    "redux": "^4.0.4",
-    "redux-thunk": "^2.3.0",
-    "sanitize-html": "^2.0.0",
-    "styled-components": "^5.2.0",
-    "tippy.js": "^4.3.5"
+    "react": "^17",
+    "react-dom": "^17",
+    "react-redux": "^7",
+    "react-router-dom": "^5",
+    "react-virtualized": "^9.22.5",
+    "redux": "^4.2.1",
+    "redux-first-history": "^5.1.1",
+    "redux-thunk": "^2.4.2",
+    "sanitize-html": "^2.10.0",
+    "styled-components": "^5.3.11",
+    "tippy.js": "^6.3.7"
   },
   "devDependencies": {
-    "@types/classnames": "^2.2.9",
-    "@types/cytoscape": "^3.14.7",
-    "@types/inflection": "^1.5.28",
-    "@types/jest": "^26.0.14",
-    "@types/lodash": "^4.14.161",
-    "@types/node": "^14.11.5",
-    "@types/numeral": "^0.0.28",
-    "@types/react": "^16.9.51",
-    "@types/react-axe": "^3.1.0",
-    "@types/react-dom": "^16.9.8",
-    "@types/react-redux": "^7.1.9",
-    "@types/react-router-dom": "^5.1.6",
-    "@types/sanitize-html": "^1.27.0",
-    "@types/styled-components": "5.1.3",
+    "@types/classnames": "^2.3.0",
+    "@types/cytoscape": "^3.19.9",
+    "@types/inflection": "^1.13.0",
+    "@types/jest": "^29.5.2",
+    "@types/lodash": "^4.14.195",
+    "@types/node": "^20.2.6",
+    "@types/numeral": "^2.0.2",
+    "@types/react": "^17",
+    "@types/react-dom": "^17",
+    "@types/react-redux": "^7.1.25",
+    "@types/react-router-dom": "^5.3.3",
+    "@types/sanitize-html": "^2.9.0",
+    "@types/styled-components": "5.1.26",
     "@typescript-eslint/eslint-plugin": "^5.59.9",
     "@typescript-eslint/parser": "^5.59.9",
     "@vitejs/plugin-react": "^4.0.0",
@@ -74,9 +70,9 @@
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "husky": "^4.3.0",
-    "lint-staged": "^10.4.0",
-    "prettier": "^2.1.2",
+    "husky": "^8.0.3",
+    "lint-staged": "^13.2.2",
+    "prettier": "^2.8.8",
     "typescript": "^5.1.3",
     "vite": "^4.3.9",
     "vite-plugin-svgr": "^3.2.0"