Merge pull request #7 from aroskanalen/feature/hmr-2

Fixed HMR setup

.docker/vhost.conf

@@ -10,12 +10,9 @@ server {
     }
 
     location /ws {
-      proxy_set_header X-Forwarded-For $remote_addr;
-      proxy_set_header Host $http_host;
-      proxy_pass http://node:3000;
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "Upgrade";
-      proxy_set_header X-Real-IP $remote_addr;
+        proxy_pass http://node:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
     }
 }

CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- Changed from vite CJS to ESM.
 - Removed array spread.
 - Fixed HMR setup.
 - Upgraded @fortawesome/react-fontawesome, react-quill, react-toastify.

package.json

@@ -1,6 +1,7 @@
 {
   "name": "admin",
-  "version": "0.1.0",
+  "type": "module",
+  "version": "2.0.0",
   "private": true,
   "homepage": "admin",
   "dependencies": {
@@ -12,7 +13,7 @@
     "@paciolan/remote-component": "^2.11.0",
     "@popperjs/core": "^2.11.8",
     "@reduxjs/toolkit": "^1.6.1",
-    "@vitejs/plugin-react": "^4.3.0",
+    "@vitejs/plugin-react-swc": "^3.7.0",
     "bootstrap": "^5.0.2",
     "dayjs": "^1.10.7",
     "dompurify": "^2.3.3",

src/components/media/image-list.jsx

@@ -2,7 +2,7 @@ import { React } from "react";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import { Form } from "react-bootstrap";
-import selectedHelper from "../util/helpers/selectedHelper";
+import selectedHelper from "../util/helpers/selected-helper";
 import useModal from "../../context/modal-context/modal-context-hook";
 import ListLoading from "../util/loading-component/list-loading";
 

src/components/util/column-hoc.jsx

@@ -4,7 +4,7 @@ import { Button } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
 import { useLocation } from "react-router-dom";
 import CheckboxForList from "./list/checkbox-for-list";
-import selectedHelper from "./helpers/selectedHelper";
+import selectedHelper from "./helpers/selected-helper";
 import useModal from "../../context/modal-context/modal-context-hook";
 import LinkForList from "./list/link-for-list";
 

vite.config.js

@@ -1,5 +1,5 @@
 import { defineConfig } from "vite";
-import react from "@vitejs/plugin-react";
+import react from "@vitejs/plugin-react-swc";
 
 export default defineConfig({
   base: "/",
@@ -9,9 +9,10 @@ export default defineConfig({
     port: 3000,
     host: "localhost",
     hmr: {
-      host: "display-admin-client.local.itkdev.dk/ws",
+      host: "display-admin-client.local.itkdev.dk",
       protocol: "wss",
-      clientPort: 80,
+      clientPort: 443,
+      path: "/ws",
     },
   },
 });