Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-15 08:13:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Update to Composer v2
This commit is contained in:
Michael Vogel 2024-11-09 06:15:27 +01:00 committed by GitHub
commit c2be44a848
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 404 additions and 1023 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/composer.phar
View file

Binary file not shown.

68
composer.json
View file

@ -29,6 +29,7 @@
"ext-xml": "*", "ext-xml": "*",
"asika/simple-console": "^1.0", "asika/simple-console": "^1.0",
"bacon/bacon-qr-code": "^2.0.0", "bacon/bacon-qr-code": "^2.0.0",
"bower-asset/base64": "^1.0",
"divineomega/password_exposed": "^3", "divineomega/password_exposed": "^3",
"enyo/dropzone": "^5.9", "enyo/dropzone": "^5.9",
"ezyang/htmlpurifier": "^4.7", "ezyang/htmlpurifier": "^4.7",
@ -46,6 +47,22 @@
"minishlink/web-push": "^6.0", "minishlink/web-push": "^6.0",
"mobiledetect/mobiledetectlib": "^3.74", "mobiledetect/mobiledetectlib": "^3.74",
"nikic/fast-route": "^1.3", "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", "paragonie/hidden-string": "^1.0",
"patrickschur/language-detection": "^5.0.0", "patrickschur/language-detection": "^5.0.0",
"pear/console_table": "^1.3", "pear/console_table": "^1.3",
@ -58,24 +75,7 @@
"seld/cli-prompt": "^1.0", "seld/cli-prompt": "^1.0",
"smarty/smarty": "^4", "smarty/smarty": "^4",
"ua-parser/uap-php": "^3.9", "ua-parser/uap-php": "^3.9",
"xemlock/htmlpurifier-html5": "^0.1.11", "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"
}, },
"suggest": { "suggest": {
"ext-imagick": "For faster image processing", "ext-imagick": "For faster image processing",
@ -87,13 +87,20 @@
{ {
"type": "vcs", "type": "vcs",
"url": "https://git.friendi.ca/friendica/php-json-ld" "url": "https://git.friendi.ca/friendica/php-json-ld"
},
{
"type": "composer",
"url": "https://asset-packagist.org"
} }
], ],
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Friendica\\": "src/", "Friendica\\": "src/"
"Friendica\\Addon\\": "addon/" },
} "classmap": ["addon/"],
"exclude-from-classmap": [
"addon/*/vendor/"
]
}, },
"autoload-dev": { "autoload-dev": {
"psr-4": { "psr-4": {
@ -104,14 +111,23 @@
"platform": { "platform": {
"php": "7.4" "php": "7.4"
}, },
"sort-packages": true,
"autoloader-suffix": "Friendica", "autoloader-suffix": "Friendica",
"optimize-autoloader": true, "optimize-autoloader": true,
"preferred-install": "dist", "preferred-install": "dist",
"fxp-asset": { "allow-plugins": {
"installer-paths": { "composer/installers": true,
"npm-asset-library": "view/asset", "oomphinc/composer-installers-extender": true,
"bower-asset-library": "view/asset" "php-http/discovery": false
} }
},
"extra": {
"installer-types": ["bower-asset", "npm-asset"],
"installer-paths": {
"view/asset/{$name}/": [
"type:bower-asset",
"type:npm-asset"
]
} }
}, },
"archive": { "archive": {

1357
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
view/templates/admin/federation.tpl
View file

@ -4,7 +4,7 @@
* *
* SPDX-License-Identifier: AGPL-3.0-or-later * 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"> <div id="adminpage">
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>