From ce3248c48254d89207264fae2123978e1db3c69f Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 21 Jun 2014 19:44:26 +0000 Subject: [PATCH] Update `phpunit` `grunt` task to not use deprecated `util` package. Run `npm install` or `sudo npm install` to get the updates. Props jorbin. Fixes #27343. git-svn-id: https://develop.svn.wordpress.org/trunk@28796 602fd350-edb4-49c9-b593-d223f7449a82 --- Gruntfile.js | 4 +++- package.json | 15 ++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 778247b481..6d18811cb5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -5,7 +5,9 @@ module.exports = function(grunt) { BUILD_DIR = 'build/'; // Load tasks. - require('matchdep').filterDev('grunt-*').forEach( grunt.loadNpmTasks ); + require('matchdep').filterDev(['grunt-*', '!grunt-legacy-util']).forEach( grunt.loadNpmTasks ); + // Load legacy utils + grunt.util = require('grunt-legacy-util'); // Project configuration. grunt.initConfig({ diff --git a/package.json b/package.json index a4109035d6..be529e9e25 100644 --- a/package.json +++ b/package.json @@ -10,21 +10,22 @@ "license": "GPLv2 or later", "devDependencies": { "grunt": "~0.4.2", + "grunt-autoprefixer": "~0.7.1", "grunt-contrib-clean": "~0.5.0", + "grunt-contrib-compress": "~0.6.0", + "grunt-contrib-concat": "~0.3.0", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-cssmin": "~0.7.0", + "grunt-contrib-imagemin": "~0.4.1", + "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-qunit": "~0.4.0", "grunt-contrib-uglify": "~0.3.0", "grunt-contrib-watch": "~0.5.3", - "grunt-contrib-compress": "~0.6.0", - "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-jshint": "~0.8.0", "grunt-cssjanus": "~0.2.2", - "grunt-sass": "~0.10.0", - "grunt-autoprefixer": "~0.7.1", "grunt-jsvalidate": "~0.2.2", - "grunt-contrib-imagemin" : "~0.4.1", - "grunt-patch-wordpress" : "~0.2.1", + "grunt-legacy-util": "^0.2.0", + "grunt-patch-wordpress": "~0.2.1", + "grunt-sass": "~0.10.0", "matchdep": "~0.3.0" } }