Integrate npm bootstrap-sass; Remove bootstrap-sass gem; Update README

Gemfile

@@ -51,7 +51,4 @@ group :development, :test do
  gem 'spring'
 end
 
-
-gem 'bootstrap-sass', '~> 3.2.0'
 gem 'autoprefixer-rails'
-

README.md

@@ -38,6 +38,17 @@ That's totally different than "Live Reload" which refreshes the browser.
 
 # Rails
 
+## Automatically building the rails-bundle.js
+Run this command to automatically build the rails-bundle.js file in the
+javascript directory whenever your jsx files change.
+
+```
+cd webpack
+webpack -w --config webpack.rails.config.js
+```
+
+## Run Rails
+
 ```
 bundle install
 rake db:setup
@@ -47,15 +58,6 @@ Point browser to [http://0.0.0.0:4000]().
 
 It's important to run the rails server on different port than the node server.
 
-## Automatically Building the rails-bundle.js
-Run this command to automatically build the rails-bundle.js file in the
-javascript directory whenever your jsx files change.
-
-```
-cd webpack
-webpack -w --config webpack.rails.config.js
-```
-
 # Webpack Configuration
 `webpack.hot.config.js`: Used by server.js to run the demo server.
 `webpack.rails.config.js`: Used to generate the rails-bundle.js file

app/assets/javascripts/application.js

@@ -17,4 +17,3 @@
 
 //= require rails-bundle
 //= require turbolinks
-//= require bootstrap-sprockets

app/assets/stylesheets/application.css.scss

@@ -1,4 +1,2 @@
-@import "bootstrap-sprockets";
-@import "bootstrap";
 @import "../../../webpack/assets/stylesheets/test-stylesheet";
 @import "../../../webpack/assets/stylesheets/test-sass-stylesheet";

package.json

@@ -7,6 +7,10 @@
  "node": "0.10.32"
  },
  "dependencies": {
+ "bootstrap-sass": "~3.3.1",
+ "bootstrap-sass-loader": "~0.0.4",
+ "imports-loader": "^0.6.3",
+ "extract-text-webpack-plugin": "~0.3.5",
  "body-parser": "^1.9.0",
  "bootstrap-webpack": "*",
  "es6-loader": "^0.2.0",

webpack/webpack.rails.config.js

@@ -12,7 +12,16 @@ module.exports = {
  entry: [
  // to expose something Rails specific, uncomment the next line
  //"./scripts/rails_only",
- "./assets/javascripts/example"
+ "./assets/javascripts/example",
+
+ // Alternative for including everything with no customization
+ 'bootstrap-sass-loader'
+ //
+ // Example of using customization file
+ //'bootstrap-sass!./bootstrap-sass.config.js'
+ //
+ // Example of using customization file with ExtractTextPlugin
+ //"bootstrap-sass!./bootstrap-sass.extract-text-plugin.config.js"
  ],
  output: {
  filename: railsBundleFile,
@@ -28,9 +37,18 @@ module.exports = {
  },
  module: {
  loaders: [
+ // **IMPORTANT** This is needed so that each bootstrap js file required by
+ // bootstrap-sass-loader has access to the jQuery object
+ { test: /bootstrap-sass\/assets\/javascripts\//, loader: 'imports?jQuery=jquery' },
+ { test: /\.scss$/, loader: "style!css!sass?outputStyle=expanded&imagePath=/assets/images"},
+ { test: /\.woff$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
+ { test: /\.ttf$/, loader: "file-loader" },
+ { test: /\.eot$/, loader: "file-loader" },
+ { test: /\.svg$/, loader: "file-loader" },
+
  { test: /\.jsx$/, loaders: ['es6', 'jsx?harmony'] },
  // Next 2 lines expose jQuery and $ to any JavaScript files loaded after rails-bundle.js
- //  in the Rails Asset Pipeline. Thus, load this one prior.
+ // in the Rails Asset Pipeline. Thus, load this one prior.
  { test: require.resolve("jquery"), loader: "expose?jQuery" },
  { test: require.resolve("jquery"), loader: "expose?$" }
  ]
@@ -47,4 +65,3 @@ if (devBuild) {
 } else {
  console.log("Webpack production build for rails");
 }
-