diff --git a/package-lock.json b/package-lock.json index c1ca16a13..44ec6982a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7730,9 +7730,10 @@ "license": "MIT" }, "node_modules/node-fetch": { - "version": "2.6.7", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, - "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -17199,7 +17200,9 @@ "dev": true }, "node-fetch": { - "version": "2.6.7", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, "requires": { "whatwg-url": "^5.0.0" diff --git a/packages/less/src/less-browser/index.js b/packages/less/src/less-browser/index.js index d2ab24a77..84fb35803 100644 --- a/packages/less/src/less-browser/index.js +++ b/packages/less/src/less-browser/index.js @@ -2,6 +2,8 @@ // index.js // Should expose the additional browser functions on to the less object // + + import {addDataAttr} from './utils'; import lessRoot from '../less'; import browser from './browser'; @@ -47,13 +49,7 @@ export default (window, options) => { } // only really needed for phantom - function bind(func, thisArg) { - const curryArgs = Array.prototype.slice.call(arguments, 2); - return function() { - const args = curryArgs.concat(Array.prototype.slice.call(arguments, 0)); - return func.apply(thisArg, args); - }; - } +//removed phantom function loadStyles(modifyVars) { const styles = document.getElementsByTagName('style'); diff --git a/packages/less/src/less/functions/number.js b/packages/less/src/less/functions/number.js index 9bfb1a5cc..bafbd4870 100644 --- a/packages/less/src/less/functions/number.js +++ b/packages/less/src/less/functions/number.js @@ -55,17 +55,24 @@ const minMax = function (isMin, args) { return new Anonymous(`${isMin ? 'min' : 'max'}(${args})`); }; -export default { - min: function(...args) { - try { - return minMax.call(this, true, args); - } catch (e) {} - }, - max: function(...args) { +function evaluateWithFallback(func, context) { + return function (...args) { try { - return minMax.call(this, false, args); - } catch (e) {} - }, + return func.apply(context, args); + } catch (e) { + // Return the original node as-is if evaluation fails + return args + } + }; +} + +export default { + min: evaluateWithFallback(function (...args) { + return minMax.call(this, true, args); + }, this), + max: evaluateWithFallback(function (...args) { + return minMax.call(this, false, args); + }, this), convert: function (val, unit) { return val.convertTo(unit.value); },