diff --git a/dev/tools/grunt/configs/mage-minify.json b/dev/tools/grunt/configs/mage-minify.json index 7f0c177722b31..1ddfa3910a3a8 100644 --- a/dev/tools/grunt/configs/mage-minify.json +++ b/dev/tools/grunt/configs/mage-minify.json @@ -1,8 +1,7 @@ { "legacy": { "options": { - "type": "yui-js", - "tempPath": "pub/static/" + "compressor": "yui-js" }, "files": { "<%= path.uglify.legacy %>": [ @@ -19,4 +18,4 @@ ] } } -} \ No newline at end of file +} diff --git a/dev/tools/grunt/tasks/deploy.js b/dev/tools/grunt/tasks/deploy.js index 812bf1ac14314..ac3d8679f705b 100644 --- a/dev/tools/grunt/tasks/deploy.js +++ b/dev/tools/grunt/tasks/deploy.js @@ -20,7 +20,7 @@ module.exports = function (grunt) { ok('"pub/static" is empty.'); log('Deploying Magento application...'); - deploy = spawn('php', ['bin/magento', 'setup:static-content:deploy -f']); + deploy = spawn('php', ['bin/magento', 'setup:static-content:deploy', '-f']); deploy.stdout.on('data', function (data) { log(data); diff --git a/dev/tools/grunt/tasks/mage-minify.js b/dev/tools/grunt/tasks/mage-minify.js index 6f96c7e839d4c..199b66a212ea3 100644 --- a/dev/tools/grunt/tasks/mage-minify.js +++ b/dev/tools/grunt/tasks/mage-minify.js @@ -17,8 +17,8 @@ module.exports = function (grunt) { */ function getConfig(options, file) { return _.extend({ - fileIn: file.src, - fileOut: file.dest + input: file.src, + output: file.dest }, options); } @@ -43,7 +43,7 @@ module.exports = function (grunt) { } }; - new compressor.minify(config); + compressor.minify(config); }); }); }; diff --git a/package.json.sample b/package.json.sample index a88a4ad6bab8c..2b657ac172b93 100644 --- a/package.json.sample +++ b/package.json.sample @@ -9,33 +9,33 @@ }, "homepage": "http://magento.com/", "devDependencies": { - "glob": "^5.0.14", - "grunt": "^0.4.5", - "grunt-autoprefixer": "^2.0.0", - "grunt-banner": "^0.4.0", - "grunt-contrib-clean": "^0.6.0", - "grunt-contrib-connect": "^0.9.0", - "grunt-contrib-cssmin": "^0.10.0", - "grunt-contrib-imagemin": "^0.9.2", - "grunt-contrib-jasmine": "^1.0.0", - "grunt-contrib-less": "^0.12.0", - "grunt-contrib-watch": "^0.6.1", - "grunt-eslint": "17.3.1", - "grunt-exec": "^0.4.6", - "grunt-jscs": "2.2.0", - "grunt-replace": "^0.9.2", - "grunt-styledocco": "^0.1.4", - "grunt-template-jasmine-requirejs": "^0.2.3", - "grunt-text-replace": "^0.4.0", - "imagemin-svgo": "^4.0.1", - "load-grunt-config": "^0.16.0", - "morgan": "^1.5.0", - "node-minify": "^1.0.1", - "path": "^0.11.14", - "serve-static": "^1.7.1", - "strip-json-comments": "^1.0.2", - "time-grunt": "^1.0.0", - "underscore": "^1.7.0", - "squirejs": "0.2.1" + "glob": "~7.1.1", + "grunt": "~1.0.1", + "grunt-autoprefixer": "~3.0.4", + "grunt-banner": "~0.6.0", + "grunt-contrib-clean": "~1.0.0", + "grunt-contrib-connect": "~1.0.2", + "grunt-contrib-cssmin": "~2.0.0", + "grunt-contrib-imagemin": "~1.0.1", + "grunt-contrib-jasmine": "~1.0.0", + "grunt-contrib-less": "~1.4.1", + "grunt-contrib-watch": "~1.0.0", + "grunt-eslint": "~19.0.0", + "grunt-exec": "~2.0.0", + "grunt-jscs": "~3.0.1", + "grunt-replace": "~1.0.1", + "grunt-styledocco": "~0.3.0", + "grunt-template-jasmine-requirejs": "~0.2.3", + "grunt-text-replace": "~0.4.0", + "imagemin-svgo": "~5.2.1", + "load-grunt-config": "~0.19.2", + "morgan": "~1.5.0", + "node-minify": "~2.0.3", + "path": "~0.12.7", + "serve-static": "~1.7.1", + "squirejs": "~0.2.1", + "strip-json-comments": "~2.0.1", + "time-grunt": "~1.0.0", + "underscore": "~1.7.0" } }