version docs pages

Author: outfoxxed

default.nix

@@ -6,8 +6,7 @@
   yarn-berry,
   nodejs,
   cacert,
-  quickshell-types ? null,
-  masterBranch ? false,
+  versions ? null,
 }: stdenv.mkDerivation (final: let
   nodeModules = stdenv.mkDerivation {
     pname = "${final.pname}-node_modules";
@@ -70,8 +69,7 @@ in {
   '';
 
   PRODUCTION = true;
-  MASTER_BRANCH = masterBranch;
-  SECRET_MODULES_PATH = if quickshell-types == null then "" else quickshell-types;
+  VERSION_FILE_PATH = versions;
 
   buildPhase = ''
     HOME=$(pwd)/garbage-tooling yarn build

flake.lock

@@ -1,23 +1,15 @@
 {
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-
-    quickshell-docs = {
-      url = "git+https://git.outfoxxed.me/quickshell/quickshell-docs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, quickshell-docs }: let
+  outputs = { self, nixpkgs }: let
     forEachSystem = fn: nixpkgs.lib.genAttrs
       [ "x86_64-linux" "aarch64-linux" ]
       (system: fn system nixpkgs.legacyPackages.${system});
   in {
     packages = forEachSystem (system: pkgs: rec {
-      quickshell-web = pkgs.callPackage ./default.nix {
-        quickshell-types = quickshell-docs.packages.${system}.quickshell-types;
-      };
-
+      quickshell-web = pkgs.callPackage ./default.nix {};
       default = quickshell-web;
     });
   };

flake.nix

@@ -3,3 +3,6 @@ redir /docs/configuration/intro* /docs/guide/introduction permanent
 redir /docs/configuration/positioning* /docs/guide/size-position permanent
 redir /docs/configuration/qml-overview* /docs/guide/qml-language permanent
 redir /docs/configuration* /docs/guide permanent
+
+@unversioned_docs path_regexp ^/docs/((guide|types).*)$
+redir @unversioned_docs /docs/v0.1.0/{re.1}

redirects.caddyfile

@@ -1,7 +1,7 @@
 ---
 import { processMarkdown } from "@config/io/markdown";
 
-const codeDesktop = await processMarkdown(`\`\`\`qml
+const codeDesktop = await processMarkdown("N/A", `\`\`\`qml
 // a standard desktop window
 FloatingWindow {
   Timer {
@@ -21,7 +21,7 @@ FloatingWindow {
 }
 \`\`\``);
 
-const codeMobile = await processMarkdown(`\`\`\`qml
+const codeMobile = await processMarkdown("N/A", `\`\`\`qml
 // a standard desktop window
 FloatingWindow {
   Timer {

src/components/featurelist/FeatureList.astro

@@ -2,7 +2,6 @@
 import "@pagefind/default-ui/css/ui.css";
 import magnifierIcon from "@icons/magnifier.svg?raw"
 ---
-
 <site-search class="search-wrapper">
   <button
     data-open-modal
@@ -52,7 +51,6 @@ import magnifierIcon from "@icons/magnifier.svg?raw"
 
 <script>
 import { getQMLTypeLinkObject, getQMLTypeLink, getIconForLink } from '@src/config/io/helpers';
-
 	class SiteSearch extends HTMLElement {
 		constructor() {
 			super();
@@ -107,7 +105,7 @@ import { getQMLTypeLinkObject, getQMLTypeLink, getIconForLink } from '@src/confi
         if (match.length > 0){
           for (const matching of match) {
             const linkObject = getQMLTypeLinkObject(matching[1]);
-            const link = getQMLTypeLink(linkObject);
+            const link = getQMLTypeLink("NOVERSION", linkObject);
             const icon = linkObject.mtype ? getIconForLink(linkObject.mtype, false) : null;
 
             // for signal

src/components/navigation/Search.astro

@@ -5,15 +5,18 @@ export interface Props {
   currentClass?: string;
 }
 
-import { getModulesData } from "@config/io/generateTypeData";
+import { getVersionsData } from "@config/io/generateTypeData";
 import type { TreeEntry } from "./Tree.astro";
 import Tree from "./Tree.astro";
 import Link from "./Link.astro";
-import VersionSelector from "./VersionSelector.astro"
+import { getCollection } from "astro:content";
 
-const modules = await getModulesData();
+const versions = await getVersionsData();
+const versionName = Astro.params.version;
+const modules = versions.versions.find(version => version.name === versionName)?.modules;
+
+const currentPath = Astro.url.pathname.split('/').filter(s => s !== "");
 
-import { getCollection } from "astro:content";
 const guidePages = await getCollection("guide");
 
 interface NavTree {
@@ -22,8 +25,6 @@ interface NavTree {
   entries?: NavTree[],
 }
 
-const currentPath = Astro.url.pathname.slice(1).split('/');
-
 function mkTree(mount: string, pathIdx: number, { title, slug, entries }: NavTree): TreeEntry {
   const link = `${mount}/${slug}`;
 
@@ -48,43 +49,67 @@ function genGuideNav(base: string): NavTree[] | undefined {
   return pages.length === 0 ? undefined : pages;
 }
 
-const guide = mkTree("/docs", 1, {
-  title: "Usage Guide",
-  slug: "guide",
-  entries: genGuideNav(""),
-});
+let versionedEntries;
+let versionsTree;
 
-const types = mkTree("/docs", 1, {
-  title: "Quickshell Types",
-  slug: "types",
-  entries: modules.map(module => ({
-    title: module.name,
-    slug: module.name,
-    entries: module.types.map(type => ({
-      title: type.name,
-      slug: type.name,
-    }))
-  }))
-});
+if (versionName) {
+  versionedEntries = {
+    guide: mkTree(`/docs/${versionName}`, 2, {
+      title: "Usage Guide",
+      slug: "guide",
+      entries: genGuideNav(""),
+    }),
+    types: mkTree(`/docs/${versionName}`, 2, {
+      title: "Quickshell Types",
+      slug: "types",
+      entries: modules!.map(module => ({
+        title: module.name,
+        slug: module.name,
+        entries: module.types.map(type => ({
+          title: type.name,
+          slug: type.name,
+        }))
+      }))
+    }),
+  };
 
+  versionsTree = {
+    title: `Switch Version (${versionName})`,
+    link: "#",
+    entries: versions.versions.map(version => ({
+      title: version.name,
+      link: `/docs/${version.name}${Astro.url.pathname.slice(6 + versionName.length)}`,
+      current: version.name == versionName,
+    })),
+  };
+}
 ---
 <nav class="navtree">
-  <VersionSelector title="Versions" link=`${Astro.currentLocale}` current/>
   <Link
-    title="About Quickshell"
+    title="About"
     link="/about"
-    current={Astro.url.pathname === "/about"}
-  />
-  <Tree {...guide}/>
-  <Tree {...types}/>
-  <Link
-    title="QtQuick Types"
-    link="https://doc.qt.io/qt-6/qtquick-qmlmodule.html"
-    showIcon={true}
-  />
-  <Link
-    title="Quickshell Examples"
-    link="https://git.outfoxxed.me/outfoxxed/quickshell-examples"
-    showIcon={true}
+    current={currentPath.length === 1 && currentPath[0] === "about"}
   />
+  { versionedEntries && <Tree {...versionsTree as TreeEntry}/>}
+  <hr/>
+  { versionedEntries && (
+    <Tree {...versionedEntries.guide}/>
+    <Tree {...versionedEntries.types}/>
+    <Link
+      title="QtQuick Types"
+      link="https://doc.qt.io/qt-6/qtquick-qmlmodule.html"
+      showIcon={true}
+    />
+    <Link
+      title="Quickshell Examples"
+      link="https://git.outfoxxed.me/outfoxxed/quickshell-examples"
+      showIcon={true}
+    />
+  )}
+  { !versionedEntries && versions.versions.map(version => (
+    <Link
+      title={`Quickshell Documentation (${version.name})`}
+      link={`/docs/${version.name}/guide`}
+    />
+  ))}
 </nav>

src/components/navigation/sidebars/nav/RootNav.astro

@@ -13,12 +13,13 @@ export interface Props {
 }
 
 const { funcData } = Astro.props;
+const { version } = Astro.params;
 ---
 <ul class="typedata typefuncs">
   {
     funcData.map(item => {
       const functionParams = item.params.length > 0 ? item.params.map((funcparam,index) => `${funcparam.name}${index !== item.params.length -1 ? ", ":""}`) : undefined
-      const retTypeLink = getQMLTypeLink(item.ret as unknown as QMLTypeLinkObject)
+      const retTypeLink = getQMLTypeLink(version!, item.ret as unknown as QMLTypeLinkObject)
       let genericType:string|undefined;
       let genericTypeLink:string|undefined;
       return (
@@ -37,7 +38,7 @@ const { funcData } = Astro.props;
               <p class="typedata-params typefunc-params">
                 {
                   item.params.map(param => {
-                    const paramTypeLink = getQMLTypeLink(param.type);
+                    const paramTypeLink = getQMLTypeLink(version!, param.type);
                     return (
                       <span class="typedata-param typefunc-param">
                         <Tag client:idle/>