From 26aaf2e9cece554cf7300360e00e24704bd41b81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Sep 2020 09:50:12 +0000 Subject: Bump angular from 1.7.9 to 1.8.0 in /glances/outputs/static Bumps [angular](https://github.com/angular/angular.js) from 1.7.9 to 1.8.0. - [Release notes](https://github.com/angular/angular.js/releases) - [Changelog](https://github.com/angular/angular.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/angular/angular.js/compare/v1.7.9...v1.8.0) Signed-off-by: dependabot[bot] --- glances/outputs/static/package-lock.json | 6 +++--- glances/outputs/static/package.json | 2 +- glances/outputs/static/yarn.lock | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json index 0ca02fce..a2b73d0d 100644 --- a/glances/outputs/static/package-lock.json +++ b/glances/outputs/static/package-lock.json @@ -83,9 +83,9 @@ "dev": true }, "angular": { - "version": "1.7.9", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.9.tgz", - "integrity": "sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.0.tgz", + "integrity": "sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg==" }, "angular-hotkeys": { "version": "1.7.0", diff --git a/glances/outputs/static/package.json b/glances/outputs/static/package.json index 34c99905..fa42afcc 100644 --- a/glances/outputs/static/package.json +++ b/glances/outputs/static/package.json @@ -1,7 +1,7 @@ { "private": true, "dependencies": { - "angular": "^1.7.9", + "angular": "^1.8.0", "angular-hotkeys": "^1.7.0", "bootstrap": "^3.4.1", "favico.js": "^0.3.10", diff --git a/glances/outputs/static/yarn.lock b/glances/outputs/static/yarn.lock index 9f232724..96be288a 100644 --- a/glances/outputs/static/yarn.lock +++ b/glances/outputs/static/yarn.lock @@ -77,7 +77,7 @@ angular-hotkeys@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/angular-hotkeys/-/angular-hotkeys-1.7.0.tgz#052e6b6f44dfcd824427798b7f10e1917e8700a1" -angular@^1.7.9: +angular@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.0.tgz#b1ec179887869215cab6dfd0df2e42caa65b1b51" -- cgit v1.2.3 From d1c5ee1595d9cdc85497d139f4103dec709c3a44 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Mon, 14 Sep 2020 13:11:05 +0200 Subject: Build the WebUI and remove yarn.lock --- glances/outputs/static/.gitignore | 1 + glances/outputs/static/public/glances.js | 131 +- glances/outputs/static/public/glances.map.js | 2 +- glances/outputs/static/yarn.lock | 3940 -------------------------- 4 files changed, 100 insertions(+), 3974 deletions(-) create mode 100644 glances/outputs/static/.gitignore delete mode 100644 glances/outputs/static/yarn.lock diff --git a/glances/outputs/static/.gitignore b/glances/outputs/static/.gitignore new file mode 100644 index 00000000..8ee01d32 --- /dev/null +++ b/glances/outputs/static/.gitignore @@ -0,0 +1 @@ +yarn.lock diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index eabf6375..272b3715 100644 --- a/glances/outputs/static/public/glances.js +++ b/glances/outputs/static/public/glances.js @@ -18022,8 +18022,8 @@ module.exports = __webpack_require__.p + "9a360c92ce9bda60a8da6389741dcfbf.png"; /***/ (function(module, exports) { /** - * @license AngularJS v1.7.9 - * (c) 2010-2018 Google, Inc. http://angularjs.org + * @license AngularJS v1.8.0 + * (c) 2010-2020 Google, Inc. http://angularjs.org * License: MIT */ (function(window) {'use strict'; @@ -18060,7 +18060,7 @@ var minErrConfig = { * non-positive or non-numeric value, removes the max depth limit. * Default: 5 * - * * `urlErrorParamsEnabled` **{Boolean}** - Specifies wether the generated error url will + * * `urlErrorParamsEnabled` **{Boolean}** - Specifies whether the generated error url will * contain the parameters of the thrown error. Disabling the parameters can be useful if the * generated error url is very long. * @@ -18110,7 +18110,7 @@ function isValidObjectMaxDepth(maxDepth) { * Since data will be parsed statically during a build step, some restrictions * are applied with respect to how minErr instances are created and called. * Instances should have names of the form namespaceMinErr for a minErr created - * using minErr('namespace') . Error codes, namespaces and template strings + * using minErr('namespace'). Error codes, namespaces and template strings * should all be static strings, not variables or general expressions. * * @param {string} module The namespace to use for the new minErr instance. @@ -18122,7 +18122,7 @@ function isValidObjectMaxDepth(maxDepth) { function minErr(module, ErrorConstructor) { ErrorConstructor = ErrorConstructor || Error; - var url = 'https://errors.angularjs.org/1.7.9/'; + var url = 'https://errors.angularjs.org/1.8.0/'; var regex = url.replace('.', '\\.') + '[\\s\\S]*'; var errRegExp = new RegExp(regex, 'g'); @@ -18255,6 +18255,7 @@ function minErr(module, ErrorConstructor) { hasOwnProperty, createMap, stringify, + UNSAFE_restoreLegacyJqLiteXHTMLReplacement, NODE_TYPE_ELEMENT, NODE_TYPE_ATTRIBUTE, @@ -18982,8 +18983,8 @@ function arrayRemove(array, value) { * - [`MediaStream`](https://developer.mozilla.org/docs/Web/API/MediaStream) * - [`Set`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set) * - [`WeakMap`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WeakMap) - * - ['getter'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/get)/ - * [`setter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/set)` + * - [`getter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/get)/ + * [`setter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/set) * * @param {*} source The source that will be used to make a copy. Can be any type, including * primitives, `null`, and `undefined`. @@ -20111,6 +20112,26 @@ function bindJQuery() { bindJQueryFired = true; } +/** + * @ngdoc function + * @name angular.UNSAFE_restoreLegacyJqLiteXHTMLReplacement + * @module ng + * @kind function + * + * @description + * Restores the pre-1.8 behavior of jqLite that turns XHTML-like strings like + * `
` to `
` instead of `
`. + * The new behavior is a security fix. Thus, if you need to call this function, please try to adjust + * your code for this change and remove your use of this function as soon as possible. + + * Note that this only patches jqLite. If you use jQuery 3.5.0 or newer, please read the + * [jQuery 3.5 upgrade guide](https://jquery.com/upgrade-guide/3.5/) for more details + * about the workarounds. + */ +function UNSAFE_restoreLegacyJqLiteXHTMLReplacement() { + JQLite.legacyXHTMLReplacement = true; +} + /** * throw error if the argument is falsy. */ @@ -20830,11 +20851,11 @@ function toDebugString(obj, maxDepth) { var version = { // These placeholder strings will be replaced by grunt's `build` task. // They need to be double- or single-quoted. - full: '1.7.9', + full: '1.8.0', major: 1, - minor: 7, - dot: 9, - codeName: 'pollution-eradication' + minor: 8, + dot: 0, + codeName: 'nested-vaccination' }; @@ -20867,6 +20888,7 @@ function publishExternalAPI(angular) { 'callbacks': {$$counter: 0}, 'getTestability': getTestability, 'reloadWithDebugInfo': reloadWithDebugInfo, + 'UNSAFE_restoreLegacyJqLiteXHTMLReplacement': UNSAFE_restoreLegacyJqLiteXHTMLReplacement, '$$minErr': minErr, '$$csp': csp, '$$encodeUriSegment': encodeUriSegment, @@ -20984,7 +21006,7 @@ function publishExternalAPI(angular) { }); } ]) - .info({ angularVersion: '1.7.9' }); + .info({ angularVersion: '1.8.0' }); } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -21077,6 +21099,16 @@ function publishExternalAPI(angular) { * - [`val()`](http://api.jquery.com/val/) * - [`wrap()`](http://api.jquery.com/wrap/) * + * jqLite also provides a method restoring pre-1.8 insecure treatment of XHTML-like tags. + * This legacy behavior turns input like `
` to `
` + * instead of `
` like version 1.8 & newer do. To restore it, invoke: + * ```js + * angular.UNSAFE_restoreLegacyJqLiteXHTMLReplacement(); + * ``` + * Note that this only patches jqLite. If you use jQuery 3.5.0 or newer, please read the + * [jQuery 3.5 upgrade guide](https://jquery.com/upgrade-guide/3.5/) for more details + * about the workarounds. + * * ## jQuery/jqLite Extras * AngularJS also provides the following additional methods and events to both jQuery and jqLite: * @@ -21156,20 +21188,36 @@ var HTML_REGEXP = /<|&#?\w+;/; var TAG_NAME_REGEXP = /<([\w:-]+)/; var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi; +// Table parts need to be wrapped with `` or they're +// stripped to their contents when put in a div. +// XHTML parsers do not magically insert elements in the +// same way that tag soup parsers do, so we cannot shorten +// this by omitting or other required elements. var wrapMap = { - 'option': [1, ''], - - 'thead': [1, '
', '
'], - 'col': [2, '', '
'], - 'tr': [2, '', '
'], - 'td': [3, '', '
'], - '_default': [0, '', ''] + thead: ['table'], + col: ['colgroup', 'table'], + tr: ['tbody', 'table'], + td: ['tr', 'tbody', 'table'] }; -wrapMap.optgroup = wrapMap.option; wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; wrapMap.th = wrapMap.td; +// Support: IE <10 only +// IE 9 requires an option wrapper & it needs to have the whole table structure +// set up in advance; assigning `""` to `tr.innerHTML` doesn't work, etc. +var wrapMapIE9 = { + option: [1, ''], + _default: [0, '', ''] +}; + +for (var key in wrapMap) { + var wrapMapValueClosing = wrapMap[key]; + var wrapMapValue = wrapMapValueClosing.slice().reverse(); + wrapMapIE9[key] = [wrapMapValue.length, '<' + wrapMapValue.join('><') + '>', '']; +} + +wrapMapIE9.optgroup = wrapMapIE9.option; function jqLiteIsTextNode(html) { return !HTML_REGEXP.test(html); @@ -21190,7 +21238,7 @@ function jqLiteHasData(node) { } function jqLiteBuildFragment(html, context) { - var tmp, tag, wrap, + var tmp, tag, wrap, finalHtml, fragment = context.createDocumentFragment(), nodes = [], i; @@ -21201,13 +21249,30 @@ function jqLiteBuildFragment(html, context) { // Convert html into DOM nodes tmp = fragment.appendChild(context.createElement('div')); tag = (TAG_NAME_REGEXP.exec(html) || ['', ''])[1].toLowerCase(); - wrap = wrapMap[tag] || wrapMap._default; - tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, '<$1>') + wrap[2]; + finalHtml = JQLite.legacyXHTMLReplacement ? + html.replace(XHTML_TAG_REGEXP, '<$1>') : + html; - // Descend through wrappers to the right content - i = wrap[0]; - while (i--) { - tmp = tmp.lastChild; + if (msie < 10) { + wrap = wrapMapIE9[tag] || wrapMapIE9._default; + tmp.innerHTML = wrap[1] + finalHtml + wrap[2]; + + // Descend through wrappers to the right content + i = wrap[0]; + while (i--) { + tmp = tmp.firstChild; + } + } else { + wrap = wrapMap[tag] || []; + + // Create wrappers & descend into them + i = wrap.length; + while (--i > -1) { + tmp.appendChild(window.document.createElement(wrap[i])); + tmp = tmp.firstChild; + } + + tmp.innerHTML = finalHtml; } nodes = concat(nodes, tmp.childNodes); @@ -26306,7 +26371,7 @@ function $TemplateCacheProvider() { * * When the original node and the replace template declare the same directive(s), they will be * {@link guide/compiler#double-compilation-and-how-to-avoid-it compiled twice} because the compiler - * does not deduplicate them. In many cases, this is not noticable, but e.g. {@link ngModel} will + * does not deduplicate them. In many cases, this is not noticeable, but e.g. {@link ngModel} will * attach `$formatters` and `$parsers` twice. * * See issue [#2573](https://github.com/angular/angular.js/issues/2573). @@ -51629,7 +51694,7 @@ var ngRefDirective = ['$parse', function($parse) { * For example: `item in items | filter:x as results` will store the fragment of the repeated items as `results`, but only after * the items have been processed through the filter. * - * Please note that `as [variable name] is not an operator but rather a part of ngRepeat + * Please note that `as [variable name]` is not an operator but rather a part of ngRepeat * micro-syntax so it can be used only after all filters (and not as operator, inside an expression). * * For example: `item in items | filter : x | orderBy : order | limitTo : limit as results track by item.id` . @@ -52438,11 +52503,11 @@ var ngHideDirective = ['$animate', function($animate) { var colorSpan = element(by.css('span')); it('should check ng-style', function() { - expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)'); + expect(colorSpan.getCssValue('color')).toMatch(/rgba\(0, 0, 0, 1\)|rgb\(0, 0, 0\)/); element(by.css('input[value=\'set color\']')).click(); - expect(colorSpan.getCssValue('color')).toBe('rgba(255, 0, 0, 1)'); + expect(colorSpan.getCssValue('color')).toMatch(/rgba\(255, 0, 0, 1\)|rgb\(255, 0, 0\)/); element(by.css('input[value=clear]')).click(); - expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)'); + expect(colorSpan.getCssValue('color')).toMatch(/rgba\(0, 0, 0, 1\)|rgb\(0, 0, 0\)/); }); @@ -54451,7 +54516,7 @@ $provide.value("$locale", { })(window); -!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend(''); +!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend(window.angular.element('