ember-cli-rails-assets 0.8.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f38df79bd5263f5e6d124fd2ddeff3e0f724a6a967e1c165d4799a946f557c51
-  data.tar.gz: 36afc4bff115269fa3cb626e5d52aed8f8a8cddfb09b13b8e621602a9b72ec3c
+  metadata.gz: '09d4079f97e405aafa40b0b3663fdeaed6ae362e55e84839563856169225aed7'
+  data.tar.gz: 2f329df8fb400ff28c6ddb7105589a7a76ff7054606e9007d6955d2090848e61
 SHA512:
-  metadata.gz: '084c574b46d27829d332586bd8e3766ab3e4a1205a373d1c2d1b2a9e2f89e1924393b22b1ed418021e3c30e047ae92357b06c72d89bb5e6b796ec51f7693589c'
-  data.tar.gz: 521eee2cc26d824b6e6862b428213cfdd2b1f8bb2827c366d7a0b59688d066818d991a0b9e27065771d1c118a868247a47cf1b301da6cafad1f325c4b0679261
+  metadata.gz: 97f6951bc89beb25aa963e554679415758069fdecb817753c8ce2148137669d159e8bc9384e22cd778ea2aebe371d3b57c9b530188700b442a27f7d8fb07586d
+  data.tar.gz: 574368c875b462fd04a08613e8fece7ed186e4b95a8918e3429e37251c3385d3993795feb2c58d34c2777058e0b67323151f0ed73a2de3494512fa686ed065fd

data/README.md

@@ -67,6 +67,12 @@ extracted from the generated `index.html`:
 <%= include_ember_script_tags :frontend %>
 ```
 
+When ember-cli-rails serves the application from Vite's development server in
+`development`, `include_ember_script_tags` reads `index.html` from the server
+instead of a build directory, and emits the startup tags with absolute URLs
+pointing at the server. Nothing is built, so changes to the application are
+picked up by reloading the page.
+
 `include_ember_stylesheet_tags` only supports classic applications, and raises
 an error when called for a Vite-based application.
 
@@ -130,12 +136,13 @@ To render the asset elements without using a `<base>` element, pass the URL or
 path to prepend:
 
 ```erb
-<-- assuming Ember's assets are mounted to `"/"` -->
+<!-- assuming Ember's assets are mounted to `"/"` -->
 <%= include_ember_script_tags :frontend, prepend: "/" %>
 <%= include_ember_stylesheet_tags :frontend, prepend: "/" %>
 
-<%= include_ember_script_tags :admin_panel, prepend: "/" %>
-<%= include_ember_stylesheet_tags :admin_panel, prepend: "/" %>
+<!-- assuming Ember's assets are mounted to `"/admin_panel/"` -->
+<%= include_ember_script_tags :admin_panel, prepend: "/admin_panel/" %>
+<%= include_ember_stylesheet_tags :admin_panel, prepend: "/admin_panel/" %>
 ```
 
 ## EmberCLI support

data/app/helpers/ember_cli_rails_assets_helper.rb

@@ -1,18 +1,23 @@
 require "ember_cli/assets/errors"
 require "ember_cli/assets/lookup"
 require "ember_cli/assets/paths"
+require "ember_cli/assets/url"
 
 module EmberCliRailsAssetsHelper
   def include_ember_script_tags(name, prepend: "")
     app = EmberCli[name]
     app.build
 
-    paths = EmberCli::Assets::Paths.new(app)
-
-    if paths.vite?
-      vite_ember_script_tags(paths, prepend)
+    if dev_server?(app)
+      dev_server_ember_script_tags(app)
     else
-      classic_ember_script_tags(app, prepend)
+      paths = EmberCli::Assets::Paths.new(app)
+
+      if paths.vite?
+        vite_ember_script_tags(paths, prepend)
+      else
+        classic_ember_script_tags(app, prepend)
+      end
     end
   end
 
@@ -22,7 +27,7 @@ module EmberCliRailsAssetsHelper
 
     paths = EmberCli::Assets::Paths.new(app)
 
-    if paths.vite?
+    if dev_server?(app) || paths.vite?
       raise EmberCli::Assets::NotSupportedError, <<~MSG
         `include_ember_stylesheet_tags` does not support Vite-based
         applications (`ember-cli >= 6.8`).
@@ -35,13 +40,29 @@ module EmberCliRailsAssetsHelper
     assets = EmberCli::Assets::Lookup.new(app)
 
     assets.stylesheet_assets.
-      map { |src| [prepend, src].join }.
+      map { |src| mount_asset(src, prepend) }.
       map { |src| %{<link rel="stylesheet" href="#{src}">}.html_safe }.
       inject(&:+)
   end
 
   private
 
+  # Whether ember-cli-rails serves the application from Vite's development
+  # server. Older ember-cli-rails releases have no development server, so
+  # feature-detect the reader.
+  def dev_server?(app)
+    app.respond_to?(:dev_server?) && app.dev_server?
+  end
+
+  # The application is served by Vite's development server, so read
+  # `index.html` from the server instead of a build directory, and rewrite
+  # its root-relative URLs to absolute URLs on the server — the same way
+  # ember-cli-rails serves the document itself. `app.build` has already
+  # booted the server.
+  def dev_server_ember_script_tags(app)
+    vite_startup_tags(app.dev_server.index_html, prefix: app.dev_server.origin)
+  end
+
   # 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.
@@ -49,24 +70,43 @@ module EmberCliRailsAssetsHelper
     assets = EmberCli::Assets::Lookup.new(app)
 
     assets.javascript_assets.
-      map { |src| [prepend, src].join }.
+      map { |src| mount_asset(src, prepend) }.
       map { |src| %{<script src="#{src}"></script>}.html_safe }.
       inject(&:+)
   end
 
+  # `prepend` mounts the build's assets onto a path (or another host), so it only applies to the URLs that point into the build.
+  # Assets hosted elsewhere (a CDN, a font service) are already absolute.
+  def mount_asset(src, prepend)
+    if EmberCli::Assets::Url.remote?(src)
+      src
+    else
+      [prepend, src].join
+    end
+  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("/")
+    vite_startup_tags(paths.index_html.read, prefix: prepend.to_s.chomp("/"))
+  end
+
+  # Extracts the tags a Vite-based application needs to boot from an
+  # `index.html` document, with `prefix` joined onto every root-relative
+  # URL. Protocol-relative URLs (`//`) are left alone.
+  def vite_startup_tags(html, prefix:)
+    document = Nokogiri::HTML5(html)
 
     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?("/")
