Merge branch 'main' into versions/6.0.0

# Conflicts:
#	src/init/ServerInitializer.ts
#	src/server/BaseHttpServerFactory.ts
#	src/server/HttpServerFactory.ts
#	src/server/WebSocketServerFactory.ts
#	test/unit/server/BaseHttpServerFactory.test.ts
This commit is contained in:
Joachim Van Herwegen
2023-02-01 10:13:04 +01:00
30 changed files with 972 additions and 653 deletions

View File

@@ -83,7 +83,7 @@
"commit-and-tag-version": {
"scripts": {
"postbump": "ts-node ./scripts/upgradeConfig.ts",
"postchangelog": "ts-node ./scripts/formatChangelog.ts"
"postchangelog": "ts-node ./scripts/formatChangelog.ts && markdownlint-cli2-fix"
},
"writerOpts": {
"commitsSort": false
@@ -128,7 +128,7 @@
"arrayify-stream": "^2.0.0",
"async-lock": "^1.3.2",
"bcryptjs": "^2.4.3",
"componentsjs": "^5.3.0",
"componentsjs": "^5.3.2",
"cors": "^2.8.5",
"cross-fetch": "^3.1.5",
"ejs": "^3.1.8",