From c6aa69ba7b0dfe32eabc78e5ab4d186460d128e7 Mon Sep 17 00:00:00 2001 From: bscheshirwork Date: Thu, 20 Sep 2018 16:51:55 +0300 Subject: [PATCH 1/4] use asset-packagist instead of fxp-asset --- composer.json | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 96febfc..82b9d2e 100644 --- a/composer.json +++ b/composer.json @@ -80,16 +80,7 @@ "*": "auto" }, "fxp-asset": { - "installer-paths": { - "npm-asset-library": "vendor/npm", - "bower-asset-library": "vendor/bower" - }, - "vcs-driver-options": { - "github-no-api": true - }, - "git-skip-update": "2 days", - "pattern-skip-version": "(-build|-patch)" - } + "enabled": false } }, "conflict": { "dektrium/yii2-rbac": "*", @@ -97,5 +88,11 @@ }, "extra": { "bootstrap": "Da\\User\\Bootstrap" - } + }, + "repositories": [ + { + "type": "composer", + "url": "https://asset-packagist.org" + } + ] } From 5bbeba85499ae51091aa34234e29fe4b386921e0 Mon Sep 17 00:00:00 2001 From: bscheshirwork Date: Thu, 20 Sep 2018 16:58:34 +0300 Subject: [PATCH 2/4] :book: --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5ba762..33e78e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Enh: Add controller module class reference (TonisOrmisson) - Enh: Replace the deprecated InvalidParamException in ClassMapHelper (TonisOrmisson) - Fix #242: Add POST filter for `admin/force-password-change` action (bscheshirwork) + - Enh #251: Use `asset-packagist` instead of `fxp-asset` if you run it as a module without having a project around (bscheshirwork) ## 1.1.4 - February 19, 2018 - Enh: Check enableEmailConfirmation on registration (faenir) From 0f54fe3fe16b4c3b36a076a7f16384ae52e73f1c Mon Sep 17 00:00:00 2001 From: bscheshirwork Date: Thu, 20 Sep 2018 17:19:13 +0300 Subject: [PATCH 3/4] travis configure --- .travis.yml | 1 - composer.json | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 83741c8..dbe3f4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ install: phpenv config-rm xdebug.ini || echo "xdebug is not installed" fi - travis_retry composer self-update && composer --version - - travis_retry composer global require "fxp/composer-asset-plugin:^1.4.0" - export PATH="$HOME/.composer/vendor/bin:$PATH" - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --prefer-dist --no-interaction diff --git a/composer.json b/composer.json index 82b9d2e..0c99f6e 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,8 @@ "*": "auto" }, "fxp-asset": { - "enabled": false } + "enabled": false + } }, "conflict": { "dektrium/yii2-rbac": "*", From 6d7abd91ce35791039d56b2f9d98e1e3b12460f1 Mon Sep 17 00:00:00 2001 From: bscheshirwork Date: Thu, 20 Sep 2018 17:43:08 +0300 Subject: [PATCH 4/4] add aliases --- tests/_app/config/console.php | 2 ++ tests/_app/config/test.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/_app/config/console.php b/tests/_app/config/console.php index e3da14f..1264cd0 100644 --- a/tests/_app/config/console.php +++ b/tests/_app/config/console.php @@ -6,6 +6,8 @@ return [ 'aliases' => [ '@Da/User' => dirname(dirname(dirname(__DIR__))) . '/src/User', '@tests' => dirname(dirname(__DIR__)), + '@bower' => '@vendor/bower-asset', + '@npm' => '@vendor/npm-asset', ], 'components' => [ 'log' => null, diff --git a/tests/_app/config/test.php b/tests/_app/config/test.php index 650ae4b..690b908 100644 --- a/tests/_app/config/test.php +++ b/tests/_app/config/test.php @@ -8,7 +8,8 @@ return [ '@Da/User' => dirname(dirname(dirname(__DIR__))) . '/src/User', '@tests' => dirname(dirname(__DIR__)), '@vendor' => VENDOR_DIR, - '@bower' => VENDOR_DIR . '/bower', + '@bower' => '@vendor/bower-asset', + '@npm' => '@vendor/npm-asset', ], 'bootstrap' => ['Da\User\Bootstrap'], 'modules' => [