vite_rails 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6ae06bd2fe02d39882813646c291aa1984bf6f4bfbd337859c8527f83cdd66
-  data.tar.gz: 932af2eeadf8830685a6f1d30431849b1e46227147f34a11b286824d3ce80cf7
+  metadata.gz: 57f866deafddde5401e02ec27cf751eb26a40a0be1fd832d9d3813fd7a69e721
+  data.tar.gz: 7cf22c583a3ac70f4353e227b0da4463b42067dd38f0c36774e665e619b31f2d
 SHA512:
-  metadata.gz: 67f388f8c74bd39ee14f9d8033941a7616400f9e725a1c2cec7f459f9faa06457dcb113648d9bdb672b5497093f3905bddc13928b834c91f43cef08a58de0e65
-  data.tar.gz: fba446503a41accc9bd4a769042858789615b2095171d6c138c0f2aaf0471ce741da98d9aa058fabc1ee92e2f667b8c19bcab48980ea4288d4b4400b53d94f15
+  metadata.gz: d101294de0e6f585b7df56c2881c465698f4c6ccbe8c4220117d7119c84f21e8b80e6aa2865dd353fa27b3b2c3d7a78095e80466c2d9b5f6eda60b6073a55ed0
+  data.tar.gz: fdbe92f7afafd6f82bafc6525a4099151efcdc385ce49e5cc5f696ea79efe5d411b6eaf093b9b1ec1402140a7d4ac34f629401fb70d9005535eaf38e989cf4cd

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Vite Rails 1.0.12  (2020-01-29)
+
+- Add support for Vite 2.0.0-beta.56, which modified the manifest to output a `css` field in the manifest.
+- Start generating an assets manifest, since 2.0.0-beta.51 stopped including non-JS entrypoints in the manifest.
+
 ## Vite Rails 1.0.11  (2020-01-24)
 
 - Fix bug in `assetHost` that caused `base` to be configured incorrectly.

data/README.md

@@ -10,7 +10,7 @@
   </a>
 
   <br>
-  
+
   <p align="center">
     <a href="https://github.com/ElMassimo/vite_rails/actions">
       <img alt="Build Status" src="https://github.com/ElMassimo/vite_rails/workflows/build/badge.svg"/>
@@ -41,6 +41,8 @@
 [config file]: https://github.com/ElMassimo/vite_rails/blob/main/package/default.vite.json
 [example app]: https://github.com/ElMassimo/vite_rails/tree/main/examples/blog
 [heroku]: https://vite-rails-demo.herokuapp.com/
+[Issues]: https://github.com/ElMassimo/vite_rails/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc
+[Discussions]: https://github.com/ElMassimo/vite_rails/discussions
 
 [__Vite Rails__][vite_rails] allows you to use [Vite] to power the frontend of your Rails app.
 
@@ -50,7 +52,7 @@ Check an [example app] running on [Heroku].
 
 ## Features ⚡️
 
-- 🤖 Automatic entrypoint detection
+- 💡 Instant server start
 - ⚡️ Blazing fast hot reload
 - 🚀 Zero-config deployments
 - 🤝 Integrated with <kbd>assets:precompile</kbd>
@@ -94,6 +96,13 @@ Visit any page and you should see a printed console output: `Vite ⚡️ Rails`.
 
 For more [guides] and a full [configuration reference], check the [documentation website][website].
 
+## Contact ✉️
+
+Please use [Issues] to report bugs you find, and [Discussions] to make feature requests or get help.
+
+Don't hesitate to _⭐️ star the project_ if you find it useful!
+
+
 ## Special Thanks 🙏
 
 - [webpacker]

data/lib/install/config/vite.config.ts

@@ -5,7 +5,4 @@ export default defineConfig({
   plugins: [
     RubyPlugin(),
   ],
-  optimizeDeps: {
-    exclude: [/webpack/], // In case webpacker is installed (these deps won't be imported)
-  },
 })

