Renamed /webpack directory to /client

* Avoids confusion between the `webpack` executable and the `/client`
  directory.

Author: justin808

.gitignore

@@ -15,8 +15,8 @@
 /log/*.log
 /tmp
 /public/assets
-webpack-bundle.js
-webpack-bundle.js.map
+client-bundle.js
+client-bundle.js.map
 .env
 /node_modules
 npm-debug.log

CHANGELOG.md

@@ -0,0 +1,3 @@
+v1.1 - Sunday, March 22, 2015
+------------------------------
+1. Changed /webpack directory to /client

Procfile.dev

@@ -1,3 +1,3 @@
 web: rails s -p 4000
-webpack: cd webpack && $(npm bin)/webpack -w --config webpack.rails.config.js
-hot: cd webpack && node server.js
+client: cd client && $(npm bin)/webpack -w --config webpack.rails.config.js
+hot: cd client && node server.js

README.md

@@ -2,6 +2,8 @@
 
 By Justin Gordon and the Rails On Maui Team, http://www.railsonmaui.com
 
+- If you came to here from the blog article, this example project has evolved. See CHANGELOG.md for 
+  what's changed.
 - Please email us at [[email protected]](mailto:[email protected]) if you have a ReactJs +
   Rails project.
 - Please file issues for problems and feature requests.
@@ -64,7 +66,7 @@ See package.json and Gemfile for versions
 Setup node and run the node server with file `server.js`.
 
 ```
-cd webpack
+cd client
 node server.js
 ```
 
@@ -85,11 +87,11 @@ Webpack ExtractTextPlugin can optionally be used to extract the CSS out of
 the JS bundle. We've chosen to let Rails handle CSS, SCSS, images, fonts.
 
 ```
-cd webpack
+cd client
 $(npm bin)/webpack -w --config webpack.rails.config.js
 ```
 
-`webpack-bundle.js` is generated and saved to `app/assets/javascripts`. This is included in the
+`client-bundle.js` is generated and saved to `app/assets/javascripts`. This is included in the
 Rails asset pipeline.
 
 Observe how the bundles are automatically re-generated whenever your JSX changes.
@@ -155,7 +157,7 @@ customize the Bootstrap Sass variables.
 
 # Notes on Rails assets
 ## Javascript
-The `webpack.rails.config.js` file generates webpack-bundle.js which is then included
+The `webpack.rails.config.js` file generates client-bundle.js which is then included
 by the Rails asset pipeline.
 
 ## Sass and images
@@ -232,5 +234,5 @@ shrinkwrap`.
 Special thanks to [JetBrains](https://www.jetbrains.com) for their great tools
 [RubyMine](https://www.jetbrains.com/ruby/) and [WebStorm](https://www.jetbrains.com/webstorm/).
 The developers of this project use RubyMine at the top level, mostly for Ruby work, and we use
-WebStorm opened up to the `webpack` directory to focus on JSX and Sass files.
+WebStorm opened up to the `client` directory to focus on JSX and Sass files.
 

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 webpack-bundle
+//= require client-bundle
 //= require turbolinks

app/assets/stylesheets/_bootstrap-custom.scss

@@ -1,6 +1,6 @@
 // Customizations - needs to be imported first!
 // The _bootstrap-variables-customization.scss file is located under
-// webpack/assets/stylesheets, which has been added to the Rails asset
+// client/assets/stylesheets, which has been added to the Rails asset
 // pipeline search path. See config/application.rb.
 @import "bootstrap-variables-customization";
 

app/assets/stylesheets/application.css.scss

@@ -2,7 +2,7 @@
 // with Rails vs. the Webpack Dev Server
 $rails: true;
 
-// Those scss files are located under webpack/assets/stylesheets,
+// Those scss files are located under client/assets/stylesheets,
 // which has been added to the Rails asset pipeline search path.
 // See config/application.rb.
 @import "bootstrap-custom";

webpack/assets/fonts renamed to client/assets/fonts

@@ -1,5 +1,5 @@
 // Run like this:
-// cd webpack && node server.js
+// cd client && node server.js
 
 var path = require("path");
 var config = require("./webpack.common.config");

webpack/assets/images renamed to client/assets/images

@@ -1,18 +1,18 @@
 // Run like this:
-// cd webpack && $(npm bin)/webpack -w --config webpack.rails.config.js
+// cd client && $(npm bin)/webpack -w --config webpack.rails.config.js
 // Note that Foreman (Procfile.dev) has also been configured to take care of this.
 
 // NOTE: All style sheets handled by the asset pipeline in rails
 
 var config = require("./webpack.common.config");
 
 config.entry.push("./scripts/rails_only"); // rails specific assets
-config.output = { filename: "webpack-bundle.js",
+config.output = { filename: "client-bundle.js",
                   path: "../app/assets/javascripts" };
 config.externals = { jquery: "var jQuery" }; // load jQuery from cdn or rails asset pipeline
 config.module.loaders.push(
   { test: /\.jsx$/, loaders: ["es6", "jsx?harmony"] },
-  // Next 2 lines expose jQuery and $ to any JavaScript files loaded after webpack-bundle.js
+  // Next 2 lines expose jQuery and $ to any JavaScript files loaded after client-bundle.js
   // in the Rails Asset Pipeline. Thus, load this one prior.
   { test: require.resolve("jquery"), loader: "expose?jQuery" },
   { test: require.resolve("jquery"), loader: "expose?$" }

webpack/assets/javascripts/CommentBox.jsx renamed to client/assets/javascripts/CommentBox.jsx

@@ -23,7 +23,7 @@ class Application < Rails::Application
     # For not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
 
-    # Add webpack/assets/stylesheets to asset pipeline's search path.
-    config.assets.paths << Rails.root.join("webpack", "assets" ,"stylesheets")
+    # Add client/assets/stylesheets to asset pipeline's search path.
+    config.assets.paths << Rails.root.join("client", "assets" ,"stylesheets")
   end
 end

webpack/assets/javascripts/example.jsx renamed to client/assets/javascripts/example.jsx

@@ -13,7 +13,7 @@ namespace :assets do
 
   desc 'Compile assets with webpack'
   task :webpack do
-    sh 'cd webpack && $(npm bin)/webpack --config webpack.rails.config.js'
+    sh 'cd client && $(npm bin)/webpack --config webpack.rails.config.js'
   end
 
   task :clobber do