ember-cli-rails-assets 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa48833ac88509c2293cfbb6b1502afd4e40033e48c03d22d0a9f9de7235b544
-  data.tar.gz: bfb7b14b77dd4bc225561f5944dc501c260911144d5dd78ead9975f6c03c7644
+  metadata.gz: f38df79bd5263f5e6d124fd2ddeff3e0f724a6a967e1c165d4799a946f557c51
+  data.tar.gz: 36afc4bff115269fa3cb626e5d52aed8f8a8cddfb09b13b8e621602a9b72ec3c
 SHA512:
-  metadata.gz: 8a3978d00fdc61218dc8e8bb610b439c914c97e3fd583192ef42a5bac21bc7d98583342bd33a08ced4990bde88d3ec305b6119deabd201e8d5df0578c4335130
-  data.tar.gz: 88eea61bebb9026affa520cd491028401aab6c640e03a3aa032e1a2fef9a4db79d6500c7314e6a3bb3b2e5231d673fb37cff2073c09916664228cdd239747e33
+  metadata.gz: '084c574b46d27829d332586bd8e3766ab3e4a1205a373d1c2d1b2a9e2f89e1924393b22b1ed418021e3c30e047ae92357b06c72d89bb5e6b796ec51f7693589c'
+  data.tar.gz: 521eee2cc26d824b6e6862b428213cfdd2b1f8bb2827c366d7a0b59688d066818d991a0b9e27065771d1c118a868247a47cf1b301da6cafad1f325c4b0679261

data/README.md

@@ -12,7 +12,7 @@ actively supported method of serving EmberCLI applications.
 However, for the sake of backwards compatibility, `ember-cli-rails-assets`
 supports injecting the EmberCLI-generated assets into an existing Rails layout.
 
-[ember-cli-rails]: https://github.com/thoughtbot/ember-cli-rails
+[ember-cli-rails]: https://github.com/tricknotes/ember-cli-rails
 
 ## Install
 
@@ -33,8 +33,9 @@ $ bundle install
 To configure your project to use `ember-cli-rails`, follow the instructions
 listed in the [`ember-cli-rails` README][README].
 
-To configure your project to user `ember-cli-rails-assets`, ensure each Ember
-application's `ember-cli-build.js` includes the following values:
+To configure a classic (Broccoli-based) Ember application to use
+`ember-cli-rails-assets`, ensure its `ember-cli-build.js` includes the
+following values:
 
 ```js
 // frontend/ember-cli-build.js
@@ -52,7 +53,22 @@ module.exports = function(defaults) {
 };
 ```
 
-[README]: https://github.com/thoughtbot/ember-cli-rails#readme
+[README]: https://github.com/tricknotes/ember-cli-rails#readme
+
+### Vite-based applications
+
+Vite-based applications (generated with `ember-cli >= 6.8`) require no build
+configuration. For them, use `include_ember_script_tags` on its own: it emits
+everything the application needs to boot — the configuration `<meta>` tag, the
+stylesheet and `modulepreload` links, and the ES module script tags —
+extracted from the generated `index.html`:
+
+```erb
+<%= include_ember_script_tags :frontend %>
+```
+
+`include_ember_stylesheet_tags` only supports classic applications, and raises
+an error when called for a Vite-based application.
 
 ## Mount
 
@@ -126,7 +142,9 @@ path to prepend:
 
 This project supports:
 
-* EmberCLI versions `>= 1.13.13`
+* EmberCLI versions `>= 1.13.13` using the classic (Broccoli-based) build
+* EmberCLI versions `>= 6.8` using the Vite-based build, with
+  `include_ember_script_tags` only
 
 ## Ruby and Rails support
 
@@ -141,7 +159,7 @@ See the [CONTRIBUTING] document.
 Thank you, [contributors]!
 
   [CONTRIBUTING]: CONTRIBUTING.md
-  [contributors]: https://github.com/seanpdoyle/ember-cli-rails-assets/graphs/contributors
+  [contributors]: https://github.com/tricknotes/ember-cli-rails-assets/graphs/contributors
 
 ## License
 
@@ -158,8 +176,9 @@ ember-cli-rails was originally created by
 [Jonathan Jackson][rondale-sc].
 
 ember-cli-rails-assets was extracted from ember-cli-rails is maintained by
-[Sean Doyle][seanpdoyle].
+[Sean Doyle][seanpdoyle] and [Ryunosuke Sato][tricknotes].
 
 [rwz]: https://github.com/rwz
 [rondale-sc]: https://github.com/rondale-sc
 [seanpdoyle]: https://github.com/seanpdoyle
+[tricknotes]: https://github.com/tricknotes

data/app/helpers/ember_cli_rails_assets_helper.rb

@@ -1,25 +1,76 @@
+require "ember_cli/assets/errors"
 require "ember_cli/assets/lookup"
