Skip to content

Commit 9bf0e5a

Browse files
committed
Revert "fix: resolve Shakapacker append/pack tag ordering issue"
This reverts commit 23b25b3.
1 parent 23b25b3 commit 9bf0e5a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/views/layouts/application.html.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99
<%= append_javascript_pack_tag('stimulus-bundle') %>
1010
<%= append_javascript_pack_tag('stores-registration') %>
1111

12+
<%= stylesheet_pack_tag(media: 'all', 'data-turbolinks-track': true) %>
13+
<%= javascript_pack_tag('data-turbolinks-track': true, defer: true) %>
14+
1215
<%= csrf_meta_tags %>
1316
</head>
14-
<body class="min-h-screen flex flex-col bg-sky-50 text-gray-700" data-turbo-suppress-warning="true">
17+
<body class="min-h-screen flex flex-col bg-sky-50 text-gray-700">
1518
<%= react_component "NavigationBarApp" %>
1619

1720
<div class="container mx-auto px-4 flex-grow">
@@ -20,9 +23,6 @@
2023

2124
<%= react_component "Footer" %>
2225

23-
<%= stylesheet_pack_tag(media: 'all', 'data-turbolinks-track': true) %>
24-
<%= javascript_pack_tag('data-turbolinks-track': true, defer: true) %>
25-
2626
<!-- This is a placeholder for ReactOnRails to know where to render the store props for
2727
client side hydration -->
2828
<%= redux_store_hydration_data %>

app/views/layouts/stimulus_layout.html.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010
<%= append_stylesheet_pack_tag('stimulus-bundle') %>
1111
<%= append_javascript_pack_tag('stimulus-bundle') %>
12+
13+
<%= stylesheet_pack_tag(media: 'all', 'data-turbolinks-track': true) %>
14+
<%= javascript_pack_tag('data-turbolinks-track': true, defer: true) %>
1215
</head>
13-
<body class="min-h-screen flex flex-col bg-sky-50 text-gray-700" data-turbo-suppress-warning="true">
16+
<body class="min-h-screen flex flex-col bg-sky-50 text-gray-700">
1417
<%= react_component "NavigationBarApp" %>
1518

1619
<div class="container mx-auto px-4 flex-grow">
1720
<%= yield %>
1821
</div>
1922

2023
<%= react_component "Footer" %>
21-
22-
<%= stylesheet_pack_tag(media: 'all', 'data-turbolinks-track': true) %>
23-
<%= javascript_pack_tag('data-turbolinks-track': true, defer: true) %>
2424
</body>
2525
</html>

0 commit comments

Comments
 (0)