Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change Bower to NPM. #40

Closed
wants to merge 1 commit into from
Closed

Change Bower to NPM. #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
],
"require": {
"yiisoft/yii2": "~2.0|~2.1@dev|~3.0@dev",
"bower-asset/bootstrap": "~4.0"
"npm-asset/bootstrap": "~4.1",
"npm-asset/popper.js": "~1.14.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no dist directory in popper.js repo on non-stable versions:

https://github.com/FezVrasta/popper.js

We need to add the @stable tag here, to ensure we have assets we can publish.

Suggested change
"npm-asset/popper.js": "~1.14.3"
"npm-asset/popper.js": "~1.14.3@stable"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the same as we have with jquery here:

https://github.com/yiisoft/yii2/blob/558cd482d8a0525fceec8646ea20ccc9b7c3fdf4/framework/composer.json#L73

},
"require-dev": {
"yiisoft/yii2-coding-standards": "~2.0",
Expand Down
6 changes: 3 additions & 3 deletions docs/guide-ja/assets-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Bower または NPM のクライアントを直接に使って Bootstrap のア

```json
"replace": {
"bower-asset/bootstrap": ">=4.1.1"
"npm-asset/bootstrap": ">=4.1.1"
},
```

Expand All @@ -93,7 +93,7 @@ Bower または NPM のクライアントを直接に使って Bootstrap のア

```json
"replace": {
"bower-asset/bootstrap": ">=4.1.1"
"npm-asset/bootstrap": ">=4.1.1"
},
```

Expand Down Expand Up @@ -145,7 +145,7 @@ Bootstrap アセットを手作業でダウンロードし、プロジェクト

```json
"replace": {
"bower-asset/bootstrap": ">=3.3.0"
"npm-asset/bootstrap": ">=4.1.1"
},
```

Expand Down
6 changes: 3 additions & 3 deletions docs/guide/assets-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ In the `composer.json` of your project, add the following lines in order to prev

```json
"replace": {
"bower-asset/bootstrap": ">=4.1.1"
"npm-asset/bootstrap": ">=4.1.1"
},
```

Expand All @@ -93,7 +93,7 @@ In the `composer.json` of your project, add the following lines in order to prev

```json
"replace": {
"bower-asset/bootstrap": ">=4.1.1"
"npm-asset/bootstrap": ">=4.1.1"
},
```

Expand Down Expand Up @@ -145,7 +145,7 @@ In the `composer.json` of your project, add the following lines in order to prev

```json
"replace": {
"bower-asset/bootstrap": ">=4.1.1"
"npm-asset/bootstrap": ">=4.1.1"
},
```

Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapAsset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class BootstrapAsset extends AssetBundle
{
public $sourcePath = '@bower/bootstrap/dist';
public $sourcePath = '@npm/bootstrap/dist';
public $css = [
'css/bootstrap.css',
];
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapPluginAsset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class BootstrapPluginAsset extends AssetBundle
{
public $sourcePath = '@bower/bootstrap/dist';
public $sourcePath = '@npm/bootstrap/dist';
public $js = [
'js/bootstrap.js',
];
Expand Down
2 changes: 1 addition & 1 deletion src/PopperAsset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class PopperAsset extends AssetBundle
{
public $sourcePath = '@bower/bootstrap/assets/js/vendor';
public $sourcePath = '@npm/popper.js/dist';
public $js = [
'popper.min.js',
];
Expand Down