From d0e0fbafb205f96444d889c8654f18a9ee0bb328 Mon Sep 17 00:00:00 2001
From: Andrei Istratii <andrei.istratii@gmail.com>
Date: Wed, 5 Aug 2015 16:14:09 +0300
Subject: Migrate to Sprockets 4.

---
 railties/lib/rails/generators/app_base.rb                   |  6 ++++--
 .../rails/app/templates/app/assets/manifest.js.tt           |  8 ++++++++
 .../lib/rails/generators/rails/plugin/plugin_generator.rb   | 13 +++++++++++--
 .../rails/plugin/templates/rails/dummy_manifest.js          | 11 +++++++++++
 .../rails/plugin/templates/rails/engine_manifest.js         |  6 ++++++
 5 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 railties/lib/rails/generators/rails/app/templates/app/assets/manifest.js.tt
 create mode 100644 railties/lib/rails/generators/rails/plugin/templates/rails/dummy_manifest.js
 create mode 100644 railties/lib/rails/generators/rails/plugin/templates/rails/engine_manifest.js

(limited to 'railties/lib/rails/generators')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 249fe96772..a5fdfdcf2f 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -209,12 +209,16 @@ module Rails
           [
             GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
             GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'),
+            GemfileEntry.github('sprockets', 'rails/sprockets'),
+            GemfileEntry.github('sass-rails', 'rails/sass-rails'),
             GemfileEntry.github('arel', 'rails/arel')
           ]
         elsif options.edge?
           [
             GemfileEntry.github('rails', 'rails/rails'),
             GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'),
+            GemfileEntry.github('sprockets', 'rails/sprockets'),
+            GemfileEntry.github('sass-rails', 'rails/sass-rails'),
             GemfileEntry.github('arel', 'rails/arel')
           ]
         else
@@ -255,8 +259,6 @@ module Rails
         return [] if options[:skip_sprockets]
 
         gems = []
-        gems << GemfileEntry.version('sass-rails', '~> 5.0',
-                                     'Use SCSS for stylesheets')
 
         gems << GemfileEntry.version('uglifier',
                                    '>= 1.3.0',
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/manifest.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/manifest.js.tt
new file mode 100644
index 0000000000..3325553f57
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/manifest.js.tt
@@ -0,0 +1,8 @@
+
+<% unless options.api? -%>
+//= link_tree ./images
+<% end -%>
+<% unless options.skip_javascript -%>
+//= link ./javascripts/application.js
+<% end -%>
+//= link ./stylesheets/application.css
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index 0e1326ce4f..8fea30189e 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -104,8 +104,9 @@ task default: :test
     end
 
     def test_dummy_assets
-      template "rails/javascripts.js",  "#{dummy_path}/app/assets/javascripts/application.js", force: true
-      template "rails/stylesheets.css", "#{dummy_path}/app/assets/stylesheets/application.css", force: true
+      template "rails/javascripts.js",    "#{dummy_path}/app/assets/javascripts/application.js", force: true
+      template "rails/stylesheets.css",   "#{dummy_path}/app/assets/stylesheets/application.css", force: true
+      template "rails/dummy_manifest.js", "#{dummy_path}/app/assets/manifest.js", force: true
     end
 
     def test_dummy_clean
@@ -122,6 +123,10 @@ task default: :test
       end
     end
 
+    def assets_manifest
+      template "rails/engine_manifest.js", "app/assets/#{underscored_name}_manifest.js"
+    end
+
     def stylesheets
       if mountable?
         copy_file "rails/stylesheets.css",
@@ -220,6 +225,10 @@ task default: :test
         build(:lib)
       end
 
+      def create_assets_manifest_file
+        build(:assets_manifest) unless api?
+      end
+
       def create_public_stylesheets_files
         build(:stylesheets) unless api?
       end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/dummy_manifest.js b/railties/lib/rails/generators/rails/plugin/templates/rails/dummy_manifest.js
new file mode 100644
index 0000000000..ace695a811
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/rails/dummy_manifest.js
@@ -0,0 +1,11 @@
+
+<% unless api? -%>
+//= link_tree ./images
+<% end -%>
+<% unless options.skip_javascript -%>
+//= link ./javascripts/application.js
+<% end -%>
+//= link ./stylesheets/application.css
+<% if mountable? && !api? -%>
+//= link <%= underscored_name %>_manifest.js
+<% end -%>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/engine_manifest.js b/railties/lib/rails/generators/rails/plugin/templates/rails/engine_manifest.js
new file mode 100644
index 0000000000..f8ef26982a
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/rails/engine_manifest.js
@@ -0,0 +1,6 @@
+<% if mountable? -%>
+<% unless options.skip_javascript -%>
+//= link ./javascripts/<%= namespaced_name %>/application.js
+<% end -%>
+//= link ./stylesheets/<%= namespaced_name %>/application.css
+<% end -%>
-- 
cgit v1.2.3