@lukoweb/apitogo 0.2.64 → 0.2.66

package/dist/cli/cli.js

@@ -8519,10 +8519,13 @@ function buildSiteConfig(resolved, plan2, theme, extras = {}) {
       }
     ] : []
   ];
+  const logo = portal?.logo ? siteLogo(portal) : void 0;
   return {
+    // The browser tab's icon is the project's logo; without one, the portal's own icon (API-134).
+    ...logo ? { metadata: { favicon: logo.src.light } } : {},
     site: {
       title: portal?.name ?? resolved.project.name,
-      ...portal?.logo ? { logo: siteLogo(portal) } : {},
+      ...logo ? { logo } : {},
       ...plan2.preview ? { banner: { message: PREVIEW_BANNER_MESSAGE, color: "caution" } } : {}
     },
     modules: {
@@ -11430,7 +11433,7 @@ import {
 // package.json
 var package_default = {
   name: "@lukoweb/apitogo",
-  version: "0.2.64",
+  version: "0.2.66",
   type: "module",
   sideEffects: [
     "**/*.css",
@@ -23190,6 +23193,9 @@ function waitForJobStepLabel(kind, moduleType) {
       return "Job";
   }
 }
+function deletionFinished(error) {
+  return error instanceof ProjectGoneError || error instanceof PlatformApiError && error.status === 404;
+}
 function projectDeletionNotFoundResult(last, jobId) {
   return last ?? {
     status: "Completed",
@@ -23251,7 +23257,7 @@ function pollProvisionJob(poll, options) {
     stepLabel: options.stepLabel,
     progress: options.progress?.child(options.stepLabel),
     onPollError: options.kind === "projectDeletion" ? (error, last) => {
-      if (error instanceof PlatformApiError && error.status === 404) {
+      if (deletionFinished(error)) {
         return {
           status: "succeeded",
           value: projectDeletionNotFoundResult(last, options.jobId),

package/dist/cli/worker.js

@@ -115,6 +115,11 @@ var ProtectedRoutesSchema = z.pipe(
 
 // src/vite/prerender/utils.ts
 var prerenderFileFor = (urlPath) => urlPath === "/" ? "/index.html" : urlPath.endsWith("/index") ? `${urlPath}/index.html` : `${urlPath}.html`;
+var SCRIPT_SAFE_LT = `${"\\"}u003c`;
+var redirectPageHtml = (to) => (
+  // Every `<` of the target becomes SCRIPT_SAFE_LT, so a target can never close the script early.
+  `<!doctype html><link rel="icon" href="data:,"><script>window.location.href=${JSON.stringify(to).replaceAll("<", SCRIPT_SAFE_LT)};</script>`
+);
 
 // src/vite/prerender/worker.ts
 var { template, distDir, serverConfigPath, entryServerPath, writeRedirects } = Piscina.workerData;
@@ -149,7 +154,7 @@ var renderPage = async ({ urlPath }) => {
   if ([301, 302, 303, 307, 308].includes(response.status)) {
     const redirectTo = response.headers.get("Location") ?? "";
     if (writeRedirects) {
-      const redirectHtml = `<!doctype html><script>window.location.href=${JSON.stringify(redirectTo)};</script>`;
+      const redirectHtml = redirectPageHtml(redirectTo);
       await fs.mkdir(path.dirname(outputPath), { recursive: true });
       await fs.writeFile(outputPath, redirectHtml);
     }

package/dist/declarations/cli/platform/tools/infrastructure.d.ts

@@ -3,6 +3,7 @@ import { type ApitogoConfig } from "../config.js";
 import { recentJobMessages, type ProgressReporter } from "../helpers/progress.js";
 export type WaitForJobKind = "module" | "deployment" | "azureInfrastructure" | "projectDeletion" | "devPortalDeploy" | "devPortalBackendUpdate";
 export declare function waitForJobStepLabel(kind: WaitForJobKind, moduleType?: string): string;
+export declare function deletionFinished(error: unknown): boolean;
 export declare function handleActivateModule(client: PlatformApiClient, config: ApitogoConfig, args: {
     projectId?: string;
     moduleType: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lukoweb/apitogo",
-  "version": "0.2.64",
+  "version": "0.2.66",
   "type": "module",
   "sideEffects": [
     "**/*.css",

package/src/config/v2/wrapper.ts

@@ -400,10 +400,13 @@ export function buildSiteConfig(
         ]
       : []),
   ];
+  const logo = portal?.logo ? siteLogo(portal) : undefined;
   return {
+    // The browser tab's icon is the project's logo; without one, the portal's own icon (API-134).
+    ...(logo ? { metadata: { favicon: logo.src.light } } : {}),
     site: {
       title: portal?.name ?? resolved.project.name,
-      ...(portal?.logo ? { logo: siteLogo(portal) } : {}),
+      ...(logo ? { logo } : {}),
       ...(plan.preview
         ? { banner: { message: PREVIEW_BANNER_MESSAGE, color: "caution" } }
         : {}),
@@ -518,9 +521,10 @@ export const PREVIEW_BANNER_MESSAGE =
  * The header logo as the site takes it: a file of the portal's `public/` folder becomes its address on the site, an https
  * address stays as it is (API-129). `check` refuses a file outside `public/`.
  */
-function siteLogo(
-  portal: NonNullable<ResolvedConfigV2["portal"]>,
-): Record<string, unknown> {
+function siteLogo(portal: NonNullable<ResolvedConfigV2["portal"]>): {
+  src: { light: string; dark: string };
+  alt: string;
+} {
   const logo = portal.logo as NonNullable<typeof portal.logo>;
   const publicDir = path.join(portal.dir, "public");
   const src = (file: string) =>

package/src/lib/components/Meta.tsx

@@ -1,46 +1,49 @@
-import { Helmet } from "@zudoku/react-helmet-async";
-import type { PropsWithChildren } from "react";
-import { useLocation } from "react-router";
-import { joinUrl } from "../util/joinUrl.js";
-import { useZudoku } from "./context/ZudokuContext.js";
-
-export const Meta = ({ children }: PropsWithChildren) => {
-  const { options } = useZudoku();
-  const { metadata: meta } = options;
-  const location = useLocation();
-
-  return (
-    <>
-      <Helmet titleTemplate={meta?.title} defaultTitle={meta?.defaultTitle}>
-        {options.canonicalUrlOrigin && (
-          <link
-            rel="canonical"
-            href={joinUrl(
-              options.canonicalUrlOrigin,
-              options.basePath,
-              location.pathname,
-            )}
-          />
-        )}
-        {meta?.description && (
-          <meta name="description" content={meta.description} />
-        )}
-        {meta?.favicon && <link rel="icon" href={meta.favicon} />}
-        {meta?.generator && <meta name="generator" content={meta.generator} />}
-        {meta?.applicationName && (
-          <meta name="application-name" content={meta.applicationName} />
-        )}
-        {meta?.referrer && <meta name="referrer" content={meta.referrer} />}
-        {meta?.keywords && meta.keywords.length > 0 && (
-          <meta name="keywords" content={meta.keywords.join(", ")} />
-        )}
-        {meta?.authors?.map((author) => (
-          <meta key={author} name="author" content={author} />
-        ))}
-        {meta?.creator && <meta name="creator" content={meta.creator} />}
-        {meta?.publisher && <meta name="publisher" content={meta.publisher} />}
-      </Helmet>
-      {children}
-    </>
-  );
-};
+import { Helmet } from "@zudoku/react-helmet-async";
+import type { PropsWithChildren } from "react";
+import { useLocation } from "react-router";
+// A site without its own icon would leave the browser asking for /favicon.ico, a 404 and a console error on every page
+// (API-134). The build publishes this file with a hashed name, so no project has to carry it.
+import defaultFavicon from "../assets/powered-by-icon.png";
+import { joinUrl } from "../util/joinUrl.js";
+import { useZudoku } from "./context/ZudokuContext.js";
+
+export const Meta = ({ children }: PropsWithChildren) => {
+  const { options } = useZudoku();
+  const { metadata: meta } = options;
+  const location = useLocation();
+
+  return (
+    <>
+      <Helmet titleTemplate={meta?.title} defaultTitle={meta?.defaultTitle}>
+        {options.canonicalUrlOrigin && (
+          <link
+            rel="canonical"
+            href={joinUrl(
+              options.canonicalUrlOrigin,
+              options.basePath,
+              location.pathname,
+            )}
+          />
+        )}
+        {meta?.description && (
+          <meta name="description" content={meta.description} />
+        )}
+        <link rel="icon" href={meta?.favicon ?? defaultFavicon} />
+        {meta?.generator && <meta name="generator" content={meta.generator} />}
+        {meta?.applicationName && (
+          <meta name="application-name" content={meta.applicationName} />
+        )}
+        {meta?.referrer && <meta name="referrer" content={meta.referrer} />}
+        {meta?.keywords && meta.keywords.length > 0 && (
+          <meta name="keywords" content={meta.keywords.join(", ")} />
+        )}
+        {meta?.authors?.map((author) => (
+          <meta key={author} name="author" content={author} />
+        ))}
+        {meta?.creator && <meta name="creator" content={meta.creator} />}
+        {meta?.publisher && <meta name="publisher" content={meta.publisher} />}
+      </Helmet>
+      {children}
+    </>
+  );
+};

package/src/vite/prerender/utils.ts

@@ -87,3 +87,15 @@ export const routesToPaths = (routes: RouteObject[]): string[] =>
 
 export const routesToRewrites = (routes: RouteObject[]): RouteRewrite[] =>
   collectRewrites(resolveRoutes(routes));
+
+/** `<` as a JavaScript string escape: a backslash, then u003c. */
+const SCRIPT_SAFE_LT = `${"\\"}u003c`;
+
+/**
+ * The page written for a route that redirects, such as `/` of a portal without a home page of its own. It declares an
+ * empty icon: without one the browser asks for /favicon.ico before the script runs, a 404 and a console error on every
+ * visit of the home page (API-134).
+ */
+export const redirectPageHtml = (to: string): string =>
+  // Every `<` of the target becomes SCRIPT_SAFE_LT, so a target can never close the script early.
+  `<!doctype html><link rel="icon" href="data:,"><script>window.location.href=${JSON.stringify(to).replaceAll("<", SCRIPT_SAFE_LT)};</script>`;

package/src/vite/prerender/worker.ts

@@ -7,7 +7,7 @@ import type { ZudokuConfig } from "../../config/validators/ZudokuConfig.js";
 import { runPluginTransformConfig } from "../../lib/core/transform-config.js";
 import { joinUrl } from "../../lib/util/joinUrl.js";
 import type { WorkerResult } from "./prerender.js";
-import { prerenderFileFor } from "./utils.js";
+import { prerenderFileFor, redirectPageHtml } from "./utils.js";
 
 type EntryServer = typeof import("../../app/entry.server.js");
 
@@ -75,7 +75,7 @@ const renderPage = async ({ urlPath }: WorkerData): Promise<WorkerResult> => {
     const redirectTo = response.headers.get("Location") ?? "";
 
     if (writeRedirects) {
-      const redirectHtml = `<!doctype html><script>window.location.href=${JSON.stringify(redirectTo)};</script>`;
+      const redirectHtml = redirectPageHtml(redirectTo);
       await fs.mkdir(path.dirname(outputPath), { recursive: true });
       await fs.writeFile(outputPath, redirectHtml);
     }