diff --git a/variants/backend-base/app/views/layouts/application.html.erb.tt b/variants/backend-base/app/views/layouts/application.html.erb.tt index c3c68b5e..e20f9ef9 100644 --- a/variants/backend-base/app/views/layouts/application.html.erb.tt +++ b/variants/backend-base/app/views/layouts/application.html.erb.tt @@ -2,7 +2,7 @@ - <%%= strip_tags(yield(:title)) + " – " if content_for?(:title) %> + <%%= strip_tags(yield(:title)) + " - " if content_for?(:title) %> <%= app_const_base.titleize %> @@ -15,7 +15,7 @@ <%%= stylesheet_link_tag("application", media: "all", "data-turbolinks-track": "reload") %> <%%# JavaScript must be in head for Turbolinks to work. %> - <%%= javascript_pack_tag "application", "data-turbolinks-track": "reload", defer: true %> + <%%= javascript_pack_tag "application", "data-turbolinks-track": "reload", defer: true, nonce: true %> <%%= yield(:head) %> diff --git a/variants/frontend-base/template.rb b/variants/frontend-base/template.rb index 1dca6831..9c90f7b5 100644 --- a/variants/frontend-base/template.rb +++ b/variants/frontend-base/template.rb @@ -25,9 +25,6 @@ # Configure app/frontend run "mv app/javascript app/frontend" -run "mkdir app/frontend/packs" -run "mv app/frontend/application.js app/frontend/packs/application.js" - copy_file "config/webpack/webpack.config.js", force: true gsub_file "config/shakapacker.yml", "source_entry_path: /", "source_entry_path: packs", force: true