ember-cli-rails-assets 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e9361dbdbf288e9b4945183a249ef297ec40d00d2bdbe1e5c3931e4015892e4
-  data.tar.gz: 91a2fbb0e865ad05e5e6f7ce07ceaa92fee88ec6f7bd10ad49dd8e265fac1b86
+  metadata.gz: 56b0e51245621258b937d06d80ec8a579a0a79757d82ca48543c6140a831a557
+  data.tar.gz: c3e66e4300881a1627db2ef33e89cd4814a3cb9aaba1f664113bd3dd5caf3ba0
 SHA512:
-  metadata.gz: 2f2a291c76a50993d6e18cae3398364507ce288bc33da35f877945f5aaacbf51a45f48b260373f5708eef4d57134a3204c2b49d9d529f91da562b639a5a6fe9d
-  data.tar.gz: 86b8e8b0d76d40867537b97613504b131e3972eebc7c7fe386f284af1745481ffa2a81391bc26ebc0f89a67af2209c1ad1c2eae6e816d233d02b4f893b8eb608
+  metadata.gz: e11ac7ab0892ee54e8c6de2e0bf410db8596de9e45efd40658bd6c5c2803ddb3a9eee354730327644f9445063e041f502415280d1ac93fd0de54eb697cfb07a1
+  data.tar.gz: 6d5cbfadca8796f9596eaa67d5c8c3a9a6c36a45ea3f5751606ac617ea025064861210cebd97f04bf2ff14b65d202c049645577c08220da5bd3acf476f06a535

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
 
@@ -52,7 +52,7 @@ module.exports = function(defaults) {
 };
 ```
 
-[README]: https://github.com/thoughtbot/ember-cli-rails#readme
+[README]: https://github.com/tricknotes/ember-cli-rails#readme
 
 ## Mount
 
@@ -141,7 +141,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 +158,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,15 +1,18 @@
 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: "")
@@ -22,4 +25,38 @@ module EmberCliRailsAssetsHelper
       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/engine.rb

@@ -1,9 +1,6 @@
 module EmberCli
   module Assets
     class Engine < ::Rails::Engine
-      config.to_prepare do
-        ActionController::Base.helper EmberCliRailsAssetsHelper
-      end
     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.0"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails-assets
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Sean Doyle
-autorequire:
+- Ryunosuke Sato
 bindir: bin
 cert_chain: []
-date: 2023-02-11 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.4.6
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Include EmberCLI-generated JavaScript and CSS stylesheet tags in your Rails
   layouts