Upgrading deps, cleaning up package.json.

package.json

@@ -16,10 +16,9 @@
   },
   "repository": "https://github.com/LemmyNet/lemmy-isomorphic-ui",
   "dependencies": {
-    "@typescript-eslint/parser": "^4.0.1",
+    "@typescript-eslint/parser": "^4.1.0",
     "autosize": "^4.0.2",
     "choices.js": "^9.0.1",
-    "cookie-parser": "^1.4.3",
     "emoji-short-name": "^1.0.0",
     "express": "~4.17.1",
     "i18next": "^19.4.1",
@@ -32,18 +31,16 @@
     "inferno-server": "^7.4.3",
     "isomorphic-cookie": "^1.2.4",
     "isomorphic-ws": "^4.0.1",
-    "js-cookie": "^2.2.0",
-    "jwt-decode": "^2.2.0",
+    "jwt-decode": "^3.0.0-beta.2",
     "markdown-it": "^11.0.0",
     "markdown-it-container": "^3.0.0",
     "markdown-it-emoji": "^1.4.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
     "moment": "^2.24.0",
-    "node-fetch": "^2.6.0",
     "reconnecting-websocket": "^4.4.0",
-    "rxjs": "^6.5.5",
-    "serialize-javascript": "^4.0.0",
+    "rxjs": "^6.6.3",
+    "serialize-javascript": "^5.0.0",
     "tippy.js": "^6.1.1",
     "toastify-js": "^1.7.0",
     "tributejs": "^5.1.3",
@@ -56,40 +53,31 @@
     "@babel/preset-env": "7.11.5",
     "@babel/preset-typescript": "^7.3.3",
     "@types/autosize": "^3.0.6",
-    "@types/cookie-parser": "^1.4.1",
-    "@types/enzyme": "^3.1.10",
-    "@types/express": "^4.11.1",
-    "@types/jest": "^26.0.10",
-    "@types/node": "^14.6.0",
+    "@types/express": "^4.17.8",
+    "@types/node": "^14.6.4",
     "@types/node-fetch": "^2.5.7",
     "@types/serialize-javascript": "^4.0.0",
-    "autoprefixer": "^9.8.6",
     "babel-loader": "^8.0.6",
     "babel-plugin-inferno": "^6",
     "bootstrap": "^4.5.2",
-    "classcat": "^4.1.0",
+    "bootswatch": "^4.5.2",
     "clean-webpack-plugin": "^3.0.0",
-    "css-loader": "^4.2.2",
-    "eslint": "^7.5.0",
-    "eslint-plugin-jane": "^8.0.4",
-    "husky": "^4.2.5",
-    "jest": "^26.4.2",
+    "css-loader": "^4.3.0",
+    "eslint": "^7.8.1",
+    "eslint-plugin-jane": "^9.0.0",
+    "husky": "^4.3.0",
     "lemmy-js-client": "^1.0.11",
-    "lint-staged": "^10.1.3",
-    "mini-css-extract-plugin": "^0.11.0",
+    "lint-staged": "^10.3.0",
+    "mini-css-extract-plugin": "^0.11.1",
+    "node-fetch": "^2.6.1",
     "node-sass": "^4.12.0",
     "nodemon": "^2.0.4",
-    "postcss-loader": "^3.0.0",
-    "precss": "^4.0.0",
     "prettier": "^2.0.4",
     "rimraf": "^3.0.2",
     "sass-loader": "^10.0.1",
-    "sortpack": "^2.1.4",
+    "sortpack": "^2.1.8",
     "style-loader": "^1.2.1",
-    "terser": "^4.6.11",
-    "ts-node": "^9.0.0",
-    "ts-transform-classcat": "^1.0.0",
-    "ts-transform-inferno": "^4.0.3",
+    "terser": "^5.3.0",
     "typescript": "^4.0.2",
     "webpack": "4.44.1",
     "webpack-cli": "^3.3.6",

src/shared/components/styles.scss

@@ -1,23 +1,10 @@
-
-// import '../../assets/css/themes/darkly.min.css';
-@import '../../assets/css/tribute.css';
-@import '../../assets/css/toastify.css';
-@import '../../assets/css/choices.min.css';
-@import '../../assets/css/tippy.css';
+// Custom css
+@import '../../../node_modules/tributejs/dist/tribute.css';
+@import '../../../node_modules/toastify-js/src/toastify.css';
+@import '../../../node_modules/choices.js/src/styles/choices.scss';
+@import '../../../node_modules/tippy.js/dist/tippy.css';
 @import '../../assets/css/main.css';
 
 // Bootstrap theme
 @import "../../assets/css/themes/_variables.darkly.scss";
 @import "../../../node_modules/bootstrap/scss/bootstrap";
-
-// // Required
-// @import "../../../node_modules/bootstrap/scss/functions";
-// @import "../../../node_modules/bootstrap/scss/variables";
-// @import "../../../node_modules/bootstrap/scss/mixins";
-
-// // Optional
-// @import "../../../node_modules/bootstrap/scss/reboot";
-// @import "../../../node_modules/bootstrap/scss/type";
-// @import "../../../node_modules/bootstrap/scss/images";
-// @import "../../../node_modules/bootstrap/scss/code";
-// @import "../../../node_modules/bootstrap/scss/grid";

src/shared/env.ts

@@ -1,16 +1,13 @@
-// TODO
-// const host = `${window.location.hostname}`;
-// const port = `${
-//   window.location.port == '4444' ? '8536' : window.location.port
-// }`;
-// const endpoint = `${host}:${port}`;
+import { isBrowser } from './utils';
 
-// export const wsUri = `${
-//   window.location.protocol == 'https:' ? 'wss://' : 'ws://'
-// }${endpoint}/api/v1/ws`;
-
-const host = '192.168.50.60';
-const port = 8536;
+const host = isBrowser() ? window.location.hostname : 'localhost';
+const secure = isBrowser() && window.location.protocol == 'https:' ? 's' : '';
+const port = isBrowser()
+  ? window.location.port == '1234'
+    ? 8536
+    : window.location.port
+  : 8536;
 const endpoint = `${host}:${port}`;
-export const wsUri = `ws://${endpoint}/api/v1/ws`;
-export const httpUri = `http://${endpoint}/api/v1`;
+
+export const wsUri = `ws${secure}://${endpoint}/api/v1/ws`;
+export const httpUri = `http${secure}://${endpoint}/api/v1`;

webpack.config.js

@@ -22,20 +22,7 @@ module.exports = function (env, _) {
       rules: [
         {
           test: /\.(scss|css)$/i,
-          use: [
-            MiniCssExtractPlugin.loader,
-            'css-loader',
-            {
-              loader: 'postcss-loader', // Run post css actions
-              options: {
-                plugins: function () {
-                  // post css plugins, can be exported to postcss.config.js
-                  return [require('precss'), require('autoprefixer')];
-                },
-              },
-            },
-            'sass-loader',
-          ],
+          use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
         },
         {
           test: /\.(js|jsx|tsx|ts)$/, // All ts and tsx files will be process by