Browse Source

Merge branch 'hestiacp:main' into patch-1

Christoph Schlaepfer 2 years ago
parent
commit
717c6629ca

+ 4 - 4
package-lock.json

@@ -41,7 +41,7 @@
 				"prettier-plugin-nginx": "^1.0.3",
 				"prettier-plugin-sh": "^0.14.0",
 				"prettier-plugin-sql": "^0.18.0",
-				"stylelint": "^16.3.0",
+				"stylelint": "^16.3.1",
 				"stylelint-config-standard": "^36.0.0",
 				"vitepress": "^1.0.1",
 				"vitest": "^1.4.0",
@@ -7126,9 +7126,9 @@
 			"dev": true
 		},
 		"node_modules/stylelint": {
-			"version": "16.3.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.3.0.tgz",
-			"integrity": "sha512-hqC6xNTbQ5HRGQXfIW4HwXcx09raIFz4W4XFbraeqWqYRVVY/ibYvI0dsu0ORMQY8re2bpDdCAeIa2cm+QJ4Sw==",
+			"version": "16.3.1",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.3.1.tgz",
+			"integrity": "sha512-/JOwQnBvxEKOT2RtNgGpBVXnCSMBgKOL2k7w0K52htwCyJls4+cHvc4YZgXlVoAZS9QJd2DgYAiRnja96pTgxw==",
 			"dev": true,
 			"dependencies": {
 				"@csstools/css-parser-algorithms": "^2.6.1",

+ 1 - 1
package.json

@@ -50,7 +50,7 @@
 		"prettier-plugin-nginx": "^1.0.3",
 		"prettier-plugin-sh": "^0.14.0",
 		"prettier-plugin-sql": "^0.18.0",
-		"stylelint": "^16.3.0",
+		"stylelint": "^16.3.1",
 		"stylelint-config-standard": "^36.0.0",
 		"vitepress": "^1.0.1",
 		"vitest": "^1.4.0",

+ 4 - 4
src/deb/web-terminal/package-lock.json

@@ -12,14 +12,14 @@
 				"ws": "^8.16.0"
 			},
 			"devDependencies": {
-				"@types/node": "^20.11.30",
+				"@types/node": "^20.12.2",
 				"@types/ws": "^8.5.10"
 			}
 		},
 		"node_modules/@types/node": {
-			"version": "20.11.30",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
-			"integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
+			"version": "20.12.2",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.2.tgz",
+			"integrity": "sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==",
 			"dev": true,
 			"dependencies": {
 				"undici-types": "~5.26.4"

+ 1 - 1
src/deb/web-terminal/package.json

@@ -12,6 +12,6 @@
 	},
 	"devDependencies": {
 		"@types/ws": "^8.5.10",
-		"@types/node": "^20.11.30"
+		"@types/node": "^20.12.2"
 	}
 }

+ 4 - 4
web/src/app/WebApp/Installers/MediaWiki/MediaWikiSetup.php

@@ -10,7 +10,7 @@ class MediaWikiSetup extends BaseSetup {
 		"name" => "MediaWiki",
 		"group" => "cms",
 		"enabled" => true,
-		"version" => "1.41.0",
+		"version" => "1.41.1",
 		"thumbnail" => "MediaWiki-2020-logo.svg", //Max size is 300px by 300px
 	];
 
@@ -26,7 +26,7 @@ class MediaWikiSetup extends BaseSetup {
 		"database" => true,
 		"resources" => [
 			"archive" => [
-				"src" => "https://releases.wikimedia.org/mediawiki/1.41/mediawiki-1.41.0.zip",
+				"src" => "https://releases.wikimedia.org/mediawiki/1.41/mediawiki-1.41.1.zip",
 			],
 		],
 		"server" => [
@@ -34,7 +34,7 @@ class MediaWikiSetup extends BaseSetup {
 				"template" => "default",
 			],
 			"php" => [
-				"supported" => ["7.4", "8.0", "8.1"],
+				"supported" => ["8.0", "8.1", "8.2"],
 			],
 		],
 	];
@@ -60,7 +60,7 @@ class MediaWikiSetup extends BaseSetup {
 
 		$this->appcontext->runUser(
 			"v-copy-fs-directory",
-			[$this->getDocRoot($this->extractsubdir . "/mediawiki-1.41.0/."), $this->getDocRoot()],
+			[$this->getDocRoot($this->extractsubdir . "/mediawiki-1.41.1/."), $this->getDocRoot()],
 			$result,
 		);