vite_rails 1.0.12 → 2.0.5

data/lib/vite_rails/engine.rb

@@ -4,36 +4,32 @@ require 'rails/railtie'
 
 class ViteRails::Engine < Rails::Engine
   initializer 'vite_rails.proxy' do |app|
-    app.middleware.insert_before 0, ViteRails::DevServerProxy, ssl_verify_none: true if ViteRails.run_proxy?
+    app.middleware.insert_before 0, ViteRuby::DevServerProxy, ssl_verify_none: true if ViteRuby.run_proxy?
   end
 
   initializer 'vite_rails.helper' do
     ActiveSupport.on_load(:action_controller) do
-      ActionController::Base.helper(ViteRails::Helper)
+      ActionController::Base.helper(ViteRails::TagHelpers)
     end
 
     ActiveSupport.on_load(:action_view) do
-      include ViteRails::Helper
+      include ViteRails::TagHelpers
     end
   end
 
   initializer 'vite_rails.logger' do
     config.after_initialize do
-      ViteRails.logger = if ::Rails.logger.respond_to?(:tagged)
-                           ::Rails.logger
-                         else
-                           ActiveSupport::TaggedLogging.new(::Rails.logger)
-                         end
+      ViteRuby.instance.logger = Rails.logger
     end
   end
 
   initializer 'vite_rails.bootstrap' do
     if defined?(Rails::Server) || defined?(Rails::Console)
-      ViteRails.bootstrap
+      ViteRuby.bootstrap
       if defined?(Spring)
         require 'spring/watcher'
-        Spring.after_fork { ViteRails.bootstrap }
-        Spring.watch(ViteRails.config.config_path)
+        Spring.after_fork { ViteRuby.bootstrap }
+        Spring.watch(ViteRuby.config.config_path)
       end
     end
   end

data/lib/vite_rails/installation.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'vite_rails'
+
+# Internal: Extends the base installation script from Vite Ruby to work for a
+# typical Rails app.
+module ViteRails::Installation
+  RAILS_TEMPLATES = Pathname.new(File.expand_path('../../templates', __dir__))
+
+  # Override: Setup a typical apps/web Hanami app to use Vite.
+  def setup_app_files
+    cp RAILS_TEMPLATES.join('config/rails-vite.json'), config.config_path
+    if dir = %w[app/javascript app/packs].find { |path| root.join(path).exist? }
+      Dry::CLI::Utils::Files.replace_first_line config.config_path, 'app/frontend', %(    "sourceCodeDir": "#{ dir }",)
+    end
+    setup_content_security_policy root.join('config/initializers/content_security_policy.rb')
+  end
+
+  # Internal: Configure CSP rules that allow to load @vite/client correctly.
+  def setup_content_security_policy(csp_file)
+    return unless csp_file.exist?
+
+    inject_line_after csp_file, 'policy.script_src', <<~CSP
+          # You may need to enable this in production as well depending on your setup.
+      #    policy.script_src *policy.script_src, :blob if Rails.env.test?
+    CSP
+    inject_line_after csp_file, 'policy.connect_src', <<~CSP
+          # Allow @vite/client to hot reload changes in development
+      #    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
+      #    policy.script_src *policy.script_src, :unsafe_eval, "http://#{ ViteRuby.config.host_with_port }" if Rails.env.development?
+    CSP
+  end
+
+  # Override: Create a sample JS file and attempt to inject it in an HTML template.
+  def install_sample_files
+    unless config.resolved_entrypoints_dir.join('application.js').exist?
+      cp RAILS_TEMPLATES.join('entrypoints/application.js'), config.resolved_entrypoints_dir.join('application.js')
+    end
+
+    if (layout_file = root.join('app/views/layouts/application.html.erb')).exist?
+      inject_line_before layout_file, '</head>', <<-HTML
+    <%= vite_client_tag %>
+    <%= vite_javascript_tag 'application' %>
+      HTML
+    end
+  end
+end
+
+ViteRuby::CLI::Install.prepend(ViteRails::Installation)

