Revert "Remove `javascripts` and `javascript_engine` options for generators"

2 files changed, 4 insertions, 0 deletions

diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index a61ba5dc9f..54a74dd649 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -204,6 +204,8 @@ The full set of methods that can be used in this block are as follows:
 * `helper` defines whether or not to generate helpers. Defaults to `true`.
 * `integration_tool` defines which integration tool to use to generate integration tests. Defaults to `:test_unit`.
 * `system_tests` defines which integration tool to use to generate system tests. Defaults to `:test_unit`.
+* `javascripts` turns on the hook for JavaScript files in generators. Used in Rails for when the `scaffold` generator is run. Defaults to `true`.
+* `javascript_engine` configures the engine to be used (for eg. coffee) when generating assets. Defaults to `:js`.
 * `orm` defines which orm to use. Defaults to `false` and will use Active Record by default.
 * `resource_controller` defines which generator to use for generating a controller when using `rails generate resource`. Defaults to `:controller`.
 * `resource_route` defines whether a resource route definition should be generated
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index b835b3f3fd..77b7e7766f 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -56,6 +56,8 @@ module Rails
         force_plural: false,
         helper: true,
         integration_tool: nil,
+        javascripts: true,
+        javascript_engine: :js,
         orm: false,
         resource_controller: :controller,
         resource_route: true,