-
Notifications
You must be signed in to change notification settings - Fork 121
Fix using javascript_importmap_tag in console #139
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -14,12 +14,12 @@ 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: content_security_policy_nonce | ||||||
type: "importmap", "data-turbo-track": "reload", nonce: request&.content_security_policy | ||||||
end | ||||||
|
||||||
# Configure es-modules-shim with nonce support if the application is using a content security policy. | ||||||
def javascript_importmap_shim_nonce_configuration_tag | ||||||
if content_security_policy? | ||||||
if request&.content_security_policy | ||||||
tag.script({ nonce: content_security_policy_nonce }.to_json.html_safe, | ||||||
type: "esms-options", nonce: content_security_policy_nonce) | ||||||
end | ||||||
|
@@ -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: content_security_policy_nonce | ||||||
async: true, "data-turbo-track": "reload", nonce: request&.content_security_policy | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And similarly
Suggested change
|
||||||
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: content_security_policy_nonce | ||||||
type: "module", nonce: request&.content_security_policy | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And similarly
Suggested change
|
||||||
end | ||||||
|
||||||
# Link tags for preloading all modules marked as preload: true in the `importmap` | ||||||
|
@@ -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: content_security_policy_nonce | ||||||
tag.link rel: "modulepreload", href: path, nonce: request&.content_security_policy | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And similarly
Suggested change
|
||||||
}, "\n") | ||||||
end | ||||||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be
?