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

Fix npm 3 build failure in phantomjs task
2015-10-31 11:35:17 +01:00
parent 0a0a0776e4 2ca6acc1e9
commit db083c43dd
1 changed files with 5 additions and 0 deletions
@@ -6,6 +6,11 @@ module.exports = function(config,grunt) {
    var dest = './vendor/phantomjs/phantomjs';
    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)){

      var m=grunt.file.read(confDir+"location.js")