data/lib/vite_rails/config.rb

@@ -24,6 +24,11 @@ class ViteRails::Config
     build_output_dir.join('manifest.json')
   end
 
+  # Internal: Path where vite-plugin-ruby outputs the assets manifest file.
+  def assets_manifest_path
+    build_output_dir.join('manifest-assets.json')
+  end
+
   # Public: The directory where Vite will store the built assets.
   def build_output_dir
     root.join(public_dir, public_output_dir)

data/lib/vite_rails/helper.rb

@@ -35,15 +35,15 @@ module ViteRails::Helper
     js_entries = names.map { |name| current_vite_instance.manifest.lookup!(name, type: asset_type) }
     js_tags = javascript_include_tag(*js_entries.map { |entry| entry['file'] }, crossorigin: crossorigin, type: type, **options)
 
+    preload_entries = js_entries.flat_map { |entry| entry['imports'] }.compact.uniq
+
     unless skip_preload_tags || current_vite_instance.dev_server_running?
-      preload_paths = js_entries.flat_map { |entry| entry['imports'] }.compact.uniq
+      preload_paths = preload_entries.map { |entry| entry['file'] }.compact.uniq
       preload_tags = preload_paths.map { |path| preload_link_tag(path, crossorigin: crossorigin) }
     end
 
     unless skip_style_tags || current_vite_instance.dev_server_running?
-      style_paths = names.map { |name|
-        current_vite_instance.manifest.lookup(name.delete_suffix('.js'), type: :stylesheet)&.fetch('file')
-      }.compact
+      style_paths = (js_entries + preload_entries).flat_map { |entry| entry['css'] }.compact.uniq
       style_tags = stylesheet_link_tag(*style_paths)
     end
 

data/lib/vite_rails/manifest.rb

@@ -37,7 +37,7 @@ class ViteRails::Manifest
     find_manifest_entry(with_file_extension(name, type))
   end
 
-  # Public: Refreshes the cached mappings by reading the updated manifest.
+  # Public: Refreshes the cached mappings by reading the updated manifest files.
   def refresh
     @manifest = load_manifest
   end
@@ -81,15 +81,18 @@ private
     @manifest ||= load_manifest
   end
 
-  # Internal: Returns a Hash with the entries in the manifest.json.
+  # Internal: Loads and merges the manifest files, resolving the asset paths.
   def load_manifest
-    if config.manifest_path.exist?
-      JSON.parse(config.manifest_path.read).each do |_, entry|
-        entry['file'] = prefix_vite_asset(entry['file'])
-        entry['imports'] = entry['imports']&.map { |path| prefix_vite_asset(path) }
-      end
-    else
-      {}
+    files = [config.manifest_path, config.assets_manifest_path].select(&:exist?)
+    files.map { |path| JSON.parse(path.read) }.inject({}, &:merge).tap(&method(:resolve_references))
+  end
+
+  # Internal: Resolves the paths that reference a manifest entry.
+  def resolve_references(manifest)
+    manifest.each_value do |entry|
+      entry['file'] = prefix_vite_asset(entry['file'])
+      entry['css'] = Array.wrap(entry['css']).map { |path| prefix_vite_asset(path) } if entry['css']
+      entry['imports']&.map! { |name| manifest.fetch(name) }
     end
   end
 
@@ -106,7 +109,7 @@ private
     case entry_type
     when :javascript then 'js'
     when :stylesheet then 'css'
-    when :typescript then dev_server_running? ? 'ts' : 'js'
+    when :typescript then 'ts'
     else entry_type
     end
   end
@@ -115,12 +118,12 @@ private
   def missing_entry_error(name, type: nil, **_options)
     file_name = with_file_extension(name, type)
     raise ViteRails::Manifest::MissingEntryError, <<~MSG
