Fixed config, it works again

plone · Nov 23, 2024 · 69cc21e · 69cc21e
1 parent bd941ec
commit 69cc21e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/apps/nextjs/src/app/layout.tsx b/apps/nextjs/src/app/layout.tsx
@@ -1,5 +1,3 @@
-import installPlone from '@plone/nextjs';
-import config from '@plone/registry';
 import cx from 'clsx';
 import type { Viewport } from 'next';
 import { Inter } from 'next/font/google';
@@ -8,8 +6,6 @@ import { getServerQueryClient, client as ploneClient } from '@/helpers/client';
 import '@plone/components/src/styles/basic/theme.css';
 import '@plone/components/src/styles/quanta/theme.css';
 
-installPlone(config);
-
 const inter = Inter({ subsets: ['latin'] });
 
 const expand = ['breadcrumbs', 'navigation'];

diff --git a/apps/nextjs/src/config/index.ts b/apps/nextjs/src/config/index.ts
@@ -0,0 +1,4 @@
+import installPlone from '@plone/nextjs';
+import config from '@plone/registry';
+
+export default installPlone(config);
diff --git a/apps/nextjs/src/helpers/client.ts b/apps/nextjs/src/helpers/client.ts
@@ -4,7 +4,7 @@ import {
 } from '@tanstack/react-query';
 import { cache } from 'react';
 import PloneClient from '@plone/client';
-import config from '@plone/registry';
+import config from '@/config';
 
 export const client = PloneClient.initialize({
   apiPath: config.settings.apiPath,

diff --git a/apps/nextjs/src/helpers/url.ts b/apps/nextjs/src/helpers/url.ts
@@ -1,4 +1,4 @@
-import config from '@plone/registry';
+import config from '@/config';
 
 /**
  * Flatten to app server URL - Given a URL if it starts with the API server URL

diff --git a/packages/nextjs/src/index.ts b/packages/nextjs/src/index.ts
@@ -4,8 +4,6 @@ import { type ConfigType } from '@plone/registry';
 import applyAddonConfiguration, { addonsInfo } from 'load-registry-addons'; // eslint-disable-line import/no-unresolved
 
 export default function install(config: ConfigType): ConfigType {
-  applyAddonConfiguration(config);
-
   const settings: Partial<ConfigType['settings']> = {
     slate,
     addonsInfo,
@@ -33,5 +31,7 @@ export default function install(config: ConfigType): ConfigType {
 
   config.set('slots', {});
 
+  applyAddonConfiguration(config);
+
   return config;
 }
diff --git a/packages/quanta/index.ts b/packages/quanta/index.ts
@@ -4,7 +4,7 @@ import { ContentTypeCondition } from '@plone/slots/src/helpers';
 import Event from './views/Event/Event';
 import Page from './views/Page/Page';
 
-export default function install(config: ConfigType) {
+export default function install(config: ConfigType): ConfigType {
   config.registerSlotComponent({
     slot: 'main',
     name: 'view',

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml