Merge branch 'freeCodeCamp:main' into master

Author: gombosg

Gemfile.lock

@@ -56,9 +56,9 @@ GEM
     logger (1.6.1)
     method_source (1.0.0)
     mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    minitest (5.25.2)
     multi_json (1.15.0)
-    mustermann (3.0.0)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     newrelic_rpm (8.16.0)
     nokogiri (1.16.7)
@@ -88,8 +88,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.6.0)
-    rexml (3.2.9)
-      strscan
+    rexml (3.3.9)
     rouge (1.11.1)
     rr (3.1.1)
     rss (0.3.1)
@@ -125,7 +124,6 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    strscan (1.0.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terser (1.2.4)
@@ -135,7 +133,7 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (1.3.2)
-    tilt (2.3.0)
+    tilt (2.4.0)
     tty-pager (0.14.0)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)

assets/javascripts/news.json

@@ -1,4 +1,8 @@
 [
+  [
+    "2024-11-23",
+    "New documentation: <a href=\"/duckdb/\">DuckDB</a>"
+  ],
   [
     "2024-08-20",
     "New documentation: <a href=\"/man/\">Linux man pages</a>"

assets/javascripts/templates/pages/help_tmpl.js

@@ -3,7 +3,7 @@ app.templates.helpPage = function () {
   const navKey = $.isMac() ? "cmd" : "alt";
   const arrowScroll = app.settings.get("arrowScroll");
 
-  const aliases = Object.entries(app.models.Entry.ALIASES);
+  const aliases = Object.entries(app.config.docs_aliases);
   const middle = Math.ceil(aliases.length / 2);
   const aliases_one = aliases.slice(0, middle);
   const aliases_two = aliases.slice(middle);

lib/docs/filters/duckdb/attribution.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Docs
+  class Duckdb
+    class AttributionFilter < Docs::AttributionFilter
+      def attribution_link
+        url = current_url.to_s.sub! 'http://localhost:8000', 'https://duckdb.org'
+        %(<a href="#{url}" class="_attribution-link">#{url}</a>)
+      end
+    end
+  end
+end

lib/docs/filters/duckdb/clean_html.rb

@@ -0,0 +1,40 @@
+module Docs
+  class Duckdb
+    class CleanHtmlFilter < Filter
+      def call
+        # First extract the main content
+        @doc = at_css('#main_content_wrap', 'main')
+        return doc if @doc.nil?
+
+        doc.prepend_child at_css('.title').remove
+        at_css('.title').name = 'h1'
+
+        # Remove navigation and header elements
+        css('.headerline', '.headlinebar', '.landingmenu', '.search_icon', '#sidebar', '.pagemeta', '.toc_menu', '.section-nav').remove
+
+        # Clean up code blocks
+        css('div.highlighter-rouge').each do |node|
+          node['data-language'] = node['class'][/language-(\w+)/, 1] if node['class']
+          node.content = node.content.strip
+          node.name = 'pre'
+        end
+
+        # Remove unnecessary attributes
+        css('div, span, p').each do |node|
+          node.remove_attribute('style')
+          node.remove_attribute('class')
+        end
+
+        # Remove empty elements
+        css('div, span').each do |node|
+          node.remove if node.content.strip.empty?
+        end
+
+        # Remove script tags
+        css('script').remove
+
+        doc
+      end
+    end
+  end
+end

lib/docs/filters/duckdb/entries.rb

@@ -0,0 +1,45 @@
+module Docs
+  class Duckdb
+    class EntriesFilter < Docs::EntriesFilter
+      def get_name
+        at_css('h1', '.title').content
+      end
+
+      def get_type
+        case subpath
+        when /\Asql\//
+          'SQL Reference'
+        when /\Aapi\//
+          'Client APIs'
+        when /\Aguides\//
+          'How-to Guides'
+        when /\Adata\//
+          'Data Import'
+        when /\Aoperations_manual\//
+          'Operations Manual'
+        when /\Adev\//
+          'Development'
+        when /\Ainternals\//
+          'Internals'
+        when /\Aextensions\//
+          'Extensions'
+        when /\Aarchive\//
+          'Archive'
+        else
+          'Documentation'
+        end
+      end
+
+      def additional_entries
+        entries = []
+        css('h2[id]', 'h3[id]').each do |node|
+          name = node.content.strip
+          # Clean up the name
+          name = name.gsub(/[\r\n\t]/, ' ').squeeze(' ')
+          entries << [name, node['id'], get_type]
+        end
+        entries
+      end
+    end
+  end
+end

lib/docs/filters/eslint/clean_html.rb

@@ -5,6 +5,7 @@ def call
         @doc = at_css('#main') if at_css('#main')
         @doc = at_css('.docs-main__content') if at_css('.docs-main__content')
 
+        css('.docs-toc').remove
         css('.eslint-ad').remove
         css('.glyphicon').remove
         css('hr', 'colgroup', 'td:empty').remove

lib/docs/filters/eslint/entries.rb

@@ -10,7 +10,12 @@ def get_type
         if subpath.start_with?('rules')
           return 'Rules'
         else
-          at_css('nav.docs-index [aria-current="true"]').ancestors('li')[-1].at_css('a').content
+          type = at_css('nav.docs-index [aria-current="true"]').ancestors('li')[-1].at_css('a').content
+          # This specific entry is mispelled with a lowercase 'i'
+          if type.start_with?('integrate')
+            type = type.sub('integrate', 'Integrate')
+          end
+          return type
         end
       end
     end

lib/docs/filters/sequelize/clean_html.rb

@@ -2,7 +2,7 @@ module Docs
   class Sequelize
     class CleanHtmlFilter < Filter
       def call
-        @doc = at_css('article', '.content')
+        @doc = at_css('article', '.content .self-detail', '.content')
 
         if at_css('header > h1')
           # Pull the header out of its container

lib/docs/filters/svelte/clean_html.rb

@@ -2,11 +2,23 @@ module Docs
   class Svelte
     class CleanHtmlFilter < Filter
       def call
-        @doc = at_css('main .page.content')
+        @doc = at_css('main .page.content #docs-content')
+
+        # Remove title header
+        at_css('> header > div.breadcrumbs').remove()
+        # Remove extra input toggle
+        at_css('> aside.on-this-page input').remove()
+        # Remove "edit this page" link
+        at_css('> p.edit').remove()
+        # Remove footer navigation
+        at_css('> div.controls').remove()
+
         at_css('h1').content = 'Svelte' if root_page?
         css('pre').each do |node|
+          # Remove hover popup
+          node.css('.twoslash-popup-container').remove()
           node.content = node.css('.line').map(&:content).join("\n")
-          node['data-language'] = 'javascript'
+          node['data-language'] = 'typescript'
         end
         doc
       end