Skip to content

Commit 4586df9

Browse files
authored
Merge branch '2.4-develop' into Hammer_Platform_Health_Scope_21082023
2 parents cd3d2c3 + 8dc8c7e commit 4586df9

File tree

2 files changed

+66
-21
lines changed

2 files changed

+66
-21
lines changed

lib/web/underscore.js

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

package.json.sample

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
},
1010
"homepage": "https://magento.com/",
1111
"devDependencies": {
12-
"glob": "~8.0.1",
13-
"grunt": "~1.5.2",
12+
"glob": "~8.1.0",
13+
"grunt": "~1.6.1",
1414
"grunt-banner": "~0.6.0",
1515
"grunt-continue": "~0.1.0",
16-
"grunt-contrib-clean": "~2.0.0",
16+
"grunt-contrib-clean": "~2.0.1",
1717
"grunt-contrib-connect": "~3.0.0",
1818
"grunt-contrib-cssmin": "~4.0.0",
1919
"grunt-contrib-imagemin": "~4.0.0",
2020
"grunt-contrib-jasmine": "~4.0.0",
21-
"grunt-contrib-less": "~2.1.0",
21+
"grunt-contrib-less": "~3.0.0",
2222
"grunt-contrib-watch": "~1.1.0",
23-
"grunt-eslint": "~24.0.0",
23+
"grunt-eslint": "~24.2.0",
2424
"grunt-exec": "~3.0.0",
2525
"grunt-replace": "~2.0.2",
2626
"grunt-styledocco": "~0.3.0",
2727
"grunt-template-jasmine-requirejs": "~0.2.3",
2828
"grunt-text-replace": "~0.4.0",
2929
"imagemin-svgo": "~9.0.0",
30-
"less": "3.13.1",
30+
"less": "4.1.3",
3131
"load-grunt-config": "~4.0.1",
3232
"morgan": "~1.10.0",
3333
"node-minify": "~3.6.0",
@@ -36,6 +36,50 @@
3636
"squirejs": "~0.2.1",
3737
"strip-json-comments": "~3.1.1",
3838
"time-grunt": "~2.0.0",
39-
"underscore": "1.13.3"
40-
}
39+
"underscore": "1.13.6"
40+
},
41+
"overrides": {
42+
"styledocco": {
43+
"uglify-js": "~3.4.9",
44+
"marked": "~5.1.0",
45+
"clean-css": "~5.3.2"
46+
},
47+
"mkdirp" : {
48+
"minimist":"~1.2.6"
49+
},
50+
"optimist" : {
51+
"minimist":"~1.2.6"
52+
},
53+
"meow": {
54+
"trim-newlines":"~3.0.1"
55+
},
56+
"node-minify": {
57+
"terser": "~5.18.0"
58+
},
59+
"grunt-contrib-imagemin": {
60+
"css-select":"~5.1.0",
61+
"nth-check": "~2.1.1"
62+
},
63+
"bin-version-check": {
64+
"semver-regex": "~3.1.4"
65+
},
66+
"cacheable-request": {
67+
"http-cache-semantics": "~4.1.1"
68+
},
69+
"babel-core": {
70+
"json5": "~2.2.3"
71+
},
72+
"svgo": {
73+
"js-yaml": "~4.1.0"
74+
},
75+
"css-select": {
76+
"nth-check": "~2.1.1"
77+
},
78+
"latest-version": {
79+
"package-json": "~7.0.0"
80+
},
81+
"fast-glob": {
82+
"glob-parent": "~6.0.2"
83+
}
84+
}
4185
}

0 commit comments

Comments
 (0)