@remkoj/optimizely-cms-nextjs 6.0.0-pre8 → 6.0.0-rc.1

package/LICENSE

@@ -1,13 +1,13 @@
- Copyright 2024 Remko Jantzen
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
+ Copyright 2024 Remko Jantzen
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
    limitations under the License.

package/README.md

@@ -1,4 +1,8 @@
 # Optimizely SaaS CMS - Next.js Integration
+
+> [!WARNING]
+> There'll be an update of Optimizely SaaS CMS that is incompatible with all SDK versions prior to 5.1.6. If you don't upgrade, you will see empty pages (main website) and "Component not found" messages (preview).
+
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](./LICENSE)
 
 > [!TIP]
@@ -76,4 +80,4 @@ The package provides the following enhancements for Next.js middleware:
 | withEditFallback | `@remkoj/optimizely-cms-nextjs/preview` | Rewrite incoming Optimizely CMS 12 preview / on-page-edit URLs to Optimizely SaaS CMS preview  URLs |
 | withLanguagePrefix | `@remkoj/optimizely-cms-nextjs/page` | Handle the redirect of the homepage `/` to the locale that best matches the incoming request, such as `/en`. The locales and their URLs are taken from the second parameter - the ChannelDefinition.
 
-If you use both wrappers, the `withEditFallback` wrapper must wrap the `withLanguagePrefix` wrapper, to ensure that the edit mode URL is rewritten before the language prefix is applied.
+If you use both wrappers, the `withEditFallback` wrapper must wrap the `withLanguagePrefix` wrapper, to ensure that the edit mode URL is rewritten before the language prefix is applied.

package/dist/client.d.ts

@@ -2,7 +2,8 @@ import 'server-only';
 import { type IOptiGraphClient, type OptimizelyGraphConfig } from '@remkoj/optimizely-graph-client';
 /**
  * Create a new client instance. This is a direct wrapper for the `createClient` function
- * exported from `@remkoj/optimizely-graph-client`.
+ * exported from `@remkoj/optimizely-graph-client`. It creates the instance with the
+ * recommended configuration for published content in a Next.JS frontend.
  *
  * @returns The newly created GraphQL Client
  */
@@ -12,6 +13,10 @@ export declare function createClient(): IOptiGraphClient;
  * wraps the `createClient` function from `@remkoj/optimizely-graph-client` and applies some
  * configuration defaults.
  *
+ * It creates the instance with the recommended configuration for published content in a Next.JS
+ * frontend. When the token is a non-empty string, the configuration applied is intended to access
+ * non-published content in a Next.JS frontend, for example in the preview endpoint of Optimizely CMS.
+ *
  * @returns The newly created GraphQL Client
  */
 export declare function createAuthorizedClient(token?: string, config?: OptimizelyGraphConfig): IOptiGraphClient;

package/dist/client.js

@@ -1,8 +1,15 @@
 import 'server-only';
 import { createClient as createBaseClient, AuthMode } from '@remkoj/optimizely-graph-client';
+import { isNonEmptyString } from '@remkoj/optimizely-cms-react/utils';
+const AuthModeValues = Object.getOwnPropertyNames(AuthMode).reduce((a, b) => {
+    //@ts-ignore
+    a.push(AuthMode[b]);
+    return a;
+}, []);
 /**
  * Create a new client instance. This is a direct wrapper for the `createClient` function
- * exported from `@remkoj/optimizely-graph-client`.
+ * exported from `@remkoj/optimizely-graph-client`. It creates the instance with the
+ * recommended configuration for published content in a Next.JS frontend.
  *
  * @returns The newly created GraphQL Client
  */
@@ -14,18 +21,37 @@ export function createClient() {
  * wraps the `createClient` function from `@remkoj/optimizely-graph-client` and applies some
  * configuration defaults.
  *
+ * It creates the instance with the recommended configuration for published content in a Next.JS
+ * frontend. When the token is a non-empty string, the configuration applied is intended to access
+ * non-published content in a Next.JS frontend, for example in the preview endpoint of Optimizely CMS.
+ *
  * @returns The newly created GraphQL Client
  */
 export function createAuthorizedClient(token, config) {
-    const client = createBaseClient(config);
+    // Check the token
+    const isPotentialValidToken = isNonEmptyString(token);
+    // Create the client, but keep the cache disabled if we've got a non-empty string as token
+    const client = createBaseClient(config, undefined, {
+        nextJsFetchDirectives: true,
+        cache: !isPotentialValidToken,
+        queryCache: !isPotentialValidToken,
+    });
     if (client.debug)
         console.log('⚪ [ContentGraph Client] Created new Optimizely Graph client');
     // Apply token if needed
-    if (typeof (token) == 'string' && token.length > 0) {
+    if (isPotentialValidToken) {
         if (token == client.siteInfo.publishToken) {
             console.warn(`🔐 [ContentGraph Client] Allowed authenticated access by publish token, switching to HMAC`);
             client.updateAuthentication(AuthMode.HMAC);
         }
+        else if (AuthModeValues.includes(token)) {
+            if (client.isDebugOrDevelopment() && (token === AuthMode.HMAC || token === AuthMode.Basic)) {
+                console.warn(`🔐 [ContentGraph Client] Allowing authenticated access by using a mode as token in development or debug`);
+                client.updateAuthentication(token);
+            }
+            else
+                console.warn(`🔐 [ContentGraph Client] Blocked authenticated access by using a mode as token`);
+        }
         else {
             client.updateAuthentication(token);
         }

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,QAAQ,EAAqD,MAAM,iCAAiC,CAAA;AAE/I;;;;;GAKG;AACH,MAAM,UAAU,YAAY;IAC1B,OAAO,sBAAsB,EAAE,CAAA;AACjC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAc,EAAE,MAA8B;IACnF,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,MAAM,CAAC,KAAK;QACd,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAA;IAE5E,wBAAwB;IACxB,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnD,IAAI,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC1C,OAAO,CAAC,IAAI,CAAC,2FAA2F,CAAC,CAAA;YACzG,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC5C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACpC,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,kEAAkE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAA;YACxG,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAA;QAC5E,CAAC;QACD,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,CAAA;IACnF,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,sBAAsB,CAAA;AAE/D;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAA;AAE3C,eAAe,YAAY,CAAA"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,QAAQ,EAAqD,MAAM,iCAAiC,CAAA;AAC/I,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAA;AAErE,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAW,CAAC,CAAW,EAAE,CAAS,EAAE,EAAE;IACtG,YAAY;IACZ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACpB,OAAO,CAAC,CAAA;AACV,CAAC,EAAE,EAAc,CAAC,CAAA;AAElB;;;;;;GAMG;AACH,MAAM,UAAU,YAAY;IAC1B,OAAO,sBAAsB,EAAE,CAAA;AACjC,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAc,EAAE,MAA8B;IACnF,kBAAkB;IAClB,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;IAErD,0FAA0F;IAC1F,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE;QACjD,qBAAqB,EAAE,IAAI;QAC3B,KAAK,EAAE,CAAC,qBAAqB;QAC7B,UAAU,EAAE,CAAC,qBAAqB;KACnC,CAAC,CAAA;IACF,IAAI,MAAM,CAAC,KAAK;QACd,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAA;IAE5E,wBAAwB;IACxB,IAAI,qBAAqB,EAAE,CAAC;QAC1B,IAAI,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC1C,OAAO,CAAC,IAAI,CAAC,2FAA2F,CAAC,CAAA;YACzG,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC5C,CAAC;aAAM,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,IAAI,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,IAAI,IAAI,KAAK,KAAK,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3F,OAAO,CAAC,IAAI,CAAC,yGAAyG,CAAC,CAAA;gBACvH,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;YACpC,CAAC;;gBACC,OAAO,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAA;QAClG,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACpC,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,kEAAkE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAA;YACxG,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAA;QAC5E,CAAC;QACD,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,CAAA;IACnF,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,sBAAsB,CAAA;AAE/D;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAA;AAE3C,eAAe,YAAY,CAAA"}

package/dist/cms-page/_base.js

@@ -11,16 +11,7 @@ export function getChannelId(client, channel) {
         return channel;
     return client.currentOptiCmsSchema == OptiCmsSchema.CMS12
         ? channel.id
-        : getPrimaryURL(channel).origin;
-}
-function getPrimaryURL(chnl) {
-    const dd = chnl.domains.filter((x) => x.isPrimary).at(0) ?? chnl.domains.at(0);
-    if (!dd)
-        return chnl.getPrimaryDomain();
-    const s = dd.name.startsWith('localhost') || dd.name.indexOf('.local') > 0
-        ? 'http:'
-        : 'https:';
-    return new URL(`${s}//${dd.name}`);
+        : channel.getPrimaryDomain().origin;
 }
 function isString(toTest) {
     return typeof toTest === 'string';

package/dist/cms-page/_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"_base.js","sourceRoot":"","sources":["../../src/cms-page/_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAyB,MAAM,wCAAwC,CAAA;AAK7F,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,4BAAW,CAAA;IACX,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AAUD,MAAM,UAAU,YAAY,CAAC,MAAwB,EAAE,OAAoC;IACzF,IAAI,CAAC,OAAO;QACV,OAAO,SAAS,CAAA;IAClB,IAAI,QAAQ,CAAC,OAAO,CAAC;QACnB,OAAO,OAAO,CAAA;IAChB,OAAO,MAAM,CAAC,oBAAoB,IAAI,aAAa,CAAC,KAAK;QACvD,CAAC,CAAC,OAAO,CAAC,EAAE;QACZ,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,MAAM,CAAA;AACnC,CAAC;AAED,SAAS,aAAa,CAAC,IAAuB;IAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC9E,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAA;IACvC,MAAM,CAAC,GACL,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC9D,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,QAAQ,CAAA;IACd,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;AACpC,CAAC;AAED,SAAS,QAAQ,CAAC,MAAW;IAC3B,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;AACpC,CAAC"}
+{"version":3,"file":"_base.js","sourceRoot":"","sources":["../../src/cms-page/_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAyB,MAAM,wCAAwC,CAAA;AAK7F,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,4BAAW,CAAA;IACX,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AAUD,MAAM,UAAU,YAAY,CAAC,MAAwB,EAAE,OAAoC;IACzF,IAAI,CAAC,OAAO;QACV,OAAO,SAAS,CAAA;IAClB,IAAI,QAAQ,CAAC,OAAO,CAAC;QACnB,OAAO,OAAO,CAAA;IAChB,OAAO,MAAM,CAAC,oBAAoB,IAAI,aAAa,CAAC,KAAK;QACvD,CAAC,CAAC,OAAO,CAAC,EAAE;QACZ,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAA;AACvC,CAAC;AAED,SAAS,QAAQ,CAAC,MAAW;IAC3B,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;AACpC,CAAC"}

package/dist/cms-page/_getInfoByPath.d.ts

@@ -2,4 +2,4 @@ import { type IOptiGraphClient } from "@remkoj/optimizely-graph-client/client";
 import { type IRouteResolver } from "@remkoj/optimizely-graph-client/router";
 import { type ChannelDefinition } from "@remkoj/optimizely-graph-client/channels";
 import { type LookupResponse } from "./_base.js";
-export declare function getInfoByPath(client: IOptiGraphClient, routerFactory: (client?: IOptiGraphClient) => IRouteResolver, requestPath: string, channel?: ChannelDefinition | string): Promise<LookupResponse | undefined>;
+export declare function getInfoByPath(client: IOptiGraphClient, routerFactory: (client?: IOptiGraphClient) => IRouteResolver, requestPath: string, channel?: ChannelDefinition | string, variation?: string): Promise<LookupResponse | undefined>;

package/dist/cms-page/_getInfoByPath.js

@@ -3,12 +3,10 @@ import { ifChannelDefinition } from "@remkoj/optimizely-graph-client/channels";
 import { getChannelId } from "./_base.js";
 import { localeToGraphLocale } from "./utils.js";
 // Helper function to obtain the info by path
-export async function getInfoByPath(client, routerFactory, requestPath, channel) {
-    if (client.debug)
-        console.log(`⚪ [CmsPage.getInfoByPath] Loading content for path "${requestPath}" using RouteResolver`);
+export async function getInfoByPath(client, routerFactory, requestPath, channel, variation) {
     const channelId = getChannelId(client, channel);
     const router = routerFactory(client);
-    const route = await router.getContentInfoByPath(requestPath, channelId);
+    const route = await router.getContentInfoByPath(requestPath, channelId, variation);
     if (!route) {
         if (client.debug)
             console.warn(`🟠 [CmsPage.getInfoByPath] The RouteResolver was unable to resolve the route information for "${requestPath}"`);
@@ -17,6 +15,8 @@ export async function getInfoByPath(client, routerFactory, requestPath, channel)
     const contentLink = router.routeToContentLink(route);
     const contentType = route.contentType;
     const graphLocale = localeToGraphLocale(route.locale, ifChannelDefinition(channel));
+    if (client.debug)
+        console.log(`⚪ [CmsPage.getInfoByPath] Resolved path "${requestPath}"${variation ? ` in variation ${variation}` : ""} to content ${JSON.stringify(contentLink)} of type ${contentType.join('/')} using RouteResolver`);
     return [route, contentLink, contentType, graphLocale, null];
 }
 //# sourceMappingURL=_getInfoByPath.js.map

package/dist/cms-page/_getInfoByPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"_getInfoByPath.js","sourceRoot":"","sources":["../../src/cms-page/_getInfoByPath.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAIZ,OAAO,EAA0B,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEvG,OAAO,EAAE,YAAY,EAAuB,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,6CAA6C;AAC7C,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAwB,EACxB,aAA4D,EAC5D,WAAmB,EACnB,OAAoC;IAEpC,IAAI,MAAM,CAAC,KAAK;QACd,OAAO,CAAC,GAAG,CACT,uDAAuD,WAAW,uBAAuB,CAC1F,CAAA;IACH,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;IACvE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,MAAM,CAAC,KAAK;YACd,OAAO,CAAC,IAAI,CACV,iGAAiG,WAAW,GAAG,CAChH,CAAA;QACH,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;IACrC,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAA;IACnF,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,CAAmB,CAAA;AAC/E,CAAC"}
+{"version":3,"file":"_getInfoByPath.js","sourceRoot":"","sources":["../../src/cms-page/_getInfoByPath.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAIZ,OAAO,EAA0B,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEvG,OAAO,EAAE,YAAY,EAAuB,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,6CAA6C;AAC7C,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAwB,EACxB,aAA4D,EAC5D,WAAmB,EACnB,OAAoC,EACpC,SAAkB;IAElB,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;IAClF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,MAAM,CAAC,KAAK;YACd,OAAO,CAAC,IAAI,CACV,iGAAiG,WAAW,GAAG,CAChH,CAAA;QACH,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;IACrC,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAA;IACnF,IAAI,MAAM,CAAC,KAAK;QACd,OAAO,CAAC,GAAG,CACT,4CAA4C,WAAW,IAAI,SAAS,CAAC,CAAC,CAAC,iBAAiB,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAC1M,CAAA;IACH,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,CAAmB,CAAA;AAC/E,CAAC"}

package/dist/cms-page/_globals.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cms-page/_globals.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=_globals.js.map

package/dist/cms-page/_globals.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_globals.js","sourceRoot":"","sources":["../../src/cms-page/_globals.ts"],"names":[],"mappings":""}

package/dist/cms-page/_loadContentByPath.d.ts

@@ -2,4 +2,4 @@ import { type IOptiGraphClient } from "@remkoj/optimizely-graph-client";
 import { type ChannelDefinition } from "@remkoj/optimizely-graph-client/channels";
 import { type GetContentByPathMethod } from './data.js';
 import { SystemLocales, type LookupResponse } from "./_base.js";
-export declare function loadContentByPath<LocaleEnum = SystemLocales>(client: IOptiGraphClient, getContentByPath: GetContentByPathMethod<LocaleEnum>, requestPath: string, channel?: ChannelDefinition | string, locale?: LocaleEnum | LocaleEnum[]): Promise<LookupResponse | undefined | null>;
+export declare function loadContentByPath<LocaleEnum = SystemLocales>(client: IOptiGraphClient, getContentByPath: GetContentByPathMethod<LocaleEnum>, requestPath: string, channel?: ChannelDefinition | string, locale?: LocaleEnum | LocaleEnum[], variation?: string): Promise<LookupResponse | undefined | null>;

package/dist/cms-page/_loadContentByPath.js

@@ -4,7 +4,7 @@ import { normalizeContentLinkWithLocale, isContentLinkWithSetLocale } from '@rem
 import { Utils } from '@remkoj/optimizely-cms-react/rsc';
 import { getChannelId } from "./_base.js";
 import { localeToGraphLocale } from './utils.js';
-export async function loadContentByPath(client, getContentByPath, requestPath, channel, locale) {
+export async function loadContentByPath(client, getContentByPath, requestPath, channel, locale, variation) {
     if (client.debug)
         console.log(`⚪ [CmsPage.loadContentByPath] Loading content for path "${requestPath}" using getContentByPath method`);
     const channelId = getChannelId(client, channel);
@@ -18,6 +18,7 @@ export async function loadContentByPath(client, getContentByPath, requestPath, c
         path: pathForRequest,
         siteId: channelId,
         locale,
+        variation: variation ? { include: "SOME", value: [variation] } : undefined
     };
     if (client.isPreviewEnabled())
         requestVars.changeset = client?.getChangeset();

package/dist/cms-page/_loadContentByPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"_loadContentByPath.js","sourceRoot":"","sources":["../../src/cms-page/_loadContentByPath.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAGZ,OAAO,EAA0B,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACvG,OAAO,EAAE,8BAA8B,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAEnH,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAGzD,OAAO,EAAE,YAAY,EAAsC,MAAM,YAAY,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAwB,EACxB,gBAAoD,EACpD,WAAmB,EACnB,OAAoC,EACpC,MAAkC;IAElC,IAAI,MAAM,CAAC,KAAK;QACd,OAAO,CAAC,GAAG,CACT,2DAA2D,WAAW,iCAAiC,CACxG,CAAA;IACH,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/C,MAAM,cAAc,GAAG;QACrB,WAAW;QACX,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;YACvB,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YAClD,CAAC,CAAC,WAAW,GAAG,GAAG;KACtB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAElB,MAAM,WAAW,GAA0C;QACzD,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,SAAS;QACjB,MAAM;KACP,CAAA;IACD,IAAI,MAAM,CAAC,gBAAgB,EAAE;QAAE,WAAW,CAAC,SAAS,GAAG,MAAM,EAAE,YAAY,EAAE,CAAA;IAC7E,IAAI,MAAM,CAAC,KAAK;QACd,OAAO,CAAC,GAAG,CACT,wFAAwF,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CACtH,CAAA;IAEH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IAC5D,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1C,OAAO,CAAC,KAAK,CACX,6DAA6D,WAAW,4BAA4B,CACrG,CAAA;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC;QAClD,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAA;IAE5B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CACX,6DAA6D,WAAW,mBAAmB,EAC3F,QAAQ,CACT,CAAA;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;SAAM,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CACV,wDAAwD,WAAW,aAAa,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,iBAAiB,EAC9H,IAAI,CACL,CAAA;IACH,CAAC;IAED,0BAA0B;IAC1B,MAAM,WAAW,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;IACrE,MAAM,WAAW,GAAG,8BAA8B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAClE,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,OAAO,CAAC,KAAK,CACX,2HAA2H,CAC5H,CAAA;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAA;IAEzF,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,CAAmB,CAAA;AAC9E,CAAC"}
+{"version":3,"file":"_loadContentByPath.js","sourceRoot":"","sources":["../../src/cms-page/_loadContentByPath.ts"],"names":[],"mappings":"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"}

package/dist/cms-page/data.d.ts

@@ -1,9 +1,11 @@
-import { type IOptiGraphClient } from "@remkoj/optimizely-graph-client";
+import type { IOptiGraphClient, VariationInput } from "@remkoj/optimizely-graph-client";
+export type { VariationInput } from "@remkoj/optimizely-graph-client";
 export type GetContentByPathVariables<LocaleType = string> = {
     path: string | string[];
     locale?: Array<LocaleType> | LocaleType;
     siteId?: string;
     changeset?: string | null;
+    variation?: VariationInput | null;
 };
 type MayBe<T> = T extends Array<infer R> ? Array<R | null> | null : T | null;
 export type GetContentByPathResponse = {
@@ -32,4 +34,3 @@ export type GetMetaDataByPathResponse = {
 };
 export type GetContentByPathMethod<LocaleType = string> = (client: IOptiGraphClient, variables: GetContentByPathVariables<LocaleType>) => Promise<GetContentByPathResponse>;
 export type GetMetaDataByPathMethod<LocaleType = string> = (client: IOptiGraphClient, variables: GetContentByPathVariables<LocaleType>) => Promise<GetMetaDataByPathResponse>;
-export {};

package/dist/cms-page/middleware.d.ts

@@ -1,5 +1,5 @@
 import 'server-only';
-import { type NextMiddleware } from "next/server.js";
+import { type NextProxy } from "next/server.js";
 import { type ChannelDefinition } from "@remkoj/optimizely-graph-client";
 /**
  * Wrap the provided middleware with enforcement of the language code as the first
@@ -7,6 +7,8 @@ import { type ChannelDefinition } from "@remkoj/optimizely-graph-client";
  *
  * @param       next        The Next.JS Middleware to wrap, will be invoked if there's no redirect needed
  * @param       channel     The Optimizely CMS Application definition
+ * @param       debug       When set to debug, redirects will be temporary (302) and information will be
+ *                          logged. If omitted, it will determine debug mode based upon the NODE_ENV value.
  * @returns     The newly constructed Next.JS Middleware
  */
-export declare function withLanguagePrefix<T extends NextMiddleware>(next: T, channel: ChannelDefinition): T;
+export declare function withLanguagePrefix<T extends NextProxy>(next: T, channel: ChannelDefinition, enableDebug?: boolean): T;

package/dist/cms-page/middleware.js

@@ -8,9 +8,12 @@ import Negotiator from 'negotiator';
  *
  * @param       next        The Next.JS Middleware to wrap, will be invoked if there's no redirect needed
  * @param       channel     The Optimizely CMS Application definition
+ * @param       debug       When set to debug, redirects will be temporary (302) and information will be
+ *                          logged. If omitted, it will determine debug mode based upon the NODE_ENV value.
  * @returns     The newly constructed Next.JS Middleware
  */
-export function withLanguagePrefix(next, channel) {
+export function withLanguagePrefix(next, channel, enableDebug) {
+    const debug = enableDebug === undefined ? process.env.NODE_ENV === 'development' : enableDebug;
     if (!channel)
         throw new Error("The language prefix handling requires a CMS Channel Definition");
     const defaultLocale = channel.defaultLocale;
@@ -24,19 +27,34 @@ export function withLanguagePrefix(next, channel) {
     }
     const newMiddleware = (request, ...params) => {
         const pathname = request.nextUrl.pathname;
-        const DEBUG = process.env.NODE_ENV == 'development';
-        const pathnameIsMissingLocale = !slugs.some(slug => pathname.toLowerCase().startsWith(`/${slug.toLowerCase()}/`) || pathname.toLowerCase() === `/${slug.toLowerCase()}`);
-        if (pathnameIsMissingLocale) {
+        // Only process non internal routes
+        if (pathname.startsWith("/_") || pathname.startsWith("/."))
+            return next(request, ...params);
+        // Get the locale slug from the URL
+        const pathSlugs = pathname.split('/').filter(x => x);
+        const localeSlug = pathSlugs.length >= 1 && slugs.includes(pathSlugs.at(0) ?? '-') ? pathSlugs.at(0) : undefined;
+        if (!localeSlug) {
+            // We don't have a locale, so we're going to redirect to the best matching
+            // locale.
             const locale = getLocale(request);
             const slug = channel.resolveSlug(locale);
-            if (DEBUG)
-                console.log(`💬 [Middleware] Detected locale missing in ${pathname}, redirecting to /${slug}${pathname}`);
+            if (debug)
+                console.log(`💬 [Language Prefix Middleware] Detected locale missing in ${pathname}, redirecting to /${slug}${pathname}`);
             const newUrl = request.nextUrl.clone();
             newUrl.pathname = `/${slug}${pathname}`;
             return NextResponse.redirect(newUrl, {
-                status: DEBUG ? 302 : 301
+                status: debug ? 302 : 301
             });
         }
+        else {
+            // We have a locale, so we're going to make it available to the application
+            // using request headers.
+            const locale = channel.slugToLocale(localeSlug);
+            request.headers.append("x-app-locale", locale ?? channel.defaultLocale);
+            request.headers.append("x-app-locale-slug", localeSlug);
+            if (debug)
+                console.log(`💬 [Language Prefix Middleware] Detected locale ${locale}`);
+        }
         return next(request, ...params);
     };
     return newMiddleware;

package/dist/cms-page/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/cms-page/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,EAAE,YAAY,EAAyC,MAAM,gBAAgB,CAAA;AAEpF,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAA;AACpD,OAAO,UAAU,MAAM,YAAY,CAAA;AAEnC;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAA2B,IAAO,EAAE,OAA0B;IAE5F,IAAI,CAAC,OAAO;QACR,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAA;IAErF,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAA;IAEhC,SAAS,SAAS,CAAC,OAAoB;QAEnC,MAAM,OAAO,GAA6B,EAAE,CAAA;QAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA,CAAA,CAAC,CAAC,CAAA;QACpD,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,SAAS,EAAE,CAAA;QACzD,OAAO,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,aAAa,GAAoB,CAAC,OAAO,EAAE,GAAG,MAAM,EAAE,EAAE;QAE1D,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAA;QACzC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAA;QACnD,MAAM,uBAAuB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QACxK,IAAI,uBAAuB,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;YACjC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YACxC,IAAI,KAAK;gBACL,OAAO,CAAC,GAAG,CAAC,8CAA+C,QAAS,qBAAsB,IAAK,GAAI,QAAS,EAAE,CAAC,CAAA;YACnH,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;YACtC,MAAM,CAAC,QAAQ,GAAG,IAAK,IAAK,GAAI,QAAS,EAAE,CAAA;YAC3C,OAAO,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACjC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;aAC5B,CAAC,CAAA;QACN,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAA;IACnC,CAAC,CAAA;IACD,OAAO,aAAkB,CAAA;AAC7B,CAAC"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/cms-page/middleware.ts"],"names":[],"mappings":"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"}

package/dist/cms-page/page.d.ts

@@ -32,7 +32,7 @@ export type OptiCmsNextJsPage<TParams extends Record<string, string | Array<stri
      * @param       resolving       The metadata that is currently resolving
      * @returns     Updated metadat
      */
-    generateMetadata: (props: DefaultCmsPageProps<TParams, TSearchParams>, resolving: ResolvingMetadata) => Promise<Metadata>;
+    generateMetadata: (props: DefaultCmsPageProps<TParams, TSearchParams>, resolving: ResolvingMetadata) => Promise<Metadata> | Metadata;
     /**
      * The actual component that performs the page rendering
      *
@@ -55,7 +55,7 @@ export type CreatePageOptions<LocaleEnum = SystemLocales, TParams extends Record
      *                draftMode in configuring the client
      * @returns       The client instance
      */
-    client: (token?: string, scope?: 'request' | 'metadata') => IOptiGraphClient | Promise<IOptiGraphClient>;
+    client: ((token?: string, scope?: 'request' | 'metadata') => IOptiGraphClient) | ((token?: string, scope?: 'request' | 'metadata') => Promise<IOptiGraphClient>);
     /**
      * The channel information used to resolve locales, domains and more.
      *
@@ -84,7 +84,17 @@ export type CreatePageOptions<LocaleEnum = SystemLocales, TParams extends Record
      * @return      The path to be retrieved from Router or getContentByPath
      *              function
      */
-    propsToCmsPath: (props: DefaultCmsPageProps<TParams, TSearchParams>) => Promise<string | null>;
+    propsToCmsPath: (props: DefaultCmsPageProps<TParams, TSearchParams>, channel?: ChannelDefinition) => Promise<string | null>;
+    /**
+     * Take the props received by the CmsPage from Next.JS and tranform those
+     * into a the page variant used by the CMS.
+     *
+     * @param       props       The Properties (slugs & search params) received
+     *                          by Next.JS
+     * @return      The path to be retrieved from Router or getContentByPath
+     *              function
+     */
+    propsToVariant: (props: DefaultCmsPageProps<TParams, TSearchParams>, channel?: ChannelDefinition) => Promise<string | null | undefined>;
     /**
      * Take the route from the Routing Service and transform that to the route
      * params used by Next.JS. The default implementation assumes that the CMS

package/dist/cms-page/page.js

@@ -1,28 +1,50 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import 'server-only';
-import deepmerge from 'deepmerge';
 import { notFound } from 'next/navigation.js';
+import { cache } from 'react';
 // GraphQL Client & Services
 import { RouteResolver, } from '@remkoj/optimizely-graph-client/router';
 import { ifChannelDefinition, } from '@remkoj/optimizely-graph-client/channels';
 // React Support
-import { CmsContent, ServerContext, updateSharedServerContext, } from '@remkoj/optimizely-cms-react/rsc';
+import { CmsContent, ServerContext, isNonEmptyString, } from '@remkoj/optimizely-cms-react/rsc';
 // Within package
 import { MetaDataResolver } from '../metadata.js';
 import { urlToPath } from './utils.js';
 import { createClient } from '../client.js';
 import { getChannelId } from './_base.js';
-import { loadContentByPath } from './_loadContentByPath.js';
-import { getInfoByPath } from './_getInfoByPath.js';
+import { loadContentByPath as loadContentByPathBase } from './_loadContentByPath.js';
+import { getInfoByPath as getInfoByPathBase } from './_getInfoByPath.js';
+const getInfoByPath = cache(getInfoByPathBase);
+const loadContentByPath = cache(loadContentByPathBase);
 export { SystemLocales } from './_base.js';
 const CreatePageOptionDefaults = {
     client: createClient,
     routerFactory: (client) => new RouteResolver(client),
-    propsToCmsPath: async ({ params }) => buildRequestPath(await params),
-    routeToParams: (route) => {
-        return { path: urlToPath(route.url), lang: route.locale };
+    async propsToCmsPath(props) {
+        const params = await props.params; // Read the parameters
+        const slugs = [params.lang, ...(params.path ?? [])] // Build the full set of slugs for the path
+            .filter(isNonEmptyString) // Remove empty values
+            .filter((x) => !x.startsWith(encodeURIComponent('var:'))) // Remove any variant specification
+            .map((x) => decodeURIComponent(x)); // Decode the URI components
+        if (slugs.length === 0)
+            return '/'; // We're requesting the homepage, so just return that path
+        // Build the URL
+        const fullPath = !slugs[slugs.length - 1].includes('.') ? '/' + slugs.join('/') + '/' : '/' + slugs.join('/');
+        return fullPath;
     },
-    paramsToLocale: async (params, channel) => {
+    async propsToVariant({ params }) {
+        const pathSegments = (await params).path;
+        const variantPrefix = encodeURIComponent('var:');
+        const variantSegment = Array.isArray(pathSegments) ? pathSegments.filter(x => typeof x === 'string' && x.startsWith(variantPrefix)).at(0) : undefined;
+        return variantSegment ? variantSegment.substring(variantPrefix.length) : undefined;
+    },
+    routeToParams(route) {
+        const pathSegments = urlToPath(route.url);
+        if (route.variation)
+            pathSegments.push(`var:${route.variation}`);
+        return { path: pathSegments, lang: route.locale };
+    },
+    async paramsToLocale(params, channel) {
         // If there's no channel, just return undefined
         if (!channel)
             return undefined;
@@ -51,7 +73,7 @@ const CreatePageOptionDefaults = {
  */
 export function createPage(factory, options) {
     // Build the global/shared configuration for the Optimizely CMS Page
-    const { getContentByPath, client: clientFactory, channel, propsToCmsPath, routeToParams, routerFactory, paramsToLocale, } = {
+    const { getContentByPath, client: clientFactory, channel, propsToCmsPath, propsToVariant, routeToParams, routerFactory, paramsToLocale, } = {
         ...CreatePageOptionDefaults,
         ...options,
     };
@@ -68,74 +90,53 @@ export function createPage(factory, options) {
             const client = await clientFactory(undefined, 'metadata');
             const router = routerFactory(client);
             const channelId = getChannelId(client, channel);
-            const allRoutes = await router.getRoutes(channelId, channel ? undefined : true);
+            const allRoutes = await router.getRoutes(channelId, channel ? undefined : true, true);
             return allRoutes.map((r) => routeToParams(r));
         },
-        generateMetadata: async ({ params, searchParams }, parent) => {
-            // Get context
+        generateMetadata: async ({ params, searchParams }, resolvingMetadata) => {
+            // Prepare the context
             const context = await buildContext();
-            const channelId = getChannelId(context.client, channel);
-            // Read variables from request
-            const [requestPath, initialLocale] = await Promise.all([
-                propsToCmsPath({ params, searchParams }),
+            // Analyze the Next.JS Request props
+            const [requestPath, initialLocale, variation] = await Promise.all([
+                propsToCmsPath({ params, searchParams }, ifChannelDefinition(channel)),
                 paramsToLocale(params, ifChannelDefinition(channel)),
+                propsToVariant({ params, searchParams }, ifChannelDefinition(channel)).then(variant => variant || undefined)
             ]);
+            // Valdiate path
             if (!requestPath)
-                return Promise.resolve({});
+                return {};
+            // Track initial locale
             if (initialLocale)
                 context.setLocale(initialLocale);
-            const awaitedParams = await params;
-            // Debug output
-            if (context.isDebug)
-                console.log(`⚪ [CmsPage.generateMetadata] Processed Next.JS route: ${JSON.stringify(awaitedParams)} => Optimizely CMS route: ${JSON.stringify({ path: requestPath, siteId: channelId })}`);
-            // Resolve the route to a content link
-            const routeInfo = await getInfoByPath(context.client, routerFactory, requestPath, channel);
-            if (!routeInfo || !routeInfo[0]) {
-                if (context.isDebug)
-                    console.log('⚪ [CmsPage.generateMetadata] No data received');
-                return Promise.resolve({});
-            }
-            const [route, contentLink, contentType, graphLocale] = routeInfo;
-            if (context.isDebug)
-                console.log(`⚪ [CmsPage.generateMetadata] Retrieved content info:`, route);
+            // Resolve route
+            const pathInfo = await getInfoByPath(context.client, routerFactory, requestPath, channel, variation);
+            if (!pathInfo)
+                return {};
+            const [route, contentLink, contentType, graphLocale] = pathInfo;
+            if (!contentLink || !contentType)
+                return {};
             // Update context from route
-            context.setLocale(route.locale);
-            // Make the shared server context available
-            updateSharedServerContext(context);
+            if (route)
+                context.setLocale(route.locale);
             // Fetch the metadata based upon the actual content type and resolve parent
             const metaResolver = new MetaDataResolver(context.client);
             const [pageMetadata, baseMetadata] = await Promise.all([
                 metaResolver.resolve(factory, contentLink, contentType, graphLocale),
-                parent,
+                resolvingMetadata,
             ]);
-            if (context.isDebug)
-                console.log(`⚪ [CmsPage.generateMetadata] Component yielded metadata:`, pageMetadata);
-            // Make sure merging of objects goes correctly
-            for (const metaKey of Object.getOwnPropertyNames(pageMetadata)) {
-                if (isObject(pageMetadata[metaKey]) &&
-                    isObject(baseMetadata[metaKey])) {
-                    //@ts-expect-error Silence error due to failed introspection...
-                    pageMetadata[metaKey] = deepmerge(baseMetadata[metaKey], pageMetadata[metaKey], { arrayMerge: (target, source) => [...source] });
-                }
-            }
-            // Not sure, but needed somehow...
-            if (typeof baseMetadata.metadataBase == 'string' &&
-                baseMetadata.metadataBase.length > 1) {
-                pageMetadata.metadataBase = new URL(baseMetadata.metadataBase);
-            }
             return pageMetadata;
         },
         CmsPage: async ({ params, searchParams }) => {
             // Prepare the context
             const context = await buildContext();
-            //const params = await asyncParams;
             // Analyze the Next.JS Request props
-            const [requestPath, initialLocale] = await Promise.all([
-                propsToCmsPath({ params, searchParams }),
+            const [requestPath, initialLocale, requestVariant] = await Promise.all([
+                propsToCmsPath({ params, searchParams }, ifChannelDefinition(channel)),
                 paramsToLocale(params, ifChannelDefinition(channel)),
+                (await propsToVariant({ params, searchParams })) ?? undefined
             ]);
             if (context.isDebug)
-                console.log(`⚪ [CmsPage] Processed Next.JS route: ${JSON.stringify(await params)} => Optimizely CMS route: ${JSON.stringify({ path: requestPath })}`);
+                console.log(`⚪ [CmsPage] Processed Next.JS route: ${JSON.stringify(await params)} => Optimizely CMS route: ${JSON.stringify({ path: requestPath, variant: requestVariant })}`);
             // If we don't have the path, or the path is an internal Next.js route reject it.
             if (!requestPath || requestPath.startsWith('/_next/'))
                 return notFound();
@@ -144,8 +145,8 @@ export function createPage(factory, options) {
                 context.setLocale(initialLocale);
             // Resolve the content based upon the path
             const lookupData = await (getContentByPath
-                ? loadContentByPath(context.client, getContentByPath, requestPath, channel, initialLocale)
-                : getInfoByPath(context.client, routerFactory, requestPath, channel));
+                ? loadContentByPath(context.client, getContentByPath, requestPath, channel, initialLocale, requestVariant)
+                : getInfoByPath(context.client, routerFactory, requestPath, channel, requestVariant));
             if (!lookupData) {
                 console.error(`🔴 [CmsPage] Unable to resolve the content for ${JSON.stringify(await params)}!`);
                 return notFound();
@@ -153,38 +154,10 @@ export function createPage(factory, options) {
             const [route, contentLink, contentType, graphLocale, contentData] = lookupData;
             if (contentLink?.locale)
                 context.setLocale(contentLink.locale);
-            // Make the shared server context available
-            updateSharedServerContext(context);
             // Render the content link
             return (_jsx(CmsContent, { contentType: contentType, contentLink: contentLink, fragmentData: contentData ?? undefined, ctx: context }));
         },
     };
     return pageDefintion;
 }
-/**
- *
- *
- * @param   param0  The URL parameters
- * @returns The request path as understood by Graph
- */
-function buildRequestPath({ lang, path, }) {
-    const slugs = [];
-    if (path)
-        slugs.push(...path.filter((x) => x));
-    if (lang)
-        slugs.unshift(lang);
-    if (slugs.length == 0)
-        return '/';
-    const fullPath = '/' +
-        slugs
-            .filter((x) => x && x.length > 0)
-            .map((x) => decodeURIComponent(x))
-            .join('/');
-    if (!slugs[slugs.length - 1].includes('.'))
-        return fullPath + '/';
-    return fullPath;
-}
-function isObject(toTest) {
-    return typeof toTest == 'object' && toTest != null && toTest != undefined;
-}
 //# sourceMappingURL=page.js.map