github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into testDiscover

Browse source
This commit is contained in:
LeeDr 2015-11-11 14:21:00 -06:00
commit c8f757c3a2
6 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.npmrc Normal file
View file

@ -0,0 +1 @@
save-exact=true

3
package.json
View file

@ -83,7 +83,6 @@
"brace": "0.5.1",
"bunyan": "1.4.0",
"commander": "2.8.1",
"core-js": "1.2.5",
"css-loader": "0.17.0",
"d3": "3.5.6",
"elasticsearch": "8.0.1",
@ -173,7 +172,7 @@
"npm": "2.11.0",
"portscanner": "1.0.0",
"simple-git": "1.8.0",
"sinon": "1.16.1",
"sinon": "1.17.2",
"source-map": "0.4.4",
"wreck": "6.2.0"
},

5
src/optimize/babelOptions.build.js
View file

@ -1,6 +1,9 @@
var cloneDeep = require('lodash').cloneDeep;
var fromRoot = require('path').resolve.bind(null, __dirname, '../../');
process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
if (!process.env.BABEL_CACHE_PATH) {
process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
}
exports.webpack = {
stage: 1,

5
src/optimize/babelOptions.js
View file

@ -1,6 +1,9 @@
var cloneDeep = require('lodash').cloneDeep;
var fromRoot = require('path').resolve.bind(null, __dirname, '../../');
process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
if (!process.env.BABEL_CACHE_PATH) {
process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
}
exports.webpack = {
stage: 1,

6
src/ui/public/testHarness/testHarness.js
View file

@ -1,4 +1,8 @@
/* global mocha */
// chrome expects to be loaded first, let it get its way
var chrome = require('ui/chrome');
var Nonsense = require('Nonsense');
var sinon = require('sinon');
var $ = require('jquery');
@ -6,8 +10,6 @@ var _ = require('lodash');
var parse = require('url').parse;
var StackTraceMapper = require('ui/StackTraceMapper');
var chrome = require('ui/chrome');
/*** the vislib tests have certain style requirements, so lets make sure they are met ***/
$('body').attr('id', 'test-harness-body'); // so we can make high priority selectors

1
tasks/config/run.js
View file

@ -34,6 +34,7 @@ module.exports = function (grunt) {
cmd: /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana',
args: [
'--server.port=' + uiConfig.servers.kibana.port,
'--env.name=development',
'--elasticsearch.url=' + format(uiConfig.servers.elasticsearch),
'--logging.json=false'
]