Skip to content

Commit d88a9d2

Browse files
Merge pull request #8649 from magento-gl/Hammer_PlatformHealth_247Beta3
[Hammer - Platform Health Scope]-AC-9665: Update all js library and npm dependency with latest available version
2 parents dfba86f + d11dc91 commit d88a9d2

File tree

9 files changed

+76
-57
lines changed

9 files changed

+76
-57
lines changed

app/design/frontend/Magento/luma/web/css/source/_extends.less

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// phpcs:ignoreFile
12
// /**
23
// * Copyright © Magento, Inc. All rights reserved.
34
// * See COPYING.txt for license details.
@@ -1437,7 +1438,7 @@
14371438
}
14381439

14391440
.order-status {
1440-
@order-status-indent: ceil(@h1__margin-bottom/2);
1441+
@order-status-indent: ceil((@h1__margin-bottom/2));
14411442
margin: -@order-status-indent 0 @indent__s;
14421443
}
14431444
}
@@ -1450,7 +1451,7 @@
14501451
.page-main {
14511452
.page-title-wrapper {
14521453
.order-date {
1453-
@order-date-indent: ceil(@h1__margin-bottom/1.5);
1454+
@order-date-indent: ceil((@h1__margin-bottom/1.5));
14541455
margin: -@order-date-indent 0 18px;
14551456
}
14561457
}

lib/web/chartjs/Chart.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/css/source/lib/variables/_typography.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@font-size-ratio__base: 1.4; // Defines ratio of the root font-size to the base font-size
3030

3131
@font-size-unit: rem; // The unit to which most typography values will be converted by default
32-
@font-size-unit-ratio: unit(@root__font-size * 16/100); // Ratio of the root font-size to the font-size unit
32+
@font-size-unit-ratio: unit((@root__font-size * 16/100)); // Ratio of the root font-size to the font-size unit
3333
@font-size-unit-convert: true; // Controls whether font-size values are converted to the specified font-size unit
3434

3535
@font-size__base: unit(@font-size-unit-ratio * @font-size-ratio__base, px); // Base font size value in <b>px</b>
@@ -73,8 +73,8 @@
7373
@indent__xl: @indent__base * 2; // 40px
7474
@indent__l: @indent__base * 1.5; // 30px
7575
@indent__m: @indent__base * 1.25; // 25px
76-
@indent__s: @indent__base / 2; // 10px
77-
@indent__xs: @indent__base / 4; // 5px
76+
@indent__s: (@indent__base / 2); // 10px
77+
@indent__xs: (@indent__base / 4); // 5px
7878

7979
//
8080
// Borders

lib/web/jquery.js

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*!
2-
* jQuery JavaScript Library v3.7.0
2+
* jQuery JavaScript Library v3.7.1
33
* https://jquery.com/
44
*
55
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license
77
* https://jquery.org/license
88
*
9-
* Date: 2023-05-11T18:29Z
9+
* Date: 2023-08-28T13:37Z
1010
*/
1111
( function( global, factory ) {
1212

@@ -147,7 +147,7 @@
147147

148148

149149

150-
var version = "3.7.0",
150+
var version = "3.7.1",
151151

152152
rhtmlSuffix = /HTML$/i,
153153

@@ -411,9 +411,14 @@
411411
// Do not traverse comment nodes
412412
ret += jQuery.text( node );
413413
}
414-
} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
414+
}
415+
if ( nodeType === 1 || nodeType === 11 ) {
415416
return elem.textContent;
416-
} else if ( nodeType === 3 || nodeType === 4 ) {
417+
}
418+
if ( nodeType === 9 ) {
419+
return elem.documentElement.textContent;
420+
}
421+
if ( nodeType === 3 || nodeType === 4 ) {
417422
return elem.nodeValue;
418423
}
419424

@@ -1126,12 +1131,17 @@
11261131
documentElement.msMatchesSelector;
11271132

