Merge branch 'seven' into plate-september-update

* seven: (36 commits)
  [Seven] Fixed icon docs (#7521)
  Fixed @plone/layout tests
  [Seven] unify image and file views (#7525)
  [Seven] fixed layout package styles (#7526)
  Added Image content type view (#7513)
  [Seven] Use a single folder for autogenerated files (#7520)
  Included a File content view. refs #6707 (#7516)
  7463 docs cleanup (#7504)
  Added RSC support to plone components (#7499)
  Fixed root loader type (#7493)
  [Seven] Added i18n documentation (#7491)
  Fixed make install (#7495)
  Seven and @plone/components Icon system Documentation (#7492)
  Fix default view on non plone content types (#7490)
  Better centering of the header (still preliminar). (#7488)
  Hide tools in prod (#7487)
  [Seven] Added PoC for content types views (#7475)
  Fix logo CSS (#7480)
  Avoid including always the original size in the Image component. (#7486)
  [Seven] Added Brain to image component item types (#7474)
  ...

Author: sneridagh

.github/workflows/cookieplone.yml

@@ -2,7 +2,7 @@ name: Cookieplone
 on: [push, pull_request]
 
 env:
-  python-version: "3.13"
+  python-version: '3.13'
   CYPRESS_RETRIES: 2
 
 jobs:
@@ -30,7 +30,7 @@ jobs:
 
       - name: Generate Cookieplone-based frontend addon
         run: |
-          COOKIEPLONE_REPOSITORY_TAG=seventemplate uvx cookieplone seven_addon --no-input
+          uvx cookieplone seven_addon --no-input
 
       - name: Install generated package
         working-directory: seven-add-on

.github/workflows/unit.yml

@@ -12,7 +12,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: ["@plone/registry", "@plone/components", "@plone/helpers"]
+        name:
+          # - '@plone/blocks'
+          - '@plone/cmsui'
+          - '@plone/components'
+          - '@plone/helpers'
+          - '@plone/layout'
+          - '@plone/react-router'
+          - '@plone/registry'
         node-version: [22.x]
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -72,7 +72,3 @@ _build/
 docs/news
 
 tsconfig.tsbuildinfo
-
-# @plone/registry generated files
-registry.loader.js
-addons.styles.css

apps/seven/.gitignore

@@ -4,8 +4,6 @@ node_modules
 /build
 .env
 .react-router
-registry.loader.js
-publicui.css
-cmsui.css
-/locales/
+.plone
 /packages/
+public/locales/

apps/seven/app/config.server.ts

@@ -4,7 +4,9 @@
 import config from '@plone/registry';
 import PloneClient from '@plone/client';
 // eslint-disable-next-line import/no-unresolved
-import applyAddonConfiguration from '../registry.loader';
+import applyAddonConfiguration from '../.plone/registry.loader';
+// eslint-disable-next-line import/no-unresolved
+import applyServerAddonConfiguration from '../.plone/registry.loader.server';
 
 export default function install() {
   config.settings.apiPath =
@@ -24,6 +26,7 @@ export default function install() {
   config.settings.supportedLanguages = ['en'];
 
   applyAddonConfiguration(config);
+  applyServerAddonConfiguration(config);
 
   // eslint-disable-next-line no-console
   // console.log('API_PATH is:', config.settings.apiPath);

apps/seven/app/config.ts

@@ -3,7 +3,7 @@
  */
 import config from '@plone/registry';
 // eslint-disable-next-line import/no-unresolved
-import applyAddonConfiguration from '../registry.loader';
+import applyAddonConfiguration from '../.plone/registry.loader';
 
 export default function install() {
   config.settings.defaultLanguage = 'en';

apps/seven/app/entry.server.tsx

@@ -43,7 +43,7 @@ export default async function handleRequest(
       ...i18n, // spread the configuration
       lng, // The locale we detected above
       ns, // The namespaces the routes about to render wants to use
-      backend: { loadPath: resolve('./locales/{{lng}}/{{ns}}.json') },
+      backend: { loadPath: resolve('./public/locales/{{lng}}/{{ns}}.json') },
     });
 
   return new Promise((resolve, reject) => {

apps/seven/app/root.tsx

@@ -6,6 +6,7 @@ import type { Route } from './+types/root';
 import { flattenToAppURL } from '@plone/helpers';
 import type PloneClient from '@plone/client';
 import config from '@plone/registry';
+import type { Content } from '@plone/types';
 import {
   getAPIResourceWithAuth,
   installServerMiddleware,
@@ -32,15 +33,45 @@ export async function loader({ params, request }: Route.LoaderArgs) {
 
   const path = `/${params['*'] || ''}`;
 
+  const rootLoaderDataUtilities = config.getUtilities({
+    type: 'rootLoaderData',
+  }) as Array<{
+    method: (args: {
+      cli: PloneClient;
+      content: Content;
+      request: typeof request;
+      path: string;
+      params: typeof params;
+      locale: string;
+    }) => Promise<{ status: number; data: unknown }>;
+  }>;
+
   try {
     const [content, site] = await Promise.all([
       cli.getContent({ path, expand }),
       cli.getSite(),
     ]);
+
+    const rootLoaderDataUtilitiesData = await Promise.all([
+      ...rootLoaderDataUtilities.map((utility) =>
+        utility.method({
+          cli,
+          content: content.data,
+          request,
+          path,
+          params,
+          locale,
+        }),
+      ),
+    ]);
+
     return {
       content: flattenToAppURL(content.data),
       site: flattenToAppURL(site.data),
       locale,
+      ...rootLoaderDataUtilitiesData
+        .filter((item) => item)
+        .reduce((acc, item) => ({ ...acc, ...item }), {}),
     };
   } catch (error: any) {
     throw data('Content Not Found', {
@@ -75,16 +106,27 @@ export function Layout({
   return children;
 }
 
+// ToDo: improve error page and error handling
 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;
+    switch (error.status) {
+      case 404:
+        message = '404';
+        details = 'The requested page could not be found.';
+        break;
+      case 500:
+        message = '500';
+        details =
+          'The server encountered an internal error. Did you start the backend?';
+        break;
+      default:
+        message = 'Error';
+        details = error.statusText || details;
+        break;
+    }
   } else if (import.meta.env.DEV && error && error instanceof Error) {
     details = error.message;
     stack = error.stack;

apps/seven/app/routes.ts

@@ -3,7 +3,7 @@ import { route } from '@react-router/dev/routes';
 import { getAddonRoutesConfig } from '@plone/react-router';
 import config from '@plone/registry';
 // eslint-disable-next-line import/no-unresolved
-import applyAddonConfiguration, { addonsInfo } from '../registry.loader';
+import applyAddonConfiguration, { addonsInfo } from '../.plone/registry.loader';
 
 applyAddonConfiguration(config);
 

apps/seven/news/+cookieplone.internal

@@ -0,0 +1 @@
+Fixed cookieplone test now that the Seven template has been merged there. @pnicolli