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 remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Khalah Jones-Golden 2015-09-08 13:13:46 -04:00
commit f46c86ab66
6 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/cli/index.build.js
View file

@ -1,12 +0,0 @@
var _ = require('lodash');
var fromRoot = require('requirefrom')('src/utils')('fromRoot');
var babelOpts = _.defaults({
ignore: [
fromRoot('src'),
/[\\\/](node_modules|bower_components)[\\\/]/
]
}, require('../optimize/babelOptions').node);
require('babel/register')(babelOpts);
require('./cli');

14
src/optimize/babelOptions.build.js Normal file
View file

@ -0,0 +1,14 @@
var fromRoot = require('requirefrom')('src/utils')('fromRoot');
exports.webpack = {
stage: 1,
nonStandard: false,
optional: ['runtime']
};
exports.node = Object.assign({
ignore: [
fromRoot('src'),
/[\\\/](node_modules|bower_components)[\\\/]/
]
}, exports.webpack);

13
tasks/build/babelOptions.js Normal file
View file

@ -0,0 +1,13 @@
module.exports = function (grunt) {
var srcFile = 'build/kibana/src/optimize/babelOptions.js';
var buildFile = 'build/kibana/src/optimize/babelOptions.build.js';
var rename = require('fs').renameSync;
var unlink = require('fs').unlinkSync;
grunt.registerTask('_build:babelOptions', function () {
unlink(srcFile);
rename(buildFile, srcFile);
});
};

13
tasks/build/cliIndex.js
View file

@ -1,13 +0,0 @@
module.exports = function (grunt) {
var srcFile = 'build/kibana/src/cli/index.js';
var buildFile = 'build/kibana/src/cli/index.build.js';
var rename = require('fs').renameSync;
var unlink = require('fs').unlinkSync;
grunt.registerTask('_build:cliIndex', function () {
unlink(srcFile);
rename(buildFile, srcFile);
});
};

2
tasks/build/index.js
View file

@ -9,7 +9,7 @@ module.exports = function (grunt) {
'_build:downloadNodeBuilds:start',
'copy:devSource',
'babel:build',
'_build:cliIndex',
'_build:babelOptions',
'_build:installedPlugins',
'_build:packageJson',
'_build:readme',

4
tasks/build/shrinkwrap.js
View file

@ -13,7 +13,7 @@ module.exports = function (grunt) {
if (e.code !== 'ENOENT') throw e;
if (createIfMissing) {
exec('npm', ['shrinkwrap', '--dev', '--logLevel', 'error']);
exec('npm', ['shrinkwrap', '--dev', '--loglevel', 'error']);
newFiles.push(shrinkwrapFile);
}
else grunt.fail.warn('Releases require an npm-shrinkwrap.json file to exist');
@ -28,7 +28,7 @@ module.exports = function (grunt) {
exec('cp', ['npm-shrinkwrap.json', join(config.get('root'), 'build', 'kibana', 'npm-shrinkwrap.build.json')]);
// create shrinkwrap without dev dependencies and copy to build
exec('npm', ['shrinkwrap', '--logLevel', 'error']);
exec('npm', ['shrinkwrap', '--loglevel', 'error']);
exec('cp', ['npm-shrinkwrap.json', join(config.get('root'), 'build', 'kibana', 'npm-shrinkwrap.json')]);
// restore the dev shrinkwrap