-      Vite Rails can't find #{ file_name } in #{ config.manifest_path }.
+      Vite Rails can't find #{ file_name } in #{ config.manifest_path } or #{ config.assets_manifest_path }.
 
       Possible causes:
       #{ missing_entry_causes.map { |cause| "\t- #{ cause }" }.join("\n") }
 
-      Your manifest contains:
+      Content in your manifests:
       #{ JSON.pretty_generate(@manifest) }
     MSG
   end
@@ -133,7 +136,7 @@ private
       (local && !dev_server_running? && 'The Vite development server has crashed or is no longer available.'),
       'You have misconfigured config/vite.json file.',
       (!local && 'Assets have not been precompiled'),
-    ].compact
+    ].select(&:present?)
   rescue StandardError
     []
   end

data/lib/vite_rails/version.rb

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

data/package.json

@@ -13,7 +13,7 @@
     "test": "npm -C package run test"
   },
   "dependencies": {
-    "vite": "^2.0.0-beta.46",
-    "vite-plugin-ruby": "^1.0.5"
+    "vite": "^2.0.0-beta.56",
+    "vite-plugin-ruby": "^1.0.6"
   }
 }

data/test/dev_server_proxy_test.rb

@@ -96,7 +96,7 @@ private
 
     path, query = to.split('?')
     assert_equal path, env['PATH_INFO']
-    assert_equal query, env['QUERY_STRING']
+    assert_equal query.to_s, env['QUERY_STRING'].to_s
     assert_equal to, env['REQUEST_URI']
   end
 end

data/test/helper_test.rb

@@ -27,33 +27,32 @@ class HelperTest < ActionView::TestCase
   end
 
   def test_vite_asset_path
-    assert_equal '/vite-production/assets/colored.1173bfe0.js', vite_asset_path('colored.js')
-    assert_equal '/vite-production/assets/colored.84277fd6.css', vite_asset_path('colored.css')
+    assert_equal '/vite-production/assets/application.d9514acc.js', vite_asset_path('application.ts')
+    assert_equal '/vite-production/assets/styles.0e53e684.css', vite_asset_path('styles.css')
     with_dev_server_running {
-      assert_equal '/vite-production/colored.js', vite_asset_path('colored.js')
-      assert_equal '/vite-production/colored.css', vite_asset_path('colored.css')
+      assert_equal '/vite-production/application.ts', vite_asset_path('application.ts')
+      assert_equal '/vite-production/styles.css', vite_asset_path('styles.css')
     }
   end
 
   def test_vite_stylesheet_tag
-    assert_equal %(<link rel="stylesheet" media="screen" href="/vite-production/assets/colored.84277fd6.css" />),
-      vite_stylesheet_tag('colored')
+    assert_equal link(href: '/vite-production/assets/styles.0e53e684.css'), vite_stylesheet_tag('styles')
 
-    assert_equal vite_stylesheet_tag('colored'), vite_stylesheet_tag('colored.css')
+    assert_equal vite_stylesheet_tag('styles'), vite_stylesheet_tag('styles.css')
 
     with_dev_server_running {
-      assert_equal %(<link rel="stylesheet" media="screen" href="/vite-production/colored.css" />),
-        vite_stylesheet_tag('colored')
+      assert_equal link(href: '/vite-production/styles.css'), vite_stylesheet_tag('styles')
 
-      assert_equal vite_stylesheet_tag('colored'), vite_stylesheet_tag('colored.css')
+      assert_equal vite_stylesheet_tag('styles'), vite_stylesheet_tag('styles.css')
     }
   end
 
   def test_vite_javascript_tag
     assert_equal [
-      %(<script src="/vite-production/assets/application.a0ba047e.js" crossorigin="anonymous" type="module"></script>),
+      %(<script src="/vite-production/assets/application.d9514acc.js" crossorigin="anonymous" type="module"></script>),
+      %(<link rel="preload" href="/vite-production/assets/vendor.880705da.js" as="script" type="text/javascript" crossorigin="anonymous">),
       %(<link rel="preload" href="/vite-production/assets/example_import.8e1fddc0.js" as="script" type="text/javascript" crossorigin="anonymous">),
-      %(<link rel="stylesheet" media="screen" href="/vite-production/assets/application.cccfef34.css" />),
+      link(href: '/vite-production/assets/application.f510c1e9.css'),
     ].join, vite_javascript_tag('application')
 
     assert_equal vite_javascript_tag('application'), vite_javascript_tag('application.js')
