ember-cli-rails-assets 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a14199abf9cfa5f0faf079ea10fbc134cf701d48d016da69f7d43ed64256fbdf
-  data.tar.gz: b5d351892f33578fcae89ccdb77966393b2682f634dfe5f3d0ee384e42e095b3
+  metadata.gz: b93721604a8a9ba4f8f875767c6d95a84fd44cb973a8cd34713f9d1c9148e917
+  data.tar.gz: 7d262c1513d85634eb62d9f5eda6326be49ebb1aa9d48492d194852afe488884
 SHA512:
-  metadata.gz: 52c74aa8f6993613dd16c7e762260ce2818654d043ac80b1627392ac2fbd3cdcbcc3231a9b67125f107b1de4b0aab97f52aaa7f6f9f9fa34025a7fb92a160244
-  data.tar.gz: 4c639e39672b4cbc07281153c20e3a27d68f233e20a0abd3ab2b03ae130c71c807db7a91acbbcb05121d130fb8f4484e9baedfa1d386da0cf5eca171013c70d7
+  metadata.gz: 636d49bed887eae52fb1d74078fd195b5e9d861235004c2225c0a23b940b5ccdfdcc3e6933f3ceef2e57c501caaadd68d30b7c644d22f2dced62b709ee3b3999
+  data.tar.gz: f62f364b4ee98dca076cd7dd6ff11b35687e658d85df97781c42f15f1e54610e5e946afdf5bfb36d0aa6dd248a1c69669562fc52b10a4810b87156a3b3d1cbc8

data/app/helpers/ember_cli_rails_assets_helper.rb

@@ -1,6 +1,7 @@
 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: "")
@@ -39,7 +40,7 @@ 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
@@ -69,11 +70,21 @@ 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.

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,35 +14,51 @@ 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 asset_matching(regex)
-        matching_asset = files.detect { |asset| asset =~ regex }
+      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(url)
+        end
+      end
 
-        if matching_asset.to_s.empty?
-          raise_missing_asset(regex)
+      def asset_matching(url)
+        matching_asset = path_suffixes(url).find { |suffix| files.include?(suffix) }
+
+        unless matching_asset
+          raise_missing_asset(url)
         end
 
         prepend + matching_asset
       end
 
+      def path_suffixes(url)
+        segments = url.split("/").reject(&:empty?)
+
+        segments.each_index.map { |index| segments[index..].join("/") }
+      end
+
       def prepend
         asset_map["prepend"].to_s
       end
@@ -54,8 +71,8 @@ module EmberCli
         asset_map["assets"] || {}
       end
 
-      def raise_missing_asset(regex)
-        raise BuildError.new("Failed to find assets matching `#{regex}`")
+      def raise_missing_asset(url)
+        raise BuildError.new("Failed to find assets matching `#{url}`")
       end
 
       def assert_asset_map!

data/lib/ember_cli/assets/directory_asset_map.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 module EmberCli
   module Assets
     class DirectoryAssetMap
@@ -18,7 +20,7 @@ module EmberCli
 
       def files_with_data
         files.reduce({}) do |manifest, file|
-          name = File.basename(file.path)
+          name = file.relative_path_from(directory).to_s
 
           manifest[name] = name
 
@@ -26,9 +28,8 @@ module EmberCli
         end
       end
 
-
       def files
-        directory.children.map { |path| File.new(path) }
+        directory.glob("**/*", File::FNM_DOTMATCH).select(&:file?)
       end
     end
   end

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.9.0"
+    VERSION = "0.9.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails-assets
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 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:
@@ -62,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Include EmberCLI-generated JavaScript and CSS stylesheet tags in your Rails
   layouts