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.

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

Support Bootstrap v4 alpha 4 in v1 #170

Merged
merged 5 commits into from
Sep 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions .bootstraprc-4-default
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,14 @@ styles:
card: true
breadcrumb: true
pagination: true
pager: true
labels: true
jumbotron: true
alert: true
progress: true
media: true
list-group: true
responsive-embed: true
close: true
tags: true

# Components w/ JavaScript
modal: true
Expand All @@ -97,9 +96,6 @@ styles:

# Utility classes
utilities: true
utilities-background: true
utilities-spacing: true
utilities-responsive: true

### Bootstrap scripts
scripts:
Expand Down
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
language: node_js

node_js:
- stable

script:
- npm run lint
- npm test
- npm run build
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]

## [Unreleased]

## [1.1.7] - 2016-09-09
##### Changed
Support for Bootstrap 4.0.0-alpha.4. [#167](https://github.com/shakacode/bootstrap-loader/pull/167/files) by [rmobis](https://github.com/rmobis) and [#170](https://github.com/shakacode/bootstrap-loader/pull/170/files) by [justin808](https://github.com/justin808)..

## [1.1.6] - 2016-09-08
##### Fixed
- Allows chaining with some style loaders such as the isomorphic-style-loader. [#98](https://github.com/shakacode/bootstrap-loader/pulls/98) by [horyd](https://github.com/horyd).
Expand Down Expand Up @@ -45,7 +49,8 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]

## [1.0.8]

[Unreleased]: https://github.com/shakacode/bootstrap-loader/compare/1.1.6...master
[Unreleased]: https://github.com/shakacode/bootstrap-loader/compare/1.1.7...master
[1.1.7]: https://github.com/shakacode/bootstrap-loader/compare/1.1.6...1.1.7
[1.1.6]: https://github.com/shakacode/bootstrap-loader/compare/1.1.5...1.1.6
[1.1.5]: https://github.com/shakacode/bootstrap-loader/compare/1.1.4...1.1.5
[1.1.4]: https://github.com/shakacode/bootstrap-loader/compare/1.1.3...1.1.4
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[![Build Status](https://travis-ci.org/shakacode/react_on_rails.svg?branch=master)](https://travis-ci.org/shakacode/react_on_rails)
[![npm version](https://badge.fury.io/js/bootstrap-loader.svg)](https://badge.fury.io/js/bootstrap-loader)

Aloha from Justin Gordon and the [ShakaCode](http://www.shakacode.com) Team! We need your help. Venture capital funding has slowed and, for the first time, my ShakaCode team is actively looking for our next project. If you like **React on Rails**, please consider contacting me if we could potentially help you in any way. I'm offering a free half hour project consultation, on anything from React on Rails to any aspect of web application development, including both consumer and enterprise products. You can read more about my background [here](http://www.railsonmaui.com/about). Whether you have a new project, or need help on an existing project, please email me directly at [[email protected]](mailto:[email protected]). And thanks in advance for any referrals! Your support keeps this project going.
Expand All @@ -15,7 +16,7 @@ Successor to [bootstrap-sass-loader](https://github.com/shakacode/bootstrap-sass
2. We'd be thrilled to have another maintainer join us to help with Bootstrap 4 issues.
3. We'd also be thrilled if any companies are open to sponsoring the development of features and issues regarding Bootstrap 4.

That being said, Bootstrap 4 probably works just fine!
That being said, Bootstrap 4 probably works just fine! You must use `4.0.0-alpha.4` or greater.

Choose a reason for hiding this comment

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

I believe line 40 also needs to be updated


## NEWS

Expand Down
5 changes: 1 addition & 4 deletions examples/basic/.bootstraprc-4-example
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,14 @@ styles:
card: true
breadcrumb: true
pagination: true
pager: true
labels: true
jumbotron: true
alert: true
progress: true
media: true
list-group: true
responsive-embed: true
close: true
tags: true

# Components w/ JavaScript
modal: true
Expand All @@ -106,8 +105,6 @@ styles:

# Utility classes
utilities: true
utilities-spacing: true
utilities-responsive: true

### Bootstrap scripts
scripts:
Expand Down
6 changes: 3 additions & 3 deletions examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"license": "MIT",
"dependencies": {
"express": "^4.13.3",
"bootstrap": "4.0.0-alpha.2",
"bootstrap-sass": "^3.3.5",
"font-awesome": "^4.5.0",
"bootstrap": "4.0.0-alpha.4",
"bootstrap-sass": "^3.3.6",
"font-awesome": "^4.6.3",
"jquery": "^2.1.4",
"tether": "^1.2.0"
},
Expand Down
5 changes: 1 addition & 4 deletions examples/css-modules/.bootstraprc-4-example
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,14 @@ styles:
card: true
breadcrumb: true
pagination: true
pager: true
labels: true
jumbotron: true
alert: true
progress: true
media: true
list-group: true
responsive-embed: true
close: true
tags: true

# Components w/ JavaScript
modal: true
Expand All @@ -87,8 +86,6 @@ styles:

# Utility classes
utilities: true
utilities-spacing: true
utilities-responsive: true

### Bootstrap scripts
scripts: false
4 changes: 2 additions & 2 deletions examples/css-modules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
],
"dependencies": {
"body-parser": "^1.15.0",
"bootstrap": "4.0.0-alpha.2",
"bootstrap-sass": "^3.3.5",
"bootstrap": "4.0.0-alpha.4",
"bootstrap-sass": "^3.3.6",
"express": "^4.13.4",
"font-awesome": "^4.5.0",
"react": "^0.14.2",
Expand Down
2 changes: 1 addition & 1 deletion src/utils/createBootstrapRequire.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function(module, bootstrapVersion, bootstrapPath) {
const scriptsPath = (
parseInt(bootstrapVersion, 10) === 3 ?
['assets', 'javascripts', 'bootstrap'] :
['dist', 'js', 'umd']
['js', 'dist']
Copy link

Choose a reason for hiding this comment

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

add new path also to readme jquery module loader.

Copy link
Contributor

Choose a reason for hiding this comment

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

What is this readme jquery module loader you speak of?

);
const bootstrapModule = path.join(bootstrapPath, ...scriptsPath, module);
return `require (${JSON.stringify(bootstrapModule)});`;
Expand Down