Fabio/webssh2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: remove json-merger add ncu

Browse source
This commit is contained in:
Bill Church 2023-08-22 18:46:41 +00:00
parent d2ea50a0f2
commit 2576a495cf
No known key found for this signature in database
3 changed files with 5964 additions and 859 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6817
app/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
app/package.json
View file

@ -37,7 +37,6 @@
"debug": "^4.3.4", "debug": "^4.3.4",
"express": "^4.18.1", "express": "^4.18.1",
"express-session": "^1.17.3", "express-session": "^1.17.3",
"json-merger": "^1.1.9",
"morgan": "~1.10.0", "morgan": "~1.10.0",
"read-config-ng": "^3.0.5", "read-config-ng": "^3.0.5",
"serve-favicon": "^2.5.0", "serve-favicon": "^2.5.0",
@ -70,6 +69,7 @@
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"mini-css-extract-plugin": "^2.6.1", "mini-css-extract-plugin": "^2.6.1",
"nodaemon": "0.0.5", "nodaemon": "0.0.5",
"npm-check-updates": "^16.13.0",
"prettier": "^2.7.1", "prettier": "^2.7.1",
"snazzy": "^9.0.0", "snazzy": "^9.0.0",
"snyk": "^1.982.0", "snyk": "^1.982.0",

4
app/server/config.js
View file

@ -2,7 +2,6 @@
no-console: ["error", { allow: ["warn", "error", "info"] }] */ no-console: ["error", { allow: ["warn", "error", "info"] }] */
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const merger = require('json-merger');
const debugWebSSH2 = require('debug')('WebSSH2'); const debugWebSSH2 = require('debug')('WebSSH2');
const crypto = require('crypto'); const crypto = require('crypto');
const util = require('util'); const util = require('util');
@ -110,7 +109,8 @@ try {
} }
console.info(`WebSSH2 service reading config from: ${configPath}`); console.info(`WebSSH2 service reading config from: ${configPath}`);
const configFile = readconfig(configPath, { override: true }); const configFile = readconfig(configPath, { override: true });
myConfig = merger.mergeObjects([configDefault, configFile]); // myConfig = merger.mergeObjects([configDefault, configFile]);
myConfig = { ...configDefault, ...configFile };
debugWebSSH2(`\nCurrent config: ${util.inspect(myConfig)}`); debugWebSSH2(`\nCurrent config: ${util.inspect(myConfig)}`);
} catch (err) { } catch (err) {
myConfig = configDefault; myConfig = configDefault;