@@ -67,4 +66,10 @@ class HelperTest < ActionView::TestCase
         vite_typescript_tag('application')
     }
   end
+
+  def link(href:, rel: 'stylesheet', media: 'screen')
+    attrs = [%(media="#{ media }"), %(href="#{ href }")]
+    attrs.reverse! if Rails.gem_version > Gem::Version.new('6.1.1')
+    %(<link rel="#{ rel }" #{ attrs.join(' ') } />)
+  end
 end

data/test/manifest_test.rb

@@ -25,13 +25,19 @@ class ManifestTest < ViteRails::Test
 
   def test_lookup_success!
     entry = {
-      'file' => '/vite-production/assets/application.a0ba047e.js',
+      'file' => '/vite-production/assets/application.d9514acc.js',
+      'src' => 'application.js',
+      'isEntry' => true,
       'imports' => [
-        '/vite-production/assets/example_import.8e1fddc0.js',
+        { 'file' => '/vite-production/assets/vendor.880705da.js' },
+        { 'file' => '/vite-production/assets/example_import.8e1fddc0.js', 'src' => 'example_import.js', 'isEntry' => true },
+      ],
+      'css' => [
+        '/vite-production/assets/application.f510c1e9.css',
       ],
     }
     assert_equal entry, ViteRails.manifest.lookup!('application.js', type: :javascript)
-    assert_equal entry, ViteRails.manifest.lookup!('application', type: :typescript)
+    assert_equal entry.merge('src' => 'application.ts'), ViteRails.manifest.lookup!('application', type: :typescript)
   end
 
   def test_lookup_success_with_dev_server_running!
@@ -50,16 +56,16 @@ class ManifestTest < ViteRails::Test
   end
 
   def test_lookup_success
-    entry = { 'file' => '/vite-production/assets/application.cccfef34.css', 'imports' => nil }
-    assert_equal entry, ViteRails.manifest.lookup('application.css')
-    assert_equal entry, ViteRails.manifest.lookup('application.css', type: :stylesheet)
-    assert_equal entry, ViteRails.manifest.lookup('application', type: :stylesheet)
+    entry = { 'file' => '/vite-production/assets/styles.0e53e684.css', 'src' => 'styles.css' }
+    assert_equal entry, ViteRails.manifest.lookup('styles.css')
+    assert_equal entry, ViteRails.manifest.lookup('styles.css', type: :stylesheet)
+    assert_equal entry, ViteRails.manifest.lookup('styles', type: :stylesheet)
   end
 
   def test_lookup_success_with_dev_server_running
-    entry = { 'file' => '/vite-production/application.css' }
+    entry = { 'file' => '/vite-production/styles.css' }
     with_dev_server_running {
-      assert_equal entry, ViteRails.manifest.lookup('application', type: :stylesheet)
+      assert_equal entry, ViteRails.manifest.lookup('styles', type: :stylesheet)
     }
   end
 

data/test/mounted_app/test/dummy/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "license": "MIT",
   "devDependencies": {
-    "vite": "^2.0.0-beta.46",
-    "vite-plugin-ruby": "^1.0.5"
+    "vite": "^2.0.0-beta.56",
+    "vite-plugin-ruby": "^1.0.6"
   }
 }

data/test/mounted_app/test/dummy/yarn.lock

