Skip to content

Commit

Permalink
Merge pull request #19604 from twbs/fix-18559
Browse files Browse the repository at this point in the history
Use vanilla npm shrinkwrap instead of uber/npm-shrinkwrap
  • Loading branch information
cvrebert committed Mar 24, 2016
2 parents d34a643 + f30be4a commit 2955222
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 1,535 deletions.
17 changes: 0 additions & 17 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = function (grunt) {
var fs = require('fs');
var path = require('path');
var isTravis = require('is-travis');
var npmShrinkwrap = require('npm-shrinkwrap');
var mq4HoverShim = require('mq4-hover-shim');
var autoprefixerSettings = require('./grunt/autoprefixer-settings.js');
var autoprefixer = require('autoprefixer')(autoprefixerSettings);
Expand Down Expand Up @@ -490,20 +489,4 @@ module.exports = function (grunt) {

// Publish to GitHub
grunt.registerTask('publish', ['buildcontrol:pages']);

// Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
// This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', '_update-shrinkwrap']);
grunt.registerTask('_update-shrinkwrap', function () {
var done = this.async();
npmShrinkwrap({ dev: true, dirname: __dirname }, function (err) {
if (err) {
grunt.fail.warn(err);
}
var dest = 'grunt/npm-shrinkwrap.json';
fs.renameSync('npm-shrinkwrap.json', dest);
grunt.log.writeln('File ' + dest.cyan + ' updated.');
done();
});
});
};
Loading

0 comments on commit 2955222

Please sign in to comment.