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 'preventHomeDirAccess'

Browse source
This commit is contained in:
spalger 2015-11-06 16:56:12 -06:00
commit 5a72e17299
6 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -19,3 +19,4 @@ webpackstats.json
config/kibana.dev.yml
coverage
selenium
.babelcache.json

0
optimize/.empty Normal file
View file

5
src/cli/index.js
View file

@ -1,2 +1,5 @@
require('babel/register')(require('../optimize/babelOptions').node);
// load the babel options seperately so that they can modify the process.env
// before calling babel/register
const babelOptions = require('../optimize/babelOptions').node;
require('babel/register')(babelOptions);
require('./cli');

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

@ -1,4 +1,6 @@
var fromRoot = require('requirefrom')('src/utils')('fromRoot');
var cloneDeep = require('lodash').cloneDeep;
var fromRoot = require('path').resolve.bind(null, __dirname, '../../');
process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
exports.webpack = {
stage: 1,
@ -6,7 +8,7 @@ exports.webpack = {
optional: ['runtime']
};
exports.node = Object.assign({
exports.node = cloneDeep({
ignore: [
fromRoot('src'),
/[\\\/](node_modules|bower_components)[\\\/]/

6
src/optimize/babelOptions.js
View file

@ -1,7 +1,11 @@
var cloneDeep = require('lodash').cloneDeep;
var fromRoot = require('path').resolve.bind(null, __dirname, '../../');
process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
exports.webpack = {
stage: 1,
nonStandard: false,
optional: ['runtime']
};
exports.node = Object.assign({}, exports.webpack);
exports.node = cloneDeep(exports.webpack);

1
tasks/build/babelOptions.js
View file

@ -8,6 +8,7 @@ module.exports = function (grunt) {
grunt.registerTask('_build:babelOptions', function () {
unlink(srcFile);
rename(buildFile, srcFile);
grunt.file.mkdir('build/kibana/optimize');
});
};