From 9a12a2d13beb2d23c472fdbce1afe6a10dc0701b Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 20 Oct 2020 01:24:36 +0200 Subject: [PATCH] Don't install open-sans in vendor --- .gitignore | 1 + composer.json | 14 ++++ composer.lock | 182 ++++++++++++++++++++++++++++++++++++++++- templates/inc/head.tpl | 2 +- 4 files changed, 197 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 950d07a..d66574f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clover.xml i18n/*/LC_MESSAGES/*.mo .phpunit.result.cache .git/ +assets/ diff --git a/composer.json b/composer.json index 69670d7..cb6c51d 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,7 @@ "jawira/case-converter": "^3.4", "jean85/pretty-package-versions": "^1.3", "mathmarques/smarty-view": "^1.1", + "oomphinc/composer-installers-extender": "^2.0", "paragonie/csp-builder": "^2.5", "rinvex/countries": "^6.1", "rudloff/alltube-library": "dev-develop", @@ -57,6 +58,19 @@ }, "sort-packages": true }, + "extra": { + "installer-paths": { + "assets/{$name}": [ + "webfontkit/open-sans" + ], + "vendor/{$vendor}/{$name}/": [ + "type:library" + ] + }, + "installer-types": [ + "library" + ] + }, "autoload": { "psr-4": { "Alltube\\": "classes/" diff --git a/composer.lock b/composer.lock index c9fb147..d879092 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "779d7f64d1bd4a38943a0c10096cc330", + "content-hash": "3c2fabffdbf381b138354a986accc302", "packages": [ { "name": "aura/session", @@ -108,6 +108,133 @@ ], "time": "2018-08-10T13:58:33+00:00" }, + { + "name": "composer/installers", + "version": "v1.9.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/b93bcf0fa1fccb0b7d176b0967d969691cd74cca", + "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0" + }, + "replace": { + "roundcube/plugin-installer": "*", + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.6.* || 2.0.*@dev", + "composer/semver": "1.0.* || 2.0.*@dev", + "phpunit/phpunit": "^4.8.36", + "sebastian/comparator": "^1.2.4", + "symfony/process": "^2.3" + }, + "type": "composer-plugin", + "extra": { + "class": "Composer\\Installers\\Plugin", + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Installers\\": "src/Composer/Installers" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "https://composer.github.io/installers/", + "keywords": [ + "Craft", + "Dolibarr", + "Eliasis", + "Hurad", + "ImageCMS", + "Kanboard", + "Lan Management System", + "MODX Evo", + "MantisBT", + "Mautic", + "Maya", + "OXID", + "Plentymarkets", + "Porto", + "RadPHP", + "SMF", + "Thelia", + "Whmcs", + "WolfCMS", + "agl", + "aimeos", + "annotatecms", + "attogram", + "bitrix", + "cakephp", + "chef", + "cockpit", + "codeigniter", + "concrete5", + "croogo", + "dokuwiki", + "drupal", + "eZ Platform", + "elgg", + "expressionengine", + "fuelphp", + "grav", + "installer", + "itop", + "joomla", + "known", + "kohana", + "laravel", + "lavalite", + "lithium", + "magento", + "majima", + "mako", + "mediawiki", + "modulework", + "modx", + "moodle", + "osclass", + "phpbb", + "piwik", + "ppi", + "puppet", + "pxcms", + "reindex", + "roundcube", + "shopware", + "silverstripe", + "sydes", + "sylius", + "symfony", + "typo3", + "wordpress", + "yawik", + "zend", + "zikula" + ], + "time": "2020-04-07T06:57:05+00:00" + }, { "name": "composer/package-versions-deprecated", "version": "1.10.99", @@ -618,6 +745,59 @@ ], "time": "2018-02-13T20:26:39+00:00" }, + { + "name": "oomphinc/composer-installers-extender", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/oomphinc/composer-installers-extender.git", + "reference": "8d3fe38a1723e0e91076920c8bb946b1696e28ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/oomphinc/composer-installers-extender/zipball/8d3fe38a1723e0e91076920c8bb946b1696e28ca", + "reference": "8d3fe38a1723e0e91076920c8bb946b1696e28ca", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1 || ^2.0", + "composer/installers": "^1.0", + "php": ">=7.1" + }, + "require-dev": { + "composer/composer": "^2.0", + "phpunit/phpunit": "^7.2", + "squizlabs/php_codesniffer": "^3.3" + }, + "type": "composer-plugin", + "extra": { + "class": "OomphInc\\ComposerInstallersExtender\\Plugin" + }, + "autoload": { + "psr-4": { + "OomphInc\\ComposerInstallersExtender\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Beemsterboer", + "email": "stephen@oomphinc.com", + "homepage": "https://github.com/balbuf" + }, + { + "name": "Nathan Dentzau", + "email": "nate@oomphinc.com", + "homepage": "http://oomph.is/ndentzau" + } + ], + "description": "Extend the composer/installers plugin to accept any arbitrary package type.", + "homepage": "http://www.oomphinc.com/", + "time": "2020-08-11T21:06:11+00:00" + }, { "name": "paragonie/constant_time_encoding", "version": "v2.3.0", diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index e34d656..eee7e43 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -8,7 +8,7 @@ {/if} - + {$config->appName}{if isset($title)} - {$title|escape}{/if}