data/lib/vite_rails/tag_helpers.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Public: Allows to render HTML tags for scripts and styles processed by Vite.
+module ViteRails::TagHelpers
+  # Public: Renders a script tag for vite/client to enable HMR in development.
+  def vite_client_tag
+    return unless src = vite_manifest.vite_client_src
+
+    tag.script(src: src, type: 'module')
+  end
+
+  # Public: Resolves the path for the specified Vite asset.
+  #
+  # Example:
+  #   <%= vite_asset_path 'calendar.css' %> # => "/vite/assets/calendar-1016838bab065ae1e122.css"
+  def vite_asset_path(name, **options)
+    path_to_asset vite_manifest.path_for(name, **options)
+  end
+
+  # Public: Renders a <script> tag for the specified Vite entrypoints.
+  def vite_javascript_tag(*names,
+                          type: 'module',
+                          asset_type: :javascript,
+                          skip_preload_tags: false,
+                          skip_style_tags: false,
+                          crossorigin: 'anonymous',
+                          **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) unless skip_preload_tags
+    tags << stylesheet_link_tag(*entries.fetch(:stylesheets)) unless skip_style_tags
+    tags
+  end
+
+  # Public: Renders a <script> tag for the specified Vite entrypoints.
+  def vite_typescript_tag(*names, **options)
+    vite_javascript_tag(*names, asset_type: :typescript, **options)
+  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)
+  end
+
+private
+
+  # Internal: Returns the current manifest loaded by Vite Ruby.
+  def vite_manifest
+    ViteRuby.instance.manifest
+  end
+
+  # Internal: Renders a modulepreload link tag.
+  def vite_preload_tag(*sources, crossorigin:)
+    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)
+    }.join("\n").html_safe
+  end
+end

data/lib/vite_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class ViteRails
-  VERSION = '1.0.12'
+module ViteRails
+  VERSION = '2.0.5'
 end

data/{lib/install/config/vite.json → templates/config/rails-vite.json}

