Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,7 @@ module.exports = function (grunt) {
'<%= src %>/**/*.js',
'!<%= src %>/fixtures/**/*.js',
'!<%= root %>/test/fixtures/scenarios/**/*.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);
Expand Down
2 changes: 0 additions & 2 deletions tasks/build/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ module.exports = function (grunt) {
'_build:installNpmDeps',
'_build:removePkgJsonDeps',
'clean:testsFromModules',
'clean:deepModuleBins',
'clean:deepModules',
'run:optimizeBuild',
'stop:optimizeBuild',
'_build:downloadNodeBuilds:finish',
Expand Down
5 changes: 1 addition & 4 deletions tasks/build/packageJson.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
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 () {
const { sha, number, version } = grunt.config.get('build');
Expand All @@ -22,7 +19,7 @@ module.exports = function (grunt) {
engines: {
node: pkg.engines.node
},
dependencies: defaults({}, pkg.dependencies, deepModules)
dependencies: pkg.dependencies
}, null, ' ')
);
});
Expand Down
3 changes: 0 additions & 3 deletions tasks/config/clean.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
module.exports = function (grunt) {
let modules = Object.keys(grunt.config.get('deepModules'));
return {
build: 'build',
target: 'target',
testsFromModules: 'build/kibana/node_modules/**/{test,tests}/**',
deepModuleBins: 'build/kibana/node_modules/*/node_modules/**/.bin/{' + modules.join(',') + '}',
deepModules: 'build/kibana/node_modules/*/node_modules/**/{' + modules.join(',') + '}/',
};
};