@enonic/nextjs-adapter 3.0.0-B4 → 3.0.0-RC1

package/common/constants.d.ts

@@ -1,6 +1,6 @@
 export declare const CATCH_ALL = "*";
 export declare enum ENV_VARS {
-    PROJECTS = "ENONIC_PROJECTS",
+    MAPPINGS = "ENONIC_MAPPINGS",
     API_URL = "ENONIC_API",
     APP_NAME = "ENONIC_APP_NAME"
 }

package/common/constants.js

@@ -1,7 +1,7 @@
 export const CATCH_ALL = '*';
 export var ENV_VARS;
 (function (ENV_VARS) {
-    ENV_VARS["PROJECTS"] = "ENONIC_PROJECTS";
+    ENV_VARS["MAPPINGS"] = "ENONIC_MAPPINGS";
     ENV_VARS["API_URL"] = "ENONIC_API";
     ENV_VARS["APP_NAME"] = "ENONIC_APP_NAME";
 })(ENV_VARS || (ENV_VARS = {}));

package/common/env.d.ts

@@ -8,4 +8,4 @@ export declare const APP_NAME_UNDERSCORED: string;
 export declare const APP_NAME_DASHED: string;
 export declare const IS_DEV_MODE: boolean;
 /** Locales and Enonic XP projects correspondence list */
-export declare const PROJECTS: string;
+export declare const MAPPINGS: string;

package/common/env.js

@@ -13,11 +13,11 @@ export const APP_NAME_DASHED = (APP_NAME || '').replace(/\./g, '-');
 const mode = isServer ? process.env.MODE : process.env.NEXT_PUBLIC_MODE;
 export const IS_DEV_MODE = (mode === 'development');
 /** Locales and Enonic XP projects correspondence list */
