datalog-theme 0.6.1 → 0.8.0

data/_includes/meta/scripts-loader.html

@@ -2,25 +2,18 @@
 ---
 required:
   - location
-optional:
-  - syntax_config
 ---
-Outputs Prism assets in the head and shared data bootstrapping scripts in the body.
-Pass location="head" or location="body" to control which block renders.
+Outputs the page data scripts and the feature loader at the end of the body
+(location="body"). location="head" used to render Prism's scripts. Code is now
+highlighted by Rouge when the site builds, so the head renders nothing.
 {%- endcomment -%}
-{%- assign syntax = include.syntax_config | default: site.theme_options.syntax_highlighting | default: {} -%}
-{%- assign prism_cdn = syntax.cdn | default: 'https://cdn.jsdelivr.net/npm/prismjs@1.29.0' -%}
-{%- assign default_components = 'python|r|sql|julia|javascript' | split: '|' -%}
-{%- assign prism_components = syntax.components | default: default_components -%}
-{%- if include.location == 'head' -%}
-  <script defer src="{{ (prism_cdn | append: '/prism.min.js') | add_sri }}"></script>
-  {%- for component in prism_components -%}
-    {%- unless component == 'core' -%}
-      <script defer src="{{ (prism_cdn | append: '/components/prism-' | append: component | append: '.min.js') | add_sri }}"></script>
-    {%- endunless -%}
-  {%- endfor -%}
-  <script defer src="{{ (prism_cdn | append: '/plugins/normalize-whitespace/prism-normalize-whitespace.min.js') | add_sri }}"></script>
-{%- elsif include.location == 'body' -%}
+{%- if include.location == 'body' -%}
+  {%- comment -%}
+    Only academic.js reads the academic and publication data, and the loader
+    runs it only on pages with citation metrics, tables or charts. Inlined on
+    every page, it was a quarter of the home page's HTML.
+  {%- endcomment -%}
+  {%- if content contains 'data-citation-metric' or content contains 'data-citation-table' or content contains 'data-citation-chart' -%}
   {%- assign publications = site.data.publications | default: {} -%}
   <script nonce="{{ page.csp_nonce }}">
     window.DatalogAcademic = {{ site.data.academic | jsonify }};
@@ -31,22 +24,14 @@ Pass location="head" or location="body" to control which block renders.
       "yearly_totals": {{ publications.yearly_totals | jsonify }}
     };
   </script>
+  {%- endif -%}
+  {%- comment -%} Not include_cached: scripts.html reads the page's math and notebook settings and CSP nonce. {%- endcomment -%}
   {% include scripts.html %}
+  {%- comment -%}
+    core/github-cards.js reads the integration settings. The theme options and
+    content taxonomy were inlined here as well, and no script read them.
+  {%- endcomment -%}
   <script nonce="{{ page.csp_nonce }}">
-    window.DatalogTheme = {{ site.theme_options | jsonify }};
     window.DatalogIntegrations = {{ site.integrations | jsonify }};
-    window.DatalogContent = {{ site.content | jsonify }};
-  </script>
-  <script nonce="{{ page.csp_nonce }}">
-    document.addEventListener('DOMContentLoaded', function () {
-      if (window.Prism && window.Prism.plugins && window.Prism.plugins.NormalizeWhitespace) {
-        Prism.plugins.NormalizeWhitespace.setDefaults({
-          'remove-trailing': true,
-          'remove-indent': true,
-          'left-trim': true,
-          'right-trim': true
-        });
-      }
-    });
   </script>
 {%- endif -%}

data/_includes/post/related-posts.html

@@ -10,17 +10,14 @@ Builds a list of related posts based on overlapping tags or categories.
 Falls back to a friendly message when no related content is available.
 {%- endcomment -%}
 {%- assign related_limit = include.limit | default: 3 -%}
