Update from webpacker v5 to shakapacker v6.0.0.rc13

Using a two-step process is recommended: 332e25186a/docs/v6_upgrade.md
2022-08-11 23:52:56 +02:00
parent e2a87c5ae0
commit d223abfb5e
37 changed files with 1374 additions and 4624 deletions
--- a/app/views/admin/dashboard/show.html.slim
+++ b/app/views/admin/dashboard/show.html.slim
@ -2,8 +2,8 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, the global variable `vis` might be uninitialized in the assets (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('vis', 'data-turbolinks-track': true)
-  = stylesheet_pack_tag('vis', media: 'all', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('vis')
+  - append_stylesheet_pack_tag('vis')

 h1 = t('breadcrumbs.dashboard.show')

--- a/app/views/exercises/_form.html.slim
+++ b/app/views/exercises/_form.html.slim
@ -2,7 +2,7 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, code might not be highlighted correctly (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('sortable', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('sortable')

 - execution_environments = ExecutionEnvironment.where('file_type_id IS NOT NULL').select(:file_type_id, :id)
 - file_types = FileType.where('file_extension IS NOT NULL').select(:file_extension, :id)
--- a/app/views/exercises/_tips_content.html.slim
+++ b/app/views/exercises/_tips_content.html.slim
@ -2,8 +2,8 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, code might not be highlighted correctly (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('highlight', 'data-turbolinks-track': true)
-  = stylesheet_pack_tag('highlight', media: 'all', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('highlight')
+  - append_stylesheet_pack_tag('highlight')

 #tips.card.mt-2 role="tab" style="display: block;"
  .card-header.py-2
--- a/app/views/exercises/show.html.slim
+++ b/app/views/exercises/show.html.slim
@ -2,8 +2,8 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, code might not be highlighted correctly (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('highlight', 'data-turbolinks-track': true)
-  = stylesheet_pack_tag('highlight', media: 'all', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('highlight')
+  - append_stylesheet_pack_tag('highlight')

 h1.d-inline-block = @exercise
 .btn-group.float-right
--- a/app/views/exercises/statistics.html.slim
+++ b/app/views/exercises/statistics.html.slim
@ -2,7 +2,7 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, code might not be highlighted correctly (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('d3-tip', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('d3-tip')
 h1 = @exercise

 = row(label: '.participants', value: @exercise.users.distinct.count)
--- a/app/views/exercises/study_group_dashboard.html.slim
+++ b/app/views/exercises/study_group_dashboard.html.slim
@ -2,7 +2,7 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, code might not be highlighted correctly (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('d3-tip', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('d3-tip')

 h1
  = t('.live_dashboard')
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@ -9,10 +9,9 @@ html lang="#{I18n.locale || I18n.default_locale}"
    = favicon_link_tag('/favicon.png', type: 'image/png')
    = favicon_link_tag('/favicon.png', rel: 'apple-touch-icon', type: 'image/png')
    = action_cable_meta_tag
-    = stylesheet_pack_tag('application', media: 'all', 'data-turbolinks-track': true)
-    = stylesheet_pack_tag('stylesheets', media: 'all', 'data-turbolinks-track': true)
+    = stylesheet_pack_tag('application', 'stylesheets', media: 'all', 'data-turbolinks-track': true)
    = stylesheet_link_tag('application', media: 'all', 'data-turbolinks-track': true)
-    = javascript_pack_tag('application', 'data-turbolinks-track': true)
+    = javascript_pack_tag('application', 'data-turbolinks-track': true, defer: false)
    = javascript_include_tag('application', 'data-turbolinks-track': true)
    = yield(:head)
    = csrf_meta_tags
--- a/app/views/statistics/activity_history.html.slim
+++ b/app/views/statistics/activity_history.html.slim
@ -2,8 +2,8 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, the global variable `vis` might be uninitialized in the assets (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('vis', 'data-turbolinks-track': true)
-  = stylesheet_pack_tag('vis', media: 'all', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('vis')
+  - append_stylesheet_pack_tag('vis')

 .group
  .title
--- a/app/views/statistics/graphs.html.slim
+++ b/app/views/statistics/graphs.html.slim
@ -2,8 +2,8 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, the global variable `vis` might be uninitialized in the assets (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('vis', 'data-turbolinks-track': true)
-  = stylesheet_pack_tag('vis', media: 'all', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('vis')
+  - append_stylesheet_pack_tag('vis')

 .group
  .title
--- a/app/views/submissions/show.html.slim
+++ b/app/views/submissions/show.html.slim
@ -2,8 +2,8 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, code might not be highlighted correctly (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('highlight', 'data-turbolinks-track': true)
-  = stylesheet_pack_tag('highlight', media: 'all', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('highlight')
+  - append_stylesheet_pack_tag('highlight')

 h1 = @submission

--- a/app/views/tips/show.html.slim
+++ b/app/views/tips/show.html.slim
@ -2,8 +2,8 @@
  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
     Otherwise, code might not be highlighted correctly (race condition)
  meta name='turbolinks-visit-control' content='reload'
-  = javascript_pack_tag('highlight', 'data-turbolinks-track': true)
-  = stylesheet_pack_tag('highlight', media: 'all', 'data-turbolinks-track': true)
+  - append_javascript_pack_tag('highlight')
+  - append_stylesheet_pack_tag('highlight')

 h1
  = @tip.to_s