Skip to content

Commit 5682fa3

Browse files
authored
Merge pull request magento#33515 from mrtuvn/update-npm-packages
Update npm packages to recently compatible
2 parents 9439feb + 8f6ceb9 commit 5682fa3

File tree

5 files changed

+29
-27
lines changed

5 files changed

+29
-27
lines changed

Gruntfile.js.sample

+7-5
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ module.exports = function (grunt) {
1616
tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'),
1717
themes;
1818

19-
filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
20-
themes = filesRouter.get('themes');
19+
filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
20+
themes = filesRouter.get('themes');
2121

22-
tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
22+
tasks = _.map(tasks, function (task) {
23+
return task.replace('.js', '');
24+
});
2325
tasks.push('time-grunt');
2426
tasks.forEach(function (task) {
2527
require(task)(grunt);
@@ -53,7 +55,7 @@ module.exports = function (grunt) {
5355
'autoprefixer',
5456
'cssmin',
5557
'usebanner'
56-
].map(function(task){
58+
].map(function (task) {
5759
return task + ':' + component;
5860
});
5961

@@ -72,7 +74,7 @@ module.exports = function (grunt) {
7274
'clean',
7375
'exec:all'
7476
];
75-
_.each(themes, function(theme, name) {
77+
_.each(themes, function (theme, name) {
7678
tasks.push('less:' + name);
7779
});
7880
grunt.task.run(tasks);

dev/tests/js/jasmine/spec_runner/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function getTasks() {
5757
return [
5858
'connect:' + theme,
5959
'jasmine:' + theme
60-
]
60+
];
6161
});
6262

6363
return _.flatten(tasks);

dev/tests/js/jasmine/spec_runner/tasks/connect.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function init(config) {
3939
});
4040

4141
return middlewares;
42-
}
42+
};
4343

4444
_.each(themes, function (themeData, themeName) {
4545
var options = {

dev/tests/js/jasmine/spec_runner/tasks/jasmine.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function init(config) {
1515
themes, root, staticDir, baseUrl, mapFile, host, port, files, requireJs;
1616

1717
root = config.root;
18-
staticDir = config.static;
18+
staticDir = config.static;
1919
port = config.port;
2020
files = config.files;
2121
themes = config.themes;
@@ -69,7 +69,7 @@ function init(config) {
6969
*/
7070
helpers: specs
7171
}
72-
}
72+
};
7373
});
7474
}
7575

package.json.sample

+18-18
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,35 @@
99
},
1010
"homepage": "https://magento.com/",
1111
"devDependencies": {
12-
"glob": "~7.1.1",
13-
"grunt": "~1.0.1",
12+
"glob": "~7.1.7",
13+
"grunt": "~1.4.1",
1414
"grunt-autoprefixer": "~3.0.4",
1515
"grunt-banner": "~0.6.0",
1616
"grunt-continue": "~0.1.0",
17-
"grunt-contrib-clean": "~1.1.0",
18-
"grunt-contrib-connect": "~1.0.2",
19-
"grunt-contrib-cssmin": "~2.2.1",
20-
"grunt-contrib-imagemin": "~2.0.1",
17+
"grunt-contrib-clean": "~2.0.0",
18+
"grunt-contrib-connect": "~3.0.0",
19+
"grunt-contrib-cssmin": "~4.0.0",
20+
"grunt-contrib-imagemin": "~4.0.0",
2121
"grunt-contrib-jasmine": "~1.2.0",
22-
"grunt-contrib-less": "^2.1.0",
23-
"grunt-contrib-watch": "~1.0.0",
24-
"grunt-eslint": "~20.1.0",
22+
"grunt-contrib-less": "~2.1.0",
23+
"grunt-contrib-watch": "~1.1.0",
24+
"grunt-eslint": "~20.2.0",
2525
"grunt-exec": "~3.0.0",
2626
"grunt-jscs": "~3.0.1",
27-
"grunt-replace": "~1.0.1",
27+
"grunt-replace": "~2.0.2",
2828
"grunt-styledocco": "~0.3.0",
2929
"grunt-template-jasmine-requirejs": "~0.2.3",
3030
"grunt-text-replace": "~0.4.0",
31-
"imagemin-svgo": "~5.2.1",
32-
"less": "^3.13.1",
33-
"load-grunt-config": "~0.19.2",
34-
"morgan": "~1.9.0",
35-
"node-minify": "~2.3.1",
31+
"imagemin-svgo": "~5.2.4",
32+
"less": "3.13.1",
33+
"load-grunt-config": "~4.0.1",
34+
"morgan": "~1.10.0",
35+
"node-minify": "~3.6.0",
3636
"path": "~0.12.7",
37-
"serve-static": "~1.13.1",
37+
"serve-static": "~1.14.1",
3838
"squirejs": "~0.2.1",
3939
"strip-json-comments": "~2.0.1",
40-
"time-grunt": "~1.4.0",
41-
"underscore": "^1.13.1"
40+
"time-grunt": "~2.0.0",
41+
"underscore": "1.13.1"
4242
}
4343
}

0 commit comments

Comments
 (0)