-export const PROJECTS = isServer ? process.env[ENV_VARS.PROJECTS] : process.env['NEXT_PUBLIC_ENONIC_PROJECTS'];
+export const MAPPINGS = isServer ? process.env[ENV_VARS.MAPPINGS] : process.env['NEXT_PUBLIC_ENONIC_MAPPINGS'];
 const requiredConstants = {
     [ENV_VARS.APP_NAME]: APP_NAME,
     [ENV_VARS.API_URL]: API_URL,
-    [ENV_VARS.PROJECTS]: PROJECTS,
+    [ENV_VARS.MAPPINGS]: MAPPINGS,
 };
 // Verify required values on server-side only
 Object.keys(requiredConstants).forEach((key) => {

package/guillotine/fetchContentData.js

@@ -13,7 +13,10 @@ export const fetchContentData = (contentApiUrl, xpContentPath, projectConfig, qu
     if (variables && Object.keys(variables).length > 0) {
         body.variables = variables;
     }
-    const contentResults = yield fetchGuillotine(contentApiUrl, body, projectConfig, headers);
+    const contentResults = yield fetchGuillotine(contentApiUrl, projectConfig, {
+        body,
+        headers,
+    });
     if (contentResults.error) {
         return contentResults;
     }

package/guillotine/fetchContentData.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchContentData.js","sourceRoot":"","sources":["../src/guillotine/fetchContentData.ts"],"names":[],"mappings":";;;;;;;;;AAOA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,aAAqB,EACrB,aAAqB,EACrB,aAAkC,EAClC,KAAa,EACb,SAAc,EACd,OAAY,EACU,EAAE;IACxB,MAAM,IAAI,GAAuB,EAAC,KAAK,EAAC,CAAC;IACzC,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,MAAM,cAAc,GAAG,MAAM,eAAe,CAAyB,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAElH,IAAI,cAAc,CAAC,KAAK,EAAE,CAAC;QACvB,OAAO,cAAc,CAAC;IAC1B,CAAC;SAAM,CAAC;QACJ,OAAO;YACH,qCAAqC;YACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;SAC1C,CAAC;IACN,CAAC;AACL,CAAC,CAAA,CAAC"}
+{"version":3,"file":"fetchContentData.js","sourceRoot":"","sources":["../src/guillotine/fetchContentData.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,aAAqB,EACrB,aAAqB,EACrB,aAAkC,EAClC,KAAa,EACb,SAAc,EACd,OAAY,EACU,EAAE;IACxB,MAAM,IAAI,GAAuB,EAAC,KAAK,EAAC,CAAC;IACzC,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,MAAM,cAAc,GAAG,MAAM,eAAe,CAAyB,aAAa,EAAE,aAAa,EAAE;QAC/F,IAAI;QACJ,OAAO;KACV,CAAC,CAAC;IAEH,IAAI,cAAc,CAAC,KAAK,EAAE,CAAC;QACvB,OAAO,cAAc,CAAC;IAC1B,CAAC;SAAM,CAAC;QACJ,OAAO;YACH,qCAAqC;YACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;SAC1C,CAAC;IACN,CAAC;AACL,CAAC,CAAA,CAAC"}

package/guillotine/fetchContentPathsForLocale.js

@@ -23,7 +23,7 @@ export function fetchContentPathsForLocale(path, config, query = GET_STATIC_PATH
                 count,
             },
         };
-        return fetchGuillotine(contentApiUrl, body, config).then((results) => {
+        return fetchGuillotine(contentApiUrl, config, { body }).then((results) => {
             return results.guillotine.queryDsl.reduce((prev, child) => {
                 var _a;
                 const regexp = new RegExp(`^/${((_a = child.site) === null || _a === void 0 ? void 0 : _a._name) ? `${child.site._name}/?` : ''}`);

package/guillotine/fetchContentPathsForLocale.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchContentPathsForLocale.js","sourceRoot":"","sources":["../src/guillotine/fetchContentPathsForLocale.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,UAAgB,0BAA0B,CAC5C,IAAY,EACZ,MAA2B,EAC3B,QAAgB,sBAAsB,EACtC,KAAK,GAAG,GAAG;;QAEX,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACnC,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;SACxB,CAAC,CAAC;QACH,MAAM,IAAI,GAAuB;YAC7B,KAAK;YACL,SAAS,EAAE;gBACP,IAAI;gBACJ,KAAK;aACR;SACJ,CAAC;QACF,OAAO,eAAe,CAAoB,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CACxE,OAAyB,EAC3B,EAAE;YACA,OAAO,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CACtC,IAAuB,EACvB,KAAU,EACZ,EAAE;;gBACA,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,KAAK,EAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnF,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC;oBACN,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;oBACnC,MAAM,EAAE,MAAM,CAAC,MAAM;iBACxB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YAChB,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC;CAAA"}
+{"version":3,"file":"fetchContentPathsForLocale.js","sourceRoot":"","sources":["../src/guillotine/fetchContentPathsForLocale.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,UAAgB,0BAA0B,CAC5C,IAAY,EACZ,MAA2B,EAC3B,QAAgB,sBAAsB,EACtC,KAAK,GAAG,GAAG;;QAEX,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACnC,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;SACxB,CAAC,CAAC;QACH,MAAM,IAAI,GAAuB;YAC7B,KAAK;YACL,SAAS,EAAE;gBACP,IAAI;gBACJ,KAAK;aACR;SACJ,CAAC;QACF,OAAO,eAAe,CAAoB,aAAa,EAAE,MAAM,EAAE,EAAC,IAAI,EAAC,CAAC,CAAC,IAAI,CAAC,CAC1E,OAAyB,EAC3B,EAAE;YACA,OAAO,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CACtC,IAAuB,EACvB,KAAU,EACZ,EAAE;;gBACA,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,KAAK,EAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnF,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC;oBACN,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;oBACnC,MAAM,EAAE,MAAM,CAAC,MAAM;iBACxB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YAChB,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC;CAAA"}

package/guillotine/fetchFromApi.d.ts

@@ -1,3 +1,3 @@
-import type { ContentApiBaseBody, GuillotineResponseJson, ProjectLocaleConfig } from '../types';
+import type { FetchOptions, GuillotineResponseJson, ProjectLocaleConfig } from '../types';
 /** Generic fetch */
-export declare function fetchFromApi<Data = Record<string, unknown>>(apiUrl: string, body: ContentApiBaseBody, projectConfig: ProjectLocaleConfig, headers?: {}, method?: string): Promise<GuillotineResponseJson<Data>>;
+export declare function fetchFromApi<Data = Record<string, unknown>>(apiUrl: string, projectConfig: ProjectLocaleConfig, options?: FetchOptions): Promise<GuillotineResponseJson>;

package/guillotine/fetchFromApi.js

@@ -8,23 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 /** Generic fetch */
-export function fetchFromApi(apiUrl, body, projectConfig, headers, method = 'POST') {
+export function fetchFromApi(apiUrl, projectConfig, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const options = {
-            method,
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'X-Guillotine-SiteKey': projectConfig.site,
-            },
-            body: JSON.stringify(body),
+        const opts = {
+            method: (options === null || options === void 0 ? void 0 : options.method) || 'POST',
+            body: (options === null || options === void 0 ? void 0 : options.body) ? JSON.stringify(options === null || options === void 0 ? void 0 : options.body) : null,
+            headers: mergeHeaders(projectConfig, options === null || options === void 0 ? void 0 : options.headers),
+            next: options === null || options === void 0 ? void 0 : options.next,
+            cache: options === null || options === void 0 ? void 0 : options.cache,
         };
-        if (headers) {
-            Object.assign(options.headers, headers);
-        }
         let res;
         try {
-            res = yield fetch(apiUrl, options);
+            res = yield fetch(apiUrl, opts);
         }
         catch (e) {
             console.warn(apiUrl, e);
@@ -64,4 +59,18 @@ export function fetchFromApi(apiUrl, body, projectConfig, headers, method = 'POS
         return json;
     });
 }
+function mergeHeaders(projectConfig, headers) {
+    const newHeaders = new Headers({
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+    });
+    if (headers) {
+        for (const headersKey in headers) {
+            newHeaders.set(headersKey, headers[headersKey]);
+        }
+        // append last to make sure it is not overwritten
+    }
+    newHeaders.set('X-Guillotine-SiteKey', projectConfig.site);
+    return newHeaders;
+}
 //# sourceMappingURL=fetchFromApi.js.map

package/guillotine/fetchFromApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchFromApi.js","sourceRoot":"","sources":["../src/guillotine/fetchFromApi.ts"],"names":[],"mappings":";;;;;;;;;AAGA,oBAAoB;AACpB,MAAM,UAAgB,YAAY,CAC9B,MAAc,EACd,IAAwB,EACxB,aAAkC,EAClC,OAAY,EACZ,MAAM,GAAG,MAAM;;QAEf,MAAM,OAAO,GAAG;YACZ,MAAM;YACN,OAAO,EAAE;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,cAAc,EAAE,kBAAkB;gBAClC,sBAAsB,EAAE,aAAa,CAAC,IAAI;aAC7C;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC7B,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,GAA6B,CAAC;QAClC,IAAI,CAAC;YACD,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC3B,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,CAAC,CAAC,OAAO;aACrB,CAAC,CAAC,CAAC;QACR,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC3B,IAAI,EAAE,GAAG,CAAC,MAAM;gBAChB,OAAO,EAAE,mCAAmC,MAAM,GAAG,CAAC,IAAI,EAAE,IAAI;aACnE,CAAC,CAAC,CAAC;QACR,CAAC;QAED,IAAI,IAAkC,CAAC;QACvC,IAAI,CAAC;YACD,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC5B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC3B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,8CAA8C,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE;aAC5F,CAAC,CAAC,CAAC;QACR,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC3B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,wDAAwD,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE;aACtG,CAAC,CAAC,CAAC;QACR,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC3B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,sDAAsD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;aACxF,CAAC,CAAC,CAAC;QACR,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CAAA"}
+{"version":3,"file":"fetchFromApi.js","sourceRoot":"","sources":["../src/guillotine/fetchFromApi.ts"],"names":[],"mappings":"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"}

package/guillotine/fetchGuillotine.d.ts

@@ -1,3 +1,3 @@
-import type { ContentApiBaseBody, GuillotineResult, ProjectLocaleConfig } from '../types';
+import type { FetchOptions, GuillotineResult, ProjectLocaleConfig } from '../types';
 /** Guillotine-specialized fetch, using the generic fetch above */
-export declare function fetchGuillotine<Data = Record<string, unknown>>(contentApiUrl: string, body: ContentApiBaseBody, projectConfig: ProjectLocaleConfig, headers?: {}): Promise<GuillotineResult>;
+export declare function fetchGuillotine<Data = Record<string, unknown>>(contentApiUrl: string, projectConfig: ProjectLocaleConfig, options?: FetchOptions): Promise<GuillotineResult>;

package/guillotine/fetchGuillotine.js

@@ -9,9 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { fetchFromApi } from './fetchFromApi';
 /** Guillotine-specialized fetch, using the generic fetch above */
-export function fetchGuillotine(contentApiUrl, body, projectConfig, headers) {
+export function fetchGuillotine(contentApiUrl, projectConfig, options) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        const body = options === null || options === void 0 ? void 0 : options.body;
         if (typeof body.query !== 'string' || !body.query.trim()) {
             return {
                 error: {
@@ -20,9 +21,9 @@ export function fetchGuillotine(contentApiUrl, body, projectConfig, headers) {
                 },
             };
         }
-        const path = (_a = body.variables) === null || _a === void 0 ? void 0 : _a.path;
+        const path = (_a = body === null || body === void 0 ? void 0 : body.variables) === null || _a === void 0 ? void 0 : _a.path;
         const pathMessage = path ? JSON.stringify(path) : '';
-        return yield fetchFromApi(contentApiUrl, body, projectConfig, headers)
+        return yield fetchFromApi(contentApiUrl, projectConfig, options)
             .then(json => {
             let errors = json.errors; // fetchFromApi ensures json is an object
             if (errors) {
@@ -30,7 +31,6 @@ export function fetchGuillotine(contentApiUrl, body, projectConfig, headers) {
                     errors = [errors];
                 }
                 console.error(`${errors.length} error(s) when fetching data from: ${contentApiUrl}`);
-                console.error(`headers: ${JSON.stringify(headers, null, 2)} \nvariables: ${JSON.stringify(body.variables, null, 2)}`);
                 errors.forEach(error => {
                     console.error(error);
                 });

package/guillotine/fetchGuillotine.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchGuillotine.js","sourceRoot":"","sources":["../src/guillotine/fetchGuillotine.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAG5C,kEAAkE;AAClE,MAAM,UAAgB,eAAe,CACjC,aAAqB,EACrB,IAAwB,EACxB,aAAkC,EAClC,OAAY;;;QAEZ,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACvD,OAAO;gBACH,KAAK,EAAE;oBACH,IAAI,EAAE,KAAK;oBACX,OAAO,EAAE,qDAAqD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;iBAC7F;aACJ,CAAC;QACN,CAAC;QACD,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,MAAM,YAAY,CACrB,aAAa,EACb,IAAI,EACJ,aAAa,EACb,OAAO,CACV;aACI,IAAI,CAAC,IAAI,CAAC,EAAE;YACT,IAAI,MAAM,GAAU,IAAI,CAAC,MAAM,CAAC,CAAC,yCAAyC;YAE1E,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBACzB,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;gBACtB,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,sCAAsC,aAAa,EAAE,CAAC,CAAC;gBACrF,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACtH,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACnB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;gBAEH,OAAO;oBACH,KAAK,EAAE;wBACH,IAAI,EAAE,KAAK;wBACX,OAAO,EAAE,yBAAyB,MAAM,CAAC,MAAM,gDAAgD;qBAClG;iBACJ,CAAC;YACN,CAAC;YAED,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,+CAA+C,WAAW,EAAE,EAAE,GAAG,CAAC,CAAC;YAChF,IAAI,CAAC;gBACD,OAAO,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACV,OAAO,EAAC,KAAK,EAAE,EAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAC,EAAC,CAAC;YACtE,CAAC;QACL,CAAC,CAAC,CAAC;;CACV"}
+{"version":3,"file":"fetchGuillotine.js","sourceRoot":"","sources":["../src/guillotine/fetchGuillotine.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAG5C,kEAAkE;AAClE,MAAM,UAAgB,eAAe,CACjC,aAAqB,EACrB,aAAkC,EAClC,OAAsB;;;QAEtB,MAAM,IAAI,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC;QAC3B,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACvD,OAAO;gBACH,KAAK,EAAE;oBACH,IAAI,EAAE,KAAK;oBACX,OAAO,EAAE,qDAAqD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;iBAC7F;aACJ,CAAC;QACN,CAAC;QAED,MAAM,IAAI,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,0CAAE,IAAI,CAAC;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,MAAM,YAAY,CACrB,aAAa,EACb,aAAa,EACb,OAAO,CACV;aACI,IAAI,CAAC,IAAI,CAAC,EAAE;YACT,IAAI,MAAM,GAAU,IAAI,CAAC,MAAM,CAAC,CAAC,yCAAyC;YAE1E,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBACzB,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;gBACtB,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,sCAAsC,aAAa,EAAE,CAAC,CAAC;gBACrF,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACnB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;gBAEH,OAAO;oBACH,KAAK,EAAE;wBACH,IAAI,EAAE,KAAK;wBACX,OAAO,EAAE,yBAAyB,MAAM,CAAC,MAAM,gDAAgD;qBAClG;iBACJ,CAAC;YACN,CAAC;YAED,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,+CAA+C,WAAW,EAAE,EAAE,GAAG,CAAC,CAAC;YAChF,IAAI,CAAC;gBACD,OAAO,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACV,OAAO,EAAC,KAAK,EAAE,EAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAC,EAAC,CAAC;YACtE,CAAC;QACL,CAAC,CAAC,CAAC;;CACV"}

package/guillotine/fetchMetaData.js

@@ -17,7 +17,10 @@ export const fetchMetaData = (contentApiUrl, xpContentPath, projectConfig, heade
             path: xpContentPath,
         },
     };
-    const metaResult = yield fetchGuillotine(contentApiUrl, body, projectConfig, headers);
+    const metaResult = yield fetchGuillotine(contentApiUrl, projectConfig, {
+        body,
+        headers,
+    });
     if (metaResult.error) {
         return metaResult;
     }

package/guillotine/fetchMetaData.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchMetaData.js","sourceRoot":"","sources":["../src/guillotine/fetchMetaData.ts"],"names":[],"mappings":";;;;;;;;;AAOA,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,MAAM,aAAa,GAAG,CACzB,aAAqB,EACrB,aAAqB,EACrB,aAAkC,EAClC,OAAY,EACO,EAAE;;IACrB,MAAM,IAAI,GAAuB;QAC7B,KAAK,EAAE,YAAY,CAAC,iBAAiB,EAAE,CAAC;QACxC,SAAS,EAAE;YACP,IAAI,EAAE,aAAa;SACtB;KACJ,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAa,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAClG,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,UAAU,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,OAAO;YACH,IAAI,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,0CAAE,GAAG;SACpC,CAAC;IACN,CAAC;AACL,CAAC,CAAA,CAAC"}
+{"version":3,"file":"fetchMetaData.js","sourceRoot":"","sources":["../src/guillotine/fetchMetaData.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,MAAM,aAAa,GAAG,CACzB,aAAqB,EACrB,aAAqB,EACrB,aAAkC,EAClC,OAAY,EACO,EAAE;;IACrB,MAAM,IAAI,GAAuB;QAC7B,KAAK,EAAE,YAAY,CAAC,iBAAiB,EAAE,CAAC;QACxC,SAAS,EAAE;YACP,IAAI,EAAE,aAAa;SACtB;KACJ,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAa,aAAa,EAAE,aAAa,EAAE;QAC/E,IAAI;QACJ,OAAO;KACV,CAAC,CAAC;IACH,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,UAAU,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,OAAO;YACH,IAAI,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,0CAAE,GAAG;SACpC,CAAC;IACN,CAAC;AACL,CAAC,CAAA,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "3.0.0-B4",
+  "version": "3.0.0-RC1",
   "license": "Apache-2.0",
   "main": "index.js",
   "author": "Pavel Milkevich <pmi@enonic.com>",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.5.4",
-    "html-react-parser": "^5.1.2",
+    "html-react-parser": "^5.1.7",
     "negotiator": "^0.6.3",
     "next": "^14.1.0",
     "react": "18.2.0",
@@ -56,21 +56,21 @@
     "unescape": "^1.0.1"
   },
   "devDependencies": {
-    "@edge-runtime/jest-environment": "^2.3.9",
+    "@edge-runtime/jest-environment": "^2.3.10",
     "@enonic-types/core": "^7.14.0-B2",
     "@enonic/eslint-config": "^1.1.0",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
     "@types/negotiator": "^0.6.3",
-    "@types/node": "^20.11.17",
-    "@types/react": "^18.2.55",
+    "@types/node": "^20.11.20",
+    "@types/react": "^18.2.58",
     "@types/react-dom": "^18.2.19",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.21.0",
     "concurrently": "^8.2.2",
     "cpy-cli": "^5.0.0",
     "del-cli": "^5.1.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-plugin-react": "^7.33.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",

package/src/common/constants.ts

@@ -1,7 +1,7 @@
 export const CATCH_ALL = '*';
 
 export enum ENV_VARS {
-    PROJECTS = 'ENONIC_PROJECTS',
+    MAPPINGS = 'ENONIC_MAPPINGS',
     API_URL = 'ENONIC_API',
     APP_NAME = 'ENONIC_APP_NAME',
 }

package/src/common/env.ts

@@ -21,12 +21,12 @@ const mode = isServer ? process.env.MODE : process.env.NEXT_PUBLIC_MODE;
 export const IS_DEV_MODE = (mode === 'development');
 
 /** Locales and Enonic XP projects correspondence list */
-export const PROJECTS = isServer ? process.env[ENV_VARS.PROJECTS] : process.env['NEXT_PUBLIC_ENONIC_PROJECTS'];
+export const MAPPINGS = isServer ? process.env[ENV_VARS.MAPPINGS] : process.env['NEXT_PUBLIC_ENONIC_MAPPINGS'];
 
 const requiredConstants = {
     [ENV_VARS.APP_NAME]: APP_NAME,
     [ENV_VARS.API_URL]: API_URL,
-    [ENV_VARS.PROJECTS]: PROJECTS,
+    [ENV_VARS.MAPPINGS]: MAPPINGS,
 };
 
 // Verify required values on server-side only

package/src/guillotine/fetchContentData.ts

@@ -1,8 +1,4 @@
-import type {
-    ContentApiBaseBody,
-    ContentResult,
-    ProjectLocaleConfig,
-} from '../types';
+import type {ContentApiBaseBody, ContentResult, ProjectLocaleConfig} from '../types';
 
 
 import {fetchGuillotine} from './fetchGuillotine';
@@ -20,7 +16,10 @@ export const fetchContentData = async <Content = Record<string, unknown>>(
     if (variables && Object.keys(variables).length > 0) {
         body.variables = variables;
     }
-    const contentResults = await fetchGuillotine<ContentResult<Content>>(contentApiUrl, body, projectConfig, headers);
+    const contentResults = await fetchGuillotine<ContentResult<Content>>(contentApiUrl, projectConfig, {
+        body,
+        headers,
+    });
 
     if (contentResults.error) {
         return contentResults;
@@ -30,4 +29,4 @@ export const fetchContentData = async <Content = Record<string, unknown>>(
             contents: Object.values(contentResults),
         };
     }
-};
+};

package/src/guillotine/fetchContentPathsForLocale.ts

@@ -23,7 +23,7 @@ export async function fetchContentPathsForLocale(
             count,
         },
     };
-    return fetchGuillotine<ContentPathItem[]>(contentApiUrl, body, config).then((
+    return fetchGuillotine<ContentPathItem[]>(contentApiUrl, config, {body}).then((
         results: GuillotineResult,
     ) => {
         return results.guillotine.queryDsl.reduce((

package/src/guillotine/fetchFromApi.ts

@@ -1,31 +1,23 @@
-import type {ContentApiBaseBody, GuillotineResponse, GuillotineResponseJson, ProjectLocaleConfig} from '../types';
-
+import type {FetchOptions, GuillotineResponse, GuillotineResponseJson, ProjectLocaleConfig} from '../types';
 
 /** Generic fetch */
 export async function fetchFromApi<Data = Record<string, unknown>>(
     apiUrl: string,
-    body: ContentApiBaseBody,
     projectConfig: ProjectLocaleConfig,
-    headers?: {},
-    method = 'POST',
-) {
-    const options = {
-        method,
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-            'X-Guillotine-SiteKey': projectConfig.site,
-        },
-        body: JSON.stringify(body),
-    };
+    options?: FetchOptions,
+): Promise<GuillotineResponseJson> {
 
-    if (headers) {
-        Object.assign(options.headers, headers);
-    }
+    const opts = {
+        method: options?.method || 'POST',
+        body: options?.body ? JSON.stringify(options?.body) : null,
+        headers: mergeHeaders(projectConfig, options?.headers),
+        next: options?.next,
+        cache: options?.cache,
+    };
 
     let res: GuillotineResponse<Data>;
     try {
-        res = await fetch(apiUrl, options);
+        res = await fetch(apiUrl, opts as RequestInit);
     } catch (e: any) {
         console.warn(apiUrl, e);
         throw new Error(JSON.stringify({
@@ -67,3 +59,18 @@ export async function fetchFromApi<Data = Record<string, unknown>>(
 
     return json;
 }
+
+function mergeHeaders(projectConfig: ProjectLocaleConfig, headers?: HeadersInit): Headers {
+    const newHeaders = new Headers({
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+    });
+    if (headers) {
+        for (const headersKey in headers) {
+            newHeaders.set(headersKey, headers[headersKey]);
+        }
+        // append last to make sure it is not overwritten
+    }
+    newHeaders.set('X-Guillotine-SiteKey', projectConfig.site);
+    return newHeaders;
+}

package/src/guillotine/fetchGuillotine.ts

@@ -1,4 +1,4 @@
-import type {ContentApiBaseBody, GuillotineResult, ProjectLocaleConfig} from '../types';
+import type {FetchOptions, GuillotineResult, ProjectLocaleConfig} from '../types';
 
 
 import {fetchFromApi} from './fetchFromApi';
@@ -7,10 +7,10 @@ import {fetchFromApi} from './fetchFromApi';
 /** Guillotine-specialized fetch, using the generic fetch above */
 export async function fetchGuillotine<Data = Record<string, unknown>>(
     contentApiUrl: string,
-    body: ContentApiBaseBody,
     projectConfig: ProjectLocaleConfig,
-    headers?: {},
+    options?: FetchOptions,
 ): Promise<GuillotineResult> {
+    const body = options?.body;
     if (typeof body.query !== 'string' || !body.query.trim()) {
         return {
             error: {
@@ -19,13 +19,13 @@ export async function fetchGuillotine<Data = Record<string, unknown>>(
             },
         };
     }
-    const path = body.variables?.path;
+
+    const path = body?.variables?.path;
     const pathMessage = path ? JSON.stringify(path) : '';
     return await fetchFromApi<Data>(
         contentApiUrl,
-        body,
         projectConfig,
-        headers,
+        options,
     )
         .then(json => {
             let errors: any[] = json.errors; // fetchFromApi ensures json is an object
@@ -35,7 +35,6 @@ export async function fetchGuillotine<Data = Record<string, unknown>>(
                     errors = [errors];
                 }
                 console.error(`${errors.length} error(s) when fetching data from: ${contentApiUrl}`);
-                console.error(`headers: ${JSON.stringify(headers, null, 2)} \nvariables: ${JSON.stringify(body.variables, null, 2)}`);
                 errors.forEach(error => {
                     console.error(error);
                 });

package/src/guillotine/fetchMetaData.ts

@@ -1,8 +1,4 @@
-import type {
-    ContentApiBaseBody,
-    MetaResult,
-    ProjectLocaleConfig,
-} from '../types';
+import type {ContentApiBaseBody, MetaResult, ProjectLocaleConfig} from '../types';
 
 
 import {getMetaQuery, pageFragmentQuery} from './getMetaData';
@@ -21,7 +17,10 @@ export const fetchMetaData = async (
             path: xpContentPath,
         },
     };
-    const metaResult = await fetchGuillotine<MetaResult>(contentApiUrl, body, projectConfig, headers);
+    const metaResult = await fetchGuillotine<MetaResult>(contentApiUrl, projectConfig, {
+        body,
+        headers,
+    });
     if (metaResult.error) {
         return metaResult;
     } else {
@@ -29,4 +28,4 @@ export const fetchMetaData = async (
             meta: metaResult?.guillotine?.get,
         };
     }
-};
+};

package/src/types/index.ts

@@ -44,12 +44,14 @@ export type ProjectLocalesConfig = Record<string, ProjectLocaleConfig>;
 
 export type SelectorName = 'contentType' | 'page' | 'component' | 'part' | 'layout' | 'macro';
 
-export interface ServerSideParams
-    extends NodeJS.Dict<string | string[]> {
-    // String array catching a sub-path assumed to match the site-relative path of an XP content.
-    contentPath?: string[];
-    mode?: string;
-}
+// https://nextjs.org/docs/app/api-reference/functions/fetch
+export type FetchOptions = Omit<RequestInit, 'body'> & {
+    body?: ContentApiBaseBody,
+    next?: {
+        revalidate?: boolean | number,
+        tags?: string[],
+    }
+};
 
 export interface StaticContentProps extends Record<string, any> {
     children?: React.ReactNode;

package/src/utils/getProjectLocaleConfigs.ts

@@ -2,7 +2,7 @@ import type {ProjectLocalesConfig} from '../types';
 
 
 import {ENV_VARS} from '../common/constants';
-import {PROJECTS} from '../common/env';
+import {MAPPINGS} from '../common/env';
 
 
 // NOTE: Dissallowing slash and any whitespace in 2nd capture group.
@@ -10,9 +10,9 @@ const PROJECT_CONFIG_REGEXP = /^([\w-]+):([^/\s]+)(\/[\w.-]+)?$/i;
 
 
 export function getProjectLocaleConfigs(): ProjectLocalesConfig {
-    const str = PROJECTS;
+    const str = MAPPINGS;
     if (!str?.length) {
-        throw new Error(`Did you forget to define "${ENV_VARS.PROJECTS}" environmental variable?
+        throw new Error(`Did you forget to define "${ENV_VARS.MAPPINGS}" environmental variable?
         Format: <default-language>:<default-repository-name>/<default-site-path>,<language>:<repository-name>/<site-path>,...`);
     }
     return str.split(',').reduce((config, prjStr, index: number) => {
@@ -33,4 +33,4 @@ export function getProjectLocaleConfigs(): ProjectLocalesConfig {
         };
         return config;
     }, {});
-}
+}

package/types/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /// <reference types="react" />
 export type * from './component';
 export type * from './componentProps';
@@ -34,10 +33,13 @@ export interface ProjectLocaleConfig {
 }
 export type ProjectLocalesConfig = Record<string, ProjectLocaleConfig>;
 export type SelectorName = 'contentType' | 'page' | 'component' | 'part' | 'layout' | 'macro';
-export interface ServerSideParams extends NodeJS.Dict<string | string[]> {
-    contentPath?: string[];
-    mode?: string;
-}
+export type FetchOptions = Omit<RequestInit, 'body'> & {
+    body?: ContentApiBaseBody;
+    next?: {
+        revalidate?: boolean | number;
+        tags?: string[];
+    };
+};
 export interface StaticContentProps extends Record<string, any> {
     children?: React.ReactNode;
     element?: string;

package/utils/getProjectLocaleConfigs.js

@@ -1,11 +1,11 @@
 import { ENV_VARS } from '../common/constants';
-import { PROJECTS } from '../common/env';
+import { MAPPINGS } from '../common/env';
 // NOTE: Dissallowing slash and any whitespace in 2nd capture group.
 const PROJECT_CONFIG_REGEXP = /^([\w-]+):([^/\s]+)(\/[\w.-]+)?$/i;
 export function getProjectLocaleConfigs() {
-    const str = PROJECTS;
+    const str = MAPPINGS;
     if (!(str === null || str === void 0 ? void 0 : str.length)) {
-        throw new Error(`Did you forget to define "${ENV_VARS.PROJECTS}" environmental variable?
+        throw new Error(`Did you forget to define "${ENV_VARS.MAPPINGS}" environmental variable?
         Format: <default-language>:<default-repository-name>/<default-site-path>,<language>:<repository-name>/<site-path>,...`);
     }
     return str.split(',').reduce((config, prjStr, index) => {