IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix npm 3 build failure in phantomjs task

Browse Source 
npm v3.0+ by default dedupes node modules and stores them in a flat
tree, which means the hardcoded path to the location.js will no longer
be nested under the karma-phantomjs-launcher module.

This fixes issue #2999.
This commit is contained in:
Felix Bünemann 2015-10-31 05:36:35 +01:00
parent 0a0a0776e4
commit 2ca6acc1e9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/options/phantomjs.js
View File

@ -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")