Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions app/helpers/script_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,27 @@ def javascript_packs_tag_once(*names, prepend: false)
def render_javascript_pack_once_tags(*names)
javascript_packs_tag_once(*names) if names.present?
if @scripts && (sources = AssetSources.get_sources(*@scripts)).present?
safe_join([javascript_polyfill_pack_tag, javascript_include_tag(*sources)])
safe_join(
[
javascript_polyfill_pack_tag,
javascript_include_tag(*sources, crossorigin: local_crossorigin_sources? ? true : nil),
],
)
end
end

private

def local_crossorigin_sources?
Rails.env.development? && ENV['WEBPACK_PORT'].present?
end

def javascript_polyfill_pack_tag
javascript_include_tag_without_preload(*AssetSources.get_sources('polyfill'), nomodule: '')
javascript_include_tag_without_preload(
*AssetSources.get_sources('polyfill'),
nomodule: '',
crossorigin: local_crossorigin_sources? ? true : nil,
)
end

def without_preload_links_header
Expand Down
37 changes: 34 additions & 3 deletions spec/helpers/script_helper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,44 @@
output = render_javascript_pack_once_tags

expect(output).to have_css(
"script[src^='/polyfill.js'][nomodule] ~ \
script[src^='/application.js'] ~ \
script[src^='/document-capture.js']",
"script:not([crossorigin])[src^='/polyfill.js'][nomodule] ~ \
script:not([crossorigin])[src^='/application.js'] ~ \
script:not([crossorigin])[src^='/document-capture.js']",
count: 1,
visible: :all,
)
end

context 'local development crossorigin sources' do
let(:webpack_port) { '3035' }

before do
allow(Rails.env).to receive(:development?).and_return(true)
stub_const('ENV', 'WEBPACK_PORT' => webpack_port)
end

it 'prints script sources with crossorigin attribute' do
output = render_javascript_pack_once_tags

expect(output).to have_css(
"script[crossorigin][src^='/polyfill.js'][nomodule] ~ \
script[crossorigin][src^='/application.js'] ~ \
script[crossorigin][src^='/document-capture.js']",
count: 1,
visible: :all,
)
end

context 'empty webpack port' do
let(:webpack_port) { '' }

it 'renders as if webpack port was unassigned' do
output = render_javascript_pack_once_tags

expect(output).to_not have_css('[crossorigin]', visible: :all)
end
end
end
end

context 'with named scripts argument' do
Expand Down