upgrade to npm 3.0

This commit is contained in:
spalger 2015-08-26 16:36:19 -07:00
parent 556e79dc2f
commit faa1011bbd
5 changed files with 5 additions and 26 deletions

View file

@ -45,23 +45,7 @@ module.exports = function (grunt) {
'<%= root %>/tasks/**/*.js',
'<%= src %>/**/*.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);

View file

@ -166,6 +166,7 @@
"wreck": "^6.1.0"
},
"engines": {
"node": ">=2"
"node": "^2.4",
"npm": "^3.2"
}
}

View file

@ -14,8 +14,6 @@ module.exports = function (grunt) {
'_build:readme',
'_build:installNpmDeps',
'clean:testsFromModules',
'clean:deepModuleBins',
'clean:deepModules',
'run:optimizeBuild',
'stop:optimizeBuild',
'_build:downloadNodes:finish',

View file

@ -2,7 +2,6 @@ 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 () {
@ -18,7 +17,7 @@ module.exports = function (grunt) {
sha: grunt.config.get('buildSha')
},
repository: pkg.repository,
dependencies: defaults({}, pkg.dependencies, deepModules)
dependencies: pkg.dependencies
}, null, ' ')
);
});

View file

@ -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*/**',
deepModuleBins: 'build/kibana/node_modules/*/node_modules/**/.bin/{' + modules.join(',') + '}',
deepModules: 'build/kibana/node_modules/*/node_modules/**/{' + modules.join(',') + '}/',
testsFromModules: 'build/kibana/node_modules/**/*test*/**'
};
};