-{%- assign source_posts = site.collections.posts.docs | default: site.posts | default: '' | split: '' -%}
-{%- assign layout_filtered = source_posts | where: 'layout', 'post' -%}
-{%- assign collection_filtered = source_posts | where: 'collection', 'posts' -%}
-{%- assign candidate_posts = layout_filtered | concat: collection_filtered -%}
-{%- assign sorted_candidates = candidate_posts | sort: 'date' | reverse -%}
+{%- comment -%} site.posts is already newest first. {%- endcomment -%}
 {%- assign rendered_count = 0 -%}
 <section class="post-related" aria-labelledby="post-related-heading">
   <h2 id="post-related-heading">Related posts</h2>
   <ul class="post-related-list">
-    {%- for candidate in sorted_candidates -%}
-      {%- if candidate.url != include.page.url and rendered_count < related_limit -%}
+    {%- for candidate in site.posts -%}
+      {%- if rendered_count >= related_limit -%}{%- break -%}{%- endif -%}
+      {%- if candidate.url != include.page.url -%}
         {%- assign overlap = 0 -%}
         {%- if include.page.tags and candidate.tags -%}
           {%- for tag in include.page.tags -%}

data/_includes/scripts.html

@@ -1,12 +1,4 @@
-{% assign math_settings = site.theme_options.math %}
-{% assign math_engine = page.math_engine | default: math_settings.engine | default: 'mathjax' %}
-{% assign math_enabled = page.mathjax %}
-{% if math_enabled == nil %}
-  {% assign math_enabled = page.math %}
-{% endif %}
-{% if math_enabled == nil %}
-  {% assign math_enabled = math_settings.render_on_load | default: site.features.mathjax %}
-{% endif %}
+{% include meta/math-config.html page=page %}
 {% assign js_manifest = site.data.js_manifest %}
 
 {% if site.features.search %}

data/_includes/search/index-data.json

@@ -0,0 +1,131 @@
+{
+  "generated_at": "{{ 'now' | date_to_xmlschema }}",
+  "documents": [
+    {% assign known_langs = 'python,r,sql,julia,javascript,scala,go,java,typescript,html,css' | split: ',' %}
+    {% assign no_code = '' | split: '' %}
+    {% assign searchable = '' | split: '' %}
+    {% for post in site.posts %}
+      {% unless post.exclude_from_search %}
+        {% assign searchable = searchable | push: post %}
+      {% endunless %}
+    {% endfor %}
+    {% for page in site.pages %}
+      {% unless page.exclude_from_search or page.layout == nil or page.url contains 'search.json' %}
+        {% assign searchable = searchable | push: page %}
+      {% endunless %}
+    {% endfor %}
+    {% if site.portfolio %}
+      {% for project in site.portfolio %}
+        {% unless project.exclude_from_search %}
+          {% assign searchable = searchable | push: project %}
+        {% endunless %}
+      {% endfor %}
+    {% endif %}
+    {% if site.datasets %}
+      {% for dataset in site.datasets %}
+        {% unless dataset.exclude_from_search %}
+          {% assign searchable = searchable | push: dataset %}
+        {% endunless %}
+      {% endfor %}
+    {% endif %}
+    {% for doc in searchable %}
+      {% assign raw_tags = doc.tags | default: doc.topics %}
+      {% if raw_tags %}
+        {% assign tags = raw_tags %}
+      {% else %}
+        {% assign tags = '' | split: '' %}
+      {% endif %}
+      {% assign languages = '' | split: '' %}
+      {% if doc.languages %}
+        {% for lang in doc.languages %}
+          {% assign lang_normalized = lang | downcase %}
+          {% if known_langs contains lang_normalized %}
+            {% unless languages contains lang_normalized %}
+              {% assign languages = languages | push: lang_normalized %}
+            {% endunless %}
+          {% endif %}
+        {% endfor %}
+      {% elsif doc.language %}
+        {% assign lang_normalized = doc.language | downcase %}
+        {% if known_langs contains lang_normalized %}
+          {% assign languages = languages | push: lang_normalized %}
+        {% endif %}
+      {% elsif doc.tools %}
+        {% for tool in doc.tools %}
+          {% assign lang_normalized = tool | downcase %}
+          {% if known_langs contains lang_normalized %}
+            {% unless languages contains lang_normalized %}
+              {% assign languages = languages | push: lang_normalized %}
+            {% endunless %}
+          {% endif %}
+        {% endfor %}
+      {% elsif tags %}
+        {% for tag in tags %}
+          {% assign lang_normalized = tag | downcase %}
+          {% if known_langs contains lang_normalized %}
+            {% unless languages contains lang_normalized %}
+              {% assign languages = languages | push: lang_normalized %}
+            {% endunless %}
+          {% endif %}
+        {% endfor %}
+      {% endif %}
+      {% assign raw_content = doc.content | default: '' %}
+      {% assign content_text = raw_content | markdownify | strip_html | normalize_whitespace %}
+      {% assign summary = doc.summary | default: doc.excerpt | default: content_text | truncate: 280, '' %}
+      {% assign inline_math_segments = raw_content | split: '$' %}
+      {% assign display_math_segments = raw_content | split: '$$' %}
+      {% capture doc_type %}
+        {% if doc.collection == 'posts' %}post{% elsif doc.collection == 'portfolio' %}project{% elsif doc.collection == 'datasets' %}dataset{% elsif doc.layout == 'research' %}research{% elsif doc.layout == 'project' %}project{% elsif doc.layout == 'post' %}post{% else %}{{ doc.collection | default: doc.layout | default: 'page' }}{% endif %}
+      {% endcapture %}
+      {%- comment -%}
+      Each text field is written once. The search engine normalizes it in the browser with the
+      function it applies to queries; a precomputed normalized copy doubled the size of the file.
+      The code blocks come from the page's source, collected before rendering by
+      _plugins/search_code_blocks.rb: by the time this renders, a post's content is already HTML.
+      {%- endcomment %}
+      {
+        "title": {{ doc.title | default: doc.name | jsonify }},
+        "url": {{ doc.url | relative_url | jsonify }},
+        "type": {{ doc_type | strip | jsonify }},
+        "summary": {{ summary | strip | jsonify }},
+        "content": {{ content_text | jsonify }},
+        "code": {{ doc.search_code | default: no_code | jsonify }},
+        "math": [
+          {% assign math_counter = 0 %}
+          {% for piece in inline_math_segments %}
+            {% assign piece_index = forloop.index0 | modulo: 2 %}
+            {% if piece_index == 1 %}
+              {% assign cleaned = piece | strip %}
+              {% if cleaned != '' %}
+                {% if math_counter > 0 %},{% endif %}
+                {{ cleaned | jsonify }}
+                {% assign math_counter = math_counter | plus: 1 %}
+              {% endif %}
+            {% endif %}
+          {% endfor %}
+          {% for piece in display_math_segments %}
+            {% assign piece_index = forloop.index0 | modulo: 2 %}
+            {% if piece_index == 1 %}
+              {% assign cleaned = piece | strip %}
+              {% if cleaned != '' %}
+                {% if math_counter > 0 %},{% endif %}
+                {{ cleaned | jsonify }}
+                {% assign math_counter = math_counter | plus: 1 %}
+              {% endif %}
+            {% endif %}
+          {% endfor %}
+        ],
+        "tags": {{ tags | uniq | jsonify }},
+        "languages": {{ languages | uniq | jsonify }},
+        "difficulty": {{ doc.difficulty | default: doc.level | default: '' | jsonify }},
+        "topics": {{ doc.topics | default: tags | uniq | jsonify }},
+        "date": {% if doc.date %}{{ doc.date | date_to_xmlschema | jsonify }}{% else %}null{% endif %},
+        "reading_time": {{ doc.reading_time | default: doc.time | default: '' | jsonify }}
+        {% assign search_extensions = doc.datalog_search_extensions %}
+        {% if search_extensions and search_extensions != empty %}
+        ,"extensions": {{ search_extensions | jsonify }}
+        {% endif %}
+      }{% unless forloop.last %},{% endunless %}
+    {% endfor %}
+  ]
+}

data/_includes/search/page.html

@@ -0,0 +1,136 @@
+<div class="search-app" data-search-app data-search-index="{{ '/search.json' | relative_url }}">
+  <div class="search-app__panel">
+    <form class="search-app__form" data-search-form novalidate role="search" aria-label="Technical content search">
+      <div class="search-app__query">
+        <label class="search-app__label" for="advanced-search-input">Query</label>
+        <div class="search-app__input-group">
+          <input
+            id="advanced-search-input"
+            class="search-app__input"
+            type="search"
+            name="q"
+            placeholder="Search code, LaTeX, datasets, and more"
+            autocomplete="off"
+            spellcheck="false"
+            data-search-input
+            aria-describedby="search-shortcuts"
+            aria-activedescendant=""
+          />
+          <button type="submit" class="search-app__submit">Search</button>
+        </div>
+        <p id="search-shortcuts" class="search-app__shortcuts" data-search-shortcuts>
+          Keyboard shortcuts: <kbd>/</kbd> or <kbd>Ctrl</kbd> + <kbd>K</kbd> to focus, <kbd>Enter</kbd> to run, <kbd>Esc</kbd> to clear.
+        </p>
+        <div class="search-app__autocomplete" data-search-autocomplete role="listbox" aria-label="Search suggestions"></div>
+      </div>
+      <fieldset class="search-app__filters" data-search-filters>
+        <legend>Advanced filters</legend>
+        <div class="search-app__filters-grid">
+          <label class="search-filter">
+            <span class="search-filter__label">Content type</span>
+            <select data-filter-type>
+              <option value="">All content</option>
+              <option value="post">Tutorials &amp; blog posts</option>
+              <option value="research">Research outputs</option>
+              <option value="project">Projects &amp; portfolio</option>
+              <option value="dataset">Datasets</option>
+              <option value="page">Pages</option>
+            </select>
+          </label>
+          <label class="search-filter">
+            <span class="search-filter__label">Programming language</span>
+            <select data-filter-language>
+              <option value="">Any language</option>
+              <option value="python">Python</option>
+              <option value="r">R</option>
+              <option value="sql">SQL</option>
+              <option value="julia">Julia</option>
+              <option value="javascript">JavaScript</option>
+            </select>
+          </label>
+          <label class="search-filter">
+            <span class="search-filter__label">Difficulty</span>
+            <select data-filter-difficulty>
+              <option value="">All levels</option>
+              <option value="beginner">Beginner</option>
+              <option value="intermediate">Intermediate</option>
+              <option value="advanced">Advanced</option>
+            </select>
+          </label>
+          <div class="search-filter">
+            <span class="search-filter__label">Topics</span>
+            <div class="search-filter__tags" data-filter-tags role="group" aria-label="Filter by topic tags"></div>
+          </div>
+        </div>
+      </fieldset>
+    </form>
+    <aside class="search-app__analytics" data-search-analytics aria-live="polite">
+      <h2 class="search-app__analytics-title">Popular technical queries</h2>
+      <p class="search-app__analytics-empty">Search activity will appear here once queries are made.</p>
+      <ol class="search-app__analytics-list"></ol>
+    </aside>
+  </div>
+  <section class="search-app__results" aria-live="polite" data-search-region>
+    <header class="search-app__results-header">
+      <h2>Results</h2>
+      <p class="search-app__results-meta" data-search-meta>Enter a query to begin.</p>
+      <div class="search-app__loading" data-search-loading hidden>
+        <span class="search-app__spinner" aria-hidden="true"></span>
+        <span class="search-app__loading-text">Searching…</span>
+      </div>
+      <div class="visually-hidden" data-search-announcements>
+        <p aria-live="polite" data-search-live="count" hidden></p>
+        <p aria-live="polite" data-search-live="selection" hidden></p>
+        <p aria-live="polite" data-search-live="status" hidden></p>
+      </div>
+    </header>
+    <ol class="search-app__results-list" data-search-results role="listbox" aria-label="Search results"></ol>
+    <template id="search-result-template">
+      <li class="search-result" role="option" data-result-item>
+        <article class="search-result__card">
+          <header class="search-result__header">
+            <p class="search-result__meta">
+              <span class="search-result__type" data-result-type></span>
+              <span class="search-result__difficulty" data-result-difficulty></span>
+              <span class="search-result__language" data-result-languages></span>
+            </p>
+            <h3 class="search-result__title"><a data-result-link></a></h3>
+            <p class="search-result__summary" data-result-summary></p>
+          </header>
+          <div class="search-result__body">
+            <pre class="search-result__code language-none line-numbers" data-result-code><code></code></pre>
+            <div class="search-result__math" data-result-math hidden>
+              <div class="search-result__math-preview" data-result-math-preview aria-hidden="true"></div>
+              <pre class="search-result__math-source"><code data-result-math-code></code></pre>
+              <button type="button" class="search-result__math-copy" data-result-math-copy>
+                <span aria-hidden="true">⧉</span>
+                <span class="visually-hidden">Copy LaTeX</span>
+              </button>
+            </div>
+            <p class="search-result__excerpt" data-result-excerpt></p>
+          </div>
+          <footer class="search-result__footer">
+            <ul class="search-result__tags" data-result-tags></ul>
+            <time class="search-result__date" data-result-date></time>
+          </footer>
+        </article>
+      </li>
+    </template>
+    <div class="search-app__no-results" data-search-empty hidden>
+      <div class="search-app__no-results-illustration" aria-hidden="true">
+        <svg viewBox="0 0 120 80" role="presentation" focusable="false">
+          <g fill="none" stroke="currentColor" stroke-width="2">
+            <circle cx="40" cy="34" r="18" opacity="0.35" />
+            <circle cx="72" cy="46" r="14" opacity="0.2" />
+            <path d="M28 58h64" stroke-linecap="round" opacity="0.45" />
+            <path d="M48 33l8 9 16-18" stroke-linecap="round" stroke-linejoin="round" />
+          </g>
+        </svg>
+      </div>
+      <p>No matching entries were found. Try refining your filters or adjusting the query.</p>
+    </div>
+  </section>
+</div>
+<noscript>
+  <p class="search-app__noscript">JavaScript is required for the interactive search experience. Please enable JavaScript to explore technical content.</p>
+</noscript>

data/_layouts/dataset.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 {% assign localization_config = site.theme_options.localization %}
 {% assign date_format = page.date_format | default: localization_config.date_format | default: 'long' %}

data/_layouts/default.html

@@ -8,25 +8,33 @@
   <head>
     {% include head.html %}
     <meta name="twitter:creator" content="{{ site.author.twitter | default: site.social.twitter }}" />
-    {% if page.tags and page.tags.size > 0 %}
-      <meta name="keywords" content="{% include helpers/array-to-sentence.html items=page.tags conjunction='and' %}" />
-    {% endif %}
-    <meta name="format-detection" content="telephone=no" />
-    <link rel="preconnect" href="https://cdn.jsdelivr.net" crossorigin />
     {% include meta/schema.html page=page %}
-    {% include meta/scripts-loader.html location='head' %}
   </head>
   {% capture body_classes %}
     site-body{% if page.layout %} layout-{{ page.layout | replace: ' ', '-' }}{% endif %}{% if page.page_class %} page-{{ page.page_class | replace: ' ', '-' | downcase }}{% endif %}{% if page.classes %} {{ page.classes | join: ' ' }}{% endif %}{% if site.features.dark_mode_toggle %} has-dark-toggle{% endif %}{% if html_dir == 'rtl' %} rtl{% endif %}
   {% endcapture %}
   <body class="{{ body_classes | strip }}" data-theme="{{ page.theme | default: 'system' }}">
-    {% include skip-link.html %}
+    {%- comment -%}
+    Applies the saved or system color scheme before anything is drawn. core/dark-mode.js
+    applies the same rule, but only once the script bundles have loaded, so readers who
+    chose dark saw the light theme first; keep the two in step.
+    {%- endcomment %}
+    <script nonce="{{ page.csp_nonce }}">
+      try {
+        var mode = localStorage.getItem("datalog-color-mode");
+        if (mode === "dark" || (mode !== "light" && window.matchMedia("(prefers-color-scheme: dark)").matches)) {
+          document.body.classList.add("dark-mode");
+        }
+      } catch (error) {}
+    </script>
+    {%- comment -%} The skip link and the footer take nothing from the page, so each is rendered once per build (the skip link once per language). {%- endcomment -%}
+    {% include_cached skip-link.html lang=page.lang %}
     {% include header.html %}
     <main id="main-content" class="site-main container" role="main" tabindex="-1" aria-describedby="{{ math_status_id }}">
       {% include components/math-fallback.html expressions=page.math_expressions %}
       {% include layouts/default/article.html page=page content=content date_format=date_format %}
     </main>
-    {% include footer.html %}
+    {% include_cached footer.html %}
     <div class="visually-hidden" aria-live="polite" id="{{ math_status_id }}">{% t 'global.math_loading' %}</div>
     {% include meta/scripts-loader.html location='body' %}
   </body>

data/_layouts/home.html

@@ -31,6 +31,11 @@ layout: default
     </div>
   </div>
 </section>
+{% comment %}
+  The portfolio collection is optional: a site that has not declared it gets
+  nil here, and sorting nil raises rather than rendering an empty section.
+{% endcomment %}
+{% if site.portfolio and site.portfolio.size > 0 %}
 <section class="section section-portfolio">
   <div class="container">
     <h2 class="section-title">{% t 'home.featured_projects' %}</h2>
@@ -46,3 +51,4 @@ layout: default
     </div>
   </div>
 </section>
+{% endif %}

data/_layouts/notebook.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 
 {%- comment -%}

data/_layouts/package.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 
 <div class="package-docs">

data/_layouts/portfolio.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 <article class="portfolio-item">
   <header class="portfolio-header">

data/_layouts/post.html

@@ -272,7 +272,12 @@ schema_type: TechnicalArticle
       const metaBar = document.createElement('div');
       metaBar.className = 'code-block-meta';
 
-      const lang = codeBlock.getAttribute('class');
+      // Rouge puts the language on the block's wrapper rather than on the code.
+      // With line numbers on, the code is a table whose first column holds the
+      // numbers, and the copy leaves them out.
+      const langHolder = codeBlock.matches('[class*="language-"]') ? codeBlock : codeBlock.closest('.highlighter-rouge');
+      const lang = langHolder && langHolder.getAttribute('class');
+      const source = codeBlock.querySelector('.rouge-code') || codeBlock;
       if (lang) {
         const m = lang.match(/language-([a-z0-9+#]+)/i);
         if (m) {
@@ -291,7 +296,7 @@ schema_type: TechnicalArticle
 
       if (navigator.clipboard && navigator.clipboard.writeText) {
         button.addEventListener('click', function () {
-          navigator.clipboard.writeText(codeBlock.textContent).then(function () {
+          navigator.clipboard.writeText(source.textContent).then(function () {
             button.textContent = 'Copied!';
             button.classList.add('is-copied');
             setTimeout(function () {
@@ -311,9 +316,19 @@ schema_type: TechnicalArticle
       wrapper.insertBefore(metaBar, pre);
     });
 
-    // Make equation references focus their targets for accessibility.
-    if (window.MathJax && window.MathJax.startup) {
-      window.MathJax.startup.promise.then(function () {
+    // Make equation references focus their targets for accessibility. This runs
+    // on DOMContentLoaded, before MathJax has loaded, when window.MathJax is
+    // still the configuration object and has no startup.promise; reading it
+    // threw. The head's MathJax configuration announces typeset math instead.
+    const onMathReady = function (callback) {
+      if (document.body.classList.contains('math-ready') && document.querySelector('mjx-container')) {
+        callback();
+      } else {
+        document.addEventListener('datalog:math-ready', callback, { once: true });
+      }
+    };
+    if (window.MathJax) {
+      onMathReady(function () {
         const equations = document.querySelectorAll('.post-content mjx-container[display="true"]');
         let eqIndex = 1;
         equations.forEach(function (container) {

data/_layouts/project.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 {% assign localization_config = site.theme_options.localization %}
 {% assign date_format = localization_config.date_format | default: 'long' %}
@@ -30,7 +31,7 @@ layout: default
       {% if page.github %}
       <section class="project-case__github" aria-labelledby="github-heading">
         <h2 id="github-heading">{% t 'project.header.github_repository' %}</h2>
-        <div class="project-case__github-card" data-github-repo="{{ page.github.repo }}" data-github-owner="{{ page.github.owner }}">
+        <div class="project-case__github-card" data-github-repo="{{ page.github.repo }}" data-github-owner="{{ page.github.owner }}" data-github-unavailable="{% t 'project.github.unavailable' %}">
           <div class="project-case__github-meta">
             <p class="project-case__github-name">
               <a href="https://github.com/{{ page.github.owner }}/{{ page.github.repo }}" itemprop="url">{{ page.github.owner }}/{{ page.github.repo }}</a>

data/_plugins/analytics_dashboard.rb

@@ -31,7 +31,10 @@ module Datalog
 
       data = query_analytics(site)
       data["fetched_at"] = Time.now.utc.iso8601
-      write_cache(cache_path, data)
+      # Only a successful report is cached. A missing-configuration or error
+      # payload used to be kept for CACHE_TTL as well, so a site that had just
+      # set GA4_PROPERTY_ID went on reporting the old problem for a day.
+      write_cache(cache_path, data) if data["status"] == "ok"
       data
     rescue StandardError => e
       Jekyll.logger.warn("Analytics", "Falling back to cached analytics data: #{e.message}")
@@ -43,7 +46,7 @@ module Datalog
     end
 
     def fresh?(payload)
-      return false unless payload.is_a?(Hash)
+      return false unless payload.is_a?(Hash) && payload["status"] == "ok"
 
       fetched_at = payload["fetched_at"]
       return false if fetched_at.to_s.empty?
@@ -95,7 +98,10 @@ module Datalog
       results["status"] = "ok"
       results
     rescue LoadError => e
-      fallback_payload("missing_dependency", "Install googleauth to enable GA4 integration: #{e.message}")
+      # The theme does not depend on googleauth: only a site with a GA4 property
+      # configured needs it, and adds it to its own Gemfile.
+      fallback_payload("missing_dependency",
+                       "Add gem \"googleauth\" to the site's Gemfile to enable the GA4 integration: #{e.message}")
     rescue StandardError => e
       fallback_payload("error", e.message)
     end

data/_plugins/config_validator.rb

@@ -12,8 +12,9 @@ module Datalog
     SCHEMA = {
       title: { type: :string, required: true },
       url: { type: :string, required: true, format: :url },
+      # `author: Jane Doe` is a common Jekyll setting; the hash adds an email and profile links.
       author: {
-        type: :hash,
+        type: %i[string hash],
         required: true,
         schema: {
           name: { type: :string, required: true },
@@ -68,12 +69,6 @@ module Datalog
               engine: { type: :string, enum: %w[mathjax katex] },
               enabled: { type: :boolean }
             }
-          },
-          syntax_highlighting: {
-            type: :hash,
-            schema: {
-              cdn: { type: :string }
-            }
           }
         }
       }
@@ -84,6 +79,10 @@ module Datalog
         replacement: "theme_options.math.engine",
         message: "'math_engine' has moved under theme_options.math.engine.",
         auto_migrate: true
+      },
+      "theme_options.syntax_highlighting" => {
+        message: "Code is highlighted by Rouge when the site builds and the theme no longer loads Prism, " \
+                 "so these settings have no effect. Remove them."
       }
     }.freeze
 
@@ -204,6 +203,8 @@ module Datalog
       end
 
       def type_valid?(value, expected_type)
+        return expected_type.any? { |type| type_valid?(value, type) } if expected_type.is_a?(Array)
+
         case expected_type
         when :string
           value.is_a?(String)
@@ -222,6 +223,8 @@ module Datalog
 
       def url_valid?(value)
         return false unless value.is_a?(String)
+        # `url: ""` is what `jekyll new` writes, and what a site built locally keeps.
+        return true if value.strip.empty?
 
         uri = URI.parse(value)
         uri.is_a?(URI::HTTP) && !uri.host.nil?
@@ -311,6 +314,8 @@ module Datalog
       end
 
       def human_type(type)
+        return type.map { |entry| human_type(entry) }.join(" or ") if type.is_a?(Array)
+
         case type
         when :string then "a String"
         when :integer then "an Integer"