Skip to content

Commit

Permalink
Merge pull request #32 from UKHomeOffice/devtask/31-remove-parallelshell
Browse files Browse the repository at this point in the history
Replaced parallelshell (deprecated) with npm-run-all, also removed unn…
  • Loading branch information
JoeChapman committed Apr 26, 2016
2 parents cbc8886 + adf6a2a commit d523ecc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion acceptance_tests/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source "https://rubygems.org"

gem 'cucumber'
gem 'capybara'
gem 'rspec'
gem 'poltergeist'
gem 'phantomjs', '1.9.8.0'
gem 'rspec'
gem 'show_me_the_cookies'
gem 'yard-cucumber'
gem 'selenium-webdriver', '2.45.0'
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
},
"scripts": {
"start": "node .",
"dev": "parallelshell 'NODE_ENV=development nodemon .' 'npm run watch:scss' 'npm run watch:js' 'npm run watch:translations'",
"dev": "npm-run-all --parallel watch:app watch:scss watch:js watch:translations",
"watch:app": "NODE_ENV=development nodemon .",
"watch:scss": "nodemon -e scss -x 'npm run sass'",
"watch:js": "nodemon --watch assets/js -x 'npm run browserify'",
"watch:translations": "nodemon --watch apps/my_awesome_form/translations/src -x 'npm run hof-transpile'",
Expand All @@ -22,7 +23,7 @@
"copy:images": "cp -r ./assets/images ./public/",
"style": "jscs **/*.js --config=./.jscsrc.json",
"quality": "plato -r -x 'node_modules|reports|test' -d reports/plato .",
"sass": "./node_modules/node-sass/bin/node-sass ./assets/scss/app.scss ./public/css/app.css --include-path ./node_modules",
"sass": "node-sass ./assets/scss/app.scss ./public/css/app.css --include-path ./node_modules",
"create:public": "mkdir -p ./public/js ./public/css ./public/images",
"hof-transpile": "hof-transpiler ./apps/**/translations/src -w --shared ./apps/common/translations/src",
"postinstall": "npm run create:public; npm run sass; npm run browserify; npm run copy:images; npm run hof-transpile"
Expand Down Expand Up @@ -65,7 +66,7 @@
"mocha-junit-reporter": "^1.4.0",
"mocha-multi": "^0.7.1",
"nodemon": "^1.9.0",
"parallelshell": "^1.1.1",
"npm-run-all": "^1.7.0",
"plato": "^1.5.0",
"pre-commit": "^1.0.10",
"proxyquire": "^1.5.0",
Expand Down

0 comments on commit d523ecc

Please sign in to comment.