Merge branch 'sprockets_js_assetpipeline'

ecovillage · Feb 22, 2020 · c1f3825 · c1f3825
2 parents 19e9a32 + c0329c7
commit c1f3825
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,8 +11,11 @@ gem 'sqlite3', '~> 1.4'
 gem 'puma', '~> 4.1'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6'
-# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 4.0'
+
+# Use traditional (non-webpack) sprockets asset-pipeline
+gem 'sprockets', '~> 4'
+gem 'sprockets-rails', :require => 'sprockets/railtie'
+
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,2 +1,3 @@
 //= link_tree ../images
 //= link_directory ../stylesheets .css
+//= link_directory ../javascripts .js
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -0,0 +1,4 @@
+//= require rails-ujs
+//= require turbolinks
+//= require_tree .
+
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -7,7 +7,7 @@
     = csrf_meta_tags
     = csp_meta_tag
     = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
-    = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload'
+    = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
   %body
     .navbar-placeholder
     = render "navbar"

diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
@@ -7,7 +7,7 @@
     = csrf_meta_tags
     = csp_meta_tag
     = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
-    = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload'
+    = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
   %body
     .content
       .hero