diff options
| author | Chris Rebert <[email protected]> | 2016-03-23 22:37:43 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-03-23 23:20:38 -0700 |
| commit | 768dac2e87efdeb250564e612671437974171983 (patch) | |
| tree | c09dff764b8b4959d0cbee78dbd1e2481fc93d6e | |
| parent | d34a6436212629937cd62bfb8226bb9aff6fff45 (diff) | |
| download | bootstrap-768dac2e87efdeb250564e612671437974171983.tar.xz bootstrap-768dac2e87efdeb250564e612671437974171983.zip | |
Use vanilla npm shrinkwrap instead of uber/npm-shrinkwrap; fixes #18559
| -rw-r--r-- | Gruntfile.js | 17 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index dd7391c19..6861ceba4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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); @@ -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(); - }); - }); }; diff --git a/package.json b/package.json index 394b9cd7c..e09ce0352 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "author": "Twitter, Inc.", "scripts": { "change-version": "node grunt/change-version.js", + "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "test": "grunt test" }, "style": "dist/css/bootstrap.css", @@ -62,7 +63,6 @@ "is-travis": "^1.0.0", "load-grunt-tasks": "^3.4.0", "mq4-hover-shim": "^0.3.0", - "npm-shrinkwrap": "^200.1.0", "shelljs": "^0.6.0", "time-grunt": "^1.2.1" }, |