Skip to content

Commit

Permalink
Add support for yarn
Browse files Browse the repository at this point in the history
#496

[yarn](https://github.com/yarnpkg/yarn) has significantly reduced the time it takes to install npm packages. Given the benefits of yarn, I've added opt-in support for using `yarn install` instead of `npm install`.

Enabling yarn can be done by either:
* Specifying the `yarn` option:
```ruby
EmberCli.configure do |c|
  c.app :frontend, yarn: true
end
```
* Specifying the `yarn_path`:
```ruby
EmberCli.configure do |c|
  c.app :frontend, yarn_path: "/home/app/bin/yarn"
end
```
  • Loading branch information
drewtempelmeyer authored and seanpdoyle committed Oct 28, 2016
1 parent 9119085 commit 7fc1b3e
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
master
------

* Add support for integrating with `yarn`. [#496]

[#496]: https://github.com/thoughtbot/ember-cli-rails/pull/496

0.8.2.
------

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ c.app :frontend, path: "~/projects/my-ember-app"

- `silent` - this provides `--silent` option for Ember CLI commands to control verbosity of their output.

- `yarn` - enables the [yarn](https://github.com/yarnpkg/yarn) package manager when installing dependencies

```ruby
EmberCli.configure do |c|
c.app :adminpanel # path defaults to `Rails.root.join("adminpanel")`
Expand Down
20 changes: 19 additions & 1 deletion lib/ember_cli/path_set.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def ember
Install it:
$ cd #{root}
$ npm install
$ #{package_manager} install
MSG
end
end
Expand Down Expand Up @@ -86,6 +86,12 @@ def npm
@npm ||= app_options.fetch(:npm_path) { which("npm") }
end

def yarn
if yarn?
@yarn ||= app_options.fetch(:yarn_path) { which("yarn") }
end
end

def node_modules
@node_modules ||= root.join("node_modules")
end
Expand All @@ -102,6 +108,18 @@ def bundler

attr_reader :app, :ember_cli_root, :environment, :rails_root

def package_manager
if yarn?
"yarn"
else
"npm"
end
end

def yarn?
app_options[:yarn] || app_options[:yarn_path]
end

def app_name
app.name
end
Expand Down
7 changes: 6 additions & 1 deletion lib/ember_cli/shell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ def install
clean_ember_dependencies!
end

run! "#{paths.npm} prune && #{paths.npm} install"
if paths.yarn
run! "#{paths.yarn} install"
else
run! "#{paths.npm} prune && #{paths.npm} install"
end

run! "#{paths.bower} prune && #{paths.bower} install"
end

Expand Down
26 changes: 26 additions & 0 deletions spec/lib/ember_cli/path_set_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,32 @@
end
end

describe "#yarn" do
it "is not enabled by default" do
path_set = build_path_set

expect(path_set.yarn).to be nil
end

it "can be overridden" do
app = build_app(options: { yarn_path: "yarn-path" })

path_set = build_path_set(app: app)

expect(path_set.yarn).to eq "yarn-path"
end

it "can be inferred from the $PATH" do
stub_which(yarn: "yarn-path")

app = build_app(options: { yarn: true })

path_set = build_path_set(app: app)

expect(path_set.yarn).to eq "yarn-path"
end
end

describe "#node_modules" do
it "is a child of #root" do
app = build_app(name: "foo")
Expand Down

0 comments on commit 7fc1b3e

Please sign in to comment.