Fixes that impact webui 3.0 also

Bump dev-server to  4.7.2 and update configuration
Bump Concurrently to 7.0.0
Fix style upper case  of WebSocketPort variable raised by @MitchBradley
Update embedded page
Update version

embedded/config/server.js

@@ -92,7 +92,7 @@ app.get("/command", function (req, res) {
       Authentication: "Disabled",
       WebCommunication: "Synchronous",
       WebSocketIP: "localhost",
-      WebSocketport: "81",
+      WebSocketPort: "81",
       Hostname: "esp3d",
       WiFiMode: "STA",
       WebUpdate: "Enabled",

embedded/config/webpack.dev.js

@@ -11,8 +11,9 @@ module.exports = {
   devServer: {
     historyApiFallback: true, // to make our SPA works after a full reload, so that it serves 'index.html' when 404 response
     open: true,
-    contentBase: path.resolve(__dirname, "./dist"),
+    static: {
-    inline: true,
+      directory: path.resolve(__dirname, "./dist"),
+    },
     port: 8088,
     proxy: {
       context: () => true,

embedded/package.json

@@ -15,29 +15,29 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "^7.15.5",
+    "@babel/core": "^7.16.7",
-    "@babel/preset-env": "^7.15.6",
+    "@babel/preset-env": "^7.16.7",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.3",
     "chalk": "^4.1.2",
     "clean-webpack-plugin": "^3.0.0",
     "compression-webpack-plugin": "^7.1.2",
-    "concurrently": "^5.3.0",
+    "concurrently": "^7.0.0",
-    "core-js": "^3.17.3",
+    "core-js": "^3.20.2",
     "css-loader": "^5.2.7",
     "espress": "0.0.0",
-    "express": "^4.17.1",
+    "express": "^4.17.2",
     "express-fileupload": "^1.2.1",
     "express-ws": "^4.0.0",
     "html-inline-css-webpack-plugin": "^1.11.1",
-    "html-inline-script-webpack-plugin": "^1.1.4",
+    "html-inline-script-webpack-plugin": "^1.1.6",
     "html-minimizer-webpack-plugin": "^2.1.0",
-    "html-webpack-plugin": "^5.3.2",
+    "html-webpack-plugin": "^5.5.0",
     "mini-css-extract-plugin": "^1.6.2",
-    "nodemon": "^2.0.12",
+    "nodemon": "^2.0.15",
     "regenerator-runtime": "^0.13.9",
     "style-loader": "^2.0.0",
-    "webpack": "^5.52.1",
+    "webpack": "^5.65.0",
-    "webpack-cli": "^4.8.0",
+    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^3.11.2"
+    "webpack-dev-server": "^4.7.2"
   }
 }

embedded/src/index.js

@@ -30,7 +30,7 @@ let wsMsg = "";
 let logOff = false;
 let pageId = "";
 let currentPath = "/";
-const version = "3.0.0.a3";
+const version = "3.0.0.a4";
 let xmlhttpupload;
 let prgfiletext;
 let prgfile;
@@ -304,7 +304,7 @@ function processFWJson(text) {
     }
   }
   if (json.Hostname) document.title = json.Hostname;
-  startSocket(json.WebSocketIP, json.WebSocketport, json.WebCommunication);
+  startSocket(json.WebSocketIP, json.WebSocketPort, json.WebCommunication);
   SendFileCommand("list", "all");
 }
 
@@ -491,8 +491,8 @@ function dispatchFileStatus(jsonresponse) {
       console.log("newpath:" + newPath);
       content +=
         "<div class='fileLine'>" +
-        "<div class='fileLineHead'>"+
+        "<div class='fileLineHead'>" +
-          "<div class='filetype'>"+
+        "<div class='filetype'>" +
         backIcon() +
         "</div><div class='fileitem' id='updir'> Up..</div></div></div>";
       eventslisteners.push({ action: "updir", id: "updir", target: newPath });
@@ -501,8 +501,8 @@ function dispatchFileStatus(jsonresponse) {
       if (String(json.files[i1].size) == "-1") {
         content +=
           "<div class='fileLine'>" +
-          "<div class='fileLineHead'>"+
+          "<div class='fileLineHead'>" +
-          "<div class='filetype'>"+
+          "<div class='filetype'>" +
           dirIcon() +
           "</div><div class='fileitem' id='Dir" +
           i1 +
@@ -536,8 +536,8 @@ function dispatchFileStatus(jsonresponse) {
         }
         content +=
           "<div class='fileLine' >" +
-          "<div class='fileLineHead'>"+
+          "<div class='fileLineHead'>" +
-          "<div class='filetype'>"+
+          "<div class='filetype'>" +
           fileIcon() +
           "</div><div class='fileitem'  id='File" +
           i1 +

esp3d/src/core/espcmd/ESP800.cpp

@@ -208,7 +208,7 @@ bool Commands::ESP800(const char* cmd_params, level_authenticate_type auth_type,
     if (plain) {
         output->print("Web Socket port:");
     } else {
-        output->print(",\"WebSocketport\":\"");
+        output->print(",\"WebSocketPort\":\"");
     }
 #if defined (ASYNCWEBSERVER_FEATURE)
     output->print(HTTP_Server::port());

esp3d/src/include/version.h

@@ -22,7 +22,7 @@
 #define _VERSION_ESP3D_H
 
 //version and sources location
-#define FW_VERSION "3.0.0.a108"
+#define FW_VERSION "3.0.0.a109"
 #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
 
 #endif //_VERSION_ESP3D_H