diff options
| author | Chris Rebert <[email protected]> | 2015-04-24 23:54:27 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-04-24 23:54:27 -0700 |
| commit | 84e157513f8b05555b7b47577182165fc30ff9aa (patch) | |
| tree | 6fb495beed0586f3546ca9a9a667ffd9b6e75ecd | |
| parent | 71f4abc2015164de45eb83c9b63ac739efd15a4d (diff) | |
| parent | be6691cc048961326a8da4bcc39d2ea4a87afac1 (diff) | |
| download | bootstrap-84e157513f8b05555b7b47577182165fc30ff9aa.tar.xz bootstrap-84e157513f8b05555b7b47577182165fc30ff9aa.zip | |
Merge pull request #16344 from twbs/sed-task
Fix #16075 by switching to maintained fork of grunt-sed
| -rw-r--r-- | Gruntfile.js | 8 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test-infra/npm-shrinkwrap.json | 13 |
3 files changed, 18 insertions, 5 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 1bffd7c34..ce218828e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -389,6 +389,14 @@ module.exports = function (grunt) { return old ? RegExp.quote(old) : old; })(), replacement: grunt.option('newver'), + exclude: [ + 'dist/fonts', + 'docs/assets', + 'fonts', + 'js/tests/vendor', + 'node_modules', + 'test-infra' + ], recursive: true } }, diff --git a/package.json b/package.json index 1345ef409..f012d8430 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "grunt-jekyll": "~0.4.2", "grunt-jscs": "~1.6.0", "grunt-saucelabs": "~8.6.0", - "grunt-sed": "~0.1.1", + "grunt-sed": "twbs/grunt-sed#v0.2.0", "load-grunt-tasks": "~3.1.0", "markdown-it": "^4.1.1", "npm-shrinkwrap": "^200.1.0", diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json index 0c304399d..d84e36393 100644 --- a/test-infra/npm-shrinkwrap.json +++ b/test-infra/npm-shrinkwrap.json @@ -3879,12 +3879,17 @@ } }, "grunt-sed": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz", + "version": "0.2.0", + "from": "grunt-sed@git://github.com/twbs/grunt-sed.git#8dd1aea67ad1bab8a6719f0cf209bef719c66ad7", + "resolved": "git://github.com/twbs/grunt-sed.git#8dd1aea67ad1bab8a6719f0cf209bef719c66ad7", "dependencies": { + "lodash": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz" + }, "replace": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/replace/-/replace-0.2.10.tgz", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/replace/-/replace-0.3.0.tgz", "dependencies": { "colors": { "version": "0.5.1", |