Added support Bootstrap 4 Beta

.bootstraprc-4-default

@@ -5,9 +5,6 @@
 # Major version of Bootstrap: 3 or 4
 bootstrapVersion: 4
 
-# If Bootstrap version 4 is used - turn on/off flexbox model
-useFlexbox: true
-
 # Webpack loaders, order matters
 styleLoaders:
   - style
@@ -55,7 +52,6 @@ styles:
   mixins: true
 
   # Reset and dependencies
-  normalize: true
   print: true
 
   # Core CSS
@@ -85,7 +81,6 @@ styles:
   navbar: true
   pagination: true
   progress: true
-  responsive-embed: true
   transitions: true
 
   # Components w/ JavaScript

CHANGELOG.md

@@ -6,9 +6,16 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 *Please add entries here for your pull requests.*
 
+## [2.2.0] - 2017-08-14
+##### Updated
+- Replaced support for Bootstrap 4.0.0-alpha.6 with 4.0.0-beta. [#299](https://github.com/shakacode/bootstrap-loader/pull/316) by [Ivan Kalinin](https://github.com/IvanKalinin).
+- Removed `useFlexbox` option since BS4 uses flexboxes by default
+- Removed `normalize` option from your bootstrap v4 config. It was dropped in beta.
+- Updated dependencies in examples
+
 ## [2.1.0] - 2017-05-01
 ##### Updated
-- Replaced support for Bootstrap 4.0.0-alpha.4 with 4.0.0-alpha.6. [#299](https://github.com/shakacode/bootstrap-loader/pull/299) by [tc-imba](https://github.com/tc-imba).  
+- Replaced support for Bootstrap 4.0.0-alpha.4 with 4.0.0-alpha.6. [#299](https://github.com/shakacode/bootstrap-loader/pull/299) by [tc-imba](https://github.com/tc-imba).
 
 ## [2.0.0] - 2017-03-15
 No changes to the package. Examples are updated. We're **ONLY** supporting:

README.md

@@ -38,7 +38,7 @@ Please [Subscribe](https://app.mailerlite.com/webforms/landing/l1d9x5) to keep i
 **[React on Rails](https://github.com/shakacode/react_on_rails)** is ShakaCode's flagship product. We want to make sure you're aware of it!
 
 ### Testimonials
-From Joel Hooks, Co-Founder, Chief Nerd at [egghead.io](https://egghead.io/), January 30, 2017: 
+From Joel Hooks, Co-Founder, Chief Nerd at [egghead.io](https://egghead.io/), January 30, 2017:
 ![2017-01-30_11-33-59](https://cloud.githubusercontent.com/assets/1118459/22443635/b3549fb4-e6e3-11e6-8ea2-6f589dc93ed3.png)
 
 For more testimonials, see [Live Projects](https://github.com/shakacode/react_on_rails/blob/master/PROJECTS.md) and [Kudos](https://github.com/shakacode/react_on_rails/blob/master/KUDOS.md).
@@ -55,7 +55,7 @@ Successor to [bootstrap-sass-loader](https://github.com/shakacode/bootstrap-sass
 1. Community support to help us with Bootstrap 4 issues and pull requests.
 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! You must use `4.0.0-alpha.6` or greater.
 
 ## NEWS
@@ -149,8 +149,6 @@ Note that :`__dirname` is a [global variable](https://nodejs.org/docs/latest/api
 ```yaml
 ---
 # You can use comments here
-useFlexbox: true
-
 styleLoaders:
   - style-loader
   - css-loader
@@ -168,8 +166,6 @@ scripts:
 ```js
 {
   // And JSON comments also!
-  "useFlexbox": true,
-
   "styleLoaders": ["style-loader", "css-loader", "sass-loader"],
 
   "styles": {
@@ -393,16 +389,6 @@ $icon-font-name: 'glyphicons' // you'll typically want to change this too.
 ### Bootstrap 4 only
 There is only one additional option for Bootstrap 4:
 
-#### `useFlexbox`
-
-Default: `true`
-
-Enable / disable flexbox model.
-
-```yaml
-useFlexbox: true
-```
-
 #### Tether
 Additionally, Bootstrap 4 requires Tether. You can add Tether per the examples in the `/examples` directory.
 

examples/basic/.bootstraprc-4-example

@@ -5,16 +5,12 @@
 # Major version of Bootstrap: 3 or 4
 bootstrapVersion: 4
 
-# If Bootstrap version 4 is used - turn on/off flexbox model
-useFlexbox: true
-
-
 # Webpack loaders, order matters
 styleLoaders:
   - style-loader
   - css-loader
-  - postcss-loader
   - sass-loader
+  - postcss-loader
 
 # Extract styles to stand-alone css file
 # Different settings for different environments can be used,
@@ -51,7 +47,7 @@ preBootstrapCustomizations: ./app/styles/bootstrap/pre-customizations.scss
 # this in bootstrapCustomizations to make the input height 10% bigger than the default calculation.
 # Thus you can leverage the default calculations.
 # $input-height: $input-height * 1.10;
-bootstrapCustomizations: ./app/styles/bootstrap/customizations.scss
+bootstrapCustomizations: ./app/styles/bootstrap/customizations-bs4.scss
 
 # Import your custom styles here. You have access to all the bootstrap variables. If you require
 # your sass files separately, you will not have access to the bootstrap variables, mixins, clases, etc.
@@ -65,7 +61,6 @@ styles:
   mixins: true
 
   # Reset and dependencies
-  normalize: true
   print: true
 
   # Core CSS
@@ -95,7 +90,6 @@ styles:
   navbar: true
   pagination: true
   progress: true
-  responsive-embed: true
   transitions: true
 
   # Components w/ JavaScript

examples/basic/app/styles/app.scss

@@ -1,5 +1,5 @@
 // Example of referring to bootstrap variables in your Sass code.
-$icons-color: adjust-hue($brand-success, -20deg);
+$icons-color: adjust-hue(theme-color("success"), -20deg);
 
 #app {
   display: block;

examples/basic/app/styles/bootstrap/customizations-bs4.scss

@@ -0,0 +1,11 @@
+// Customize variables
+
+// This gets loaded after bootstrap/variables is loaded, so you can refer to
+// bootstrap variables configured by bootstrap. For example, the _variables.scss contains:
+// $btn-primary-bg: $brand-primary !default;
+
+// Here we're adjusting the hue of that default:
+$btn-primary-bg: adjust-hue(theme-color("primary"), +20deg);
+
+// NOTE: $gray-300 is defined in _variables.scss
+$body-bg: $gray-300;

examples/basic/package.json

@@ -41,7 +41,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "bootstrap": "4.0.0-alpha.6",
+    "bootstrap": "4.0.0-beta",
     "bootstrap-sass": "^3.3.7",
     "express": "^4.14.0",
     "extract-text-webpack-plugin": "^2.1.0",