From 92da851e8fa3aa8e1f40ca732463b89ec15cb473 Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <42547589+terabytesoftw@users.noreply.github.com>
Date: Fri, 17 Nov 2023 06:54:52 -0300
Subject: [PATCH] Use `yii2-extensions/asset-bootstrap5`. (#2)

---
 composer.json                | 17 ++++++++++++++--
 src/BootstrapAsset.php       | 32 -----------------------------
 src/BootstrapPluginAsset.php | 39 ------------------------------------
 src/BootstrapWidgetTrait.php |  1 +
 src/ButtonGroup.php          |  1 +
 src/ButtonToolbar.php        |  1 +
 src/Dropdown.php             |  1 +
 src/Nav.php                  |  1 +
 src/NavBar.php               |  1 +
 src/Progress.php             |  1 +
 tests/TestCase.php           |  4 ++--
 11 files changed, 24 insertions(+), 75 deletions(-)
 delete mode 100644 src/BootstrapAsset.php
 delete mode 100644 src/BootstrapPluginAsset.php

diff --git a/composer.json b/composer.json
index 343d79a..8f00d4f 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
     "prefer-stable": true,
     "require": {
         "php": ">=8.1",
-        "npm-asset/bootstrap": "^5.3",
+        "oomphinc/composer-installers-extender": "^2.0",
+        "yii2-extensions/asset-bootstrap5": "dev-main",
         "yiisoft/yii2": "^2.2"
     },
     "require-dev": {
@@ -38,12 +39,24 @@
         },
         "config-plugin": {
             "yii2-bootstrap5": "extension.php"
+        },
+        "installer-types": [
+            "bower-asset",
+            "npm-asset"
+        ],
+        "installer-paths": {
+            "./node_modules/{$name}": [
+                "type:bower-asset",
+                "type:npm-asset"
+            ]
         }
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "yiisoft/yii2-composer": true
+            "yiisoft/yii2-composer": true,
+            "composer/installers": true,
+            "oomphinc/composer-installers-extender": true
         }
     },
     "scripts": {
diff --git a/src/BootstrapAsset.php b/src/BootstrapAsset.php
deleted file mode 100644
index 71949ae..0000000
--- a/src/BootstrapAsset.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @link https://www.yiiframework.com/
- *
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license https://www.yiiframework.com/license/
- */
-
-namespace yii\bootstrap5;
-
-use yii\web\AssetBundle;
-
-/**
- * Twitter Bootstrap 5 CSS bundle.
- */
-class BootstrapAsset extends AssetBundle
-{
-    /**
-     * @inheritDoc
-     */
-    public $sourcePath = '@npm/bootstrap';
-
-    /**
-     * @inheritDoc
-     */
-    public $css = [
-        'dist/css/bootstrap.css',
-    ];
-}
diff --git a/src/BootstrapPluginAsset.php b/src/BootstrapPluginAsset.php
deleted file mode 100644
index b2cbf43..0000000
--- a/src/BootstrapPluginAsset.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @link https://www.yiiframework.com/
- *
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license https://www.yiiframework.com/license/
- */
-
-namespace yii\bootstrap5;
-
-use yii\web\AssetBundle;
-
-/**
- * Twitter Bootstrap 5 JavaScript bundle.
- */
-class BootstrapPluginAsset extends AssetBundle
-{
-    /**
-     * @inheritDoc
-     */
-    public $sourcePath = '@npm/bootstrap';
-
-    /**
-     * @inheritDoc
-     */
-    public $js = [
-        'dist/js/bootstrap.bundle.js',
-    ];
-
-    /**
-     * @inheritDoc
-     */
-    public $depends = [
-        BootstrapAsset::class,
-    ];
-}
diff --git a/src/BootstrapWidgetTrait.php b/src/BootstrapWidgetTrait.php
index 2eb82a9..701af44 100644
--- a/src/BootstrapWidgetTrait.php
+++ b/src/BootstrapWidgetTrait.php
@@ -11,6 +11,7 @@
 
 namespace yii\bootstrap5;
 
+use Yii2\Asset\BootstrapPluginAsset;
 use yii\base\InvalidConfigException;
 use yii\helpers\Json;
 
diff --git a/src/ButtonGroup.php b/src/ButtonGroup.php
index 93c2731..689ebca 100644
--- a/src/ButtonGroup.php
+++ b/src/ButtonGroup.php
@@ -12,6 +12,7 @@
 namespace yii\bootstrap5;
 
 use Throwable;
+use Yii2\Asset\BootstrapAsset;
 use yii\helpers\ArrayHelper;
 
 use function implode;
diff --git a/src/ButtonToolbar.php b/src/ButtonToolbar.php
index f7f3f30..505f37a 100644
--- a/src/ButtonToolbar.php
+++ b/src/ButtonToolbar.php
@@ -12,6 +12,7 @@
 namespace yii\bootstrap5;
 
 use Throwable;
+use Yii2\Asset\BootstrapAsset;
 
 use function implode;
 use function is_array;
diff --git a/src/Dropdown.php b/src/Dropdown.php
index b22957f..a7b3a48 100644
--- a/src/Dropdown.php
+++ b/src/Dropdown.php
@@ -13,6 +13,7 @@
 
 use Exception;
 use Throwable;
+use Yii2\Asset\BootstrapPluginAsset;
 use yii\base\InvalidConfigException;
 use yii\helpers\ArrayHelper;
 
diff --git a/src/Nav.php b/src/Nav.php
index 441eaf8..6ad0525 100644
--- a/src/Nav.php
+++ b/src/Nav.php
@@ -14,6 +14,7 @@
 use Exception;
 use Throwable;
 use Yii;
+use Yii2\Asset\BootstrapAsset;
 use yii\base\InvalidConfigException;
 use yii\helpers\ArrayHelper;
 
diff --git a/src/NavBar.php b/src/NavBar.php
index ce962af..32f847e 100644
--- a/src/NavBar.php
+++ b/src/NavBar.php
@@ -12,6 +12,7 @@
 namespace yii\bootstrap5;
 
 use Yii;
+use Yii2\Asset\BootstrapPluginAsset;
 use yii\helpers\ArrayHelper;
 
 /**
diff --git a/src/Progress.php b/src/Progress.php
index 6ed07e7..a5f1583 100644
--- a/src/Progress.php
+++ b/src/Progress.php
@@ -12,6 +12,7 @@
 namespace yii\bootstrap5;
 
 use Exception;
+use Yii2\Asset\BootstrapAsset;
 use yii\base\InvalidConfigException;
 use yii\helpers\ArrayHelper;
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 6787ed5..fde153f 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -64,8 +64,8 @@ protected function mockWebApplication(array $config = [], string $appClass = '\y
             'vendorPath' => dirname(__DIR__) . '/vendor',
             'language' => 'en-US',
             'aliases' => [
-                '@bower' => '@vendor/bower-asset',
-                '@npm' => '@vendor/npm-asset',
+                '@bower' => dirname(__DIR__) . '/node_modules',
+                '@npm' => dirname(__DIR__) . '/node_modules',
             ],
             'components' => [
                 'i18n' => [