Browse Source

refactor: updated various scripts and packages to make the app start again

Kristian Vos 2 years ago
parent
commit
f4e36e5add
5 changed files with 22 additions and 22 deletions
  1. 4 6
      frontend/Dockerfile
  2. 3 3
      frontend/bootstrap.sh
  3. 2 1
      frontend/dist/config/template.json
  4. 4 4
      frontend/package.json
  5. 9 8
      frontend/webpack.js

+ 4 - 6
frontend/Dockerfile

@@ -1,11 +1,9 @@
-FROM node
+FROM node:14
 
-RUN apt-get update
-RUN apt-get install nginx -y
+RUN apt update
+RUN apt install nginx -y
 
-RUN npm install -g webpack
-RUN npm install -g webpack-cli
-RUN npm install -g webpack-dev-server
+RUN npm install -g webpack@5.58.1 webpack-cli@4.9.0
 
 RUN mkdir -p /opt
 WORKDIR /opt

+ 3 - 3
frontend/bootstrap.sh

@@ -1,3 +1,3 @@
-#!/bin/bash
-
-cd /opt/app ; yarn run dev
+#!/bin/bash
+
+cd /opt/app ; npm run dev

+ 2 - 1
frontend/dist/config/template.json

@@ -1,5 +1,6 @@
 {
 	"frontendPort": 80,
 	"frontendDomain": "http://localhost",
+	"webSocketURL": "ws://localhost/ws",
 	"backendUrl": "http://localhost:8080"
-}
+}

+ 4 - 4
frontend/package.json

@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "dev": "webpack-dev-server --config webpack.js"
+    "dev": "npx webpack serve --config webpack.js"
   },
   "main": "main.js",
   "dependencies": {
@@ -18,8 +18,8 @@
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.10",
     "webpack": "^4.41.0",
-    "webpack-cli": "^3.3.9",
-    "webpack-dev-server": "^3.8.1",
+    "webpack-cli": "^4.9.0",
+    "webpack-dev-server": "^4.3.1",
     "webpack-md5-hash": "^0.0.6"
   }
-}
+}

+ 9 - 8
frontend/webpack.js

@@ -50,16 +50,17 @@ module.exports = {
 		}
 	},
 	devServer: {
-		contentBase: "./dist/",
-		historyApiFallback: true,
+		static: {
+			directory: "./dist/",
+			watch: true
+		},
+		client: {
+			webSocketURL: config.get("webSocketURL")
+		},
 		hot: true,
+		historyApiFallback: true,
 		port: config.get("frontendPort"),
-		public: config.get("frontendDomain"),
-		watchOptions: {
-			aggregateTimeout: 300,
-			poll: 1000
-		},
 		host: "0.0.0.0",
-		disableHostCheck: true
+		allowedHosts: "all"
 	}
 };