diff --git a/.gitignore b/.gitignore index b1c35e115..61db2a36f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ npm-debug.* /gen-examples .DS_Store +*.swp +*.swo + diff --git a/CHANGELOG.md b/CHANGELOG.md index a1ec5de7c..5687ac376 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ Changes since last non-beta release. *Please add entries here for your pull requests that are not yet released.* +### [10.0.3] - 2018-1-8 +#### Fixed +- Use redux component in generated redux Hello World example: [PR 1006](https://github.com/shakacode/react_on_rails/pull/1006) by [lewaabahmad](https://github.com/lewaabahmad). + ### [10.0.2] - 2017-11-10 #### Fixed - Remove unnecessary dependencies from released NPM package: [PR 968](https://github.com/shakacode/react_on_rails/pull/968) by [tricknotes](https://github.com/tricknotes). diff --git a/lib/generators/react_on_rails/react_with_redux_generator.rb b/lib/generators/react_on_rails/react_with_redux_generator.rb index a24ab5ea4..aebfd27b5 100644 --- a/lib/generators/react_on_rails/react_with_redux_generator.rb +++ b/lib/generators/react_on_rails/react_with_redux_generator.rb @@ -14,7 +14,7 @@ def create_redux_directories end def copy_base_files - base_js_path = "base/base" + base_js_path = "redux/base" base_files = %w[app/javascript/bundles/HelloWorld/components/HelloWorld.jsx] base_files.each { |file| copy_file("#{base_js_path}/#{file}", file) } end