From 646b59b5942bc49cabc9a49fd2cb51be2dc4054c Mon Sep 17 00:00:00 2001 From: johnjbarton Date: Thu, 19 Apr 2018 12:41:32 -0700 Subject: [PATCH 1/2] fix(package.json): sinon-chai 2.13 is not compatible with sinon 4.x --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 95a8e16be..77d85ebdb 100644 --- a/package.json +++ b/package.json @@ -437,7 +437,7 @@ "proxyquire": "^1.7.11", "qunitjs": "^2.1.1", "requirejs": "^2.1.20", - "sinon": "^4.1.2", + "sinon": "^3.0.0", "sinon-chai": "^2.7.0", "supertest": "^3.0.0", "timer-shim": "^0.3.0", From 3e9da47c220b6a6246b21e898f6fe46e43ea1db4 Mon Sep 17 00:00:00 2001 From: johnjbarton Date: Thu, 19 Apr 2018 13:08:48 -0700 Subject: [PATCH 2/2] feat(grunt): run check_clean before starting release. By checking early we avoid pushing a new version to github that is not then published to npm. --- gruntfile.js | 2 ++ package.json | 1 + 2 files changed, 3 insertions(+) diff --git a/gruntfile.js b/gruntfile.js index 0a1b6f1ce..3ae8f22bc 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -131,6 +131,7 @@ module.exports = function (grunt) { } }) + grunt.loadNpmTasks('grunt-check-clean') grunt.loadTasks('tasks') require('load-grunt-tasks')(grunt) @@ -141,6 +142,7 @@ module.exports = function (grunt) { grunt.registerTask('release', 'Build, bump and publish to NPM.', function (type) { grunt.task.run([ + 'check_clean', 'npm-contributors', 'bump:' + (type || 'patch') + ':bump-only', 'build', diff --git a/package.json b/package.json index 77d85ebdb..98a42392a 100644 --- a/package.json +++ b/package.json @@ -397,6 +397,7 @@ "grunt-browserify": "^5.0.0", "grunt-bump": "^0.8.0", "grunt-cli": "^1.1.0", + "grunt-check-clean": "^0.1.2", "grunt-contrib-watch": "^1.0.0", "grunt-conventional-changelog": "^6.0.1", "grunt-conventional-github-releaser": "^1.0.0",