ember-cli-rails 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88933ba7736d53f0cf1f9fc79e6b9997469517188a1b904571222f7e57d15091
-  data.tar.gz: fdd038c1e831096567b4bbdef03ed722c40ff11da77e87a29c3059073109d620
+  metadata.gz: '01934a2a5a3ef903507625bbb0f2d3f7ad9d3bc80e026b2b127814d0c43e3945'
+  data.tar.gz: 3b03f7954e570fa28a5def013795b75541aa2e64b7bf81698936b91ad636fed4
 SHA512:
-  metadata.gz: 10ad87d14effd255d9b13ecfd73ed2a26290199ea410d3204280cee51a2e90dd39c9802cf2201787d119fbafd7da10b29fee6d9e2305f6cf67d81b9946e8c0df
-  data.tar.gz: e6deabf31ce35858c53174386ffb9ae94cbbbf7a6b2eab5a72cec66deb607040b184c217a124b77ac06ac414d77ec86d6d62198f0fb425119657ca460403d509
+  metadata.gz: 24d38e8a374602833f3955354b8aea2056d97f2f20da42926f9de96fd2b16da768833364211b9f3a0518a9c6ce51637ca94636a0675f9380d53f784395cf2b93
+  data.tar.gz: c12ff4d4cb60463d50ad52e1be2c68bf3a9b0e89bc5f7caceabba76fcb65cee4ff3b3cafff6ea0ab7db1a9c5427e821a40c30863890abfa81ab481e76f6540d8

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+0.13.2
+------
+
+* Raise `EmberCli::BuildError` when `ember build` or a dependency
+  installation fails, instead of exiting the process from inside the gem —
+  `rake ember:compile` and `rake ember:install` still exit nonzero
+* Remap the root-relative asset URLs in a Vite build's `index.html` onto the
+  mount point when `mount_ember_app` serves the application from a path other
+  than `/`, so non-root mounts work without a matching `rootURL`
+
+0.13.1
+------
+
+* Fix `EmberCli::App#test` to report a failing suite by returning `false`
+  instead of exiting the process from inside the gem — one failing Ember suite
+  no longer aborts the caller (RSpec included) mid-run. `EmberCli.test!`
+  raises `EmberCli::TestFailureError` when a suite fails, which still exits
+  `rake ember:test` nonzero
+
 0.13.0
 ------
 

data/README.md

