Skip to content

Commit bc655a7

Browse files
Bump ansi_up from 3.0.0 to 6.0.5 (#2850)
Bumps [ansi_up](https://github.com/drudru/ansi_up) from 3.0.0 to 6.0.5. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/drudru/ansi_up/releases">ansi_up's releases</a>.</em></p> <blockquote> <h2>v6.0.5</h2> <p><strong>Full Changelog</strong>: <a href="https://github.com/drudru/ansi_up/compare/v6.0.4...v6.0.5">https://github.com/drudru/ansi_up/compare/v6.0.4...v6.0.5</a></p> <p>Again a whoops. Both the .ts and the .js should have the change now.</p> <h2>v6.0.4</h2> <h2>What's Changed</h2> <ul> <li>Fix handling of faint-only style by <a href="https://github.com/jonatanschroeder"><code>@​jonatanschroeder</code></a> in <a href="https://redirect.github.com/drudru/ansi_up/pull/94">drudru/ansi_up#94</a></li> </ul> <p>From <a href="https://github.com/drudru"><code>@​drudru</code></a>: I just forgot to pull the change into the .ts file. Whoops. The v6.0.3 release had the correct change in the .js file.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/jonatanschroeder"><code>@​jonatanschroeder</code></a> made their first contribution in <a href="https://redirect.github.com/drudru/ansi_up/pull/94">drudru/ansi_up#94</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/drudru/ansi_up/compare/v6.0.3...v6.0.4">https://github.com/drudru/ansi_up/compare/v6.0.3...v6.0.4</a></p> <h2>v6.0.3</h2> <h2>What's Changed</h2> <ul> <li>fix: Include faint style when no other modifiers are active by <a href="https://github.com/gabe565"><code>@​gabe565</code></a> in <a href="https://redirect.github.com/drudru/ansi_up/pull/93">drudru/ansi_up#93</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/gabe565"><code>@​gabe565</code></a> made their first contribution in <a href="https://redirect.github.com/drudru/ansi_up/pull/93">drudru/ansi_up#93</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/drudru/ansi_up/compare/v6.0.2...v6.0.3">https://github.com/drudru/ansi_up/compare/v6.0.2...v6.0.3</a></p> <p>Fixes <a href="https://redirect.github.com/drudru/ansi_up/issues/87">#87</a> - types specified wrong in package.json</p> <h2>Fix for <a href="https://redirect.github.com/drudru/ansi_up/issues/88">#88</a> - broken handling of SGR 22 in 6.0.0</h2> <p>Fixes <a href="https://redirect.github.com/drudru/ansi_up/issues/88">#88</a> - just a minor bug fix release</p> <h2>6.0.0 - AnsiUp now an ES6 module</h2> <p><strong>API CHANGES</strong> <a href="https://redirect.github.com/drudru/ansi_up/issues/80">#80</a> - ansi_up is now an ES6 module. This means that it can be loaded the same way everywhere <a href="https://redirect.github.com/drudru/ansi_up/issues/71">#71</a> - api change to 'allowlist' since major releases can make api changes</p> <p><strong>New Features</strong> <a href="https://redirect.github.com/drudru/ansi_up/issues/78">#78</a> - now supports the SGR 2 sequence</p> <p>Also added 4 properties that can specify the styles for bold, faint, italic, and underline.</p> <p><strong>Other</strong> <a href="https://redirect.github.com/drudru/ansi_up/issues/85">#85</a> - remove the .vscode stuff</p> <h2>5.2.0 - Re-add support for disabling html escape and other minor things</h2> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/drudru/ansi_up/commit/4e1f6c72b9d8b0bea04e970f2f01f6d9e9d30d1c"><code>4e1f6c7</code></a> Bump version to v6.0.5 <em>and</em> have changes in both .ts and .js</li> <li><a href="https://github.com/drudru/ansi_up/commit/02316f4d4d969889b29e42c01aa726330d87c5e7"><code>02316f4</code></a> Bump version to v6.0.4</li> <li><a href="https://github.com/drudru/ansi_up/commit/785430922f3b8614580dbf6b4c3f5c848e3011f5"><code>7854309</code></a> Merge pull request <a href="https://redirect.github.com/drudru/ansi_up/issues/94">#94</a> from jonatanschroeder/patch-1</li> <li><a href="https://github.com/drudru/ansi_up/commit/565bc9d5e30932af424419d619a00e9f0d1aabc5"><code>565bc9d</code></a> Fix handling of faint-only style</li> <li><a href="https://github.com/drudru/ansi_up/commit/65baddb93b16e75cf5a33104501dd1cfa921f404"><code>65baddb</code></a> Bump version to v6.0.3</li> <li><a href="https://github.com/drudru/ansi_up/commit/1bf6d110a10a36ec942adb7744631bbabb839218"><code>1bf6d11</code></a> Merge pull request <a href="https://redirect.github.com/drudru/ansi_up/issues/93">#93</a> from gabe565/fix-faint</li> <li><a href="https://github.com/drudru/ansi_up/commit/5f9bc977dbbf47e066ec2536df56e13567f07fe9"><code>5f9bc97</code></a> fix: Include faint style when no other modifiers are active</li> <li><a href="https://github.com/drudru/ansi_up/commit/ef087f9184ed258d4f236151d67857217f5d430d"><code>ef087f9</code></a> Fix for <a href="https://redirect.github.com/drudru/ansi_up/issues/87">#87</a> - types specified wrong in package.json</li> <li><a href="https://github.com/drudru/ansi_up/commit/31096148276c2bb8acd0a3ddfe060e00734f2751"><code>3109614</code></a> Fixes <a href="https://redirect.github.com/drudru/ansi_up/issues/88">#88</a> - broken handling of SGR 22 in 6.0.0</li> <li><a href="https://github.com/drudru/ansi_up/commit/4f80666740d583a513ef0b97cb052c28e7677492"><code>4f80666</code></a> Better naming</li> <li>Additional commits viewable in <a href="https://github.com/drudru/ansi_up/compare/v3.0.0...v6.0.5">compare view</a></li> </ul> </details> <br /> <details> <summary>Most Recent Ignore Conditions Applied to This Pull Request</summary> | Dependency Name | Ignore Conditions | | --- | --- | | ansi_up | [>= 5.a, < 6] | </details> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ansi_up&package-manager=npm_and_yarn&previous-version=3.0.0&new-version=6.0.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: William Allen <[email protected]>
1 parent 21091d8 commit bc655a7

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"angular-animate": "^1.4.7",
3232
"angular-ui-bootstrap": "^2.0.0",
3333
"angular-ui-sortable": "^0.14.3",
34-
"ansi_up": "^4.0.4",
34+
"ansi_up": "^6.0.6",
3535
"as-jqplot": "^1.0.8",
3636
"autoprefixer": "^10.4.23",
3737
"axios": "^1.13",

resources/js/angular/filters/terminalColors.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import AnsiUp from 'ansi_up';
1+
import { AnsiUp } from 'ansi_up';
22

33
export function ctestNonXmlCharEscape() {
44
return function(input) {
@@ -11,7 +11,7 @@ export function terminalColors() {
1111
return function(input, htmlEscape) {
1212
var ansiUp = new AnsiUp;
1313
if (htmlEscape !== undefined) {
14-
ansiUp.escape_for_html = htmlEscape;
14+
ansiUp.escape_html = htmlEscape;
1515
}
1616
return ansiUp.ansi_to_html(input);
1717
};

resources/js/vue/components/TestDetails.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,11 +330,11 @@ export default {
330330
331331
postSetup: function() {
332332
this.cdash.test.output = TextMutator.ctestNonXmlCharEscape(this.cdash.test.output);
333-
this.cdash.test.output = TextMutator.terminalColors(this.cdash.test.output, true);
333+
this.cdash.test.output = TextMutator.terminalColors(this.cdash.test.output);
334334
335335
for (let i = 0; i < this.cdash.test.preformatted_measurements.length; i++) {
336336
this.cdash.test.preformatted_measurements[i].value = TextMutator.ctestNonXmlCharEscape(this.cdash.test.preformatted_measurements[i].value);
337-
this.cdash.test.preformatted_measurements[i].value = TextMutator.terminalColors(this.cdash.test.preformatted_measurements[i].value, true);
337+
this.cdash.test.preformatted_measurements[i].value = TextMutator.terminalColors(this.cdash.test.preformatted_measurements[i].value);
338338
}
339339
340340
this.queryParams = QueryParams.get();
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
import AnsiUp from 'ansi_up';
1+
import { AnsiUp } from 'ansi_up';
22

33
export default {
44
ctestNonXmlCharEscape: function (input) {
55
const pattern = /\[NON-XML-CHAR-0x1B\]/g;
66
return input.replace(pattern, '\x1B');
77
},
88

9-
terminalColors: function (input, htmlEscape) {
9+
terminalColors: function (input) {
1010
const ansiUp = new AnsiUp;
11-
if (htmlEscape !== undefined) {
12-
ansiUp.escape_for_html = htmlEscape;
13-
}
1411
return ansiUp.ansi_to_html(input);
1512
},
1613
};

0 commit comments

Comments
 (0)