From 67342864ee54692b5f2f7b17c74c36e1a00815ff Mon Sep 17 00:00:00 2001 From: simialbi Date: Wed, 30 Nov 2022 08:47:12 +0100 Subject: [PATCH] solve asset problem (fixed #56, #59) --- src/BootstrapAsset.php | 10 ++-------- src/BootstrapIconAsset.php | 10 +++++++++- src/BootstrapPluginAsset.php | 12 ++++-------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/BootstrapAsset.php b/src/BootstrapAsset.php index cb7b066..88fcf97 100644 --- a/src/BootstrapAsset.php +++ b/src/BootstrapAsset.php @@ -20,17 +20,11 @@ class BootstrapAsset extends AssetBundle * @inheritDoc */ public $sourcePath = '@bower/bootstrap'; + /** * @inheritDoc */ public $css = [ - YII_ENV_PROD ? 'dist/css/bootstrap.min.css' : 'dist/css/bootstrap.css' - ]; - /** - * @inheritDoc - */ - public $publishOptions = [ - 'only' => ['scss/*.scss', 'scss/*/*.scss', 'dist/css/bootstrap.*'], - 'except' => ['scss/bootstrap-*.scss'] + 'dist/css/bootstrap.css' ]; } diff --git a/src/BootstrapIconAsset.php b/src/BootstrapIconAsset.php index 094bddd..ab3dbc1 100644 --- a/src/BootstrapIconAsset.php +++ b/src/BootstrapIconAsset.php @@ -11,12 +11,20 @@ namespace yii\bootstrap5; use yii\web\AssetBundle; +/** + * Twitter Bootstrap 5 icon bundle + */ class BootstrapIconAsset extends AssetBundle { + /** + * @inheritDoc + */ public $sourcePath = '@vendor/twbs/bootstrap-icons/font'; + /** + * @inheritDoc + */ public $css = [ 'bootstrap-icons.css' ]; - } diff --git a/src/BootstrapPluginAsset.php b/src/BootstrapPluginAsset.php index a3558ef..840d341 100644 --- a/src/BootstrapPluginAsset.php +++ b/src/BootstrapPluginAsset.php @@ -20,22 +20,18 @@ class BootstrapPluginAsset extends AssetBundle * @inheritDoc */ public $sourcePath = '@bower/bootstrap'; + /** * @inheritDoc */ public $js = [ - YII_ENV_PROD ? 'dist/js/bootstrap.bundle.min.js' : 'dist/js/bootstrap.bundle.js' - ]; - /** - * @inheritDoc - */ - public $publishOptions = [ - 'only' => ['dist/js/bootstrap.bundle.*', 'js/src/*.js', 'js/src/*/*.js'] + 'dist/js/bootstrap.bundle.js' ]; + /** * @inheritDoc */ public $depends = [ - BootstrapAsset::class + 'yii\bootstrap5\BootstrapAsset' ]; }