From d932cbecfd0c3a6fbe6f47200686055cb8829790 Mon Sep 17 00:00:00 2001
From: Christian Hammond <christian@beanbaginc.com>
Date: Tue, 16 Apr 2024 22:45:45 -0700
Subject: [PATCH 1/2] Ensure correct compiler error styling and strip ANSI
 escape sequences.

The compiler error output that's injected into the page hard-codes a
background color of white, but didn't hard-code a corresponding text
color. If the page had set a default text color that was too close to
white, it would be hard or impossible to read without selecting the text
on the page.

This change addresses this by hard-coding a text color of black,
ensuring it can be read.

It also goes a step further and improves the display when dealing with
ANSI escape sequences in the error output, making it difficult to read
through or copy/paste meaningful results. We now apply a common regex
for stripping away any typical ANSI escape sequences we should expect in
such output, leaving behind only the plain text content.
---
 pipeline/templates/pipeline/compile_error.html | 2 +-
 pipeline/templatetags/pipeline.py              | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pipeline/templates/pipeline/compile_error.html b/pipeline/templates/pipeline/compile_error.html
index a3a816e8..84c3ba37 100644
--- a/pipeline/templates/pipeline/compile_error.html
+++ b/pipeline/templates/pipeline/compile_error.html
@@ -1,5 +1,5 @@
 <div id="django-pipeline-error-{{package_name}}" class="django-pipeline-error"
-     style="display: none; border: 2px #DD0000 solid; margin: 1em; padding: 1em; background: white;">
+     style="display: none; border: 2px #DD0000 solid; margin: 1em; padding: 1em; background: white; color: black;">
  <h1>Error compiling {{package_type}} package "{{package_name}}"</h1>
  <p><strong>Command:</strong></p>
  <pre style="white-space: pre-wrap;">{{command}}</pre>
diff --git a/pipeline/templatetags/pipeline.py b/pipeline/templatetags/pipeline.py
index 5050f067..439b78e9 100644
--- a/pipeline/templatetags/pipeline.py
+++ b/pipeline/templatetags/pipeline.py
@@ -1,4 +1,5 @@
 import logging
+import re
 import subprocess
 
 from django import template
@@ -109,13 +110,19 @@ def render_compressed_sources(self, package, package_name, package_type):
         return method(package, paths, templates=templates)
 
     def render_error(self, package_type, package_name, e):
+        # Remove any ANSI escape sequences in the output.
+        error_output = re.sub(
+            re.compile(r"(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]"),
+            "",
+            e.error_output)
+
         return render_to_string(
             "pipeline/compile_error.html",
             {
                 "package_type": package_type,
                 "package_name": package_name,
                 "command": subprocess.list2cmdline(e.command),
-                "errors": e.error_output,
+                "errors": error_output,
             },
         )
 

From 29cb7319a8e3ac41acd7e5c84499a99b95708811 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 05:52:58 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 pipeline/templatetags/pipeline.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pipeline/templatetags/pipeline.py b/pipeline/templatetags/pipeline.py
index 439b78e9..3f38cca1 100644
--- a/pipeline/templatetags/pipeline.py
+++ b/pipeline/templatetags/pipeline.py
@@ -114,7 +114,8 @@ def render_error(self, package_type, package_name, e):
         error_output = re.sub(
             re.compile(r"(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]"),
             "",
-            e.error_output)
+            e.error_output,
+        )
 
         return render_to_string(
             "pipeline/compile_error.html",