@leadertechie/personal-site-kit 0.1.0-alpha.14 → 0.1.0-alpha.15

package/dist/prerender/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/prerender/template.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAyBD,eAAO,MAAM,kBAAkB,GAAU,2EAOtC,aAAa,KAAG,OAAO,CAAC,MAAM,CA0BhC,CAAC"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/prerender/template.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAuCD,eAAO,MAAM,kBAAkB,GAAU,2EAOtC,aAAa,KAAG,OAAO,CAAC,MAAM,CA4BhC,CAAC"}

package/dist/prerender/website-prerender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"website-prerender.d.ts","sourceRoot":"","sources":["../../src/prerender/website-prerender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAuB,MAAM,gBAAgB,CAAC;AAE1E,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,kBAAkB,CAAC,EAAE,WAAW,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IACtE,UAAU,CAAC,EAAE;QAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;KAAE,CAAC;CAChG;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,gBAAgB,CAAqD;IAC7E,OAAO,CAAC,UAAU,CAAC,CAAoF;gBAE3F,OAAO,GAAE,gBAAqB;YAmB5B,kBAAkB;YAiClB,gBAAgB;IAajB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;CA4F5E"}
+{"version":3,"file":"website-prerender.d.ts","sourceRoot":"","sources":["../../src/prerender/website-prerender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAuB,MAAM,gBAAgB,CAAC;AAE1E,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,kBAAkB,CAAC,EAAE,WAAW,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IACtE,UAAU,CAAC,EAAE;QAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;KAAE,CAAC;CAChG;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,gBAAgB,CAAqD;IAC7E,OAAO,CAAC,UAAU,CAAC,CAAoF;gBAE3F,OAAO,GAAE,gBAAqB;YAmB5B,kBAAkB;YAiClB,gBAAgB;IAajB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;CAoH5E"}

package/dist/prerender.js

@@ -1,5 +1,6 @@
 import { R2ContentLoader } from "@leadertechie/r2tohtml";
 async function getAssetPaths(baseSiteUrl) {
+  if (baseSiteUrl.includes("localhost") || baseSiteUrl.includes("127.0.0.1")) ;
   const assetsUrl = `${baseSiteUrl}/cdn-assets.json`;
   try {
     const res = await fetch(assetsUrl);
@@ -14,10 +15,12 @@ async function getAssetPaths(baseSiteUrl) {
     const html = await res.text();
     const jsMatch = html.match(/src="(\/assets\/index-[^"]+\.js)"/);
     const cssMatch = html.match(/href="(\/assets\/index-[^"]+\.css)"/);
-    return {
-      js: jsMatch ? jsMatch[1] : "/assets/index.js",
-      css: cssMatch ? cssMatch[1] : "/assets/index.css"
-    };
+    if (jsMatch || cssMatch) {
+      return {
+        js: jsMatch ? jsMatch[1] : "/assets/index.js",
+        css: cssMatch ? cssMatch[1] : "/assets/index.css"
+      };
+    }
   } catch (e) {
   }
   return { js: "/assets/index.js", css: "/assets/index.css" };
@@ -30,7 +33,8 @@ const createHtmlTemplate = async ({
   hydrationData = "",
   baseSiteUrl = ""
 }) => {
-  const { js: jsAsset, css: cssAsset } = await getAssetPaths(baseSiteUrl);
+  const effectiveBaseUrl = baseSiteUrl || new URL(canonicalUrl).origin;
+  const { js: jsAsset, css: cssAsset } = await getAssetPaths(effectiveBaseUrl);
   return `<!doctype html>
 <html lang="en" data-theme="light">
   <head>
@@ -138,7 +142,7 @@ async function fetchLatestStorySummaries(env, count = 3) {
   }
 }
 const generatePageContent = async (pathname, routes, footerLinks, env) => {
-  const apiUrl = env?.API_URL || env?.apiUrl;
+  const apiUrl = env?.API_URL || env?.apiUrl || "https://api.example.com";
   const baseUrl = env?.BASE_URL || env?.baseUrl || "https://www.example.com";
   let staticDetails = {
     siteTitle: "My Personal Website",
@@ -345,15 +349,30 @@ class WebsitePrerender {
     return null;
   }
   async fetch(request, env, ctx) {
-    const apiUrl = env?.API_URL || "https://api.example.com";
-    const baseSiteUrl = env?.BASE_SITE_URL || "https://site.example.com";
-    await this.fetchStaticDetails(apiUrl, env);
     const url = new URL(request.url);
+    const apiUrl = env?.API_URL || `${url.origin}/api`;
+    const baseSiteUrl = env?.BASE_SITE_URL || url.origin;
+    if (url.pathname === "/admin" || url.pathname.startsWith("/admin/")) {
+      const templateResponse = await fetch(`${baseSiteUrl}/index.html`);
+      if (templateResponse.ok) {
+        return new Response(templateResponse.body, {
+          headers: { "content-type": "text/html" }
+        });
+      }
+    }
+    await this.fetchStaticDetails(apiUrl, env);
     if (url.pathname.startsWith("/api/")) {
       if (this.apiHandler) {
         return this.apiHandler.fetch(request, env, ctx);
       }
-      return fetch(`${apiUrl}${url.pathname}${url.search}`);
+      return fetch(`${apiUrl}${url.pathname.replace(/^\/api/, "")}${url.search}`);
+    }
+    if (env.ASSETS && (url.pathname.startsWith("/assets/") || url.pathname === "/favicon.ico" || url.pathname === "/logo.png")) {
+      try {
+        const assetRes = await env.ASSETS.fetch(request);
+        if (assetRes.ok) return assetRes;
+      } catch (e) {
+      }
     }
     if (url.pathname.startsWith("/images/")) {
       const imageKey = url.pathname.slice(1);
@@ -390,6 +409,9 @@ class WebsitePrerender {
         ico: "image/x-icon"
       };
       const contentType = contentTypes[ext || ""] || "application/octet-stream";
+      if (baseSiteUrl === url.origin) {
+        return new Response("Asset not found", { status: 404 });
+      }
       const response = await fetch(`${baseSiteUrl}${path}`);
       if (response.ok) {
         return new Response(response.body, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leadertechie/personal-site-kit",
-  "version": "0.1.0-alpha.14",
+  "version": "0.1.0-alpha.15",
   "type": "module",
   "description": "A high-performance personal website engine for Cloudflare Workers and R2",
   "repository": {