Skip to content

Commit

Permalink
Replace npm references with yarn
Browse files Browse the repository at this point in the history
  • Loading branch information
blackjid authored and Greg Lazarev committed Mar 23, 2017
1 parent cb62326 commit 941ff0a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ dump.rdb
node_modules/
app/assets/webpack/app-bundle.js
app/assets/webpack/vendor-bundle.js
npm-debug.log
yarn-debug.log*
yarn-error.log*
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
web: bundle exec puma -C config/puma.rb
client: sh -c 'rm app/assets/webpack/* || true && npm run build:watch'
client: sh -c 'rm app/assets/webpack/* || true && yarn run build:watch'
resque_high: env TERM_CHILD=1 RESQUE_TERM_TIMEOUT=8 QUEUE=high,medium bundle exec rake resque:work
resque_medium: env TERM_CHILD=1 RESQUE_TERM_TIMEOUT=8 QUEUE=medium bundle exec rake resque:work
resque_low: env TERM_CHILD=1 RESQUE_TERM_TIMEOUT=8 QUEUE=low,medium bundle exec rake resque:work
Expand Down
4 changes: 2 additions & 2 deletions bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Set up Ruby
bundle install

# Install NPM modules
npm install
# Install Node modules
yarn

# Add binstubs to PATH via export PATH=".git/safe/../../bin:$PATH" in ~/.zshenv
mkdir -p .git/safe
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/js.rake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
namespace :js do
task spec: "webpack:build" do
sh "npm run test"
sh "yarn run test"
end
end
2 changes: 1 addition & 1 deletion lib/tasks/webpack.rake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace :webpack do
desc "Build the asset bundle with Webpack"
task :build do
sh "npm run build"
sh "yarn run build"
end
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"engines": {
"node": "7.4",
"npm": "4.0.5"
"yarn": "^0.14.0"
},
"dependencies": {
"autoprefixer": "^6.3.2",
Expand Down

0 comments on commit 941ff0a

Please sign in to comment.