Skip to content

Commit 7ebdc92

Browse files
committed
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
1 parent 76878d5 commit 7ebdc92

File tree

8 files changed

+2424
-3461
lines changed

8 files changed

+2424
-3461
lines changed

embedded/config/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ app.get("/command", function (req, res) {
9292
Authentication: "Disabled",
9393
WebCommunication: "Synchronous",
9494
WebSocketIP: "localhost",
95-
WebSocketport: "81",
95+
WebSocketPort: "81",
9696
Hostname: "esp3d",
9797
WiFiMode: "STA",
9898
WebUpdate: "Enabled",

embedded/config/webpack.dev.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ module.exports = {
1111
devServer: {
1212
historyApiFallback: true, // to make our SPA works after a full reload, so that it serves 'index.html' when 404 response
1313
open: true,
14-
contentBase: path.resolve(__dirname, "./dist"),
15-
inline: true,
14+
static: {
15+
directory: path.resolve(__dirname, "./dist"),
16+
},
1617
port: 8088,
1718
proxy: {
1819
context: () => true,

embedded/package-lock.json

Lines changed: 1728 additions & 3048 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

embedded/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@
1515
"author": "",
1616
"license": "ISC",
1717
"devDependencies": {
18-
"@babel/core": "^7.15.5",
19-
"@babel/preset-env": "^7.15.6",
20-
"babel-loader": "^8.2.2",
18+
"@babel/core": "^7.16.7",
19+
"@babel/preset-env": "^7.16.7",
20+
"babel-loader": "^8.2.3",
2121
"chalk": "^4.1.2",
2222
"clean-webpack-plugin": "^3.0.0",
2323
"compression-webpack-plugin": "^7.1.2",
24-
"concurrently": "^5.3.0",
25-
"core-js": "^3.17.3",
24+
"concurrently": "^7.0.0",
25+
"core-js": "^3.20.2",
2626
"css-loader": "^5.2.7",
2727
"espress": "0.0.0",
28-
"express": "^4.17.1",
28+
"express": "^4.17.2",
2929
"express-fileupload": "^1.2.1",
3030
"express-ws": "^4.0.0",
3131
"html-inline-css-webpack-plugin": "^1.11.1",
32-
"html-inline-script-webpack-plugin": "^1.1.4",
32+
"html-inline-script-webpack-plugin": "^1.1.6",
3333
"html-minimizer-webpack-plugin": "^2.1.0",
34-
"html-webpack-plugin": "^5.3.2",
34+
"html-webpack-plugin": "^5.5.0",
3535
"mini-css-extract-plugin": "^1.6.2",
36-
"nodemon": "^2.0.12",
36+
"nodemon": "^2.0.15",
3737
"regenerator-runtime": "^0.13.9",
3838
"style-loader": "^2.0.0",
39-
"webpack": "^5.52.1",
40-
"webpack-cli": "^4.8.0",
41-
"webpack-dev-server": "^3.11.2"
39+
"webpack": "^5.65.0",
40+
"webpack-cli": "^4.9.1",
41+
"webpack-dev-server": "^4.7.2"
4242
}
4343
}

embedded/src/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ let wsMsg = "";
3030
let logOff = false;
3131
let pageId = "";
3232
let currentPath = "/";
33-
const version = "3.0.0.a3";
33+
const version = "3.0.0.a4";
3434
let xmlhttpupload;
3535
let prgfiletext;
3636
let prgfile;
@@ -304,7 +304,7 @@ function processFWJson(text) {
304304
}
305305
}
306306
if (json.Hostname) document.title = json.Hostname;
307-
startSocket(json.WebSocketIP, json.WebSocketport, json.WebCommunication);
307+
startSocket(json.WebSocketIP, json.WebSocketPort, json.WebCommunication);
308308
SendFileCommand("list", "all");
309309
}
310310

@@ -491,8 +491,8 @@ function dispatchFileStatus(jsonresponse) {
491491
console.log("newpath:" + newPath);
492492
content +=
493493
"<div class='fileLine'>" +
494-
"<div class='fileLineHead'>"+
495-
"<div class='filetype'>"+
494+
"<div class='fileLineHead'>" +
495+
"<div class='filetype'>" +
496496
backIcon() +
497497
"</div><div class='fileitem' id='updir'> Up..</div></div></div>";
498498
eventslisteners.push({ action: "updir", id: "updir", target: newPath });
@@ -501,8 +501,8 @@ function dispatchFileStatus(jsonresponse) {
501501
if (String(json.files[i1].size) == "-1") {
502502
content +=
503503
"<div class='fileLine'>" +
504-
"<div class='fileLineHead'>"+
505-
"<div class='filetype'>"+
504+
"<div class='fileLineHead'>" +
505+
"<div class='filetype'>" +
506506
dirIcon() +
507507
"</div><div class='fileitem' id='Dir" +
508508
i1 +
@@ -536,8 +536,8 @@ function dispatchFileStatus(jsonresponse) {
536536
}
537537
content +=
538538
"<div class='fileLine' >" +
539-
"<div class='fileLineHead'>"+
540-
"<div class='filetype'>"+
539+
"<div class='fileLineHead'>" +
540+
"<div class='filetype'>" +
541541
fileIcon() +
542542
"</div><div class='fileitem' id='File" +
543543
i1 +

esp3d/src/core/espcmd/ESP800.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ bool Commands::ESP800(const char* cmd_params, level_authenticate_type auth_type,
208208
if (plain) {
209209
output->print("Web Socket port:");
210210
} else {
211-
output->print(",\"WebSocketport\":\"");
211+
output->print(",\"WebSocketPort\":\"");
212212
}
213213
#if defined (ASYNCWEBSERVER_FEATURE)
214214
output->print(HTTP_Server::port());

esp3d/src/include/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define _VERSION_ESP3D_H
2323

2424
//version and sources location
25-
#define FW_VERSION "3.0.0.a108"
25+
#define FW_VERSION "3.0.0.a109"
2626
#define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
2727

2828
#endif //_VERSION_ESP3D_H

esp3d/src/modules/http/embedded.h

Lines changed: 670 additions & 388 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)