Work around bikeshed 5.3.5 regression

Author: kfranqueiro

.github/workflows/test.yml

@@ -15,8 +15,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install bikeshed
-      # NOTE: Pinning to 5.3.4 due to regression #3198 in 5.3.5
-      run: pipx install bikeshed==5.3.4 && bikeshed update
+      run: pipx install bikeshed && bikeshed update
     - run: npm install
     - run: npx respec2html -e --timeout 30 --src "https://w3c.github.io/spec-generator/respec.html"
     - run: npm test

generators/bikeshed.ts

@@ -124,9 +124,10 @@ async function invokeBikeshed(
 
                 const stdout = stdoutChunks
                     .join("")
-                    // Correct unfinished JSON in case of fatal error
-                    .replace(/,[\n\s]*$/, "]")
-                    // Correct for speced/bikeshed#3197
+                    // Correct unfinished JSON in case of fatal error,
+                    // which may not include a trailing comma in 5.3.5 (#3198)
+                    .replace(/\},?[\n\s]*$/, "}]")
+                    // Correct for #3197 (fixed in bikeshed 5.3.5)
                     .replace(/\n\[/g, "");
 
                 try {