Merge branch 'main' into generate-theme-css

diff --combined package.json
index 2e09e897633f0cfc79907a34dc459443fd72d2a3,2298d9e140c6e40705f39fd9caf0e5173bc698ae..be239e96f7bca9773cde05d72b3b07c6f1a883d3
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -1,6 -1,6 +1,6 @@@
  {
    "name": "lemmy-ui",
-   "version": "0.17.1",
+   "version": "0.18.0-rc.1",
    "description": "An isomorphic UI for lemmy",
    "repository": "https://github.com/LemmyNet/lemmy-ui",
    "license": "AGPL-3.0",
@@@ -14,21 -14,12 +14,14 @@@
      "dev": "yarn start",
      "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"",
      "prepare": "husky install",
 -    "start": "yarn build:dev --watch"
 +    "start": "yarn build:dev --watch",
 +    "themes:build": "sass src/assets/css/themes/:src/assets/css/themes",
 +    "themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes"
    },
    "lint-staged": {
-     "*.{ts,tsx,js}": [
-       "prettier --write",
-       "eslint --fix"
-     ],
-     "*.{css, scss}": [
-       "prettier --write"
-     ],
-     "package.json": [
-       "sortpack"
-     ]
+     "*.{ts,tsx,js}": ["prettier --write", "eslint --fix"],
+     "*.{css, scss}": ["prettier --write"],
+     "package.json": ["sortpack"]
    },
    "dependencies": {
      "@babel/plugin-proposal-decorators": "^7.21.0",
@@@ -51,6 -42,7 +44,7 @@@
      "emoji-mart": "^5.4.0",
      "emoji-short-name": "^2.0.0",
      "express": "~4.18.2",
+     "history": "^5.3.0",
      "html-to-text": "^9.0.5",
      "i18next": "^22.4.15",
      "inferno": "^8.1.1",
@@@ -62,7 -54,7 +56,7 @@@
      "inferno-server": "^8.1.1",
      "isomorphic-cookie": "^1.2.4",
      "jwt-decode": "^3.1.2",
-     "lemmy-js-client": "0.17.2-rc.17",
+     "lemmy-js-client": "0.17.2-rc.24",
      "lodash": "^4.17.21",
      "markdown-it": "^13.0.1",
      "markdown-it-container": "^3.0.0",
@@@ -75,7 -67,6 +69,6 @@@
      "moment": "^2.29.4",
      "register-service-worker": "^1.7.2",
      "run-node-webpack-plugin": "^1.3.0",
-     "rxjs": "^7.8.1",
      "sanitize-html": "^2.10.0",
      "sass": "^1.62.1",
      "sass-loader": "^13.2.2",
@@@ -87,8 -78,7 +80,7 @@@
      "tributejs": "^5.1.3",
      "webpack": "5.82.1",
      "webpack-cli": "^5.1.1",
-     "webpack-node-externals": "^3.0.0",
-     "websocket-ts": "^1.1.1"
+     "webpack-node-externals": "^3.0.0"
    },
    "devDependencies": {
      "@babel/core": "^7.21.8",
@@@ -104,7 -94,7 +96,7 @@@
      "@types/toastify-js": "^1.11.1",
      "@typescript-eslint/eslint-plugin": "^5.59.5",
      "@typescript-eslint/parser": "^5.59.5",
 -    "bootswatch": "^5.2.3",
 +    "bootstrap-v4": "npm:bootstrap@^4.6.2",
      "eslint": "^8.40.0",
      "eslint-plugin-inferno": "^7.32.2",
      "eslint-plugin-prettier": "^4.2.1",