Skip to content

Commit

Permalink
Merge pull request #8649 from magento-gl/Hammer_PlatformHealth_247Beta3
Browse files Browse the repository at this point in the history
[Hammer - Platform Health Scope]-AC-9665: Update all js library and npm dependency with latest available version
  • Loading branch information
2 parents dfba86f + d11dc91 commit d88a9d2
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 57 deletions.
5 changes: 3 additions & 2 deletions app/design/frontend/Magento/luma/web/css/source/_extends.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// phpcs:ignoreFile
// /**
// * Copyright © Magento, Inc. All rights reserved.
// * See COPYING.txt for license details.
Expand Down Expand Up @@ -1437,7 +1438,7 @@
}

.order-status {
@order-status-indent: ceil(@h1__margin-bottom/2);
@order-status-indent: ceil((@h1__margin-bottom/2));
margin: -@order-status-indent 0 @indent__s;
}
}
Expand All @@ -1450,7 +1451,7 @@
.page-main {
.page-title-wrapper {
.order-date {
@order-date-indent: ceil(@h1__margin-bottom/1.5);
@order-date-indent: ceil((@h1__margin-bottom/1.5));
margin: -@order-date-indent 0 18px;
}
}
Expand Down
6 changes: 3 additions & 3 deletions lib/web/chartjs/Chart.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/web/css/source/lib/variables/_typography.less
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@font-size-ratio__base: 1.4; // Defines ratio of the root font-size to the base font-size

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

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

//
// Borders
Expand Down
48 changes: 30 additions & 18 deletions lib/web/jquery.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*!
* jQuery JavaScript Library v3.7.0
* jQuery JavaScript Library v3.7.1
* https://jquery.com/
*
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2023-05-11T18:29Z
* Date: 2023-08-28T13:37Z
*/
( function( global, factory ) {

Expand Down Expand Up @@ -147,7 +147,7 @@



var version = "3.7.0",
var version = "3.7.1",

rhtmlSuffix = /HTML$/i,

Expand Down Expand Up @@ -411,9 +411,14 @@
// Do not traverse comment nodes
ret += jQuery.text( node );
}
} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
}
if ( nodeType === 1 || nodeType === 11 ) {
return elem.textContent;
} else if ( nodeType === 3 || nodeType === 4 ) {
}
if ( nodeType === 9 ) {
return elem.documentElement.textContent;
}
if ( nodeType === 3 || nodeType === 4 ) {
return elem.nodeValue;
}

Expand Down Expand Up @@ -1126,12 +1131,17 @@
documentElement.msMatchesSelector;

