Merge pull request #14523 from Art4/update-composer-v2

Update to Composer v2

composer.json

@@ -29,6 +29,7 @@
 		"ext-xml": "*",
 		"asika/simple-console": "^1.0",
 		"bacon/bacon-qr-code": "^2.0.0",
+		"bower-asset/base64": "^1.0",
 		"divineomega/password_exposed": "^3",
 		"enyo/dropzone": "^5.9",
 		"ezyang/htmlpurifier": "^4.7",
@@ -46,6 +47,22 @@
 		"minishlink/web-push": "^6.0",
 		"mobiledetect/mobiledetectlib": "^3.74",
 		"nikic/fast-route": "^1.3",
+		"npm-asset/chart.js": "^2.8",
+		"npm-asset/cropperjs": "1.2.2",
+		"npm-asset/dompurify": "^1.0",
+		"npm-asset/es-jquery-sortable": "^0.9.13",
+		"npm-asset/fork-awesome": "^1.1",
+		"npm-asset/fullcalendar": "^3.10",
+		"npm-asset/imagesloaded": "4.1.4",
+		"npm-asset/jgrowl": "^1.4",
+		"npm-asset/jquery": "^2.0",
+		"npm-asset/jquery-colorbox": "^1.6",
+		"npm-asset/jquery-datetimepicker": "^2.5",
+		"npm-asset/moment": "^2.24",
+		"npm-asset/perfect-scrollbar": "0.6.16",
+		"npm-asset/textcomplete": "^0.18.2",
+		"npm-asset/typeahead.js": "^0.11.1",
+		"oomphinc/composer-installers-extender": "^2.0",
 		"paragonie/hidden-string": "^1.0",
 		"patrickschur/language-detection": "^5.0.0",
 		"pear/console_table": "^1.3",
@@ -58,24 +75,7 @@
 		"seld/cli-prompt": "^1.0",
 		"smarty/smarty": "^4",
 		"ua-parser/uap-php": "^3.9",
-		"xemlock/htmlpurifier-html5": "^0.1.11",
-		"fxp/composer-asset-plugin": "^1.4",
-		"bower-asset/base64": "^1.0",
-		"bower-asset/chart-js": "^2.8",
-		"bower-asset/dompurify": "^1.0",
-		"bower-asset/fork-awesome": "^1.1",
-		"npm-asset/cropperjs": "1.2.2",
-		"npm-asset/es-jquery-sortable": "^0.9.13",
-		"npm-asset/fullcalendar": "^3.10",
-		"npm-asset/imagesloaded": "4.1.4",
-		"npm-asset/jquery": "^2.0",
-		"npm-asset/jquery-colorbox": "^1.6",
-		"npm-asset/jquery-datetimepicker": "^2.5",
-		"npm-asset/jgrowl": "^1.4",
-		"npm-asset/moment": "^2.24",
-		"npm-asset/perfect-scrollbar": "0.6.16",
-		"npm-asset/textcomplete": "^0.18.2",
-		"npm-asset/typeahead.js": "^0.11.1"
+		"xemlock/htmlpurifier-html5": "^0.1.11"
 	},
 	"suggest": {
 		"ext-imagick": "For faster image processing",
@@ -87,13 +87,20 @@
 		{
 			"type": "vcs",
 			"url": "https://git.friendi.ca/friendica/php-json-ld"
+		},
+		{
+			"type": "composer",
+			"url": "https://asset-packagist.org"
 		}
 	],
 	"autoload": {
 		"psr-4": {
-			"Friendica\\": "src/",
-			"Friendica\\Addon\\": "addon/"
-		}
+			"Friendica\\": "src/"
+		},
+		"classmap": ["addon/"],
+		"exclude-from-classmap": [
+			"addon/*/vendor/"
+		]
 	},
 	"autoload-dev": {
 		"psr-4": {
@@ -104,14 +111,23 @@
 		"platform": {
 			"php": "7.4"
 		},
+		"sort-packages": true,
 		"autoloader-suffix": "Friendica",
 		"optimize-autoloader": true,
 		"preferred-install": "dist",
-		"fxp-asset": {
-			"installer-paths": {
-				"npm-asset-library": "view/asset",
-				"bower-asset-library": "view/asset"
-			}
+		"allow-plugins": {
+			"composer/installers": true,
+			"oomphinc/composer-installers-extender": true,
+			"php-http/discovery": false
+		}
+	},
+	"extra": {
+		"installer-types": ["bower-asset", "npm-asset"],
+		"installer-paths": {
+			"view/asset/{$name}/": [
+				"type:bower-asset",
+				"type:npm-asset"
+			]
 		}
 	},
 	"archive": {

view/templates/admin/federation.tpl

@@ -4,7 +4,7 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<script src="{{$baseurl}}/view/asset/Chart-js/dist/Chart.min.js?v={{$VERSION}}"></script>
+<script src="{{$baseurl}}/view/asset/chart.js/dist/Chart.min.js?v={{$VERSION}}"></script>
 <div id="adminpage">
 	<h1>{{$title}} - {{$page}}</h1>