Skip to content

Commit 266a533

Browse files
committed
Resolve ember executable with full path
Closes [#392]. Resolve `ember` executable with full path within `node_modules`, instead of depending on the presence of `node_modules/.bin`. [#392]: #392
1 parent ce5db79 commit 266a533

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
master
22
------
33

4+
* Resolve `ember` executable with full path within `node_modules`, instead of
5+
depending on the presence of `node_modules/.bin`. [#395]
46
* Introduce the idea of `App#mountable?` and `App#to_rack` for handling deploys
57
that don't serve assets from the file system (Redis, for example).
68
* Fix bug with generated `bin/heroku_install` script iterating through multiple
79
* Don't mount route helpers at top-level. Instead, mount within the surrounding
810
context with which they're invoked. [#381]
911

12+
[#395]: https://github.com/thoughtbot/ember-cli-rails/pull/395
1013
[#381]: https://github.com/thoughtbot/ember-cli-rails/pull/381
1114

1215
0.7.0

lib/ember_cli/path_set.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def gemfile
3737

3838
def ember
3939
@ember ||= begin
40-
root.join("node_modules", ".bin", "ember").tap do |path|
40+
root.join("node_modules", "ember-cli", "bin", "ember").tap do |path|
4141
unless path.executable?
4242
fail DependencyError.new <<-MSG.strip_heredoc
4343
No `ember-cli` executable found for `#{app_name}`.

spec/lib/ember_cli/path_set_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
describe "#ember" do
8282
it "is an executable child of #node_modules" do
8383
app = build_app
84-
ember_path = rails_root.join(app.name, "node_modules", ".bin", "ember")
84+
ember_path = rails_root.join(app.name, "node_modules", "ember-cli", "bin", "ember")
8585
create_executable(ember_path)
8686

8787
path_set = build_path_set(app: app)

0 commit comments

Comments
 (0)