github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

lock down nvd3 and angular-nvd3 versions which are known to work together

Browse source
This commit is contained in:
Spencer Alger 2015-07-10 11:20:35 -07:00
parent 473f0a32e5
commit 226d4142ff
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
package.json
View file

@ -39,7 +39,7 @@
"url": "https://github.com/elastic/kibana.git"
},
"dependencies": {
"angular-nvd3": "^1.0.0-beta",
"angular-nvd3": "krispo/angular-nvd3#7f04d396cb69cb0ed944555ffeb95e0d7457c952",
"ansicolors": "^0.3.2",
"autoprefixer-loader": "^2.0.0",
"babel-jscs": "^1.0.3",
@ -80,7 +80,7 @@
"moment": "^2.10.3",
"node-libs-browser": "spalger/node-libs-browser",
"numeral": "^1.5.3",
"nvd3": "^1.8.1",
"nvd3": "novus/nvd3#679fe2ff96c194e442970cb9959ebccd79f6bd43",
"raw-loader": "^0.5.1",
"request": "^2.40.0",
"requirefrom": "^0.2.0",
@ -122,7 +122,6 @@
"load-grunt-config": "^0.7.0",
"marked": "^0.3.3",
"marked-text-renderer": "^0.1.0",
"mkdirp": "^0.5.0",
"mocha": "^2.2.5",
"nock": "^1.6.0",
"nodemon": "^1.3.7",

11
src/plugins/serverStatus/index.js
View file

@ -16,9 +16,16 @@ module.exports = function (kibana) {
}
},
modules: {
nvd3$: {
path: 'nvd3/build/nv.d3.js',
exports: 'window.nv',
imports: 'd3'
}
},
loaders: [
{ test: /\/nvd3\//, loader: 'exports?nv' },
{ test: /\/angular-nvd3\//, loader: 'imports?angular,d3' }
{ test: /\/angular-nvd3\//, loader: 'imports?angular,nv=nvd3,d3' }
]
}
});