@enonic/nextjs-adapter 0.13.0 → 1.0.0-RC2

package/utils.js

@@ -12,9 +12,7 @@ export const APP_NAME_DASHED = (APP_NAME || '').replace(/\./g, '-');
 export const SITE_KEY = (process.env.SITE_KEY || process.env.NEXT_PUBLIC_SITE_KEY);
 // ////////////////////////////////////////////////////////////////////////  Hardcode-able constants
 // URI parameter marking that a request is for a preview for CS. MUST MATCH THE VALUE OF 'FROM_XP_PARAM' on XP side.
-export const FROM_XP_PARAM = '__fromxp__';
 export const XP_BASE_URL_HEADER = 'xpbaseurl';
-export const COMPONENT_SUBPATH_HEADER = 'xp-component-path';
 export const RENDER_MODE_HEADER = 'content-studio-mode';
 export const JSESSIONID_HEADER = 'jsessionid';
 export const PORTAL_COMPONENT_ATTRIBUTE = 'data-portal-component-type';
@@ -49,31 +47,25 @@ export var XP_COMPONENT_TYPE;
     XP_COMPONENT_TYPE["FRAGMENT"] = "fragment";
     XP_COMPONENT_TYPE["PAGE"] = "page";
 })(XP_COMPONENT_TYPE || (XP_COMPONENT_TYPE = {}));
-/** Returns true if the context object (from next.js in [[...contentPath]].jsx ) stems from a request that comes from XP in a CS-preview, i.e. has the URI param FROM_XP_PARAM (defined as '__fromXp__' above).
- *  False if no context, query or FROM_XP_PARAM param */
-export const isRequestFromXP = (context) => {
-    return !!getXPRequestType(context);
-};
-export const getXPRequestType = (context) => {
-    var _a;
-    const headerValue = (((_a = context === null || context === void 0 ? void 0 : context.req) === null || _a === void 0 ? void 0 : _a.headers) || {})[FROM_XP_PARAM];
-    const enumValue = XP_REQUEST_TYPE[headerValue === null || headerValue === void 0 ? void 0 : headerValue.toUpperCase()];
-    return enumValue || XP_REQUEST_TYPE.PAGE; // need to have some defaults here in case of rendering without XP
-};
-const getRenderMode = (context) => {
+export const getRenderMode = (context) => {
     var _a;
     const value = (((_a = context === null || context === void 0 ? void 0 : context.req) === null || _a === void 0 ? void 0 : _a.headers) || {})[RENDER_MODE_HEADER];
     const enumValue = RENDER_MODE[value === null || value === void 0 ? void 0 : value.toUpperCase()];
     return enumValue || RENDER_MODE[process.env.RENDER_MODE] || RENDER_MODE.NEXT;
 };
-const getSingleComponentPath = (context) => {
-    var _a;
-    return (((_a = context === null || context === void 0 ? void 0 : context.req) === null || _a === void 0 ? void 0 : _a.headers) || {})[COMPONENT_SUBPATH_HEADER];
-};
 export function getContentApiUrl(context) {
     const mode = getRenderMode(context);
     return mode === RENDER_MODE.NEXT ? CONTENT_API_MASTER : CONTENT_API_DRAFT;
 }
+export function getJsessionHeaders(context) {
+    var _a;
+    const headers = {};
+    const jsessionid = (_a = context === null || context === void 0 ? void 0 : context.req) === null || _a === void 0 ? void 0 : _a.headers[JSESSIONID_HEADER];
+    if (jsessionid) {
+        headers['Cookie'] = `${JSESSIONID_HEADER}=${jsessionid}`;
+    }
+    return headers;
+}
 /** For '<a href="..."' link values in props when clicking the link should navigate to an XP content item page
  *  and the query returns the XP _path to the target content item:
  *  When viewed directly, the header will have a `<base href='/' />` (see src/pages/_app.tsx), and when viewed through an
@@ -129,13 +121,8 @@ const adapterConstants = {
     APP_NAME_UNDERSCORED,
     APP_NAME_DASHED,
     SITE_KEY,
-    FROM_XP_PARAM,
-    COMPONENT_SUBPATH_HEADER,
     PORTAL_COMPONENT_ATTRIBUTE,
     PORTAL_REGION_ATTRIBUTE,
-    getXPRequestType,
-    getSingleComponentPath,
-    getRenderMode,
 };
 // Verify required values
 const NOT_REQUIRED = ['IS_DEV_MODE'];

package/views/RichTextView.jsx

@@ -14,10 +14,17 @@ export function createReplacer(allData, meta, renderMacroInEditMode = true, cust
         switch (el.tagName) {
             case UrlProcessor.IMG_TAG:
                 ref = el.attribs[UrlProcessor.IMG_ATTR];
-                const src = el.attribs['src'];
-                // do not process content images in next to keep it absolute
-                if (ref && src && UrlProcessor.isContentImage(ref, allData.images)) {
-                    el.attribs['src'] = getUrl(src, meta);
+                if (ref) {
+                    if (UrlProcessor.isContentImage(ref, allData.images)) {
+                        const src = el.attribs['src'];
+                        if (src) {
+                            el.attribs['src'] = getUrl(src, meta);
+                        }
+                        const srcset = el.attribs['srcset'];
+                        if (srcset) {
+                            el.attribs['srcset'] = UrlProcessor.processSrcSet(srcset, meta);
+                        }
+                    }
                 }
                 break;
             case UrlProcessor.LINK_TAG: