upgrade express-handlebars #6357
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Sep 24, 2024 at 19:17 UTC
bc34f140c88cd5e59924a310a13ede718c7d2686
4 files changed
+19
-96
dependencies.txt
+1
-1
@@ -5,7 +5,7 @@
5
"compression": "1.7.4",
6
"cookie-session": "2.0.0",
7
"express": "4.21.0",
8
- "express-handlebars": "5.3.5",
8
+ "express-handlebars": "7.1.3",
9
"express-ws": "5.0.2",
10
"ipcheck": "0.1.0",
11
"minimist": "1.2.8",
meshcentral.js
+1
-1
@@ -4206,7 +4206,7 @@ function mainStart() {
4206
4207
// Build the list of required modules
4208
// NOTE: ALL MODULES MUST HAVE A VERSION NUMBER AND THE VERSION MUST MATCH THAT USED IN Dockerfile
4209
- var modules = ['archiver@7.0.1', 'body-parser@1.20.3', 'cbor@5.2.0', 'compression@1.7.4', 'cookie-session@2.0.0', 'express@4.21.0', 'express-handlebars@5.3.5', 'express-ws@5.0.2', 'ipcheck@0.1.0', 'minimist@1.2.8', 'multiparty@4.2.3', '@yetzt/nedb', 'node-forge@1.3.1', 'ua-parser-js@1.0.37', 'ws@8.17.1', 'yauzl@2.10.0'];
4209
+ var modules = ['archiver@7.0.1', 'body-parser@1.20.3', 'cbor@5.2.0', 'compression@1.7.4', 'cookie-session@2.0.0', 'express@4.21.0', 'express-handlebars@7.1.3', 'express-ws@5.0.2', 'ipcheck@0.1.0', 'minimist@1.2.8', 'multiparty@4.2.3', '@yetzt/nedb', 'node-forge@1.3.1', 'ua-parser-js@1.0.37', 'ws@8.17.1', 'yauzl@2.10.0'];
4210
if (require('os').platform() == 'win32') { modules.push('node-windows@0.1.14'); modules.push('loadavg-windows@1.1.1'); if (sspi == true) { modules.push('node-sspi@0.2.10'); } } // Add Windows modules
4211
if (ldap == true) { modules.push('ldapauth-fork@5.0.5'); }
4212
if (ssh == true) { modules.push('ssh2@1.15.0'); }
package-lock.json
+16
-93
@@ -16,7 +16,7 @@
16
"compression": "1.7.4",
17
"cookie-session": "2.0.0",
18
"express": "4.21.0",
19
- "express-handlebars": "5.3.5",
19
+ "express-handlebars": "7.1.3",
20
"express-ws": "5.0.2",
21
"ipcheck": "0.1.0",
22
"minimist": "1.2.8",
@@ -361,11 +361,6 @@
361
"node": ">= 0.8"
362
}
363
},
364
- "node_modules/concat-map": {
365
- "version": "0.0.1",
366
- "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
367
- "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
368
- },
364
"node_modules/content-disposition": {
365
"version": "0.5.4",
366
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -677,55 +672,16 @@
672
}
673
},
674
"node_modules/express-handlebars": {
680
- "version": "5.3.5",
681
- "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-5.3.5.tgz",
682
- "integrity": "sha512-r9pzDc94ZNJ7FVvtsxLfPybmN0eFAUnR61oimNPRpD0D7nkLcezrkpZzoXS5TI75wYHRbflPLTU39B62pwB4DA==",
683
- "dependencies": {
684
- "glob": "^7.2.0",
685
- "graceful-fs": "^4.2.8",
686
- "handlebars": "^4.7.7"
687
- },
688
- "engines": {
689
- "node": ">=v10.24.1"
690
- }
691
- },
692
- "node_modules/express-handlebars/node_modules/brace-expansion": {
693
- "version": "1.1.11",
694
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
695
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
696
- "dependencies": {
697
- "balanced-match": "^1.0.0",
698
- "concat-map": "0.0.1"
699
- }
700
- },
701
- "node_modules/express-handlebars/node_modules/glob": {
702
- "version": "7.2.3",
703
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
704
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
705
- "dependencies": {
706
- "fs.realpath": "^1.0.0",
707
- "inflight": "^1.0.4",
708
- "inherits": "2",
709
- "minimatch": "^3.1.1",
710
- "once": "^1.3.0",
711
- "path-is-absolute": "^1.0.0"
712
- },
713
- "engines": {
714
- "node": "*"
715
- },
716
- "funding": {
717
- "url": "https://github.com/sponsors/isaacs"
718
- }
719
- },
720
- "node_modules/express-handlebars/node_modules/minimatch": {
721
- "version": "3.1.2",
722
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
723
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
675
+ "version": "7.1.3",
676
+ "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.1.3.tgz",
677
+ "integrity": "sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew==",
678
"dependencies": {
725
- "brace-expansion": "^1.1.7"
679
+ "glob": "^10.4.2",
680
+ "graceful-fs": "^4.2.11",
681
+ "handlebars": "^4.7.8"
682
},
683
"engines": {
728
- "node": "*"
684
+ "node": ">=v16"
685
}
686
},
687
"node_modules/express-ws": {
@@ -844,11 +800,6 @@
800
"node": ">= 0.6"
801
}
802
},
847
- "node_modules/fs.realpath": {
848
- "version": "1.0.0",
849
- "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
850
- "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
851
- },
803
"node_modules/function-bind": {
804
"version": "1.1.2",
805
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -878,22 +829,20 @@
829
}
830
},
831
"node_modules/glob": {
881
- "version": "10.4.1",
882
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
883
- "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
832
+ "version": "10.4.5",
833
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
834
+ "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
835
"dependencies": {
836
"foreground-child": "^3.1.0",
837
"jackspeak": "^3.1.2",
838
"minimatch": "^9.0.4",
839
"minipass": "^7.1.2",
840
+ "package-json-from-dist": "^1.0.0",
841
"path-scurry": "^1.11.1"
842
},
843
"bin": {
844
"glob": "dist/esm/bin.mjs"
845
},
894
- "engines": {
895
- "node": ">=16 || 14 >=14.18"
896
- },
846
"funding": {
847
"url": "https://github.com/sponsors/isaacs"
848
}
@@ -1033,16 +982,6 @@
982
"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
983
"integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
984
},
1036
- "node_modules/inflight": {
1037
- "version": "1.0.6",
1038
- "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
1039
- "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
1040
- "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
1041
- "dependencies": {
1042
- "once": "^1.3.0",
1043
- "wrappy": "1"
1044
- }
1045
- },
985
"node_modules/inherits": {
986
"version": "2.0.4",
987
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -1413,13 +1352,10 @@
1352
"node": ">= 0.8"
1353
}
1354
},
1416
- "node_modules/once": {
1417
- "version": "1.4.0",
1418
- "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
1419
- "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
1420
- "dependencies": {
1421
- "wrappy": "1"
1422
- }
1355
+ "node_modules/package-json-from-dist": {
1356
+ "version": "1.0.0",
1357
+ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
1358
+ "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw=="
1359
},
1360
"node_modules/parseurl": {
1361
"version": "1.3.3",
@@ -1430,14 +1366,6 @@
1366
"node": ">= 0.8"
1367
}
1368
},
1433
- "node_modules/path-is-absolute": {
1434
- "version": "1.0.1",
1435
- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
1436
- "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
1437
- "engines": {
1438
- "node": ">=0.10.0"
1439
- }
1440
- },
1369
"node_modules/path-key": {
1370
"version": "3.1.1",
1371
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -2067,11 +1995,6 @@
1995
"node": ">=8"
1996
}
1997
},
2070
- "node_modules/wrappy": {
2071
- "version": "1.0.2",
2072
- "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
2073
- "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
2074
- },
1998
"node_modules/ws": {
1999
"version": "8.17.1",
2000
"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
package.json
+1
-1
@@ -44,7 +44,7 @@
44
"compression": "1.7.4",
45
"cookie-session": "2.0.0",
46
"express": "4.21.0",
47
- "express-handlebars": "5.3.5",
47
+ "express-handlebars": "7.1.3",
48
"express-ws": "5.0.2",
49
"ipcheck": "0.1.0",
50
"minimist": "1.2.8",