Replace composer-asset-plugin with asset-packagist

* Switch to Composer 2
sillsdev · Mar 21, 2022 · e52792e · e52792e
1 parent a35352c
commit e52792e
Show file tree

Hide file tree

Showing 6 changed files with 369 additions and 99 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -37,8 +37,11 @@ RUN chown -R www-data:www-data \
     frontend/runtime/ \
     frontend/web/assets/
 
+# Install composer
+COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
+
 # Install/cleanup composer dependencies
-RUN composer global require "fxp/composer-asset-plugin:^1.4.3" \
+RUN composer global remove "fxp/composer-asset-plugin" \
     && composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader
 
 # Install shellcheck for validating shell scripts

diff --git a/application/auth.json b/application/auth.json
diff --git a/application/composer.json b/application/composer.json
@@ -21,12 +21,15 @@
         "codeception/verify": "0.*"
     },
     "config": {
-        "process-timeout": 1800
+        "process-timeout": 1800,
+        "allow-plugins": {
+            "yiisoft/yii2-composer": true
+        }
     },
-    "extra": {
-        "asset-installer-paths": {
-            "npm-asset-library": "vendor/npm",
-            "bower-asset-library": "vendor/bower"
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
         }
-    }
+    ]
 }