@@ -142,6 +142,7 @@ end
   For instance, mounting `mount_ember_app :frontend, to: "/frontend"` will handle a
   `format: :html` request to `/frontend/posts`.
   *Note:* If you specify a custom path, you must also update the `rootURL` in `frontend/config/environment.js`. See [Mounting multiple Ember applications](#mounting-multiple-ember-applications) for more information.
+  *Note:* Requests without `Accept: text/html` — `curl`'s default, most health checkers — skip this route and receive the raw `index.html` from the asset handler.
 * `controller` - Defaults to `"ember_cli/ember"`
 * `action` - Defaults to `"index"`
 
@@ -195,6 +196,8 @@ Rails still renders the application's `index.html`, but reads it from the
 development server rather than from disk. The root-relative URLs in that
 document are rewritten to point at the development server, so the browser
 loads the application's modules — and Vite's HMR client — from it directly.
+The rewriting covers every tag the server emits: Vite externalizes even the
+document's inline bootstrapping script.
 Changes to the Ember application are hot-reloaded without reloading the page,
 and without restarting Rails.
 
@@ -238,6 +241,11 @@ end
 With `host: "0.0.0.0"`, Rails itself reaches the development server through the
 loopback interface.
 
+Vite's default CORS setting allows localhost origins only: to open the page on
+a LAN IP or a custom domain, configure
+[`server.cors`](https://vite.dev/config/server-options#server-cors) in
+`vite.config.*`.
+
 The development server's output is written to
 `log/ember-<app>.<environment>.log`.
 
@@ -469,6 +477,9 @@ helper in your view:
 The `body` block argument and the corresponding call to `body.append` in the
 example are both optional, and can be omitted.
 
+`render_ember_app` emits a complete HTML document, so render it with the
+layout disabled (see below).
+
 ### Serving Rails-generated CSS
 
 For more information on how to work with EmberCLI-generated stylesheets, refer
@@ -591,7 +602,15 @@ Rails.application.routes.draw do
 end
 ```
 
-Then set each Ember application's `rootURL` to the mount point:
+The `index.html` of a Vite build refers to its assets with root-relative URLs.
+When the application is served from the build output, `mount_ember_app` remaps
+those references onto the mount point, where the assets are served — references
+that already carry the mount point, from a `rootURL` configured to match it,
+are left alone. Development-server-backed applications are unaffected: their
+asset URLs point at the development server absolutely.
+
+For classic (Broccoli-based) applications, set each Ember application's
+`rootURL` to the mount point:
 
 ```javascript
 // frontend/config/environment.js

data/app/helpers/ember_rails_helper.rb

@@ -8,6 +8,12 @@ module EmberRailsHelper
 
     head, body = markup_capturer.capture
 
-    render html: EmberCli[name].index_html(head: head, body: body).html_safe
+    index_html = EmberCli[name].index_html(
+      head: head,
+      body: body,
+      mount_point: params[:ember_mount_point],
+    )
+
+    render html: index_html.html_safe
   end
 end

data/lib/ember_cli/app.rb

@@ -63,11 +63,11 @@ module EmberCli
       end
     end
 
-    def index_html(head:, body:)
+    def index_html(head:, body:, mount_point: nil)
       html = HtmlPage::Renderer.new(
         head: head,
         body: body,
-        content: deploy.index_html,
+        content: remap_to_mount_point(deploy.index_html, mount_point),
       )
 
       html.render
@@ -131,6 +131,25 @@ module EmberCli
       env.to_s == "test"
     end
 
+    # The `index.html` of a Vite build refers to its assets with root-relative
+    # URLs. When the application is mounted somewhere other than `/`, remap
+    # them onto the mount point, where `mount_ember_assets` serves them.
+    # References that already carry the mount point — a `rootURL` configured
+    # to match it — are left alone.
+    def remap_to_mount_point(html, mount_point)
+      prefix = mount_point.to_s.chomp("/")
+
+      if prefix.empty? || !paths.vite?
+        return html
+      end
+
+      already_mounted = Regexp.escape(prefix.delete_prefix("/"))
+
+      html.gsub(%r{(\s)(src|href)=(["'])/(?!/)(?!#{already_mounted}/)}i) do
+        "#{$1}#{$2}=#{$3}#{prefix}/"
+      end
+    end
+
     def deploy
       deploy_strategy.new(self)
     end

data/lib/ember_cli/errors.rb

@@ -1,4 +1,5 @@
 module EmberCli
   class BuildError < StandardError; end
   class DependencyError < BuildError; end
+  class TestFailureError < StandardError; end
 end

data/lib/ember_cli/route_helpers.rb

@@ -6,7 +6,7 @@ module ActionDispatch
     class Mapper
       def mount_ember_app(app_name, to:, **options)
         routing_options = options.deep_merge(
-          defaults: { ember_app: app_name },
+          defaults: { ember_app: app_name, ember_mount_point: to },
         )
 
         routing_options.reverse_merge!(

data/lib/ember_cli/runner.rb

@@ -1,5 +1,7 @@
 require "open3"
 
+require "ember_cli/errors"
+
 module EmberCli
   class Runner
     def initialize(out:, err:, env: {}, options: {})
@@ -25,7 +27,7 @@ module EmberCli
     def run!(command)
       run(command).tap do |status|
         unless status.success?
-          exit status.exitstatus
+          fail BuildError, "`#{command}` failed with status #{status.exitstatus}"
         end
       end
     end

data/lib/ember_cli/shell.rb

@@ -81,7 +81,7 @@ module EmberCli
     end
 
     def test
-      run! ember.test
+      run ember.test
     end
 
     private

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.13.0".freeze
+  VERSION = "0.13.2".freeze
 end

data/lib/ember_cli.rb

@@ -44,7 +44,11 @@ module EmberCli
   end
 
   def test!
-    each_app(&:test)
+    each_app do |app|
+      unless app.test
+        fail TestFailureError, "The Ember test suite failed for #{app.name.inspect}"
+      end
+    end
   end
 
   def compile!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Pavel Pravosud