From a61ed97a8d58576e4e0118202991d7890b5cb97a Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 21 Feb 2018 18:49:00 +0700 Subject: [PATCH] Fixed frontend dependencies paths. Issue #152. --- composer.json | 14 ++-- composer.lock | 216 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 169 insertions(+), 61 deletions(-) diff --git a/composer.json b/composer.json index 71a9790e..ab540543 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,7 @@ "phpunit/php-token-stream": "~1.4.0", "phpdocumentor/reflection-docblock": "~2.0.0", - "mnsami/composer-custom-directory-installer": "~1.1.0", + "oomphinc/composer-installers-extender": "~1.1.0", "npm-asset/sprintf-js": "~1.0.0", "npm-asset/codemirror": "~5.23.0", @@ -98,14 +98,12 @@ "platform": { "php": "5.6.*" }, + "installer-types": [ + "bower-asset", + "npm-asset" + ], "installer-paths": { - "public/assets/vendor/sprintf-js": ["npm-asset/sprintf-js"], - "public/assets/vendor/codemirror": ["npm-asset/codemirror"], - "public/assets/vendor/admin-lte": ["bower-asset/admin-lte"], - "public/assets/vendor/font-awesome": ["bower-asset/font-awesome"], - "public/assets/vendor/ion-icons": ["bower-asset/ionicons"], - "public/assets/vendor/raphael": ["bower-asset/raphael"], - "public/assets/vendor/eve-raphael": ["bower-asset/eve-raphael"] + "public/assets/vendor/{$name}/": ["type:bower-asset", "type:npm-asset"] } }, "repositories": [ diff --git a/composer.lock b/composer.lock index 7c9ae4ca..b910c90e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "acf206f49431b95f0fadc3a765e6930a", + "content-hash": "e04dd5f7a7f3a869724c591daf5d8f2e", "packages": [ { "name": "behat/gherkin", @@ -401,6 +401,126 @@ ], "time": "2017-11-29T09:37:33+00:00" }, + { + "name": "composer/installers", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "049797d727261bf27f2690430d935067710049c2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/049797d727261bf27f2690430d935067710049c2", + "reference": "049797d727261bf27f2690430d935067710049c2", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0" + }, + "replace": { + "roundcube/plugin-installer": "*", + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "^4.8.36" + }, + "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", + "Mautic", + "Maya", + "OXID", + "Plentymarkets", + "Porto", + "RadPHP", + "SMF", + "Thelia", + "WolfCMS", + "agl", + "aimeos", + "annotatecms", + "attogram", + "bitrix", + "cakephp", + "chef", + "cockpit", + "codeigniter", + "concrete5", + "croogo", + "dokuwiki", + "drupal", + "eZ Platform", + "elgg", + "expressionengine", + "fuelphp", + "grav", + "installer", + "itop", + "joomla", + "kohana", + "laravel", + "lavalite", + "lithium", + "magento", + "majima", + "mako", + "mediawiki", + "modulework", + "modx", + "moodle", + "osclass", + "phpbb", + "piwik", + "ppi", + "puppet", + "pxcms", + "reindex", + "roundcube", + "shopware", + "silverstripe", + "sydes", + "symfony", + "typo3", + "wordpress", + "yawik", + "zend", + "zikula" + ], + "time": "2017-12-29T09:13:20+00:00" + }, { "name": "doctrine/instantiator", "version": "1.0.5", @@ -780,58 +900,6 @@ ], "time": "2015-10-15T09:42:44+00:00" }, - { - "name": "mnsami/composer-custom-directory-installer", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/mnsami/composer-custom-directory-installer.git", - "reference": "8cc82e0c5801cc3bf53ba452afdcaa5c6ff645a5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mnsami/composer-custom-directory-installer/zipball/8cc82e0c5801cc3bf53ba452afdcaa5c6ff645a5", - "reference": "8cc82e0c5801cc3bf53ba452afdcaa5c6ff645a5", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": ">=5.3" - }, - "type": "composer-plugin", - "extra": { - "class": [ - "Composer\\CustomDirectoryInstaller\\LibraryPlugin", - "Composer\\CustomDirectoryInstaller\\PearPlugin", - "Composer\\CustomDirectoryInstaller\\PluginPlugin" - ], - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Composer\\CustomDirectoryInstaller": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mina Nabil Sami", - "email": "mina.nsami@gmail.com" - } - ], - "description": "A composer plugin, to help install packages of different types in custom paths.", - "keywords": [ - "composer", - "composer-installer", - "composer-plugin" - ], - "time": "2016-05-25T08:26:02+00:00" - }, { "name": "monolog/monolog", "version": "1.22.1", @@ -1034,6 +1102,48 @@ "BSD-3-Clause" ] }, + { + "name": "oomphinc/composer-installers-extender", + "version": "v1.1.2", + "source": { + "type": "git", + "url": "https://github.com/oomphinc/composer-installers-extender.git", + "reference": "ca1c4b16b0905c81d1e77e608f36a2eff1a56f56" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/oomphinc/composer-installers-extender/zipball/ca1c4b16b0905c81d1e77e608f36a2eff1a56f56", + "reference": "ca1c4b16b0905c81d1e77e608f36a2eff1a56f56", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "composer/installers": "^1.0" + }, + "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" + } + ], + "description": "Extend the composer/installers plugin to accept any arbitrary package type.", + "homepage": "http://www.oomphinc.com/", + "time": "2017-03-31T16:57:39+00:00" + }, { "name": "pda/pheanstalk", "version": "v3.1.0",