[build] move some select node modules up in the tree to prevent paths over windows limit

This commit is contained in:
spalger 2015-08-14 11:51:23 -07:00
parent 4f8cad5a0d
commit e4c4bcc513
3 changed files with 26 additions and 6 deletions

View file

@ -41,7 +41,23 @@ module.exports = function (grunt) {
'<%= root %>/tasks/**/*.js', '<%= root %>/tasks/**/*.js',
'<%= src %>/**/*.js', '<%= src %>/**/*.js',
'!<%= src %>/fixtures/**/*.js' '!<%= src %>/fixtures/**/*.js'
] ],
deepModules: {
'caniuse-db': '1.0.30000265',
'chalk': '1.1.0',
'glob': '4.5.3',
'har-validator': '1.8.0',
'json5': '0.4.0',
'loader-utils': '0.2.11',
'micromatch': '2.2.0',
'postcss-normalize-url': '2.1.1',
'postcss-reduce-idents': '1.0.2',
'postcss-unique-selectors': '1.0.0',
'postcss-minify-selectors': '1.4.6',
'postcss-single-charset': '0.3.0',
'regenerator': '0.8.36'
}
}; };
grunt.config.merge(config); grunt.config.merge(config);
@ -62,8 +78,6 @@ module.exports = function (grunt) {
} }
}); });
// load task definitions // load task definitions
grunt.task.loadTasks('tasks'); grunt.task.loadTasks('tasks');
grunt.task.loadTasks('tasks/build'); grunt.task.loadTasks('tasks/build');

View file

@ -1,6 +1,10 @@
module.exports = function (grunt) { module.exports = function (grunt) {
let { defaults } = require('lodash');
let pkg = grunt.config.get('pkg');
let deepModules = grunt.config.get('deepModules');
grunt.registerTask('build:packageJson', function () { grunt.registerTask('build:packageJson', function () {
var pkg = grunt.config.get('pkg');
grunt.file.write( grunt.file.write(
'build/kibana/package.json', 'build/kibana/package.json',
@ -14,7 +18,7 @@ module.exports = function (grunt) {
sha: grunt.config.get('buildSha') sha: grunt.config.get('buildSha')
}, },
repository: pkg.repository, repository: pkg.repository,
dependencies: pkg.dependencies dependencies: defaults({}, pkg.dependencies, deepModules)
}, null, ' ') }, null, ' ')
); );
}); });

View file

@ -1,7 +1,9 @@
module.exports = function (grunt) { module.exports = function (grunt) {
let modules = Object.keys(grunt.config.get('deepModules'));
return { return {
build: 'build', build: 'build',
target: 'target', target: 'target',
testsFromModules: 'build/kibana/node_modules/**/*test*' testsFromModules: 'build/kibana/node_modules/**/*test*/**',
deepModules: 'build/kibana/node_modules/*/node_modules/**/{' + modules.join(',') + '}/**'
}; };
}; };