Rename webpack rails config file back to webpack.rails.config.js

Author: mbreining

README.md

@@ -53,15 +53,15 @@ Observe how the bundles are automatically re-generated whenever your JSX changes
 
 ```
 cd webpack
-webpack -w --config webpack.bundle.config.js
+webpack -w --config webpack.rails.config.js
 ```
 
 Make sure to invoke your local copy of the webpack executable as opposed
 to any globally installed webpack.
 See https://github.com/webpack/extract-text-webpack-plugin/blob/master/example/webpack.config.js
 If in doubt, run the following command:
 ```
-$(npm bin)/webpack -w --config webpack.bundle.config.js
+$(npm bin)/webpack -w --config webpack.rails.config.js
 ```
 
 ## Run Rails server
@@ -81,7 +81,7 @@ It's important to run the Rails server on a different port than the node server.
 
 # Webpack configuration
 - `webpack.hot.config.js`: Used by server.js to run the demo express server.
-- `webpack.bundle.config.js`: Used to generate the Rails bundles.
+- `webpack.rails.config.js`: Used to generate the Rails bundles.
 - `webpack.common.config.js`: Common configuration file to minimize code duplication.
 
 # Bootstrap integration
@@ -123,7 +123,7 @@ customize the Bootstrap Sass variables.
 
 # Notes on Rails assets
 ## Javascript
-The `webpack.bundle.config.js` file generates rails-bundle.js which is then included
+The `webpack.rails.config.js` file generates rails-bundle.js which is then included
 by the Rails asset pipeline.
 
 ## Sass and images

app/assets/javascripts/application.js

@@ -17,5 +17,5 @@
 
 // Important to import jquery_ujs before rails-bundle as that patches jquery xhr to use the authenticity token!
 
-//= require rails-bundle
+//= require webpack-bundle
 //= require turbolinks

webpack/scripts/rails_only.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 
-// This could be done here, but instead it's done in the webpack.bundle.config.js file
+// This could be done here, but instead it's done in the webpack.rails.config.js file
 // Showing this for example purposes
 // require("expose?$!jquery");
 // require("expose?jQuery!jquery");

webpack/webpack.hot.config.js

@@ -8,7 +8,6 @@ config.entry.push("webpack-dev-server/client?http://localhost:3000",
                   "webpack/hot/dev-server",
                   "./scripts/webpack_only",
                   "bootstrap-sass!./bootstrap-sass.config.js"); // custom bootstrap
-                  //"bootstrap-sass-loader" -> all bootstrap assets
 config.output = { filename: "express-bundle.js", // this file is served directly by webpack
                   path: __dirname };
 config.plugins = [ new webpack.HotModuleReplacementPlugin() ];

webpack/webpack.bundle.config.js renamed to webpack/webpack.rails.config.js

@@ -1,11 +1,11 @@
 // Run like this:
-// cd webpack && $(npm bin)/webpack -w --config webpack.bundle.config.js
+// cd webpack && $(npm bin)/webpack -w --config webpack.rails.config.js
 // Note that Foreman (Procfile.dev) has also been configured to take care of this.
 
 var config = require("./webpack.common.config");
 
 config.entry.push("./scripts/rails_only"); // rails specific assets
-config.output = { filename: "rails-bundle.js",
+config.output = { filename: "webpack-bundle.js",
                   path: "../app/assets/javascripts" };
 config.externals = { jquery: "var jQuery" }; // load jQuery from cdn or rails asset pipeline
 config.module.loaders.push(