Skip to content

Commit c4b593f

Browse files
krasnoukhovseanpdoyle
authored andcommitted
Do not remove dependency directories entirely
Remove contents only instead. This helps when either of `node_modules` or `bower_components` is a symlink.
1 parent 8f29ad4 commit c4b593f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
master
22
------
33

4+
* Fix dependencies check for compile command. [#455]
45
* Introduce the `silent` configuration value. [#445]
56

7+
[#455]: https://github.com/thoughtbot/ember-cli-rails/pull/455
68
[#445]: https://github.com/thoughtbot/ember-cli-rails/pull/445
79

810
0.7.3

lib/ember_cli/shell.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ def invalid_ember_dependencies?
6363
end
6464

6565
def clean_ember_dependencies!
66-
ember_dependency_directories.select(&:exist?).each(&:rmtree)
66+
ember_dependency_directories.flat_map(&:children).each(&:rmtree)
6767
end
6868

6969
def ember_dependency_directories
7070
[
7171
paths.node_modules,
7272
paths.bower_components,
73-
]
73+
].select(&:exist?)
7474
end
7575

7676
def spawn(command)

0 commit comments

Comments
 (0)