+
+        if value&.start_with?("/") && !value.start_with?("//")
+          tag[attribute] = "#{prefix}#{value}"
+        end
       end
       tag.to_html.html_safe
     end

data/lib/ember_cli/assets/asset_map.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require "ember_cli/assets/errors"
+require "ember_cli/assets/url"
 
 module EmberCli
   module Assets
@@ -13,25 +14,35 @@ module EmberCli
       def javascripts
         assert_asset_map!
 
-        Nokogiri::HTML(index_html.read).css('script').map {|s|
-          filename = File.basename(s['src'])
-          asset_matching(/#{Regexp.escape(filename)}\z/)
-        }
+        document.css('script').filter_map { |script| asset_for(script['src']) }
       end
 
       def stylesheets
         assert_asset_map!
 
-        Nokogiri::HTML(index_html.read).css('link[rel="stylesheet"]').map {|s|
-          filename = File.basename(s['href'])
-          asset_matching(/#{Regexp.escape(filename)}\z/)
-        }
+        document.css('link[rel="stylesheet"]').filter_map { |link| asset_for(link['href']) }
       end
 
       private
 
       attr_reader :name, :asset_map, :index_html
 
+      def document
+        @document ||= Nokogiri::HTML(index_html.read)
+      end
+
+      # Assets hosted outside the build (a CDN, a font service) have no entry in the asset map, so their URL is emitted untouched.
+      # A tag without a URL (an inline `<script>`) references no asset at all.
+      def asset_for(url)
+        if url.to_s.empty?
+          nil
+        elsif Url.remote?(url)
+          url
+        else
+          asset_matching(/#{Regexp.escape(File.basename(url))}\z/)
+        end
+      end
+
       def asset_matching(regex)
         matching_asset = files.detect { |asset| asset =~ regex }
 

data/lib/ember_cli/assets/url.rb

@@ -0,0 +1,14 @@
+module EmberCli
+  module Assets
+    # URLs in a built `index.html` either point into the build output or somewhere else entirely (a CDN, a font service).
+    # Only the former are resolved against the build and mounted onto the Rails application.
+    module Url
+      # Matches a URL that resolves outside the build: one carrying a scheme (`https://example.com/app.css`, `data:…`), and a protocol-relative one (`//example.com/app.css`).
+      REMOTE = %r{\A(?:[a-zA-Z][a-zA-Z0-9+.\-]*:|//)}
+
+      def self.remote?(url)
+        REMOTE.match?(url.to_s)
+      end
+    end
+  end
+end

data/lib/ember_cli/assets/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails-assets
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.1
 platform: ruby
 authors:
 - Sean Doyle
@@ -43,6 +43,7 @@ files:
 - lib/ember_cli/assets/errors.rb
 - lib/ember_cli/assets/lookup.rb
 - lib/ember_cli/assets/paths.rb
+- lib/ember_cli/assets/url.rb
 - lib/ember_cli/assets/version.rb
 homepage: https://github.com/tricknotes/ember-cli-rails-assets
 licenses: