Merge branch 'main' into validate_latest

w3c · Feb 16, 2022 · 0f3940b · 0f3940b
2 parents 654ea3b + 33a0897
commit 0f3940b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -37,8 +37,9 @@ jobs:
           npx brrr builds/respec-w3c.js -o builds
           file_size=$(stat -c%s "builds/respec-w3c.js")
           xfer_file_size=$(stat -c%s "builds/respec-w3c.js.br")
-          curl --fail -L -X PUT "https://respec.org/respec/size" \
+          curl -L -X PUT "https://respec.org/respec/size" \
             -H "Authorization: $RESPEC_SECRET" \
+            -s -w "HTTP Response Code: %{http_code}\n" \
             -d "size=$file_size" -d "xferSize=$xfer_file_size "\
             -d "sha=$GITHUB_SHA" -d "timestamp=$timestamp"
         env:

diff --git a/src/core/ui.js b/src/core/ui.js
@@ -11,6 +11,7 @@
 import { html, pluralize } from "./import-maps.js";
 import css from "../styles/ui.css.js";
 import { markdownToHtml } from "./markdown.js";
+import { reindent } from "./reindent.js";
 import { sub } from "./pubsubhub.js";
 export const name = "core/ui";
 
@@ -266,10 +267,15 @@ function rsErrorToHTML(err) {
   const plugin = err.plugin
     ? `<p class="respec-plugin">(plugin: "${err.plugin}")</p>`
     : "";
+
   const hint = err.hint
-    ? `\n<p class="respec-hint"><strong>How to fix:</strong> ${markdownToHtml(
-        err.hint,
-        { inline: true }
+    ? `\n${markdownToHtml(
+        `<p class="respec-hint"><strong>How to fix:</strong> ${reindent(
+          err.hint
+        )}`,
+        {
+          inline: !err.hint.includes("\n"),
+        }
       )}\n`
     : "";
   const elements = Array.isArray(err.elements)

diff --git a/src/core/xref.js b/src/core/xref.js
@@ -456,9 +456,7 @@ function showErrors({ ambiguous, notFound }) {
   };
 
   const howToFix = (howToCiteURL, originalTerm) => {
-    return docLink`
-    [See search matches for "${originalTerm}"](${howToCiteURL}) or
-    ${"[Learn about this error|#error-term-not-found]"}.`;
+    return docLink`[See search matches for "${originalTerm}"](${howToCiteURL}) or ${"[Learn about this error|#error-term-not-found]"}.`;
   };
 
   for (const { query, elems } of notFound.values()) {