Skip to content

fix: add crossorigin attribute to style tag #544

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −14
Open

fix: add crossorigin attribute to style tag #544

Show file tree
Hide file tree
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
24 changes: 12 additions & 12 deletions test/helper_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,21 @@ def test_vite_stylesheet_tag

def test_vite_preload_tag
assert_includes vite_typescript_tag("main", host: "example.com", protocol: "https"), [
%(<link rel="modulepreload" href="https://example.com/vite-production/assets/log.818edfb8.js" as="script" crossorigin="anonymous">),
%(<link rel="modulepreload" href="https://example.com/vite-production/assets/vue.3002ada6.js" as="script" crossorigin="anonymous">),
%(<link rel="modulepreload" href="https://example.com/vite-production/assets/vendor.0f7c0ec3.js" as="script" crossorigin="anonymous">),
%(<link rel="modulepreload" href="https://example.com/vite-production/assets/log.818edfb8.js" as="script" crossorigin="">),
%(<link rel="modulepreload" href="https://example.com/vite-production/assets/vue.3002ada6.js" as="script" crossorigin="">),
%(<link rel="modulepreload" href="https://example.com/vite-production/assets/vendor.0f7c0ec3.js" as="script" crossorigin="">),
].join("\n")
end

def test_vite_javascript_tag
assert_similar [
%(<script src="/vite-production/assets/main.9dcad042.js" crossorigin="anonymous" type="module"></script>),
%(<link rel="modulepreload" href="/vite-production/assets/log.818edfb8.js" as="script" crossorigin="anonymous">),
%(<link rel="modulepreload" href="/vite-production/assets/vue.3002ada6.js" as="script" crossorigin="anonymous">),
%(<link rel="modulepreload" href="/vite-production/assets/vendor.0f7c0ec3.js" as="script" crossorigin="anonymous">),
link(href: "/vite-production/assets/app.517bf154.css"),
link(href: "/vite-production/assets/theme.e6d9734b.css"),
link(href: "/vite-production/assets/vue.ec0a97cc.css"),
%(<script src="/vite-production/assets/main.9dcad042.js" crossorigin="" type="module"></script>),
%(<link rel="modulepreload" href="/vite-production/assets/log.818edfb8.js" as="script" crossorigin="">),
%(<link rel="modulepreload" href="/vite-production/assets/vue.3002ada6.js" as="script" crossorigin="">),
%(<link rel="modulepreload" href="/vite-production/assets/vendor.0f7c0ec3.js" as="script" crossorigin="">),
link(href: "/vite-production/assets/app.517bf154.css", crossorigin: ""),
link(href: "/vite-production/assets/theme.e6d9734b.css", crossorigin: ""),
link(href: "/vite-production/assets/vue.ec0a97cc.css", crossorigin: ""),
].join, vite_typescript_tag("main")

assert_equal vite_javascript_tag("main.ts"),
Expand All @@ -132,10 +132,10 @@ def test_vite_javascript_tag
vite_javascript_tag("~/entrypoints/frameworks/vue.js")

with_dev_server_running {
assert_equal %(<script src="/vite-dev/entrypoints/frameworks/vue.js" crossorigin="anonymous" type="module"></script>),
assert_equal %(<script src="/vite-dev/entrypoints/frameworks/vue.js" crossorigin="" type="module"></script>),
vite_javascript_tag("entrypoints/frameworks/vue")

assert_equal %(<script src="/vite-dev/entrypoints/main.ts" crossorigin="anonymous" type="module"></script>),
assert_equal %(<script src="/vite-dev/entrypoints/main.ts" crossorigin="" type="module"></script>),
vite_typescript_tag("main")
}
end
Expand Down
4 changes: 2 additions & 2 deletions vite_rails/lib/vite_rails/tag_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def vite_javascript_tag(*names,
asset_type: :javascript,
skip_preload_tags: false,
skip_style_tags: false,
crossorigin: "anonymous",
crossorigin: "",
media: "screen",
**options)
entries = vite_manifest.resolve_entries(*names, type: asset_type)
Expand All @@ -49,7 +49,7 @@ def vite_javascript_tag(*names,

options[:extname] = false if Rails::VERSION::MAJOR >= 7

tags << stylesheet_link_tag(*entries.fetch(:stylesheets), media: media, **options) unless skip_style_tags
tags << stylesheet_link_tag(*entries.fetch(:stylesheets), media: media, crossorigin: crossorigin, **options) unless skip_style_tags

tags
end
Expand Down
Loading