Skip to content

Commit

Permalink
chore(utils): install npm-run to simplify scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
petebacondarwin committed Nov 29, 2016
1 parent 0990833 commit ca139de
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 21 deletions.
8 changes: 4 additions & 4 deletions lib/grunt/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var fs = require('fs');
var shell = require('shelljs');
var grunt = require('grunt');
var spawn = require('cross-spawn');
var spawn = require('npm-run').spawn;

var CSP_CSS_HEADER = '/* Include this file in your html if you are using the CSP mode. */\n\n';

Expand All @@ -15,7 +15,7 @@ module.exports = {
var reporters = grunt.option('reporters');
var noColor = grunt.option('no-colors');
var port = grunt.option('port');
var p = spawn('./node_modules/.bin/karma', ['start', config,
var p = spawn('karma', ['start', config,
singleRun ? '--single-run=true' : '',
reporters ? '--reporters=' + reporters : '',
browsers ? '--browsers=' + browsers : '',
Expand All @@ -38,7 +38,7 @@ module.exports = {
done();
return;
}
var p = spawn('./node_modules/.bin/webdriver-manager', ['update']);
var p = spawn('webdriver-manager', ['update']);
p.stdout.pipe(process.stdout);
p.stderr.pipe(process.stderr);
p.on('exit', function(code) {
Expand All @@ -65,7 +65,7 @@ module.exports = {
}


var p = spawn('./node_modules/.bin/protractor', args);
var p = spawn('protractor', args);
p.stdout.pipe(process.stdout);
p.stderr.pipe(process.stderr);
p.on('exit', function(code) {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"log4js": "^0.6.27",
"marked": "~0.3.0",
"node-html-encoder": "0.0.2",
"npm-run": "^4.1.0",
"promises-aplus-tests": "~2.1.0",
"protractor": "^4.0.10",
"q": "~1.0.0",
Expand Down
30 changes: 13 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1677,11 +1677,7 @@ domain-browser@~1.1.0:
version "1.1.7"
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"

domelementtype@1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"

domelementtype@~1.1.1:
domelementtype@1, domelementtype@~1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"

Expand Down Expand Up @@ -2472,16 +2468,7 @@ [email protected], glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@~7.0.0:
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@^4.0.5, glob@~4.0.2:
version "4.0.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-4.0.6.tgz#695c50bdd4e2fb5c5d370b091f388d3707e291a7"
dependencies:
graceful-fs "^3.0.2"
inherits "2"
minimatch "^1.0.0"
once "^1.3.0"

glob@^4.3.1, glob@~4.3.0:
glob@^4.0.5, glob@^4.3.1, glob@~4.3.0:
version "4.3.5"
resolved "https://registry.yarnpkg.com/glob/-/glob-4.3.5.tgz#80fbb08ca540f238acce5d11d1e9bc41e75173d3"
dependencies:
Expand Down Expand Up @@ -2529,6 +2516,15 @@ glob@~3.1.21:
inherits "1"
minimatch "~0.2.11"

glob@~4.0.2:
version "4.0.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-4.0.6.tgz#695c50bdd4e2fb5c5d370b091f388d3707e291a7"
dependencies:
graceful-fs "^3.0.2"
inherits "2"
minimatch "^1.0.0"
once "^1.3.0"

global-modules@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
Expand Down Expand Up @@ -5109,8 +5105,8 @@ read@~1.0.4:
mute-stream "~0.0.4"

[email protected], "readable-stream@>=1.1.13-1 <1.2.0-0", readable-stream@^1.0.27-1, readable-stream@^1.0.33-1, readable-stream@^1.1.13, readable-stream@^1.1.13-1, readable-stream@~1.1.8, readable-stream@~1.1.9:
version "1.1.14"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
version "1.1.13"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
Expand Down

0 comments on commit ca139de

Please sign in to comment.