Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit adb8a67

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authoredJun 4, 2025
Merge branch '2.4-develop' into spartans_pr_04062025
2 parents ff992e4 + 98b2848 commit adb8a67

File tree

5 files changed

+497
-418
lines changed

5 files changed

+497
-418
lines changed
 

‎dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ lib/web/prototype/**/*.js
1818
lib/web/jquery/jstree/jquery.jstree.js
1919
lib/web/jquery/colorpicker/js/colorpicker.js
2020
lib/web/chartjs/chartjs-adapter-moment.js
21+
lib/web/moment-timezone-with-data.js
22+
lib/web/less/less.min.js
23+
lib/web/underscore.js
2124

2225
// MINIFIED FILES
2326
app/code/**/*.min.js

‎lib/web/less/less.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/web/moment-timezone-with-data.js

Lines changed: 395 additions & 361 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/web/underscore.js

Lines changed: 95 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"grunt-template-jasmine-requirejs": "~0.2.3",
2929
"grunt-text-replace": "~0.4.0",
3030
"imagemin-svgo": "~9.0.0",
31-
"less": "4.2.0",
31+
"less": "4.2.2",
3232
"load-grunt-config": "~4.0.1",
3333
"morgan": "~1.10.0",
3434
"node-minify": "~3.6.0",

0 commit comments

Comments
 (0)
Please sign in to comment.