From 4f85fcfc28aee49884dbab86cdd435bc96ef06d0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 23 Apr 2015 12:00:58 -0700 Subject: [PATCH 1/2] Fix #16075 by switching to maintained fork of grunt-sed [skip sauce] [skip validator] --- Gruntfile.js | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1bffd7c34752..ce218828e063 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 1345ef4096c2..f012d8430a1e 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", From be6691cc048961326a8da4bcc39d2ea4a87afac1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 23 Apr 2015 12:14:00 -0700 Subject: [PATCH 2/2] update shrinkwrap [skip sauce] [skip validator] --- test-infra/npm-shrinkwrap.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json index 0c304399dad2..d84e363930a3 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",