@cmssy/cli 11.4.2 → 11.5.1

package/assets/init/next/app/[[...path]]/layout.tsx

@@ -0,0 +1,19 @@
+import type { ReactNode } from "react";
+import { resolveCmssyLocale } from "@cmssy/core";
+import { cmssy } from "@/cmssy.config";
+
+type LayoutProps = {
+  children: ReactNode;
+  params: Promise<{ path?: string[] }>;
+};
+
+export default async function RootLayout({ children, params }: LayoutProps) {
+  const { path } = await params;
+  const locale = await resolveCmssyLocale(cmssy, path);
+
+  return (
+    <html lang={locale}>
+      <body>{children}</body>
+    </html>
+  );
+}

package/assets/init/next/app/cmssy-edit/[[...path]]/layout.tsx

@@ -0,0 +1,19 @@
+import type { ReactNode } from "react";
+import { resolveCmssyLocale } from "@cmssy/core";
+import { cmssy } from "@/cmssy.config";
+
+type LayoutProps = {
+  children: ReactNode;
+  params: Promise<{ path?: string[] }>;
+};
+
+export default async function EditRootLayout({ children, params }: LayoutProps) {
+  const { path } = await params;
+  const locale = await resolveCmssyLocale(cmssy, path);
+
+  return (
+    <html lang={locale}>
+      <body>{children}</body>
+    </html>
+  );
+}

package/assets/init/remix/app/root.tsx

@@ -0,0 +1,64 @@
+import {
+  isRouteErrorResponse,
+  Links,
+  Meta,
+  Outlet,
+  Scripts,
+  ScrollRestoration,
+} from "react-router";
+import { useCmssyLocale } from "@cmssy/remix";
+
+import type { Route } from "./+types/root";
+
+export function Layout({ children }: { children: React.ReactNode }) {
+  const locale = useCmssyLocale();
+
+  return (
+    <html lang={locale}>
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        {children}
+        <ScrollRestoration />
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+
+export default function App() {
+  return <Outlet />;
+}
+
+export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
+  let message = "Oops!";
+  let details = "An unexpected error occurred.";
+  let stack: string | undefined;
+
+  if (isRouteErrorResponse(error)) {
+    message = error.status === 404 ? "404" : "Error";
+    details =
+      error.status === 404
+        ? "The requested page could not be found."
+        : error.statusText || details;
+  } else if (import.meta.env.DEV && error && error instanceof Error) {
+    details = error.message;
+    stack = error.stack;
+  }
+
+  return (
+    <main>
+      <h1>{message}</h1>
+      <p>{details}</p>
+      {stack && (
+        <pre>
+          <code>{stack}</code>
+        </pre>
+      )}
+    </main>
+  );
+}

package/dist/index.js

@@ -171,7 +171,9 @@ var FRAMEWORKS = [
       "cmssy/editable-layout.tsx",
       "blocks/hero/block.ts",
       "blocks/hero/Hero.tsx",
+      "app/[[...path]]/layout.tsx",
       "app/[[...path]]/page.tsx",
+      "app/cmssy-edit/[[...path]]/layout.tsx",
       "app/cmssy-edit/[[...path]]/page.tsx",
       "app/api/draft/route.ts"
     ]
@@ -202,6 +204,7 @@ var FRAMEWORKS = [
     dependencies: ["@cmssy/remix", "@cmssy/react", "@cmssy/core"],
     files: [
       "cmssy.config.ts",
+      "app/root.tsx",
       "app/routes.ts",
       "app/cmssy/blocks.ts",
       "app/cmssy/editor.tsx",
@@ -507,13 +510,17 @@ var CLI_PACKAGE_JSON = fileURLToPath(
 );
 function frameworkFiles(framework, root) {
   const srcPrefix = framework.name === "next" ? nextSrcPrefix(root) : "";
-  return [
+  const files = [
     { asset: "env.example", target: ".env.example" },
     ...framework.files.map((path) => ({
       asset: path,
       target: framework.name === "next" ? `${srcPrefix}${path}` : path
     }))
   ];
+  if (framework.name === "next" && existingFile(root, `${srcPrefix}app/layout`)) {
+    return files.filter((file) => !file.target.endsWith("/layout.tsx"));
+  }
+  return files;
 }
 function cliVersion() {
   const pkg = JSON.parse(readFileSync3(CLI_PACKAGE_JSON, "utf8"));
@@ -548,16 +555,36 @@ function detectInstallCommand(root) {
   }
   return "npm install";
 }
+function existingFile(root, base) {
+  return ["tsx", "ts", "jsx", "js"].map((extension) => `${base}.${extension}`).find((candidate) => existsSync3(join3(root, candidate)));
+}
 function frameworkNotes(framework, root, skipped) {
   const notes = [];
   if (framework.name === "next") {
-    const home = `${nextSrcPrefix(root)}app/page.tsx`;
-    if (existsSync3(join3(root, home))) {
+    const prefix = nextSrcPrefix(root);
+    const home = existingFile(root, `${prefix}app/page`);
+    if (home) {
       notes.push({
         status: "unknown",
         message: `${home} conflicts with the cmssy catch-all route - delete it and the cmssy page serves /`
       });
     }
+    const rootLayout = existingFile(root, `${prefix}app/layout`);
+    if (rootLayout) {
+      notes.push({
+        status: "fail",
+        message: `${rootLayout} outranks the cmssy root layouts, so they were NOT written and <html lang> stays whatever that file says`,
+        fix: `delete ${rootLayout} and rerun, then move its global CSS import and metadata into BOTH ${prefix}app/[[...path]]/layout.tsx and ${prefix}app/cmssy-edit/[[...path]]/layout.tsx - they are separate roots, and an editor preview with no CSS is the usual way to find out you only did one. Routes outside the cmssy catch-alls need a root layout of their own once it is gone: move them under a route group, e.g. ${prefix}app/(site)/layout.tsx, or the build fails with "doesn't have a root layout".`
+      });
+    }
+    for (const layout of ["app/[[...path]]", "app/cmssy-edit/[[...path]]"]) {
+      if (!rootLayout && skipped.includes(`${prefix}${layout}/layout.tsx`)) {
+        notes.push({
+          status: "unknown",
+          message: `${prefix}${layout}/layout.tsx already existed - set <html lang={await resolveCmssyLocale(cmssy, path)}> there yourself (import from @cmssy/core), or the site declares one language while rendering another`
+        });
+      }
+    }
   }
   if (framework.name === "astro") {
     notes.push({
@@ -577,6 +604,12 @@ function frameworkNotes(framework, root, skipped) {
       message: "app/routes.ts already existed - mount routes/page.tsx (index + splat) there yourself, or rerun with --force"
     });
   }
+  if (framework.name === "remix" && skipped.includes("app/root.tsx")) {
+    notes.push({
+      status: "unknown",
+      message: "app/root.tsx already existed - set <html lang={useCmssyLocale()}> in its Layout yourself (import from @cmssy/remix), or the site declares one language while rendering another"
+    });
+  }
   return notes;
 }
 function runInit(options, deps) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "11.4.2",
+  "version": "11.5.1",
   "description": "The cmssy CLI: `cmssy init` wires cmssy into an existing Next.js, Astro or React Router app; `cmssy link` connects it to a workspace and verifies the editor wiring.",
   "keywords": [
     "cmssy",
@@ -27,7 +27,7 @@
     "assets"
   ],
   "dependencies": {
-    "@cmssy/core": "11.4.2"
+    "@cmssy/core": "11.5.1"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",