Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nonce attributes that were accidentally broken in PR #139 #143

Merged
merged 1 commit into from
Jul 15, 2022
Merged

Fix nonce attributes that were accidentally broken in PR #139 #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions app/helpers/importmap/importmap_tags_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def javascript_importmap_tags(entry_point = "application", shim: true)
# By default, `Rails.application.importmap.to_json(resolver: self)` is used.
def javascript_inline_importmap_tag(importmap_json = Rails.application.importmap.to_json(resolver: self))
tag.script importmap_json.html_safe,
type: "importmap", "data-turbo-track": "reload", nonce: request&.content_security_policy
type: "importmap", "data-turbo-track": "reload", nonce: request&.content_security_policy_nonce
end

# Configure es-modules-shim with nonce support if the application is using a content security policy.
Expand All @@ -28,14 +28,14 @@ def javascript_importmap_shim_nonce_configuration_tag
# Include the es-modules-shim needed to make importmaps work in browsers without native support (like Firefox + Safari).
def javascript_importmap_shim_tag(minimized: true)
javascript_include_tag minimized ? "es-module-shims.min.js" : "es-module-shims.js",
async: true, "data-turbo-track": "reload", nonce: request&.content_security_policy
async: true, "data-turbo-track": "reload", nonce: request&.content_security_policy_nonce
end

# Import a named JavaScript module(s) using a script-module tag.
def javascript_import_module_tag(*module_names)
imports = Array(module_names).collect { |m| %(import "#{m}") }.join("\n")
tag.script imports.html_safe,
type: "module", nonce: request&.content_security_policy
type: "module", nonce: request&.content_security_policy_nonce
end

# Link tags for preloading all modules marked as preload: true in the `importmap`
Expand All @@ -48,7 +48,7 @@ def javascript_importmap_module_preload_tags(importmap = Rails.application.impor
# Link tag(s) for preloading the JavaScript module residing in `*paths`. Will return one link tag per path element.
def javascript_module_preload_tag(*paths)
safe_join(Array(paths).collect { |path|
tag.link rel: "modulepreload", href: path, nonce: request&.content_security_policy
tag.link rel: "modulepreload", href: path, nonce: request&.content_security_policy_nonce
}, "\n")
end
end