+require "ember_cli/assets/paths"
 
 module EmberCliRailsAssetsHelper
   def include_ember_script_tags(name, prepend: "")
-    EmberCli[name].build
+    app = EmberCli[name]
+    app.build
 
-    assets = EmberCli::Assets::Lookup.new(EmberCli[name])
+    paths = EmberCli::Assets::Paths.new(app)
 
-    assets.javascript_assets.
-      map { |src| [prepend, src].join }.
-      map { |src| %{<script src="#{src}"></script>}.html_safe }.
-      inject(&:+)
+    if paths.vite?
+      vite_ember_script_tags(paths, prepend)
+    else
+      classic_ember_script_tags(app, prepend)
+    end
   end
 
   def include_ember_stylesheet_tags(name, prepend: "")
-    EmberCli[name].build
+    app = EmberCli[name]
+    app.build
+
+    paths = EmberCli::Assets::Paths.new(app)
 
-    assets = EmberCli::Assets::Lookup.new(EmberCli[name])
+    if paths.vite?
+      raise EmberCli::Assets::NotSupportedError, <<~MSG
+        `include_ember_stylesheet_tags` does not support Vite-based
+        applications (`ember-cli >= 6.8`).
+
+        `include_ember_script_tags` already emits their stylesheet tags,
+        so remove this call.
+      MSG
+    end
+
+    assets = EmberCli::Assets::Lookup.new(app)
 
     assets.stylesheet_assets.
       map { |src| [prepend, src].join }.
       map { |src| %{<link rel="stylesheet" href="#{src}">}.html_safe }.
       inject(&:+)
   end
+
+  private
+
+  # Classic builds ship a fixed set of scripts (vendor and app) resolved
+  # through the asset map, so emit a plain script tag per JavaScript asset
+  # with `prepend` joined onto each path.
+  def classic_ember_script_tags(app, prepend)
+    assets = EmberCli::Assets::Lookup.new(app)
+
+    assets.javascript_assets.
+      map { |src| [prepend, src].join }.
+      map { |src| %{<script src="#{src}"></script>}.html_safe }.
+      inject(&:+)
+  end
+
+  # Vite builds boot from ES modules declared in dist/index.html, so extract
+  # the tags required for startup (including the config meta tag and
+  # stylesheets) and remap root-absolute paths onto the mount point.
+  def vite_ember_script_tags(paths, prepend)
+    document = Nokogiri::HTML5(paths.index_html.read)
+    prefix = prepend.to_s.chomp("/")
+
+    tags = document.css(
+      'meta[name$="/config/environment"], link[rel="stylesheet"], link[rel="modulepreload"], script'
+    ).map do |tag|
+      %w(href src).each do |attribute|
+        value = tag[attribute]
+        tag[attribute] = "#{prefix}#{value}" if value&.start_with?("/")
+      end
+      tag.to_html.html_safe
+    end
+
+    safe_join(tags, "\n")
+  end
 end

data/lib/ember_cli/assets/errors.rb

@@ -1,5 +1,6 @@
 module EmberCli
   module Assets
     class BuildError < StandardError; end
+    class NotSupportedError < StandardError; end
   end
 end

data/lib/ember_cli/assets/paths.rb

@@ -1,3 +1,5 @@
+require "nokogiri"
+
 module EmberCli
   module Assets
     class Paths
@@ -21,6 +23,13 @@ module EmberCli
         app.dist_path.join("index.html")
       end
 
+      # Vite builds (ember-cli >= 6.8) boot from ES modules in index.html,
+      # while classic builds emit plain script tags.
+      def vite?
+        index_html.exist? &&
+          !Nokogiri::HTML5(index_html.read).at_css('script[type="module"]').nil?
+      end
+
       protected
 
       attr_reader :app

data/lib/ember_cli/assets/version.rb

@@ -1,5 +1,5 @@
 module EmberCli
   module Assets
-    VERSION = "0.7.1"
+    VERSION = "0.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails-assets
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Sean Doyle
-autorequire:
+- Ryunosuke Sato
 bindir: bin
 cert_chain: []
-date: 2024-11-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,6 +28,7 @@ description: Include EmberCLI-generated JavaScript and CSS stylesheet tags in yo
   Rails layouts
 email:
 - sean.p.doyle24@gmail.com
+- tricknotes.rs@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -43,11 +44,10 @@ files:
 - lib/ember_cli/assets/lookup.rb
 - lib/ember_cli/assets/paths.rb
 - lib/ember_cli/assets/version.rb
-homepage: https://github.com/seanpdoyle/ember-cli-rails-assets
+homepage: https://github.com/tricknotes/ember-cli-rails-assets
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,8 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Include EmberCLI-generated JavaScript and CSS stylesheet tags in your Rails
   layouts