From d442d97bfa9b0dd8bdab731b29afe404e3b724de Mon Sep 17 00:00:00 2001 From: Nicholas La Roux Date: Thu, 4 Apr 2019 16:21:04 +0900 Subject: Resurrect js/js engine options and generators --- railties/lib/rails/generators.rb | 2 ++ .../lib/rails/generators/js/assets/assets_generator.rb | 15 +++++++++++++++ .../lib/rails/generators/rails/assets/assets_generator.rb | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 railties/lib/rails/generators/js/assets/assets_generator.rb (limited to 'railties') diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index b835b3f3fd..0be00d5151 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -35,6 +35,8 @@ module Rails rails: { actions: "-a", orm: "-o", + javascripts: "-j", + javascript_engine: "-je", resource_controller: "-c", scaffold_controller: "-c", stylesheets: "-y", diff --git a/railties/lib/rails/generators/js/assets/assets_generator.rb b/railties/lib/rails/generators/js/assets/assets_generator.rb new file mode 100644 index 0000000000..31a443838c --- /dev/null +++ b/railties/lib/rails/generators/js/assets/assets_generator.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + + require "rails/generators/named_base" + + module Js # :nodoc: + module Generators # :nodoc: + class AssetsGenerator < Rails::Generators::NamedBase # :nodoc: + source_root File.expand_path("templates", __dir__) + + def copy_javascript + copy_file "javascript.js", File.join("app/javascript", class_path, "#{file_name}.js") + end + end + end +end diff --git a/railties/lib/rails/generators/rails/assets/assets_generator.rb b/railties/lib/rails/generators/rails/assets/assets_generator.rb index 9ce8570172..e60637ff37 100644 --- a/railties/lib/rails/generators/rails/assets/assets_generator.rb +++ b/railties/lib/rails/generators/rails/assets/assets_generator.rb @@ -3,7 +3,10 @@ module Rails module Generators class AssetsGenerator < NamedBase # :nodoc: + class_option :javascripts, type: :boolean, desc: "Generate JavaScripts" class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets" + + class_option :javascript_engine, desc: "Engine for JavaScripts" class_option :stylesheet_engine, desc: "Engine for Stylesheets" private @@ -11,6 +14,10 @@ module Rails file_name end + hook_for :javascript_engine do |javascript_engine| + invoke javascript_engine, [name] if options[:javascripts] + end + hook_for :stylesheet_engine do |stylesheet_engine| invoke stylesheet_engine, [name] if options[:stylesheets] end -- cgit v1.2.3 From 5d944d679bb21eec14eefa763958147c46f1d3e7 Mon Sep 17 00:00:00 2001 From: Nicholas La Roux Date: Thu, 4 Apr 2019 16:21:18 +0900 Subject: Resurrect generator templates --- railties/lib/rails/generators/js/assets/templates/javascript.js | 2 ++ railties/lib/rails/generators/rails/assets/templates/javascript.js | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 railties/lib/rails/generators/js/assets/templates/javascript.js create mode 100644 railties/lib/rails/generators/rails/assets/templates/javascript.js (limited to 'railties') diff --git a/railties/lib/rails/generators/js/assets/templates/javascript.js b/railties/lib/rails/generators/js/assets/templates/javascript.js new file mode 100644 index 0000000000..6f10efeb33 --- /dev/null +++ b/railties/lib/rails/generators/js/assets/templates/javascript.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/railties/lib/rails/generators/rails/assets/templates/javascript.js b/railties/lib/rails/generators/rails/assets/templates/javascript.js new file mode 100644 index 0000000000..6f10efeb33 --- /dev/null +++ b/railties/lib/rails/generators/rails/assets/templates/javascript.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. -- cgit v1.2.3 From b46700da6069cf937f5d9b47b6bc19847bd3742a Mon Sep 17 00:00:00 2001 From: Nicholas La Roux Date: Thu, 4 Apr 2019 17:45:02 +0900 Subject: Style fixes --- railties/lib/rails/generators/js/assets/assets_generator.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails/generators/js/assets/assets_generator.rb b/railties/lib/rails/generators/js/assets/assets_generator.rb index 31a443838c..a45cfc5a1c 100644 --- a/railties/lib/rails/generators/js/assets/assets_generator.rb +++ b/railties/lib/rails/generators/js/assets/assets_generator.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true - require "rails/generators/named_base" +require "rails/generators/named_base" - module Js # :nodoc: +module Js # :nodoc: module Generators # :nodoc: class AssetsGenerator < Rails::Generators::NamedBase # :nodoc: source_root File.expand_path("templates", __dir__) - def copy_javascript + def copy_javascript copy_file "javascript.js", File.join("app/javascript", class_path, "#{file_name}.js") end end -- cgit v1.2.3 From cf5049f88b97f1a813b5b465500127506febb3b0 Mon Sep 17 00:00:00 2001 From: Nicholas La Roux Date: Fri, 5 Apr 2019 15:32:20 +0900 Subject: =?UTF-8?q?Burn=20unnecessary=20files=20=F0=9F=94=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/rails/generators/js/assets/assets_generator.rb | 15 --------------- .../rails/generators/js/assets/templates/javascript.js | 2 -- .../rails/generators/rails/assets/templates/javascript.js | 2 -- 3 files changed, 19 deletions(-) delete mode 100644 railties/lib/rails/generators/js/assets/assets_generator.rb delete mode 100644 railties/lib/rails/generators/js/assets/templates/javascript.js delete mode 100644 railties/lib/rails/generators/rails/assets/templates/javascript.js (limited to 'railties') diff --git a/railties/lib/rails/generators/js/assets/assets_generator.rb b/railties/lib/rails/generators/js/assets/assets_generator.rb deleted file mode 100644 index a45cfc5a1c..0000000000 --- a/railties/lib/rails/generators/js/assets/assets_generator.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -require "rails/generators/named_base" - -module Js # :nodoc: - module Generators # :nodoc: - class AssetsGenerator < Rails::Generators::NamedBase # :nodoc: - source_root File.expand_path("templates", __dir__) - - def copy_javascript - copy_file "javascript.js", File.join("app/javascript", class_path, "#{file_name}.js") - end - end - end -end diff --git a/railties/lib/rails/generators/js/assets/templates/javascript.js b/railties/lib/rails/generators/js/assets/templates/javascript.js deleted file mode 100644 index 6f10efeb33..0000000000 --- a/railties/lib/rails/generators/js/assets/templates/javascript.js +++ /dev/null @@ -1,2 +0,0 @@ -// Place all the behaviors and hooks related to the matching controller here. -// All this logic will automatically be available in application.js. diff --git a/railties/lib/rails/generators/rails/assets/templates/javascript.js b/railties/lib/rails/generators/rails/assets/templates/javascript.js deleted file mode 100644 index 6f10efeb33..0000000000 --- a/railties/lib/rails/generators/rails/assets/templates/javascript.js +++ /dev/null @@ -1,2 +0,0 @@ -// Place all the behaviors and hooks related to the matching controller here. -// All this logic will automatically be available in application.js. -- cgit v1.2.3