From 92f7a8c5fb4638df31ddd52edb19ad8d29de83ed Mon Sep 17 00:00:00 2001 From: AlexKVal Date: Wed, 10 Aug 2016 18:18:09 +0300 Subject: [PATCH] Doc fixes --- .gitignore | 2 +- lib/generators/USAGE | 2 +- lib/generators/react_on_rails/base_generator.rb | 2 +- spec/dummy/client/webpack.client.base.config.js | 7 ++++--- spec/dummy/client/webpack.client.rails.build.config.js | 2 +- spec/react_on_rails/generators/install_generator_spec.rb | 2 +- .../support/shared_examples/base_generator_examples.rb | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 51d63287a..dc9b49ac0 100644 --- a/.gitignore +++ b/.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 diff --git a/lib/generators/USAGE b/lib/generators/USAGE index f66f1a7f7..3314a64e9 100644 --- a/lib/generators/USAGE +++ b/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` diff --git a/lib/generators/react_on_rails/base_generator.rb b/lib/generators/react_on_rails/base_generator.rb index 7df8e15f4..9b7acfdd0 100644 --- a/lib/generators/react_on_rails/base_generator.rb +++ b/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 diff --git a/spec/dummy/client/webpack.client.base.config.js b/spec/dummy/client/webpack.client.base.config.js index 236a73139..c14084f4d 100644 --- a/spec/dummy/client/webpack.client.base.config.js +++ b/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', ], }, diff --git a/spec/dummy/client/webpack.client.rails.build.config.js b/spec/dummy/client/webpack.client.rails.build.config.js index 4d7e28b07..603464b1e 100644 --- a/spec/dummy/client/webpack.client.rails.build.config.js +++ b/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( { diff --git a/spec/react_on_rails/generators/install_generator_spec.rb b/spec/react_on_rails/generators/install_generator_spec.rb index 5efacafac..b4e72f768 100644 --- a/spec/react_on_rails/generators/install_generator_spec.rb +++ b/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 diff --git a/spec/react_on_rails/support/shared_examples/base_generator_examples.rb b/spec/react_on_rails/support/shared_examples/base_generator_examples.rb index 87954848b..4cb3e20be 100644 --- a/spec/react_on_rails/support/shared_examples/base_generator_examples.rb +++ b/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