Commit db083c43 by Torkel Ödegaard

Merge pull request #3111 from felixbuenemann/fix-npm-3-phantomjs-build-failure

Fix npm 3 build failure in phantomjs task
parents 0a0a0776 2ca6acc1
...@@ -6,6 +6,11 @@ module.exports = function(config,grunt) { ...@@ -6,6 +6,11 @@ module.exports = function(config,grunt) {
var dest = './vendor/phantomjs/phantomjs'; var dest = './vendor/phantomjs/phantomjs';
var confDir = './node_modules/karma-phantomjs-launcher/node_modules/phantomjs/lib/' var confDir = './node_modules/karma-phantomjs-launcher/node_modules/phantomjs/lib/'
if (!grunt.file.exists(confDir)) {
// npm 3 or npm 2 with dedupe
confDir = './node_modules/phantomjs/lib/';
}
if (!grunt.file.exists(dest)){ if (!grunt.file.exists(dest)){
var m=grunt.file.read(confDir+"location.js") var m=grunt.file.read(confDir+"location.js")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment