Fix minor issues

irskep · Sep 6, 2024 · 0f2a428 · 0f2a428
1 parent 346f92f
commit 0f2a428
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/docs/src/basics/configuration.dj b/docs/src/basics/configuration.dj
@@ -44,6 +44,11 @@ html:
   header_links:
     - text: "Some text"
       url: "https://a/full/url"
+  extra_static_dirs:
+    - path: "../node_modules/some_library"
+      exclude_patterns: ['**/*.ts'] # optional
+      patterns: # optional; default is '**/*'
+        - '**/*.css'
 
 gfm:
   ignore_static: ["**/*.html", "**/*.css", "**/*.js"]

diff --git a/docs/src/changelog.dj b/docs/src/changelog.dj
@@ -14,6 +14,7 @@ order: -1
   - Probably fixed more Windows bugs
 
 - Many changes to the default theme
+- Search results no longer contain duplicated text
 
 ### 0.2.4 - 2024-09-04
 
@@ -40,11 +41,13 @@ order: -1
   - Allow putting custom links in the header
 
 - HTML improvements
+
   - OpenGraph and Twitter Card metadata
   - Site-wide search using [lunr](https://lunrjs.com)
   - Move "On this page" to a header bar on mobile instead of just disappearing
 
 - Plugin API improvements
+
   - Plugins can provide static files, perhaps based on site content (this powers search)
   - More methods can be async
   - Plugins can mark nodes as "special" and not to be touched by other plugins

diff --git a/src/renderers/htmlRenderer.ts b/src/renderers/htmlRenderer.ts
@@ -97,12 +97,12 @@ export class HTMLRenderer implements DjockeyRenderer {
         results: allStaticFileAbsoluteFSPaths,
         logCollector,
       }),
-      ...config.html.extra_static_dirs.flatMap((extraStaticDir) => {
+      ...(config.html.extra_static_dirs || []).flatMap((extraStaticDir) => {
         const fsBase = fsjoin([
           config.rootPath,
           ...refsplit(extraStaticDir.path),
         ]);
-        return extraStaticDir.patterns.map(async (pattern) => {
+        return (extraStaticDir.patterns || ["**/*"]).map(async (pattern) => {
           copyFilesMatchingPattern({
             base: fsBase,
             dest: config.output_dir.html,

diff --git a/src/types.ts b/src/types.ts
@@ -31,9 +31,9 @@ export interface DjockeyConfig {
   link_mappings?: LinkMappingConfig[];
 
   html: {
-    extra_static_dirs: {
+    extra_static_dirs?: {
       path: string;
-      patterns: string[];
+      patterns?: string[];
       exclude_patterns?: string[];
     }[];
     footer_text: string;

diff --git a/templates/html/static/dj-doctree-and-toc.css b/templates/html/static/dj-doctree-and-toc.css
@@ -2,7 +2,7 @@
   padding: 0 calc(var(--mm) - var(--ms));
 }
 
-.DJTableOfContents_Content {
+.DJTableOfContents {
   font-size: var(--fs-small);
   padding: 0 var(--ms);
 }