@lukoweb/apitogo 0.2.31 → 0.2.34

package/src/config/v2/workspace.ts

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { access, lstat, readFile, rm } from "node:fs/promises";
+import { access, lstat, readFile, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { glob } from "glob";
 import { ensureStateDir } from "./layout.js";
@@ -24,6 +24,21 @@ async function relink(target: string, link: string): Promise<void> {
   await linkDirectory(target, link);
 }
 
+/**
+ * `generated/` is an ES-module package of its own. The build's output is ES modules, and Vite names the server files
+ * `.js` or `.mjs` and Node reads them as modules or not by the nearest `package.json`. Without this file that is the
+ * tenant's, which has no `"type": "module"` in many projects (a CommonJS project, or the embedded layout), and then
+ * the build failed with "Could not find server config output file".
+ */
+const GENERATED_PACKAGE_JSON = '{\n  "private": true,\n  "type": "module"\n}\n';
+
+async function writeGeneratedPackageJson(root: string): Promise<void> {
+  const file = path.join(root, "package.json");
+  const current = await readFile(file, "utf8").catch(() => undefined);
+  if (current !== GENERATED_PACKAGE_JSON)
+    await writeFile(file, GENERATED_PACKAGE_JSON, "utf8");
+}
+
 /**
  * Makes `generated/` a self-contained site root the existing build can run in: the wrapper, an empty site
  * config, and links to the tenant's files. Tenant files are linked, never copied, edited or patched.
@@ -34,6 +49,7 @@ export async function materializeWorkspace(
 ): Promise<string> {
   const root = path.dirname(prepared.wrapperPath);
   await ensureStateDir(resolved.state);
+  await writeGeneratedPackageJson(root);
   await relink(resolved.configDir, path.join(root, CONTENT_LINK));
   const publicDir = resolved.portal && path.join(resolved.portal.dir, "public");
   const publicLink = path.join(root, "public");

package/src/config/validators/HeaderNavigationSchema.ts

@@ -1,44 +1,42 @@
-import { z } from "zod";
-import { IconNames } from "./icon-types.js";
-import { DisplaySchema } from "./InputNavigationSchema.js";
-
-const IconSchema = z.enum(IconNames);
-
-const HeaderNavLinkItemSchema = z.object({
-  label: z.string(),
-  icon: IconSchema.optional(),
-  description: z.string().optional(),
-  to: z.string(),
-  target: z.enum(["_self", "_blank"]).optional(),
-  display: DisplaySchema,
-});
-
-const HeaderNavGroupSchema = z.object({
-  label: z.string(),
-  items: z.array(HeaderNavLinkItemSchema),
-});
-
-const HeaderNavItemSchema = z.union([
-  z.object({
-    label: z.string(),
-    icon: IconSchema.optional(),
-    to: z.string(),
-    target: z.enum(["_self", "_blank"]).optional(),
-    display: DisplaySchema,
-  }),
-  z.object({
-    label: z.string(),
-    items: z.array(z.union([HeaderNavLinkItemSchema, HeaderNavGroupSchema])),
-  }),
-]);
-
-export const HeaderNavigationSchema = z.array(HeaderNavItemSchema);
-
-export const isHeaderNavGroup = (
-  item: HeaderNavItem | HeaderNavLinkItem | HeaderNavGroup,
-): item is HeaderNavGroup => "items" in item;
-
-export type HeaderNavLinkItem = z.infer<typeof HeaderNavLinkItemSchema>;
-export type HeaderNavGroup = z.infer<typeof HeaderNavGroupSchema>;
-export type HeaderNavItem = z.infer<typeof HeaderNavItemSchema>;
-export type HeaderNavigation = z.infer<typeof HeaderNavigationSchema>;
+import { z } from "zod";
+import { IconNames } from "./icon-types.js";
+import { DisplaySchema } from "./InputNavigationSchema.js";
+
+const IconSchema = z.enum(IconNames);
+
+const HeaderNavLinkItemSchema = z.object({
+  label: z.string(),
+  icon: IconSchema.optional(),
+  description: z.string().optional(),
+  to: z.string(),
+  target: z.enum(["_self", "_blank"]).optional(),
+  display: DisplaySchema,
+});
+
+const HeaderNavGroupSchema = z.object({
+  label: z.string(),
+  items: z.array(HeaderNavLinkItemSchema),
+});
+
+const HeaderNavItemSchema = z.union([
+  z.object({
+    label: z.string(),
+    icon: IconSchema.optional(),
+    to: z.string(),
+    target: z.enum(["_self", "_blank"]).optional(),
+    display: DisplaySchema,
+  }),
+  z.object({
+    label: z.string(),
+    items: z.array(z.union([HeaderNavLinkItemSchema, HeaderNavGroupSchema])),
+  }),
+]);
+
+export const HeaderNavigationSchema = z.array(HeaderNavItemSchema);
+
+export { isHeaderNavGroup } from "../header-navigation-guard.js";
+
+export type HeaderNavLinkItem = z.infer<typeof HeaderNavLinkItemSchema>;
+export type HeaderNavGroup = z.infer<typeof HeaderNavGroupSchema>;
+export type HeaderNavItem = z.infer<typeof HeaderNavItemSchema>;
+export type HeaderNavigation = z.infer<typeof HeaderNavigationSchema>;