Update common files.

Author: gkellogg

common/common.js

@@ -271,6 +271,6 @@ function unComment(doc, content) {
   return content
     .replace(/<!--/, '')
     .replace(/-->/, '')
-    .replace(/< !--/g, '<!--')
-    .replace(/-- >/g, '-->');
+    .replace(/< !\s*-\s*-/g, '<!--')
+    .replace(/-\s*- >/g, '-->');
 }

common/extract-examples.rb

@@ -319,13 +319,18 @@ def save_example(examples:, element:, title:, example_number:, error:, warn:)
           $stdout.write "F".colorize(:red)
           next
         end
+
+        # Get base from document, if present
+        html_base = doc.at_xpath('/html/head/base/@href')
+        ex[:base] = html_base.to_s if html_base
+
         script_content = doc.at_xpath(xpath)
         if script_content
           # Remove (faked) XML comments and unescape sequences
           content = script_content
             .inner_html
-            .sub(/^\s*< !--/, '')
-            .sub(/-- >\s*$/, '')
+            .sub(/^\s*< !\s*-\s*-/, '')
+            .sub(/-\s*- >\s*$/, '')
             .gsub(/&lt;/, '<')
         end
 
@@ -438,7 +443,15 @@ def save_example(examples:, element:, title:, example_number:, error:, warn:)
       # Set argument to referenced content to be parsed
       args[0] = if examples[ex[:result_for]][:ext] == 'html' && method == :expand
         # If we are expanding, and the reference is HTML, find the first script element.
-        doc = Nokogiri::HTML.parse(examples[ex[:result_for]][:content])
+        doc = Nokogiri::HTML.parse(
+          examples[ex[:result_for]][:content]
+          .sub(/^\s*< !\s*-\s*-/, '')
+          .sub(/-\s*- >\s*$/, ''))
+
+        # Get base from document, if present
+        html_base = doc.at_xpath('/html/head/base/@href')
+        options[:base] = html_base.to_s if html_base
+
         script_content = doc.at_xpath(xpath)
         unless script_content
           errors << "Example #{ex[:number]} at line #{ex[:line]} references example #{ex[:result_for].inspect} with no JSON-LD script element"
@@ -447,12 +460,13 @@ def save_example(examples:, element:, title:, example_number:, error:, warn:)
         end
         StringIO.new(script_content
           .inner_html
-          .sub(/^\s*< !--/, '')
-          .sub(/-- >\s*$/, '')
           .gsub(/&lt;/, '<'))
       elsif examples[ex[:result_for]][:ext] == 'html' && ex[:target]
         # Only use the targeted script
-        doc = Nokogiri::HTML.parse(examples[ex[:result_for]][:content])
+        doc = Nokogiri::HTML.parse(
+          examples[ex[:result_for]][:content]
+          .sub(/^\s*< !\s*-\s*-/, '')
+          .sub(/-\s*- >\s*$/, ''))
         script_content = doc.at_xpath(xpath)
         unless script_content
           errors << "Example #{ex[:number]} at line #{ex[:line]} references example #{ex[:result_for].inspect} with no JSON-LD script element"
@@ -461,8 +475,6 @@ def save_example(examples:, element:, title:, example_number:, error:, warn:)
         end
         StringIO.new(script_content
           .to_html
-          .sub(/^\s*< !--/, '')
-          .sub(/-- >\s*$/, '')
           .gsub(/&lt;/, '<'))
       else
         StringIO.new(examples[ex[:result_for]][:content])