Skip to content

Commit b393a72

Browse files
committed
MAGETWO-67341: Upgrade JS dependencies #9062
- Merge Pull Request #9062 from Igloczek/magento2:update-js-dependencies
2 parents e4adb6b + a1918a5 commit b393a72

File tree

4 files changed

+34
-35
lines changed

4 files changed

+34
-35
lines changed

dev/tools/grunt/configs/mage-minify.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"legacy": {
33
"options": {
4-
"type": "yui-js",
5-
"tempPath": "pub/static/"
4+
"compressor": "yui-js"
65
},
76
"files": {
87
"<%= path.uglify.legacy %>": [
@@ -19,4 +18,4 @@
1918
]
2019
}
2120
}
22-
}
21+
}

dev/tools/grunt/tasks/deploy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = function (grunt) {
2020
ok('"pub/static" is empty.');
2121

2222
log('Deploying Magento application...');
23-
deploy = spawn('php', ['bin/magento', 'setup:static-content:deploy -f']);
23+
deploy = spawn('php', ['bin/magento', 'setup:static-content:deploy', '-f']);
2424

2525
deploy.stdout.on('data', function (data) {
2626
log(data);

dev/tools/grunt/tasks/mage-minify.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ module.exports = function (grunt) {
1717
*/
1818
function getConfig(options, file) {
1919
return _.extend({
20-
fileIn: file.src,
21-
fileOut: file.dest
20+
input: file.src,
21+
output: file.dest
2222
}, options);
2323
}
2424

@@ -43,7 +43,7 @@ module.exports = function (grunt) {
4343
}
4444
};
4545

46-
new compressor.minify(config);
46+
compressor.minify(config);
4747
});
4848
});
4949
};

package.json.sample

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@
99
},
1010
"homepage": "http://magento.com/",
1111
"devDependencies": {
12-
"glob": "^5.0.14",
13-
"grunt": "^0.4.5",
14-
"grunt-autoprefixer": "^2.0.0",
15-
"grunt-banner": "^0.4.0",
16-
"grunt-contrib-clean": "^0.6.0",
17-
"grunt-contrib-connect": "^0.9.0",
18-
"grunt-contrib-cssmin": "^0.10.0",
19-
"grunt-contrib-imagemin": "^0.9.2",
20-
"grunt-contrib-jasmine": "^1.0.0",
21-
"grunt-contrib-less": "^0.12.0",
22-
"grunt-contrib-watch": "^0.6.1",
23-
"grunt-eslint": "17.3.1",
24-
"grunt-exec": "^0.4.6",
25-
"grunt-jscs": "2.2.0",
26-
"grunt-replace": "^0.9.2",
27-
"grunt-styledocco": "^0.1.4",
28-
"grunt-template-jasmine-requirejs": "^0.2.3",
29-
"grunt-text-replace": "^0.4.0",
30-
"imagemin-svgo": "^4.0.1",
31-
"load-grunt-config": "^0.16.0",
32-
"morgan": "^1.5.0",
33-
"node-minify": "^1.0.1",
34-
"path": "^0.11.14",
35-
"serve-static": "^1.7.1",
36-
"strip-json-comments": "^1.0.2",
37-
"time-grunt": "^1.0.0",
38-
"underscore": "^1.7.0",
39-
"squirejs": "0.2.1"
12+
"glob": "~7.1.1",
13+
"grunt": "~1.0.1",
14+
"grunt-autoprefixer": "~3.0.4",
15+
"grunt-banner": "~0.6.0",
16+
"grunt-contrib-clean": "~1.0.0",
17+
"grunt-contrib-connect": "~1.0.2",
18+
"grunt-contrib-cssmin": "~2.0.0",
19+
"grunt-contrib-imagemin": "~1.0.1",
20+
"grunt-contrib-jasmine": "~1.0.0",
21+
"grunt-contrib-less": "~1.4.1",
22+
"grunt-contrib-watch": "~1.0.0",
23+
"grunt-eslint": "~19.0.0",
24+
"grunt-exec": "~2.0.0",
25+
"grunt-jscs": "~3.0.1",
26+
"grunt-replace": "~1.0.1",
27+
"grunt-styledocco": "~0.3.0",
28+
"grunt-template-jasmine-requirejs": "~0.2.3",
29+
"grunt-text-replace": "~0.4.0",
30+
"imagemin-svgo": "~5.2.1",
31+
"load-grunt-config": "~0.19.2",
32+
"morgan": "~1.5.0",
33+
"node-minify": "~2.0.3",
34+
"path": "~0.12.7",
35+
"serve-static": "~1.7.1",
36+
"squirejs": "~0.2.1",
37+
"strip-json-comments": "~2.0.1",
38+
"time-grunt": "~1.0.0",
39+
"underscore": "~1.7.0"
4040
}
4141
}

0 commit comments

Comments
 (0)