Oscarotero/main (#2787)

Co-authored-by: Oscar Otero <oom@oscarotero.com>
Co-authored-by: Phil Hawksworth <phil@deno.com>
Co-authored-by: Jesper van den Ende <jespertheend@users.noreply.github.com>
Co-authored-by: Duncan Holm <duncan@holm.scot>

Author: 5 people

_components/SidebarNav.tsx _components/SidebarNav/comp.tsx_components/SidebarNav.tsx renamed to _components/SidebarNav/comp.tsx

@@ -1,5 +1,5 @@
 // deno-lint-ignore-file no-explicit-any
-import ReferenceSidebarNav from "../reference/_components/ReferenceSidebarNav.tsx";
+import ReferenceSidebarNav from "../../reference/_components/ReferenceSidebarNav.tsx";
 
 export default function (data: Lume.Data) {
   const sectionData = data.sectionData;
@@ -129,5 +129,3 @@ function SidebarCategoryHeading(props: {
     </h2>
   );
 }
-
-export const js = `import "/js/sidebar.client.js";`;

static/js/sidebar.client.js _components/SidebarNav/script.jsstatic/js/sidebar.client.js renamed to _components/SidebarNav/script.js

@@ -20,8 +20,3 @@ export default function () {
     </button>
   );
 }
-
-export const js = `
-import "/js/darkmode.client.js";
-import "/js/darkmode-toggle.client.js";
-`;

_components/ThemeToggle.tsx _components/ThemeToggle/comp.tsx_components/ThemeToggle.tsx renamed to _components/ThemeToggle/comp.tsx

@@ -0,0 +1,2 @@
+import "./darkmode.js";
+import "./darkmode-toggle.js";

static/js/darkmode-toggle.client.js …omponents/ThemeToggle/darkmode-toggle.jsstatic/js/darkmode-toggle.client.js renamed to _components/ThemeToggle/darkmode-toggle.js static/js/darkmode-toggle.client.js renamed to _components/ThemeToggle/darkmode-toggle.js

@@ -32,7 +32,3 @@ function urlMatcher(url: string): string | undefined {
   const match = url.match(urlPattern);
   return match?.[3];
 }
-
-export const js = `
-  import "/js/youtube-lite.client.js";
-`;

static/js/darkmode.client.js _components/ThemeToggle/darkmode.jsstatic/js/darkmode.client.js renamed to _components/ThemeToggle/darkmode.js

@@ -2,16 +2,13 @@ import "@std/dotenv/load";
 
 import lume from "lume/mod.ts";
 import esbuild from "lume/plugins/esbuild.ts";
-import jsx from "lume/plugins/jsx_preact.ts";
+import jsx from "lume/plugins/jsx.ts";
 import mdx from "lume/plugins/mdx.ts";
 import ogImages from "lume/plugins/og_images.ts";
-import postcss from "lume/plugins/postcss.ts";
 import redirects from "lume/plugins/redirects.ts";
 import search from "lume/plugins/search.ts";
 import sitemap from "lume/plugins/sitemap.ts";
-import postcssNesting from "npm:@tailwindcss/nesting";
-
-import tailwind from "@tailwindcss/postcss";
+import tailwind from "lume/plugins/tailwindcss.ts";
 
 import Prism from "./prism.ts";
 
@@ -160,23 +157,25 @@ site.use(search());
 site.use(jsx());
 site.use(mdx());
 
-site.use(
-  postcss({
-    includes: false,
-    plugins: [postcssNesting, tailwind()],
-  }),
-);
-
+site.add("js");
 site.use(
   esbuild({
-    extensions: [".client.ts", ".client.js"],
+    extensions: [".ts"],
     options: {
       minify: false,
       splitting: true,
+      alias: {
+        "node:crypto": "./_node-crypto.js",
+      },
     },
   }),
 );
 
+site.add("style.css");
+site.use(tailwind({
+  minify: true,
+}));
+
 site.use(toc({ anchor: false }));
 site.use(title());
 site.use(sitemap());
@@ -210,7 +209,7 @@ site.addEventListener("afterBuild", async () => {
       Deno.writeTextFileSync(site.dest("llms-full.txt"), llmsFullTxt);
       log.info("Generated llms-full.txt in site root");
     } catch (error) {
-      log.error("Error generating LLMs files:", error);
+      log.error("Error generating LLMs files:" + error);
     }
   }
 });
@@ -298,7 +297,7 @@ if (Deno.env.get("BUILD_TYPE") == "FULL") {
   site.data("openGraphLayout", "/open_graph/default.jsx");
   site.use(
     ogImages({
-      satori: {
+      options: {
         width: 1200,
         height: 630,
         fonts: [
@@ -327,13 +326,11 @@ if (Deno.env.get("BUILD_TYPE") == "FULL") {
           },
         ],
       },
-      cache: false,
     }),
   );
 }
 
 site.scopedUpdates(
-  (path) => path == "/overrides.css",
   (path) => /\.(js|ts)$/.test(path),
   (path) => path.startsWith("/api/deno/"),
 );

_components/ThemeToggle/script.js

@@ -28,22 +28,24 @@ export default function Doc(data: Lume.Data, helpers: Lume.Helpers) {
   }
 
   function getTocCtx(
-    d: unknown,
+    d: Lume.Data,
   ): { document_navigation: unknown; document_navigation_str: string } | null {
-    type Toc = {
-      document_navigation: unknown;
-      document_navigation_str: string;
-    };
-    const tocCtx: unknown = (d as {
-      children?: { props?: { data?: { toc_ctx?: unknown } } };
-    })?.children?.props?.data?.toc_ctx;
+    const tocCandidate =
+      (d.data as { toc_ctx?: unknown } | undefined)?.toc_ctx ??
+        (d as {
+          children?: { props?: { data?: { toc_ctx?: unknown } } };
+        })?.children?.props?.data?.toc_ctx;
+
     if (
-      tocCtx &&
-      typeof tocCtx === "object" &&
-      "document_navigation" in tocCtx &&
-      "document_navigation_str" in tocCtx
+      tocCandidate &&
+      typeof tocCandidate === "object" &&
+      "document_navigation" in tocCandidate &&
+      "document_navigation_str" in tocCandidate
     ) {
-      return tocCtx as Toc;
+      return tocCandidate as {
+        document_navigation: unknown;
+        document_navigation_str: string;
+      };
     }
     return null;
   }