vite_rails 3.0.2 → 4.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede7e994b9efc576479fa558cef2b7394becd3da260caec53765e692e0df1301
-  data.tar.gz: 3a999d199170c26c1e8a7764f125209cf3ead26231a14117c517f8b090c42b43
+  metadata.gz: b468faa93a51c963d70a987a45f6dbb605c3854dd9ec188d40f0a93c085508d5
+  data.tar.gz: a04b6b5f89227b70c1d82e3a649ee1b6d423beedc1e1408126528962ba2962a0
 SHA512:
-  metadata.gz: 867c4c13da0539166d095dc3cf7bbb52a6d154bbcedf06b93a6136cf40192323d1d6cd1d528b5144a39e6bd363efa33045a650c9d48ad7a9192f2aad1b533f93
-  data.tar.gz: a93704d6f78a297d00285e9f4b56bd8f6694486a0e451de88fefb44a9fed11c385b74a5b0639ad6d2c1c18e5bebd06eb874745a912b1b1031209ffaf14f1ce4c
+  metadata.gz: 5d5d14601db1a186747566549bd620c1d6c534fe111a2dd9712694743ae3ba691200c56628f1a9fd08c0edbbce68da81ecd28d7e338b8fac215f2bf4b1c99373
+  data.tar.gz: 305be4fa2c036e0b8ef509b38fb50985f7c3a8ff8caedc608b919b436a048ffe1d06c5a136a0183ebd80faf5946882ae0a76814eac809e017477c22f7bcbbe24

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+# [](https://github.com/ElMassimo/vite_ruby/compare/vite_rails@3.0.5...vite_rails@) (2022-01-18)
+
+
+### Features
+
+* **experimental:** add support for Subresource Integrity via vite-plugin-manifest-sri ([0b3142c](https://github.com/ElMassimo/vite_ruby/commit/0b3142cd9d569a5f56821f53cdade337779bb0c1))
+
+
+
+## [3.0.5](https://github.com/ElMassimo/vite_ruby/compare/vite_rails@3.0.4...vite_rails@3.0.5) (2022-01-18)
+
+
+### Bug Fixes
+
+* update example setup from turbolinks to @hotwired/turbo ([e1750bf](https://github.com/ElMassimo/vite_ruby/commit/e1750bfb4b22a9a73a2b86950fb203d3e489ced6))
+
+
+
+## [3.0.4](https://github.com/ElMassimo/vite_ruby/compare/vite_rails@3.0.3...vite_rails@3.0.4) (2022-01-02)
+
+
+### Features
+
+* add style-src to suggestion Content Security Policy changes ([#169](https://github.com/ElMassimo/vite_ruby/issues/169)) ([ec7f4f7](https://github.com/ElMassimo/vite_ruby/commit/ec7f4f7a030a852115b38748dd3cdb22ec3b7e47))
+
+
+
+## [3.0.3](https://github.com/ElMassimo/vite_ruby/compare/vite_rails@3.0.2...vite_rails@3.0.3) (2021-12-22)
+
+
+
 ## [3.0.2](https://github.com/ElMassimo/vite_ruby/compare/vite_rails@3.0.1...vite_rails@3.0.2) (2021-12-12)
 
 

data/lib/vite_rails/installation.rb

@@ -30,9 +30,13 @@ module ViteRails::Installation
       #    policy.connect_src *policy.connect_src, "ws://\#{ ViteRuby.config.host_with_port }" if Rails.env.development?
     CSP
     inject_line_after csp_file, 'policy.script_src', <<~CSP
-          # Allow @vite/client to hot reload changes in development
+          # Allow @vite/client to hot reload javascript changes in development
       #    policy.script_src *policy.script_src, :unsafe_eval, "http://\#{ ViteRuby.config.host_with_port }" if Rails.env.development?
     CSP
+    inject_line_after csp_file, 'policy.style_src', <<~CSP
+          # Allow @vite/client to hot reload style changes in development
+      #    policy.style_src *policy.style_src, :unsafe_inline if Rails.env.development?
+    CSP
   end
 
   # Override: Create a sample JS file and attempt to inject it in an HTML template.

data/lib/vite_rails/tag_helpers.rb

@@ -26,15 +26,27 @@ module ViteRails::TagHelpers
   def vite_javascript_tag(*names,
                           type: 'module',
                           asset_type: :javascript,
+                          integrity: false,
                           skip_preload_tags: false,
                           skip_style_tags: false,
                           crossorigin: 'anonymous',
                           media: 'screen',
                           **options)
     entries = vite_manifest.resolve_entries(*names, type: asset_type)
-    tags = javascript_include_tag(*entries.fetch(:scripts), crossorigin: crossorigin, type: type, extname: false, **options)
-    tags << vite_preload_tag(*entries.fetch(:imports), crossorigin: crossorigin, **options) unless skip_preload_tags
+    tags = ''.html_safe
+
+    entries.fetch(:main).each do |src, attrs|
+      tags << javascript_include_tag(src, crossorigin: crossorigin, type: type, extname: false, **attrs, **options)
+    end
+
+    unless skip_preload_tags
+      entries.fetch(:imports).each do |href, attrs|
+        tags << vite_preload_tag(href, crossorigin: crossorigin, **attrs, **options)
+      end
+    end
+
     tags << stylesheet_link_tag(*entries.fetch(:stylesheets), media: media, crossorigin: crossorigin, **options) unless skip_style_tags
+
     tags
   end
 
@@ -44,9 +56,23 @@ module ViteRails::TagHelpers
   end
 
   # Public: Renders a <link> tag for the specified Vite entrypoints.
-  def vite_stylesheet_tag(*names, **options)
-    style_paths = names.map { |name| vite_asset_path(name, type: :stylesheet) }
-    stylesheet_link_tag(*style_paths, **options)
+  def vite_stylesheet_tag(*names, integrity: false, **options)
+    ''.html_safe.tap do |tags|
+      vite_manifest.resolve_entries(*names, type: :stylesheet).fetch(:main).each do |href, attrs|
+        tags << stylesheet_link_tag(href, **attrs, **options)
+      end
+    end
+  end
+
+  # Public: Renders an <img> tag for the specified Vite asset.
+  def vite_image_tag(name, **options)
+    if options[:srcset] && !options[:srcset].is_a?(String)
+      options[:srcset] = options[:srcset].map do |src_name, size|
+        "#{ vite_asset_path(src_name) } #{ size }"
+      end.join(', ')
+    end
+
+    image_tag(vite_asset_path(name), options)
   end
 
 private
@@ -57,11 +83,13 @@ private
   end
 
   # Internal: Renders a modulepreload link tag.
-  def vite_preload_tag(*sources, crossorigin:, **options)
-    sources.map { |source|
-      href = path_to_asset(source)
-      try(:request).try(:send_early_hints, 'Link' => %(<#{ href }>; rel=modulepreload; as=script; crossorigin=#{ crossorigin }))
-      tag.link(rel: 'modulepreload', href: href, as: 'script', crossorigin: crossorigin, **options)
-    }.join("\n").html_safe
+  def vite_preload_tag(source, crossorigin:, **options)
+    href = path_to_asset(source)
+    try(:request).try(:send_early_hints, 'Link' => %(<#{ href }>; rel=modulepreload; as=script; crossorigin=#{ crossorigin }).tap { |hint|
+      if integrity = options[:integrity]
+        hint << "; integrity: #{ integrity }"
+      end
+    })
+    tag.link(rel: 'modulepreload', href: href, as: 'script', type: 'module', crossorigin: crossorigin, **options)
   end
 end

data/lib/vite_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ViteRails
-  VERSION = '3.0.2'
+  VERSION = '4.0.0.alpha1'
 end

data/templates/entrypoints/application.js

@@ -15,16 +15,14 @@ console.log('Visit the guide for more information: ', 'https://vite-ruby.netlify
 
 // Example: Load Rails libraries in Vite.
 //
-// import '@rails/ujs'
+// import * as Turbo from '@hotwired/turbo'
+// Turbo.start()
 //
-// import Turbolinks from 'turbolinks'
 // import ActiveStorage from '@rails/activestorage'
+// ActiveStorage.start()
 //
 // // Import all channels.
 // const channels = import.meta.globEager('./**/*_channel.js')
-//
-// Turbolinks.start()
-// ActiveStorage.start()
 
 // Example: Import a stylesheet in app/frontend/index.css
 // import '~/index.css'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_rails
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0.alpha1
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: spring
   requirement: !ruby/object:Gem::Requirement
@@ -82,8 +82,8 @@ homepage: https://github.com/ElMassimo/vite_ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_rails@3.0.2/vite_rails
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_rails@3.0.2/vite_rails/CHANGELOG.md
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_rails@4.0.0.alpha1/vite_rails
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_rails@4.0.0.alpha1/vite_rails/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -95,11 +95,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Use Vite in Rails and bring joy to your JavaScript experience