@@ -1,5 +1,6 @@
 {
   "all": {
+    "sourceCodeDir": "app/frontend",
     "watchAdditionalPaths": []
   },
   "development": {

metadata

@@ -1,113 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: vite_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 2.0.5
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: rack-proxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '8'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: vite_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.93.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.93.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: spring
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description:
 email:
 - maximomussini@gmail.com
@@ -116,78 +66,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- CONTRIBUTING.md
 - LICENSE.txt
 - README.md
-- lib/install/bin/vite
-- lib/install/binstubs.rb
-- lib/install/config/vite.config.ts
-- lib/install/config/vite.json
-- lib/install/javascript/entrypoints/application.js
-- lib/install/template.rb
-- lib/tasks/vite/binstubs.rake
-- lib/tasks/vite/build.rake
-- lib/tasks/vite/clean.rake
-- lib/tasks/vite/clobber.rake
-- lib/tasks/vite/info.rake
-- lib/tasks/vite/install.rake
-- lib/tasks/vite/install_dependencies.rake
-- lib/tasks/vite/verify_install.rake
+- lib/tasks/vite.rake
 - lib/vite_rails.rb
-- lib/vite_rails/builder.rb
-- lib/vite_rails/commands.rb
 - lib/vite_rails/config.rb
-- lib/vite_rails/dev_server.rb
-- lib/vite_rails/dev_server_proxy.rb
 - lib/vite_rails/engine.rb
-- lib/vite_rails/helper.rb
-- lib/vite_rails/manifest.rb
-- lib/vite_rails/runner.rb
+- lib/vite_rails/installation.rb
+- lib/vite_rails/tag_helpers.rb
 - lib/vite_rails/version.rb
-- package.json
-- package/default.vite.json
-- test/builder_test.rb
-- test/commands_test.rb
-- test/config_test.rb
-- test/dev_server_proxy_test.rb
-- test/dev_server_test.rb
-- test/engine_rake_tasks_test.rb
-- test/helper_test.rb
-- test/manifest_test.rb
-- test/mode_test.rb
-- test/mounted_app/Rakefile
-- test/mounted_app/test/dummy/Rakefile
-- test/mounted_app/test/dummy/bin/rails
-- test/mounted_app/test/dummy/bin/rake
-- test/mounted_app/test/dummy/config.ru
-- test/mounted_app/test/dummy/config/application.rb
-- test/mounted_app/test/dummy/config/environment.rb
-- test/mounted_app/test/dummy/config/vite.json
-- test/mounted_app/test/dummy/package.json
-- test/mounted_app/test/dummy/yarn.lock
-- test/rake_tasks_test.rb
-- test/runner_test.rb
-- test/test_app/Rakefile
-- test/test_app/app/frontend/entrypoints/application.js
-- test/test_app/bin/vite
-- test/test_app/config.ru
-- test/test_app/config/application.rb
-- test/test_app/config/environment.rb
-- test/test_app/config/vite.json
-- test/test_app/config/vite_additional_paths.json
-- test/test_app/config/vite_public_dir.json
-- test/test_app/package.json
-- test/test_app/public/vite-production/manifest-assets.json
-- test/test_app/public/vite-production/manifest.json
-- test/test_app/some.config.js
-- test/test_app/yarn.lock
-- test/test_helper.rb
-homepage: https://github.com/ElMassimo/vite_rails
+- templates/config/rails-vite.json
+- templates/entrypoints/application.js
+homepage: https://github.com/ElMassimo/vite_ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ElMassimo/vite_rails/tree/v1.0.12
-  changelog_uri: https://github.com/ElMassimo/vite_rails/blob/v1.0.12/CHANGELOG.md
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_rails@2.0.5/vite_rails
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_rails@2.0.5/vite_rails/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -196,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -207,40 +102,4 @@ rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Use Vite in Rails and bring joy to your JavaScript experience
-test_files:
-- test/builder_test.rb
-- test/commands_test.rb
-- test/config_test.rb
-- test/dev_server_proxy_test.rb
-- test/dev_server_test.rb
-- test/engine_rake_tasks_test.rb
-- test/helper_test.rb
-- test/manifest_test.rb
-- test/mode_test.rb
-- test/mounted_app/Rakefile
-- test/mounted_app/test/dummy/Rakefile
-- test/mounted_app/test/dummy/bin/rails
-- test/mounted_app/test/dummy/bin/rake
-- test/mounted_app/test/dummy/config.ru
-- test/mounted_app/test/dummy/config/application.rb
-- test/mounted_app/test/dummy/config/environment.rb
-- test/mounted_app/test/dummy/config/vite.json
-- test/mounted_app/test/dummy/package.json
-- test/mounted_app/test/dummy/yarn.lock
-- test/rake_tasks_test.rb
-- test/runner_test.rb
-- test/test_app/Rakefile
-- test/test_app/app/frontend/entrypoints/application.js
-- test/test_app/bin/vite
-- test/test_app/config.ru
-- test/test_app/config/application.rb
-- test/test_app/config/environment.rb
-- test/test_app/config/vite.json
-- test/test_app/config/vite_additional_paths.json
-- test/test_app/config/vite_public_dir.json
-- test/test_app/package.json
-- test/test_app/public/vite-production/manifest-assets.json
-- test/test_app/public/vite-production/manifest.json
-- test/test_app/some.config.js
-- test/test_app/yarn.lock
-- test/test_helper.rb
+test_files: []

data/CONTRIBUTING.md

@@ -1,33 +0,0 @@
-## Setting Up a Development Environment
-
-1. Install [Yarn](https://yarnpkg.com/)
-
-2. Run the following commands to set up the development environment.
-
-```
-bundle install
-```
-
-## Making sure your changes pass all tests
-There are a number of automated checks which run on GitHub Actions when a pull request is created.
-You can run those checks on your own locally to make sure that your changes would not break the CI build.
-
-### 1. Check the code for JavaScript style violations
-```
-yarn lint
-```
-
-### 2. Check the code for Ruby style violations
-```
-bundle exec rubocop
-```
-
-### 3. Run the JavaScript test suite
-```
-yarn test
-```
-
-### 4. Run the Ruby test suite
-```
-bundle exec rake test
-```