@@ -188,17 +188,17 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-vite-plugin-ruby@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/vite-plugin-ruby/-/vite-plugin-ruby-1.0.4.tgz#0f4a263fd79a082a84917a54b0881f02a3bbfa61"
-  integrity sha512-WJE+c2TGLwcbSHzkqcwCmPcHxasUnXmx5Bi1HPO89Yo+Mggi8t/fO/WIPUF7NxSlp9q2lq5/L3Vnkt3R/tolPg==
+vite-plugin-ruby@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/vite-plugin-ruby/-/vite-plugin-ruby-1.0.6.tgz#7ecaf2b8ad4237096c631587e7170c4ce95c0a26"
+  integrity sha512-wJ0Djf/t1bqaowO14ceeNKeqgKW69WwNHboV/Gxq+66NpuDSm8jLKRtm+CiqnvlT9fK5NCiNwtyFkgsKbKAH/g==
   dependencies:
     fast-glob "^3.2.4"
 
-vite@^2.0.0-beta.46:
-  version "2.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.46.tgz#9c0d35019c350fbebd17f84c4e7243fffccd1819"
-  integrity sha512-RiiJdjiFDaM9youfcTFnCztstwBXHHSdsSATZVD5A4QSb39KJRTpSKoveFo0PT7VJM5HjOP7QC/sVOqX011F6Q==
+vite@^2.0.0-beta.56:
+  version "2.0.0-beta.56"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.56.tgz#b254ec4647ae1383d7c5b6f3fdb01f8971b5bcdd"
+  integrity sha512-MX20PSXT6wTfq37B9d/iTmfAut4kBT6DOquw60zVFRtnO7hR9sNmkM6pmoNyVuYJrlkhKZZqoO2DnYs3C7LKCw==
   dependencies:
     esbuild "^0.8.34"
     postcss "^8.2.1"

data/test/test_app/public/vite-production/manifest-assets.json

@@ -0,0 +1,10 @@
+{
+  "logo.svg": {
+    "file": "assets/logo.490fa4f8.svg",
+    "src": "logo.svg"
+  },
+  "styles.css": {
+    "file": "assets/styles.0e53e684.css",
+    "src": "styles.css"
+  }
+}

data/test/test_app/public/vite-production/manifest.json

@@ -1,22 +1,39 @@
 {
   "application.js": {
-    "file": "assets/application.a0ba047e.js",
+    "file": "assets/application.d9514acc.js",
+    "src": "application.js",
+    "isEntry": true,
     "imports": [
-      "assets/example_import.8e1fddc0.js"
+      "_vendor.880705da.js",
+      "example_import.js"
+    ],
+    "css": [
+      "assets/application.f510c1e9.css"
+    ]
+  },
+  "application.ts": {
+    "file": "assets/application.d9514acc.js",
+    "src": "application.ts",
+    "isEntry": true,
+    "imports": [
+      "_vendor.880705da.js",
+      "example_import.js"
+    ],
+    "css": [
+      "assets/application.f510c1e9.css"
     ]
   },
   "example_import.js": {
     "file": "assets/example_import.8e1fddc0.js",
-    "imports": []
-  },
-  "colored.js": {
-    "file": "assets/colored.1173bfe0.js",
-    "imports": []
+    "src": "example_import.js",
+    "isEntry": true
   },
-  "application.css": {
-    "file": "assets/application.cccfef34.css"
+  "logo.svg": {
+    "file": "assets/logo.f1745d22.js",
+    "src": "logo.svg",
+    "isEntry": true
   },
-  "colored.css": {
-    "file": "assets/colored.84277fd6.css"
+  "_vendor.880705da.js": {
+    "file": "assets/vendor.880705da.js"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,6 +177,7 @@ files:
 - 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
@@ -185,8 +186,8 @@ homepage: https://github.com/ElMassimo/vite_rails
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ElMassimo/vite_rails/tree/v1.0.11
-  changelog_uri: https://github.com/ElMassimo/vite_rails/blob/v1.0.11/CHANGELOG.md
+  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
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -238,6 +239,7 @@ test_files:
 - 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