diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js index 02cdeab97..952768da7 100644 --- a/lib/grunt/utils.js +++ b/lib/grunt/utils.js @@ -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'; @@ -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 : '', @@ -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) { @@ -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) { diff --git a/package.json b/package.json index f2c484800..beac2859b 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,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", diff --git a/yarn.lock b/yarn.lock index 4073d66ac..e6ae90ce6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1660,11 +1660,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" @@ -2449,16 +2445,7 @@ glob@7.0.5, 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: @@ -2506,6 +2493,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" @@ -5069,8 +5065,8 @@ read@~1.0.4: mute-stream "~0.0.4" readable-stream@1.1, "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"