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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -398,15 +398,17 @@ class WebsiteUI {
398
398
  apiUrl: this.config.apiUrl,
399
399
  baseUrl: this.config.baseUrl
400
400
  });
401
- this.store.subscribe(() => {
401
+ this.store.subscribe((config) => {
402
402
  this.applyTheme();
403
403
  this.updateFavicon();
404
+ this.updateBanner(config);
404
405
  if (this.router && window.location.pathname !== "/admin") {
405
406
  this.router.navigate(window.location.pathname);
406
407
  }
407
408
  });
408
409
  this.applyTheme();
409
410
  this.updateFavicon();
411
+ this.updateBanner(this.store.getConfig());
410
412
  this.router = new Router(this);
411
413
  this.router.init(this.config.appElementId || "app");
412
414
  if (this.config.onBootstrap) {
@@ -414,6 +416,13 @@ class WebsiteUI {
414
416
  }
415
417
  console.log("WebsiteUI bootstrapped");
416
418
  }
419
+ updateBanner(config) {
420
+ const banner = document.querySelector("my-banner");
421
+ if (banner) {
422
+ banner.setAttribute("header", config.siteTitle || "My Site");
423
+ banner.setAttribute("logo", `${config.apiUrl}/api/logo?t=${Date.now()}`);
424
+ }
425
+ }
417
426
  applyTheme() {
418
427
  if (!this.config.theme) return;
419
428
  const { theme } = this.config;
package/dist/index.js CHANGED
@@ -2,7 +2,7 @@ import { A, B, M, R, W, c, a, g, b, d, h, e, r, s, v } from "./chunks/website-ap
2
2
  import { WebsitePrerender } from "./prerender.js";
3
3
  import { A as A2, a as a2, b as b2, c as c2, d as d2, e as e2, f, g as g2, h as h2, i, B as B2, F, M as M2, j, S, k } from "./chunks/index-B2jGIzSi.js";
4
4
  import { S as S2, g as g3, i as i2, r as r2 } from "./chunks/site-store-CGV9c2DI.js";
5
- import { R as R2, T, W as W2, b as b3, c as c3, g as g4, r as r3 } from "./chunks/template-Ccxil4s-.js";
5
+ import { R as R2, T, W as W2, b as b3, c as c3, g as g4, r as r3 } from "./chunks/template-DXUSp0BG.js";
6
6
  export {
7
7
  A as AUTH_KV,
8
8
  A2 as AdminAboutMeSection,
@@ -1 +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"}
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;AAuCD,eAAO,MAAM,kBAAkB,GAAU,2EAOtC,aAAa,KAAG,OAAO,CAAC,MAAM,CA4BhC,CAAC"}
@@ -1 +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"}
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;CAoH5E"}
package/dist/prerender.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { R2ContentLoader } from "@leadertechie/r2tohtml";
2
2
  async function getAssetPaths(baseSiteUrl) {
3
+ if (baseSiteUrl.includes("localhost") || baseSiteUrl.includes("127.0.0.1")) ;
3
4
  const assetsUrl = `${baseSiteUrl}/cdn-assets.json`;
4
5
  try {
5
6
  const res = await fetch(assetsUrl);
@@ -14,10 +15,12 @@ async function getAssetPaths(baseSiteUrl) {
14
15
  const html = await res.text();
15
16
  const jsMatch = html.match(/src="(\/assets\/index-[^"]+\.js)"/);
16
17
  const cssMatch = html.match(/href="(\/assets\/index-[^"]+\.css)"/);
17
- return {
18
- js: jsMatch ? jsMatch[1] : "/assets/index.js",
19
- css: cssMatch ? cssMatch[1] : "/assets/index.css"
20
- };
18
+ if (jsMatch || cssMatch) {
19
+ return {
20
+ js: jsMatch ? jsMatch[1] : "/assets/index.js",
21
+ css: cssMatch ? cssMatch[1] : "/assets/index.css"
22
+ };
23
+ }
21
24
  } catch (e) {
22
25
  }
23
26
  return { js: "/assets/index.js", css: "/assets/index.css" };
@@ -30,7 +33,8 @@ const createHtmlTemplate = async ({
30
33
  hydrationData = "",
31
34
  baseSiteUrl = ""
32
35
  }) => {
33
- const { js: jsAsset, css: cssAsset } = await getAssetPaths(baseSiteUrl);
36
+ const effectiveBaseUrl = baseSiteUrl || new URL(canonicalUrl).origin;
37
+ const { js: jsAsset, css: cssAsset } = await getAssetPaths(effectiveBaseUrl);
34
38
  return `<!doctype html>
35
39
  <html lang="en" data-theme="light">
36
40
  <head>
@@ -138,7 +142,7 @@ async function fetchLatestStorySummaries(env, count = 3) {
138
142
  }
139
143
  }
140
144
  const generatePageContent = async (pathname, routes, footerLinks, env) => {
141
- const apiUrl = env?.API_URL || env?.apiUrl;
145
+ const apiUrl = env?.API_URL || env?.apiUrl || "https://api.example.com";
142
146
  const baseUrl = env?.BASE_URL || env?.baseUrl || "https://www.example.com";
143
147
  let staticDetails = {
144
148
  siteTitle: "My Personal Website",
@@ -345,15 +349,30 @@ class WebsitePrerender {
345
349
  return null;
346
350
  }
347
351
  async fetch(request, env, ctx) {
348
- const apiUrl = env?.API_URL || "https://api.example.com";
349
- const baseSiteUrl = env?.BASE_SITE_URL || "https://site.example.com";
350
- await this.fetchStaticDetails(apiUrl, env);
351
352
  const url = new URL(request.url);
353
+ const apiUrl = env?.API_URL || `${url.origin}/api`;
354
+ const baseSiteUrl = env?.BASE_SITE_URL || url.origin;
355
+ if (url.pathname === "/admin" || url.pathname.startsWith("/admin/")) {
356
+ const templateResponse = await fetch(`${baseSiteUrl}/index.html`);
357
+ if (templateResponse.ok) {
358
+ return new Response(templateResponse.body, {
359
+ headers: { "content-type": "text/html" }
360
+ });
361
+ }
362
+ }
363
+ await this.fetchStaticDetails(apiUrl, env);
352
364
  if (url.pathname.startsWith("/api/")) {
353
365
  if (this.apiHandler) {
354
366
  return this.apiHandler.fetch(request, env, ctx);
355
367
  }
356
- return fetch(`${apiUrl}${url.pathname}${url.search}`);
368
+ return fetch(`${apiUrl}${url.pathname.replace(/^\/api/, "")}${url.search}`);
369
+ }
370
+ if (env.ASSETS && (url.pathname.startsWith("/assets/") || url.pathname === "/favicon.ico" || url.pathname === "/logo.png")) {
371
+ try {
372
+ const assetRes = await env.ASSETS.fetch(request);
373
+ if (assetRes.ok) return assetRes;
374
+ } catch (e) {
375
+ }
357
376
  }
358
377
  if (url.pathname.startsWith("/images/")) {
359
378
  const imageKey = url.pathname.slice(1);
@@ -390,6 +409,9 @@ class WebsitePrerender {
390
409
  ico: "image/x-icon"
391
410
  };
392
411
  const contentType = contentTypes[ext || ""] || "application/octet-stream";
412
+ if (baseSiteUrl === url.origin) {
413
+ return new Response("Asset not found", { status: 404 });
414
+ }
393
415
  const response = await fetch(`${baseSiteUrl}${path}`);
394
416
  if (response.ok) {
395
417
  return new Response(response.body, {
@@ -22,6 +22,7 @@ export declare class WebsiteUI {
22
22
  private constructor();
23
23
  static getInstance(config?: UIConfig): WebsiteUI;
24
24
  bootstrap(): Promise<void>;
25
+ private updateBanner;
25
26
  private applyTheme;
26
27
  private updateFavicon;
27
28
  getStore(): SiteStore;
@@ -1 +1 @@
1
- {"version":3,"file":"website-ui.d.ts","sourceRoot":"","sources":["../../src/shared/website-ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE;QACN,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAY;IACnC,OAAO,CAAC,KAAK,CAAY;IACzB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,MAAM,CAAuB;IAErC,OAAO;WAKO,WAAW,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS;IAU1C,SAAS;IAoCtB,OAAO,CAAC,UAAU;IAiBlB,OAAO,CAAC,aAAa;IAad,QAAQ;IAIR,SAAS;IAIT,SAAS;CAGjB;AAED,eAAO,MAAM,SAAS,GAAI,SAAS,QAAQ,kBAA8C,CAAC"}
1
+ {"version":3,"file":"website-ui.d.ts","sourceRoot":"","sources":["../../src/shared/website-ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE;QACN,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAY;IACnC,OAAO,CAAC,KAAK,CAAY;IACzB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,MAAM,CAAuB;IAErC,OAAO;WAKO,WAAW,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS;IAU1C,SAAS;IAsCtB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,UAAU;IAiBlB,OAAO,CAAC,aAAa;IAad,QAAQ;IAIR,SAAS;IAIT,SAAS;CAGjB;AAED,eAAO,MAAM,SAAS,GAAI,SAAS,QAAQ,kBAA8C,CAAC"}
package/dist/shared.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { S, g, i, r } from "./chunks/site-store-CGV9c2DI.js";
2
- import { R, T, W, b, c, g as g2, r as r2 } from "./chunks/template-Ccxil4s-.js";
2
+ import { R, T, W, b, c, g as g2, r as r2 } from "./chunks/template-DXUSp0BG.js";
3
3
  export {
4
4
  R as Router,
5
5
  S as SiteStore,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leadertechie/personal-site-kit",
3
- "version": "0.1.0-alpha.13",
3
+ "version": "0.1.0-alpha.15",
4
4
  "type": "module",
5
5
  "description": "A high-performance personal website engine for Cloudflare Workers and R2",
6
6
  "repository": {