11281133
// Support: IE 9 - 11+, Edge 12 - 18+
1129-
// Accessing iframe documents after unload throws "permission denied" errors (see trac-13936)
1130-
// Support: IE 11+, Edge 17 - 18+
1131-
// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
1132-
// two documents; shallow comparisons work.
1133-
// eslint-disable-next-line eqeqeq
1134-
if ( preferredDoc != document &&
1134+
// Accessing iframe documents after unload throws "permission denied" errors
1135+
// (see trac-13936).
1136+
// Limit the fix to IE & Edge Legacy; despite Edge 15+ implementing `matches`,
1137+
// all IE 9+ and Edge Legacy versions implement `msMatchesSelector` as well.
1138+
if ( documentElement.msMatchesSelector &&
1139+
1140+
// Support: IE 11+, Edge 17 - 18+
1141+
// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
1142+
// two documents; shallow comparisons work.
1143+
// eslint-disable-next-line eqeqeq
1144+
preferredDoc != document &&
11351145
( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
11361146

11371147
// Support: IE 9 - 11+, Edge 12 - 18+
@@ -2694,12 +2704,12 @@
26942704
jQuery.expr[ ":" ] = jQuery.expr.pseudos;
26952705
jQuery.unique = jQuery.uniqueSort;
26962706

2697-
// These have always been private, but they used to be documented
2698-
// as part of Sizzle so let's maintain them in the 3.x line
2699-
// for backwards compatibility purposes.
2707+
// These have always been private, but they used to be documented as part of
2708+
// Sizzle so let's maintain them for now for backwards compatibility purposes.
27002709
find.compile = compile;
27012710
find.select = select;
27022711
find.setDocument = setDocument;
2712+
find.tokenize = tokenize;
27032713

27042714
find.escape = jQuery.escapeSelector;
27052715
find.getText = jQuery.text;
@@ -5913,7 +5923,7 @@
59135923
if ( hasScripts ) {
59145924
doc = scripts[ scripts.length - 1 ].ownerDocument;
59155925

5916-
// Reenable scripts
5926+
// Re-enable scripts
59175927
jQuery.map( scripts, restoreScript );
59185928

59195929
// Evaluate executable scripts on first document insertion
@@ -6370,7 +6380,7 @@
63706380
trChild = document.createElement( "div" );
63716381

63726382
table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
6373-
tr.style.cssText = "border:1px solid";
6383+
tr.style.cssText = "box-sizing:content-box;border:1px solid";
63746384

63756385
// Support: Chrome 86+
63766386
// Height set through cssText does not get applied.
@@ -6382,7 +6392,7 @@
63826392
// In our bodyBackground.html iframe,
63836393
// display for all div elements is set to "inline",
63846394
// which causes a problem only in Android 8 Chrome 86.
6385-
// Ensuring the div is display: block
6395+
// Ensuring the div is `display: block`
63866396
// gets around this issue.
63876397
trChild.style.display = "block";
63886398

@@ -10550,7 +10560,9 @@
1055010560
},
1055110561

1055210562
hover: function( fnOver, fnOut ) {
10553-
return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
10563+
return this
10564+
.on( "mouseenter", fnOver )
10565+
.on( "mouseleave", fnOut || fnOver );
1055410566
}
1055510567
} );
1055610568

lib/web/jquery/jquery.min.js

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

lib/web/jquery/jstree/jquery.jstree.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}(function ($, undefined) {
1414
"use strict";
1515
/*!
16-
* jsTree 3.3.15
16+
* jsTree 3.3.16
1717
* http://jstree.com/
1818
*
1919
* Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
@@ -63,7 +63,7 @@
6363
* specifies the jstree version in use
6464
* @name $.jstree.version
6565
*/
66-
version : '3.3.15',
66+
version : '3.3.16',
6767
/**
6868
* holds all the default options used when creating new instances
6969
* @name $.jstree.defaults
@@ -528,7 +528,12 @@
528528
e.preventDefault();
529529
this.edit(e.currentTarget);
530530
}
531-
}
531+
},
532+
/**
533+
* Should reselecting an already selected node trigger the select and changed callbacks
534+
* @name $.jstree.defaults.core.allow_reselect
535+
*/
536+
allow_reselect : false
532537
};
533538
$.jstree.core.prototype = {
534539
/**
@@ -3172,7 +3177,7 @@
31723177
this.deselect_node(obj, false, e);
31733178
}
31743179
else {
3175-
if (!this.is_selected(obj) || this._data.core.selected.length !== 1) {
3180+
if (this.settings.core.allow_reselect || !this.is_selected(obj) || this._data.core.selected.length !== 1) {
31763181
this.deselect_all(true);
31773182
this.select_node(obj, false, false, e);
31783183
}

lib/web/js-cookie/js.cookie.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
/*! js-cookie v3.0.1 | MIT */
1+
/*! js-cookie v3.0.5 | MIT */
22
;
33
(function (global, factory) {
44
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
55
typeof define === 'function' && define.amd ? define(factory) :
6-
(global = global || self, (function () {
6+
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, (function () {
77
var current = global.Cookies;
88
var exports = global.Cookies = factory();
99
exports.noConflict = function () { global.Cookies = current; return exports; };
10-
}()));
11-
}(this, (function () { 'use strict';
10+
})());
11+
})(this, (function () { 'use strict';
1212

1313
/* eslint-disable no-var */
1414
function assign (target) {
@@ -42,7 +42,7 @@
4242
/* eslint-disable no-var */
4343

4444
function init (converter, defaultAttributes) {
45-
function set (key, value, attributes) {
45+
function set (name, value, attributes) {
4646
if (typeof document === 'undefined') {
4747
return
4848
}
@@ -56,7 +56,7 @@
5656
attributes.expires = attributes.expires.toUTCString();
5757
}
5858

59-
key = encodeURIComponent(key)
59+
name = encodeURIComponent(name)
6060
.replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent)
6161
.replace(/[()]/g, escape);
6262

@@ -83,11 +83,11 @@
8383
}
8484

8585
return (document.cookie =
86-
key + '=' + converter.write(value, key) + stringifiedAttributes)
86+
name + '=' + converter.write(value, name) + stringifiedAttributes)
8787
}
8888

89-
function get (key) {
90-
if (typeof document === 'undefined' || (arguments.length && !key)) {
89+
function get (name) {
90+
if (typeof document === 'undefined' || (arguments.length && !name)) {
9191
return
9292
}
9393

@@ -100,25 +100,25 @@
100100
var value = parts.slice(1).join('=');
101101

102102
try {
103-
var foundKey = decodeURIComponent(parts[0]);
104-
jar[foundKey] = converter.read(value, foundKey);
103+
var found = decodeURIComponent(parts[0]);
104+
jar[found] = converter.read(value, found);
105105

106-
if (key === foundKey) {
106+
if (name === found) {
107107
break
108108
}
109109
} catch (e) {}
110110
}
111111

112-
return key ? jar[key] : jar
112+
return name ? jar[name] : jar
113113
}
114114

115115
return Object.create(
116116
{
117-
set: set,
118-
get: get,
119-
remove: function (key, attributes) {
117+
set,
118+
get,
119+
remove: function (name, attributes) {
120120
set(
121-
key,
121+
name,
122122
'',
123123
assign({}, attributes, {
124124
expires: -1
@@ -144,4 +144,4 @@
144144

145145
return api;
146146

147-
})));
147+
}));

lib/web/less/less.min.js

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

package.json.sample

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
"grunt-banner": "~0.6.0",
1515
"grunt-continue": "~0.1.0",
1616
"grunt-contrib-clean": "~2.0.1",
17-
"grunt-contrib-connect": "~3.0.0",
18-
"grunt-contrib-cssmin": "~4.0.0",
17+
"grunt-contrib-connect": "~4.0.0",
18+
"grunt-contrib-cssmin": "~5.0.0",
1919
"grunt-contrib-imagemin": "~4.0.0",
2020
"grunt-contrib-jasmine": "~4.0.0",
2121
"grunt-contrib-less": "~3.0.0",
2222
"grunt-contrib-watch": "~1.1.0",
23-
"grunt-eslint": "~24.2.0",
23+
"grunt-eslint": "~24.3.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": "4.1.3",
30+
"less": "4.2.0",
3131
"load-grunt-config": "~4.0.1",
3232
"morgan": "~1.10.0",
3333
"node-minify": "~3.6.0",

0 commit comments

Comments
 (0)