// Support: IE 9 - 11+, Edge 12 - 18+
// Accessing iframe documents after unload throws "permission denied" errors (see trac-13936)
// Support: IE 11+, Edge 17 - 18+
// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
// two documents; shallow comparisons work.
// eslint-disable-next-line eqeqeq
if ( preferredDoc != document &&
// Accessing iframe documents after unload throws "permission denied" errors
// (see trac-13936).
// Limit the fix to IE & Edge Legacy; despite Edge 15+ implementing `matches`,
// all IE 9+ and Edge Legacy versions implement `msMatchesSelector` as well.
if ( documentElement.msMatchesSelector &&

// Support: IE 11+, Edge 17 - 18+
// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
// two documents; shallow comparisons work.
// eslint-disable-next-line eqeqeq
preferredDoc != document &&
( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {

// Support: IE 9 - 11+, Edge 12 - 18+
Expand Down Expand Up @@ -2694,12 +2704,12 @@
jQuery.expr[ ":" ] = jQuery.expr.pseudos;
jQuery.unique = jQuery.uniqueSort;

// These have always been private, but they used to be documented
// as part of Sizzle so let's maintain them in the 3.x line
// for backwards compatibility purposes.
// These have always been private, but they used to be documented as part of
// Sizzle so let's maintain them for now for backwards compatibility purposes.
find.compile = compile;
find.select = select;
find.setDocument = setDocument;
find.tokenize = tokenize;

find.escape = jQuery.escapeSelector;
find.getText = jQuery.text;
Expand Down Expand Up @@ -5913,7 +5923,7 @@
if ( hasScripts ) {
doc = scripts[ scripts.length - 1 ].ownerDocument;

// Reenable scripts
// Re-enable scripts
jQuery.map( scripts, restoreScript );

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

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

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

Expand Down Expand Up @@ -10550,7 +10560,9 @@
},

hover: function( fnOver, fnOut ) {
return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
return this
.on( "mouseenter", fnOver )
.on( "mouseleave", fnOut || fnOver );
}
} );

Expand Down
4 changes: 2 additions & 2 deletions lib/web/jquery/jquery.min.js

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions lib/web/jquery/jstree/jquery.jstree.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}(function ($, undefined) {
"use strict";
/*!
* jsTree 3.3.15
* jsTree 3.3.16
* http://jstree.com/
*
* Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
Expand Down Expand Up @@ -63,7 +63,7 @@
* specifies the jstree version in use
* @name $.jstree.version
*/
version : '3.3.15',
version : '3.3.16',
/**
* holds all the default options used when creating new instances
* @name $.jstree.defaults
Expand Down Expand Up @@ -528,7 +528,12 @@
e.preventDefault();
this.edit(e.currentTarget);
}
}
},
/**
* Should reselecting an already selected node trigger the select and changed callbacks
* @name $.jstree.defaults.core.allow_reselect
*/
allow_reselect : false
};
$.jstree.core.prototype = {
/**
Expand Down Expand Up @@ -3172,7 +3177,7 @@
this.deselect_node(obj, false, e);
}
else {
if (!this.is_selected(obj) || this._data.core.selected.length !== 1) {
if (this.settings.core.allow_reselect || !this.is_selected(obj) || this._data.core.selected.length !== 1) {
this.deselect_all(true);
this.select_node(obj, false, false, e);
}
Expand Down
36 changes: 18 additions & 18 deletions lib/web/js-cookie/js.cookie.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/*! js-cookie v3.0.1 | MIT */
/*! js-cookie v3.0.5 | MIT */
;
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
(global = global || self, (function () {
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, (function () {
var current = global.Cookies;
var exports = global.Cookies = factory();
exports.noConflict = function () { global.Cookies = current; return exports; };
}()));
}(this, (function () { 'use strict';
})());
})(this, (function () { 'use strict';

/* eslint-disable no-var */
function assign (target) {
Expand Down Expand Up @@ -42,7 +42,7 @@
/* eslint-disable no-var */

function init (converter, defaultAttributes) {
function set (key, value, attributes) {
function set (name, value, attributes) {
if (typeof document === 'undefined') {
return
}
Expand All @@ -56,7 +56,7 @@
attributes.expires = attributes.expires.toUTCString();
}

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

Expand All @@ -83,11 +83,11 @@
}

return (document.cookie =
key + '=' + converter.write(value, key) + stringifiedAttributes)
name + '=' + converter.write(value, name) + stringifiedAttributes)
}

function get (key) {
if (typeof document === 'undefined' || (arguments.length && !key)) {
function get (name) {
if (typeof document === 'undefined' || (arguments.length && !name)) {
return
}

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

try {
var foundKey = decodeURIComponent(parts[0]);
jar[foundKey] = converter.read(value, foundKey);
var found = decodeURIComponent(parts[0]);
jar[found] = converter.read(value, found);

if (key === foundKey) {
if (name === found) {
break
}
} catch (e) {}
}

return key ? jar[key] : jar
return name ? jar[name] : jar
}

return Object.create(
{
set: set,
get: get,
remove: function (key, attributes) {
set,
get,
remove: function (name, attributes) {
set(
key,
name,
'',
assign({}, attributes, {
expires: -1
Expand All @@ -144,4 +144,4 @@

return api;

})));
}));
7 changes: 4 additions & 3 deletions lib/web/less/less.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json.sample
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
"grunt-banner": "~0.6.0",
"grunt-continue": "~0.1.0",
"grunt-contrib-clean": "~2.0.1",
"grunt-contrib-connect": "~3.0.0",
"grunt-contrib-cssmin": "~4.0.0",
"grunt-contrib-connect": "~4.0.0",
"grunt-contrib-cssmin": "~5.0.0",
"grunt-contrib-imagemin": "~4.0.0",
"grunt-contrib-jasmine": "~4.0.0",
"grunt-contrib-less": "~3.0.0",
"grunt-contrib-watch": "~1.1.0",
"grunt-eslint": "~24.2.0",
"grunt-eslint": "~24.3.0",
"grunt-exec": "~3.0.0",
"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": "~9.0.0",
"less": "4.1.3",
"less": "4.2.0",
"load-grunt-config": "~4.0.1",
"morgan": "~1.10.0",
"node-minify": "~3.6.0",
Expand Down

0 comments on commit d88a9d2

Please sign in to comment.