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

[optimize] remove optimize.tests config, rely on optimize.bundleFilter instead

Browse source
This commit is contained in:
spalger 2015-08-18 13:30:45 -07:00
parent ce19ecc2a2
commit e39a47e9bf
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/testsBundle/index.js
View file

@ -1,6 +1,4 @@
module.exports = (kibana) => { module.exports = (kibana) => {
if (!kibana.config.get('optimize.tests')) return;
let { union } = require('lodash'); let { union } = require('lodash');
let utils = require('requirefrom')('src/utils'); let utils = require('requirefrom')('src/utils');

9
src/server/config/schema.js
View file

@ -79,11 +79,7 @@ module.exports = Joi.object({
optimize: Joi.object({ optimize: Joi.object({
enabled: Joi.boolean().default(true), enabled: Joi.boolean().default(true),
bundleFilter: Joi.string().when('tests', { bundleFilter: Joi.string().default('!tests'),
is: true,
then: Joi.default('tests'),
otherwise: Joi.default('*')
}),
bundleDir: Joi.string().default(fromRoot('optimize/bundles')), bundleDir: Joi.string().default(fromRoot('optimize/bundles')),
viewCaching: Joi.boolean().default(Joi.ref('$prod')), viewCaching: Joi.boolean().default(Joi.ref('$prod')),
lazy: Joi.boolean().when('$dev', { lazy: Joi.boolean().when('$dev', {
@ -109,8 +105,7 @@ module.exports = Joi.object({
Joi.boolean() Joi.boolean()
) )
.default(Joi.ref('$dev')), .default(Joi.ref('$dev')),
profile: Joi.boolean().default(false), profile: Joi.boolean().default(false)
tests: Joi.boolean().default(false),
}).default() }).default()
}).default(); }).default();

2
tasks/config/run.js
View file

@ -14,7 +14,7 @@ module.exports = function (grunt) {
args: [ args: [
'--env.name=development', '--env.name=development',
'--logging.json=false', '--logging.json=false',
'--optimize.tests=true', '--optimize.bundleFilter=tests',
'--optimize.lazy=false' '--optimize.lazy=false'
] ]
}, },