From 73d07f355abce9714ab2316ba515095db9e12eda Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Thu, 16 Jun 2016 11:00:16 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=20composer?=
 =?UTF-8?q?-asset-plugin=20=D0=B2=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83?=
 =?UTF-8?q?=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=D1=82=D0=B8=D0=B2=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20asset=20packagist=20registry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bowerrc               |  3 ---
 Dockerfile             |  3 ++-
 common/config/main.php |  4 ++++
 composer.json          | 16 +++++-----------
 4 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 .bowerrc

diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index 1669168..0000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "directory" : "vendor/bower"
-}
diff --git a/Dockerfile b/Dockerfile
index 1949b7c..f87100c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,8 @@ RUN yes | pecl install xdebug \
 # Next composer and global composer package, as their versions may change from time to time
 RUN curl -sS https://getcomposer.org/installer | php \
  && mv composer.phar /usr/local/bin/composer.phar \
- && composer.phar global require --no-progress "fxp/composer-asset-plugin:~1.1.4" "hirak/prestissimo:>=0.3.1"
+ && echo '{"github-oauth": {"github.com": "***REMOVED***"}}' > ~/.composer/auth.json \
+ && composer.phar global require --no-progress "hirak/prestissimo:>=0.3.1"
 
 COPY ./docker/php/composer.sh /usr/local/bin/composer
 RUN chmod a+x /usr/local/bin/composer
diff --git a/common/config/main.php b/common/config/main.php
index 6ec7952..0722b11 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -23,4 +23,8 @@ return [
             'class' => \common\components\RabbitMQ\Component::class,
         ],
     ],
+    'aliases' => [
+        '@bower' => '@vendor/bower-asset',
+        '@npm'   => '@vendor/npm-asset',
+    ],
 ];
diff --git a/composer.json b/composer.json
index 882a669..b3cb3f9 100644
--- a/composer.json
+++ b/composer.json
@@ -36,21 +36,15 @@
         "codeception/verify": "*",
         "phploc/phploc": "^3.0.1"
     },
-    "provide": {
-        "bower-asset/jquery": "*",
-        "bower-asset/jquery.inputmask": "*",
-        "bower-asset/punycode": "*",
-        "bower-asset/yii2-pjax": "*"
-    },
     "config": {
         "process-timeout": 1800
     },
-    "extra": {
-        "asset-installer-paths": {
-            "npm-asset-library": "vendor/npm",
-            "bower-asset-library": "vendor/bower"
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
         }
-    },
+    ],
     "scripts": {
         "build-tests" : "cd tests && codecept build",
         "test" : "codecept run -c tests",