Skip to content

Commit

Permalink
Merge pull request magento#33515 from mrtuvn/update-npm-packages
Browse files Browse the repository at this point in the history
Update npm packages to recently compatible
  • Loading branch information
Andrii Beziazychnyi authored Sep 2, 2021
2 parents 9439feb + 8f6ceb9 commit 5682fa3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 27 deletions.
12 changes: 7 additions & 5 deletions Gruntfile.js.sample
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ module.exports = function (grunt) {
tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'),
themes;

filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
themes = filesRouter.get('themes');
filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
themes = filesRouter.get('themes');

tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
tasks = _.map(tasks, function (task) {
return task.replace('.js', '');
});
tasks.push('time-grunt');
tasks.forEach(function (task) {
require(task)(grunt);
Expand Down Expand Up @@ -53,7 +55,7 @@ module.exports = function (grunt) {
'autoprefixer',
'cssmin',
'usebanner'
].map(function(task){
].map(function (task) {
return task + ':' + component;
});

Expand All @@ -72,7 +74,7 @@ module.exports = function (grunt) {
'clean',
'exec:all'
];
_.each(themes, function(theme, name) {
_.each(themes, function (theme, name) {
tasks.push('less:' + name);
});
grunt.task.run(tasks);
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/js/jasmine/spec_runner/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function getTasks() {
return [
'connect:' + theme,
'jasmine:' + theme
]
];
});

return _.flatten(tasks);
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/js/jasmine/spec_runner/tasks/connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function init(config) {
});

return middlewares;
}
};

_.each(themes, function (themeData, themeName) {
var options = {
Expand Down
4 changes: 2 additions & 2 deletions dev/tests/js/jasmine/spec_runner/tasks/jasmine.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function init(config) {
themes, root, staticDir, baseUrl, mapFile, host, port, files, requireJs;

root = config.root;
staticDir = config.static;
staticDir = config.static;
port = config.port;
files = config.files;
themes = config.themes;
Expand Down Expand Up @@ -69,7 +69,7 @@ function init(config) {
*/
helpers: specs
}
}
};
});
}

Expand Down
36 changes: 18 additions & 18 deletions package.json.sample
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,35 @@
},
"homepage": "https://magento.com/",
"devDependencies": {
"glob": "~7.1.1",
"grunt": "~1.0.1",
"glob": "~7.1.7",
"grunt": "~1.4.1",
"grunt-autoprefixer": "~3.0.4",
"grunt-banner": "~0.6.0",
"grunt-continue": "~0.1.0",
"grunt-contrib-clean": "~1.1.0",
"grunt-contrib-connect": "~1.0.2",
"grunt-contrib-cssmin": "~2.2.1",
"grunt-contrib-imagemin": "~2.0.1",
"grunt-contrib-clean": "~2.0.0",
"grunt-contrib-connect": "~3.0.0",
"grunt-contrib-cssmin": "~4.0.0",
"grunt-contrib-imagemin": "~4.0.0",
"grunt-contrib-jasmine": "~1.2.0",
"grunt-contrib-less": "^2.1.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-eslint": "~20.1.0",
"grunt-contrib-less": "~2.1.0",
"grunt-contrib-watch": "~1.1.0",
"grunt-eslint": "~20.2.0",
"grunt-exec": "~3.0.0",
"grunt-jscs": "~3.0.1",
"grunt-replace": "~1.0.1",
"grunt-replace": "~2.0.2",
"grunt-styledocco": "~0.3.0",
"grunt-template-jasmine-requirejs": "~0.2.3",
"grunt-text-replace": "~0.4.0",
"imagemin-svgo": "~5.2.1",
"less": "^3.13.1",
"load-grunt-config": "~0.19.2",
"morgan": "~1.9.0",
"node-minify": "~2.3.1",
"imagemin-svgo": "~5.2.4",
"less": "3.13.1",
"load-grunt-config": "~4.0.1",
"morgan": "~1.10.0",
"node-minify": "~3.6.0",
"path": "~0.12.7",
"serve-static": "~1.13.1",
"serve-static": "~1.14.1",
"squirejs": "~0.2.1",
"strip-json-comments": "~2.0.1",
"time-grunt": "~1.4.0",
"underscore": "^1.13.1"
"time-grunt": "~2.0.0",
"underscore": "1.13.1"
}
}

0 comments on commit 5682fa3

Please sign in to comment.