fix(ci): github workflows docs

gc-victor · gc-victor · commit 3c649f69bd6b · 2025-02-28T16:41:51.000+01:00
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,4 +1,4 @@
-name: Q|ery. Web Docs
+name: Web Docs
 
 on:
   push:
@@ -8,6 +8,7 @@ on:
       - "**[0-9]+.[0-9]+.[0-9]+*"
     paths:
       - examples/docs/**
+      - .github/workflows/docs.yml
 
 env:
   CARGO_TERM_COLOR: always
@@ -29,28 +30,19 @@ jobs:
       - name: Rust Cache Action
         uses: Swatinem/rust-cache@v2
 
-      - name: Assets Cache
+      - name: Cache
         id: query-cache
         uses: actions/cache@v4
         with:
-          path: .query/.cache
+          path: examples/docs/.query/.cache
           key: query-cache-${{ github.run_id }}
           restore-keys: query-cache
 
-      - name: Set token
-        env:
-          QUERY_WEB_PRIVATE_TOKEN: ${{ secrets.QUERY_WEB_PRIVATE_TOKEN }}
-        run: |
-          echo "[default] $QUERY_WEB_PRIVATE_TOKEN" > .query/.token
-
-      - name: Set remote URL
-        run: |
-          sed -i "s|http://localhost:3000|https://qery.io|" .query/Query.toml
-
       - name: Use pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 10
+          run_install: false
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
@@ -59,18 +51,43 @@ jobs:
           cache: "pnpm"
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          cd examples/docs
+          pnpm install
 
       - name: Create docs
         env:
           RUST_BACKTRACE: full
           RUST_LOG: info
+        run: |
+          cargo run --package query-docs -- --input examples/docs/docs --output examples/docs/dist/docs
+
+      - name: Debug dist directory
+        run: |
+          find examples/docs/dist/docs -type f | sort
+
+      - name: Set token
+        env:
+          QUERY_WEB_PRIVATE_TOKEN: ${{ secrets.QUERY_WEB_PRIVATE_TOKEN }}
+        run: |
+          cd examples/docs
+          echo "[default] $QUERY_WEB_PRIVATE_TOKEN" > .query/.token
+
+      - name: Set remote URL
         run: |
           cd examples/docs
-          pnpm query task docs
+          sed -i "s|http://localhost:3000|https://qery.io|" .query/Query.toml
 
       - name: Deploy to qery.io
         run: |
           cd examples/docs
-          pnpm query task deploy
-          pnpm query asset dist
+          ./node_modules/.bin/tailwindcss -i ./docs/styles.css -o ./dist/docs/styles.css
+          ./node_modules/.bin/query asset dist
+          ./node_modules/.bin/query function src/pages/docs/get.index.tsx
+          ./node_modules/.bin/query function src/pages/docs/\[slug\]/get.index.tsx
+          ./node_modules/.bin/query function src/pages/docs/\[slug\]/\[slug\]/get.index.tsx
+
+      - name: Cache content
+        run: |
+          cd examples/docs
+          cat .query/.cache
diff --git a/examples/docs/docs/template.html b/examples/docs/docs/template.html
@@ -4,7 +4,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>{{title}} - Documentation</title>
-        <base href="http://localhost:3000/docs/" />
+        <base href="__BASE_URL__/docs/" />
         <meta name="description" content="{{description}}" />
         <link rel="stylesheet" href="__STYLES_CSS__" />
     </head>
diff --git a/examples/docs/docs/templates/left-navigation.html b/examples/docs/docs/templates/left-navigation.html
@@ -16,7 +16,7 @@ <h2 class="font-cal mb-8 pb-4 border-b border-slate-200 text-slate-900 dark:bord
                     <ul class="toc-list space-y-4 dark:text-white">
                     {% for group in toc.items %}
                         <li class="pb-4 border-b border-slate-200 space-y-2 dark:border-slate-700">
-                            <h3 class="font-cal text-sm">{{ group.group }}</h3>
+                            <h3 class="font-cal text-sm">{{ group.name }}</h3>
                             <ul class="border-l border-slate-400 pl-4">
                             {% for item in group.items %}
                                 <li class="toc-item{% if item.url == navigation.current.url %} active font-semibold{% endif %}">
diff --git a/examples/docs/docs/templates/page-footer.html b/examples/docs/docs/templates/page-footer.html
@@ -14,7 +14,7 @@
             <!-- -->2025<!-- -->. All rights reserved.
         </p>
         <div class="flex gap-4">
-            <a class="group" href="#"
+            <a class="group" href="https://github.com/gc-victor/query"
                 ><span class="sr-only">Follow us on GitHub</span
                 ><svg
                     viewBox="0 0 20 20"
@@ -23,7 +23,7 @@
                 >
                     <title>Follow us on GitHub</title>
                     <use href="#icon-github-logo" /></svg></a
-            ><a class="group" href="#"
+            ><a class="group" href="https://qery.io/discord"
                 ><span class="sr-only">Join our Discord server</span
                 ><svg
                     viewBox="0 0 20 20"
diff --git a/examples/docs/docs/templates/top-navigation.html b/examples/docs/docs/templates/top-navigation.html
@@ -33,7 +33,7 @@
                     ></path>
                 </svg>
             </label>
-            <a class="group" href="#"
+            <a class="group" href="https://github.com/gc-victor/query"
                 ><span class="sr-only">Follow us on GitHub</span
                 ><svg
                     viewBox="0 0 20 20"
@@ -42,7 +42,7 @@
                 >
                     <title>Follow us on GitHub</title>
                     <use href="#icon-github-logo" /></svg></a
-            ><a class="group" href="#"
+            ><a class="group" href="https://qery.io/discord"
                 ><span class="sr-only">Join our Discord server</span
                 ><svg
                     viewBox="0 0 20 20"
diff --git a/examples/docs/src/pages/docs/[slug]/[slug]/get.index.tsx b/examples/docs/src/pages/docs/[slug]/[slug]/get.index.tsx
@@ -1,13 +1,12 @@
 export async function handleRequest(req: Request) {
     const url = new URL(req.url);
-    const dir = url.pathname.split("/").slice(0, -2).pop();
     const subdir = url.pathname.split("/").slice(0, -1).pop();
     const slug = url.pathname.split("/").pop();
 
     const db = new Database("query_asset.sql");
     const result: { data: AllowSharedBufferSource }[] = db.query_cache(
         "SELECT data FROM asset WHERE name = $1",
-        [`dist/${dir}/${subdir}/${slug}`],
+        [`dist/docs/${subdir}/${slug}`],
         10000,
     );
 
@@ -25,7 +24,7 @@ export async function handleRequest(req: Request) {
 
         const html = new TextDecoder().decode((result404[0] as { data: AllowSharedBufferSource }).data);
 
-        return new Response(html.replace("__STYLES_CSS__", styles), {
+        return new Response(html.replace("__STYLES_CSS__", styles).replace("__BASE_URL__", url.origin), {
             status: 404,
             headers: { "Content-Type": "text/html; charset=utf-8", "Query-Cache-Control": "max-age=3600000" },
         });
@@ -44,5 +43,5 @@ export async function handleRequest(req: Request) {
         headers["Query-Cache-Control"] = "max-age=3600000";
     }
 
-    return new Response(html.replace("__STYLES_CSS__", styles), { status: 200, headers });
+    return new Response(html.replace("__STYLES_CSS__", styles).replace("__BASE_URL__", url.origin), { status: 200, headers });
 }
diff --git a/examples/docs/src/pages/docs/[slug]/get.index.tsx b/examples/docs/src/pages/docs/[slug]/get.index.tsx
@@ -1,10 +1,9 @@
 export async function handleRequest(req: Request) {
     const url = new URL(req.url);
-    const dir = url.pathname.split("/").slice(0, -1).pop();
     const slug = url.pathname.split("/").pop();
 
     const db = new Database("query_asset.sql");
-    const result = db.query("SELECT data FROM asset WHERE name = $1", [`dist/${dir}/${slug}`]);
+    const result = db.query("SELECT data FROM asset WHERE name = $1", [`dist/docs/${slug}`]);
     
     const styles_result = db.query("SELECT name_hashed FROM asset WHERE name = ?", ["dist/docs/styles.css"]) as {
         name_hashed: string;
@@ -19,10 +18,10 @@ export async function handleRequest(req: Request) {
         }
 
         const html = new TextDecoder().decode((result404[0] as { data: AllowSharedBufferSource }).data);
-
-        return new Response(html.replace("__STYLES_CSS__", styles), {
+        
+        return new Response(html.replace("__STYLES_CSS__", styles).replace("__BASE_URL__", url.origin), {
             status: 404,
-            headers: { "Content-Type": "text/html; charset=utf-8", "Query-Cache-Control": "max-age=3600000" },
+            headers: { "Content-Type": "text/html; charset=utf-8" },
         });
     }
 
@@ -39,5 +38,5 @@ export async function handleRequest(req: Request) {
         headers["Query-Cache-Control"] = "max-age=3600000";
     }
 
-    return new Response(html.replace("__STYLES_CSS__", styles), { status: 200, headers });
+    return new Response(html.replace("__STYLES_CSS__", styles).replace("__BASE_URL__", url.origin), { status: 200, headers });
 }
diff --git a/examples/docs/src/pages/docs/get.index.tsx b/examples/docs/src/pages/docs/get.index.tsx
@@ -1,5 +1,5 @@
 export async function handleRequest(req: Request) {
-    const url = process.env.QUERY_APP_ENV === "development" ? "http://localhost:3000" : "https://qery.io";
-
-    return Response.redirect(`${url}/docs/introduction.html`, 301);
+    const url = new URL(req.url)
+        
+    return Response.redirect(`${url.origin}/docs/introduction.html`, 301);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`export async function handleRequest(req: Request) {`
`2`		`- const url = process.env.QUERY_APP_ENV === "development" ? "http://localhost:3000" : "https://qery.io";`
`3`		`-`
`4`		- return Response.redirect(`${url}/docs/introduction.html`, 301);
	`2`	`+ const url = new URL(req.url)`
	`3`	`+`
	`4`	+ return Response.redirect(`${url.origin}/docs/introduction.html`, 301);
`5`	`5`	`}`