Merge pull request #514 from AlexKVal/misc-fixes

Misc fixes (unimportant)

.gitignore

@@ -25,7 +25,7 @@ node_modules
 /node_package/lib
 
 npm-debug.*
-spec/dummy/client/npm-debug.log.*
+spec/dummy/client/npm-debug.log*
 
 /gen-examples
 

lib/generators/USAGE

@@ -21,4 +21,4 @@ Then you may run
 
 More Details:
 
-    `https://github.com/shakacode/react_on_rails#generator`
+    `https://github.com/shakacode/react_on_rails/blob/master/docs/basics/generator.md`

lib/generators/react_on_rails/base_generator.rb

@@ -23,7 +23,7 @@ def add_hello_world_route
       def update_git_ignore
         data = <<-DATA.strip_heredoc
           # React on Rails
-          npm-debug.log
+          npm-debug.log*
           node_modules
 
           # Generated js bundles

spec/dummy/client/webpack.client.base.config.js

@@ -1,4 +1,5 @@
-// Common client-side webpack configuration used by webpack.hot.config and webpack.rails.config.
+// Common client-side webpack configuration used by
+// webpack.client.rails.hot.config and webpack.client.rails.build.config.
 
 const webpack = require('webpack');
 const path = require('path');
@@ -22,9 +23,9 @@ module.exports = {
       'jquery',
     ],
 
-    // This will contain the app entry points defined by webpack.hot.config and webpack.rails.config
+    // This will contain the app entry points defined by
+    // webpack.client.rails.hot.config and webpack.client.rails.build.config
     app: [
-      // './app/assets/styles/global-styles.scss',
       './app/startup/clientRegistration',
     ],
   },

spec/dummy/client/webpack.client.rails.build.config.js

@@ -14,7 +14,7 @@ config.output = {
   path: '../app/assets/webpack',
 };
 
-// See webpack.common.config for adding modules common to both the webpack dev server and rails
+// See webpack.client.base.config for adding modules common to both the webpack dev server and rails
 
 config.module.loaders.push(
   {

spec/react_on_rails/generators/install_generator_spec.rb

@@ -57,7 +57,7 @@
         .gitignore was not found.
         Please add the following content to your .gitignore file:
         # React on Rails
-        npm-debug.log
+        npm-debug.log*
         node_modules
 
         # Generated js bundles

spec/react_on_rails/support/shared_examples/base_generator_examples.rb

@@ -12,7 +12,7 @@
     match = <<-MATCH.strip_heredoc
       some existing text
       # React on Rails
-      npm-debug.log
+      npm-debug.log*
       node_modules
 
       # Generated js bundles