@ofidj/generator-fidj 3.21.0 → 3.21.2

package/generators/app/templates/typescript/package.json

@@ -15,8 +15,8 @@
     "privacy:rehearse": "npm run build && node --test test/server.test.mjs"
   },
   "dependencies": {
-    "@ofidj/entry": "^3.21.0",
-    "@ofidj/node": "^3.21.0"
+    "@ofidj/entry": "^3.21.1",
+    "@ofidj/node": "^3.21.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/generators/app/templates/typescript/scripts/render-content.mjs

@@ -31,7 +31,7 @@ function mountedHead(config) {
 }
 export function renderContent(config) {
   // HTML is supplied by the developer at generation time, never by an app visitor.
-  return `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="referrer" content="no-referrer"><title>${escape(config.title)}</title><link rel="icon" href="${escape(config.favicon)}"><link rel="stylesheet" href="./main.css">${mountedHead(config)}</head><body>
+  return `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="referrer" content="no-referrer"><meta name="description" content="${escape(config.description)}"><title>${escape(config.title)}</title><link rel="icon" href="${escape(config.favicon)}"><link rel="preload" href="./fonts/InstrumentSerif-400-latin.woff2" as="font" type="font/woff2" crossorigin><link rel="stylesheet" href="./main.css">${mountedHead(config)}</head><body>
   <header class="topbar"><a class="brand" href="#/content"><img src="${escape(config.logo)}" alt=""><span class="brand-name">${escape(config.title)}</span></a><nav class="content-nav" id="app-nav" aria-label="App navigation" hidden></nav></header>
   <main><template id="public-content"><section class="card public-content"><h1>${escape(config.welcome)}</h1><div>${config.content}</div></section></template><div id="app" aria-live="polite"></div><footer>Built with Fidj · Your choices belong to this app.</footer></main><script type="module" src="./main.js"></script></body></html>`;
 }

package/generators/app/templates/typescript/src/content.ts

@@ -100,11 +100,7 @@ function appNav(current: "content" | "account") {
   const tab = (id: string, label: string, selected: boolean) =>
     `<button id="${id}"${selected ? ' class="selected" aria-current="page"' : ""}><span class="tab-label">${label}</span></button>`;
   const account = signedIn
-    ? tab(
-        "account-tab",
-        accountEmail ? `Profile (${escape(accountEmail)})` : "Profile",
-        current === "account",
-      )
+    ? tab("account-tab", "Profile", current === "account")
     : tab("account-tab", "Sign in", false);
   return tab("content-tab", "Content", current === "content") + account;
 }
@@ -112,7 +108,7 @@ function appNav(current: "content" | "account") {
 function profileSummary() {
   const publicUrl = `${config.dashboardUrl}/#/pub/${encodeURIComponent(config.appId)}`;
   const badgeUrl = `${config.apiEndpoint}/apps/${encodeURIComponent(config.appId)}/badge`;
-  return `<header class="profile-summary"><div class="profile-summary-copy"><span class="eyebrow">Profile</span><strong>${escape(accountEmail)}</strong><span>${escape(config.title)}</span></div><a class="profile-public" href="${escape(publicUrl)}" target="_blank" rel="noopener"><img src="${escape(badgeUrl)}" alt="${escape(config.title)} public badge" width="133" height="20"></a><button id="exit" class="danger">Sign out</button></header>`;
+  return `<header class="profile-summary"><div class="profile-summary-copy"><h1 class="eyebrow">Profile</h1><strong>${escape(accountEmail)}</strong><span>${escape(config.title)}</span></div><a class="profile-public" href="${escape(publicUrl)}" target="_blank" rel="noopener"><img src="${escape(badgeUrl)}" alt="${escape(config.title)} public badge" width="133" height="20"></a><button id="exit" class="sign-out">Sign out</button></header>`;
 }
 
 // The bar belongs to the document, not to the screen being drawn: it survives
@@ -521,6 +517,9 @@ function startModule() {
   } | null;
   if (!mount) return;
   moduleStarted = true;
+  // The entry may have been on screen a moment ago (a refused request, a
+  // redirect); its class drops the page margins the app relies on.
+  document.body.classList.remove("signin-view");
   document.body.classList.add("has-module");
   // The app takes the whole document, not a corner of the shell's. A built
   // single-page app positions itself against the body — Ionic, for one, fixes
@@ -809,7 +808,12 @@ function render() {
       signInThroughProvider(submitter);
       return;
     }
-    submitter?.setAttribute("data-busy", "true");
+    // Enter arrives through the unseen twin of Continue; the wait is shown on
+    // the Continue a person can see.
+    const shown = submitter?.classList.contains("implicit-submit")
+      ? root.querySelector<HTMLButtonElement>('button.primary[value="credentials"]')
+      : submitter;
+    shown?.setAttribute("data-busy", "true");
     void action(async () => {
       if (oidc && (!email || !password)) {
         throw new Error("Enter your email and password, or sign in with Fidj.");

package/lib/module-mount.cjs

@@ -27,7 +27,9 @@ function describeMount(html, file) {
   for (const tag of head.match(/<link\b[^>]*>/gi) || []) {
     const rel = (attribute(tag, "rel") || "").toLowerCase();
     const href = attribute(tag, "href");
-    if (rel === "stylesheet" && href) styles.push(resolve(href));
+    // Once each: Angular repeats its deferred stylesheet inside <noscript>.
+    if (rel === "stylesheet" && href && !styles.includes(resolve(href)))
+      styles.push(resolve(href));
   }
 
   const scripts = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ofidj/generator-fidj",
-  "version": "3.21.0",
+  "version": "3.21.2",
   "description": "Generate a TypeScript app with Fidj sign-in, live server-side roles and per-app privacy.",
   "homepage": "https://fidj.ovh",
   "bugs": {