Use yii2-extensions/asset-bootstrap5. (#2)

yii2-extensions · Nov 17, 2023 · 92da851 · 92da851
1 parent 1354f30
commit 92da851
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 75 deletions.
diff --git 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
diff --git a/src/BootstrapPluginAsset.php b/src/BootstrapPluginAsset.php
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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' => [