@enonic/nextjs-adapter 5.0.0-beta.2 → 6.0.0-beta.1

package/dist/index.d.ts

@@ -5,10 +5,12 @@ export { CATCH_ALL, JSESSIONID_HEADER, PORTAL_COMPONENT_ATTRIBUTE, PORTAL_REGION
 export { richTextQuery } from './guillotine/metadata/richTextQuery';
 export { validateData } from './guillotine/validateData';
 export { I18n } from './i18n/i18n';
-export { getContentApiUrl } from './utils/getContentApiUrl';
+export { getContentBranch } from './utils/getContentBranch';
 export { getLocaleMapping } from './utils/getLocaleMapping';
 export { getLocaleMappingByProjectId } from './utils/getLocaleMappingByProjectId';
 export { getLocaleMappingByLocale } from './utils/getLocaleMappingByLocale';
 export { getRequestLocaleInfo } from './utils/getRequestLocaleInfo';
 export { sanitizeGraphqlName } from './utils/sanitizeGraphqlName';
-export { UrlProcessor, getAsset, getUrl } from './common/UrlProcessor';
+export { encryptParams } from './utils/encryptParams';
+export { decryptParams } from './utils/decryptParams';
+export { UrlProcessor, getUrl } from './common/UrlProcessor';

package/dist/index.js

@@ -4,11 +4,13 @@ export { CATCH_ALL, JSESSIONID_HEADER, PORTAL_COMPONENT_ATTRIBUTE, PORTAL_REGION
 export { richTextQuery } from './guillotine/metadata/richTextQuery';
 export { validateData } from './guillotine/validateData';
 export { I18n } from './i18n/i18n';
-export { getContentApiUrl } from './utils/getContentApiUrl';
+export { getContentBranch } from './utils/getContentBranch';
 export { getLocaleMapping } from './utils/getLocaleMapping';
 export { getLocaleMappingByProjectId } from './utils/getLocaleMappingByProjectId';
 export { getLocaleMappingByLocale } from './utils/getLocaleMappingByLocale';
 export { getRequestLocaleInfo } from './utils/getRequestLocaleInfo';
 export { sanitizeGraphqlName } from './utils/sanitizeGraphqlName';
-export { UrlProcessor, getAsset, getUrl } from './common/UrlProcessor';
+export { encryptParams } from './utils/encryptParams';
+export { decryptParams } from './utils/decryptParams';
+export { UrlProcessor, getUrl } from './common/UrlProcessor';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,EACR,eAAe,EACf,oBAAoB,EACpB,WAAW,EACd,MAAM,cAAc,CAAC;AAItB,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EACH,SAAS,EACT,iBAAiB,EACjB,0BAA0B,EAC1B,uBAAuB,EACvB,iBAAiB,EACjB,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EAClB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAC,aAAa,EAAC,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,2BAA2B,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,wBAAwB,EAAC,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EACH,YAAY,EACZ,QAAQ,EACR,MAAM,EACT,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,EACR,eAAe,EACf,oBAAoB,EACpB,WAAW,EACd,MAAM,cAAc,CAAC;AAItB,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EACH,SAAS,EACT,iBAAiB,EACjB,0BAA0B,EAC1B,uBAAuB,EACvB,iBAAiB,EACjB,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EAClB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAC,aAAa,EAAC,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,2BAA2B,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,wBAAwB,EAAC,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACH,YAAY,EACZ,MAAM,EACT,MAAM,uBAAuB,CAAC"}

package/dist/query/Shortcut.d.ts

@@ -1 +1 @@
-export declare const getShortcutQuery = "\n  query($path:ID!){\n    guillotine {\n      get(key:$path) {\n        ... on base_Shortcut {\n          data {\n            target {\n              pageUrl(type: absolute)\n            }\n            parameters {\n              name\n              value\n            }\n          }\n        }\n      }\n    }\n  }";
+export declare const getShortcutQuery: string;

package/dist/query/Shortcut.js

@@ -1,19 +1,15 @@
-export const getShortcutQuery = `
-  query($path:ID!){
-    guillotine {
-      get(key:$path) {
-        ... on base_Shortcut {
-          data {
-            target {
-              pageUrl(type: absolute)
-            }
-            parameters {
-              name
-              value
-            }
-          }
+import { queryGuillotineWithPath } from '../guillotine/getMetaData';
+export const getShortcutQuery = queryGuillotineWithPath(`get(key:$path) {
+    ... on base_Shortcut {
+      data {
+        target {
+          _path
+        }
+        parameters {
+          name
+          value
         }
       }
     }
-  }`;
+  }`);
 //# sourceMappingURL=Shortcut.js.map

package/dist/query/Shortcut.js.map

@@ -1 +1 @@
-{"version":3,"file":"Shortcut.js","sourceRoot":"","sources":["../../src/query/Shortcut.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;IAiB5B,CAAC"}
+{"version":3,"file":"Shortcut.js","sourceRoot":"","sources":["../../src/query/Shortcut.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAElE,MAAM,CAAC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;;;;;;;;;;;;IAYpD,CAAC,CAAC"}

package/dist/types/component.d.ts

@@ -75,7 +75,13 @@ export interface QueryAndVariables {
     query: string;
     variables?: Record<string, any>;
 }
-export type QueryGetter = (path: string, context?: Context, config?: any) => string;
+export interface GlobalVariables {
+    path: string;
+    siteKey: string;
+    branch: string;
+    project: string;
+}
+export type QueryGetter = (vars: GlobalVariables, context?: Context, config?: any) => string;
 export type SelectedQueryMaybeVariablesFunc = string | QueryGetter | {
     query: string | QueryGetter;
     variables: VariablesGetter;
@@ -85,8 +91,5 @@ export type RichTextData = CompsRichTextData;
 export interface TextData {
     value: RichTextData;
 }
-export type VariablesGetter = (path: string, context?: Context, config?: any) => VariablesGetterResult;
-export interface VariablesGetterResult {
-    [variables: string]: any;
-    path: string;
-}
+export type VariablesGetter = (vars: GlobalVariables, context?: Context, config?: any) => VariablesGetterResult;
+export type VariablesGetterResult = GlobalVariables & Record<string, any>;

package/dist/types/componentProps.d.ts

@@ -18,7 +18,6 @@ export interface BaseMacroProps {
     children: ReactNode;
     data: Omit<MacroData, 'ref'>;
     meta: MetaData;
-    renderInEditMode?: boolean;
 }
 export interface BasePageProps {
     component?: PageData;
@@ -63,7 +62,9 @@ export interface MetaData {
     requestedComponent?: PageComponent;
     canRender: boolean;
     catchAll: boolean;
-    apiUrl: string;
+    branch: string;
+    project: string;
+    site: string;
     baseUrl: string;
     locale: string;
     defaultLocale: string;
@@ -95,13 +96,12 @@ export interface RegionsProps {
     common?: any;
     meta: MetaData;
 }
-export type Replacer = (domNode: DOMNode, data: RichTextData, meta: MetaData, renderMacroInEditMode: boolean) => ReplacerResult;
+export type Replacer = (domNode: DOMNode, data: RichTextData, meta: MetaData) => ReplacerResult;
 export type ReplacerResult = ReactElement | DOMNode;
 export interface RichTextViewProps {
     data: RichTextData;
     meta: MetaData;
     className?: string;
     tag?: string;
-    renderMacroInEditMode?: boolean;
     customReplacer?: Replacer;
 }

package/dist/types/guillotine.d.ts

@@ -109,7 +109,6 @@ interface Content {
     components?: Component[];
     attachments?: Attachment[];
     publish?: PublishInfo;
-    pageUrl?: string;
     site?: portal_Site;
     parent?: Content;
     children?: Content[];

package/dist/utils/decryptParams.d.ts

@@ -0,0 +1 @@
+export declare function decryptParams(blob: string, secret: string): Record<string, any> | null;

package/dist/utils/decryptParams.js

@@ -0,0 +1,20 @@
+import { createHash, createDecipheriv } from 'crypto';
+const IV_LENGTH = 12;
+const TAG_LENGTH = 16;
+export function decryptParams(blob, secret) {
+    try {
+        const key = createHash('sha256').update(secret).digest();
+        const data = Buffer.from(blob, 'base64url');
+        const iv = data.subarray(0, IV_LENGTH);
+        const tag = data.subarray(data.length - TAG_LENGTH);
+        const ciphertext = data.subarray(IV_LENGTH, data.length - TAG_LENGTH);
+        const decipher = createDecipheriv('aes-256-gcm', key, iv);
+        decipher.setAuthTag(tag);
+        const plaintext = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+        return JSON.parse(plaintext.toString('utf8'));
+    }
+    catch (_a) {
+        return null;
+    }
+}
+//# sourceMappingURL=decryptParams.js.map

package/dist/utils/decryptParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"decryptParams.js","sourceRoot":"","sources":["../../src/utils/decryptParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,MAAM,QAAQ,CAAC;AAEpD,MAAM,SAAS,GAAG,EAAE,CAAC;AACrB,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,MAAc;IACtD,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE5C,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;QAEtE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1D,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAEzB,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAAC,WAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC"}

package/dist/utils/encryptParams.d.ts

@@ -0,0 +1 @@
+export declare function encryptParams(params: Record<string, any>, secret: string): string;

package/dist/utils/encryptParams.js

@@ -0,0 +1,12 @@
+import { createHash, randomBytes, createCipheriv } from 'crypto';
+const IV_LENGTH = 12;
+export function encryptParams(params, secret) {
+    const key = createHash('sha256').update(secret).digest();
+    const iv = randomBytes(IV_LENGTH);
+    const cipher = createCipheriv('aes-256-gcm', key, iv);
+    const plaintext = Buffer.from(JSON.stringify(params), 'utf8');
+    const ciphertext = Buffer.concat([cipher.update(plaintext), cipher.final()]);
+    const tag = cipher.getAuthTag();
+    return Buffer.concat([iv, ciphertext, tag]).toString('base64url');
+}
+//# sourceMappingURL=encryptParams.js.map

package/dist/utils/encryptParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"encryptParams.js","sourceRoot":"","sources":["../../src/utils/encryptParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,WAAW,EAAE,cAAc,EAAC,MAAM,QAAQ,CAAC;AAE/D,MAAM,SAAS,GAAG,EAAE,CAAC;AAErB,MAAM,UAAU,aAAa,CAAC,MAA2B,EAAE,MAAc;IACrE,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;IACzD,MAAM,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,cAAc,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;IAE9D,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7E,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IAEhC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACtE,CAAC"}

package/dist/utils/fixDoubleSlashes.d.ts

@@ -1 +1,4 @@
 export declare function fixDoubleSlashes(str: string): string;
+export declare function stripTrailingSlashes(str: string): string;
+export declare function stripLeadingSlashes(str: string): string;
+export declare function stripOutsideSlashes(str: string): string;

package/dist/utils/fixDoubleSlashes.js

@@ -1,4 +1,13 @@
 export function fixDoubleSlashes(str) {
     return str.replace(/(^|[^:/])\/{2,}/g, '$1/');
 }
+export function stripTrailingSlashes(str) {
+    return str.replace(/\/+$/, '');
+}
+export function stripLeadingSlashes(str) {
+    return str.replace(/^\/+/, '');
+}
+export function stripOutsideSlashes(str) {
+    return str.replace(/^\/+|\/+$/g, '');
+}
 //# sourceMappingURL=fixDoubleSlashes.js.map

package/dist/utils/fixDoubleSlashes.js.map

@@ -1 +1 @@
-{"version":3,"file":"fixDoubleSlashes.js","sourceRoot":"","sources":["../../src/utils/fixDoubleSlashes.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,gBAAgB,CAAC,GAAW;IACxC,OAAO,GAAG,CAAC,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"fixDoubleSlashes.js","sourceRoot":"","sources":["../../src/utils/fixDoubleSlashes.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,gBAAgB,CAAC,GAAW;IACxC,OAAO,GAAG,CAAC,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC5C,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC3C,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC3C,OAAO,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AACzC,CAAC"}

package/dist/utils/getContentBranch.d.ts

@@ -0,0 +1,2 @@
+import type { Context } from '../types';
+export declare function getContentBranch(context?: Context): string;

package/dist/utils/getContentBranch.js

@@ -0,0 +1,11 @@
+import { RENDER_MODE } from '../common/constants';
+import { getRenderMode } from './getRenderMode';
+export function getContentBranch(context) {
+    const renderMode = getRenderMode(context);
+    return renderMode === RENDER_MODE.NEXT
+        ? 'master'
+        : renderMode === RENDER_MODE.LIVE
+            ? 'master'
+            : 'draft';
+}
+//# sourceMappingURL=getContentBranch.js.map

package/dist/utils/getContentBranch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getContentBranch.js","sourceRoot":"","sources":["../../src/utils/getContentBranch.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,MAAM,UAAU,gBAAgB,CAAC,OAAiB;IAC9C,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,OAAO,UAAU,KAAK,WAAW,CAAC,IAAI;QAC/B,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,UAAU,KAAK,WAAW,CAAC,IAAI;YAC/B,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,OAAO,CAAC;AACvB,CAAC"}

package/dist/utils/getRenderMode.d.ts

@@ -1,3 +1,3 @@
 import type { Context } from '../types';
 import { RENDER_MODE } from '../common/constants';
-export declare const getRenderMode: (context: Context) => RENDER_MODE;
+export declare const getRenderMode: (context?: Context) => RENDER_MODE;

package/dist/utils/getRenderMode.js

@@ -1,7 +1,7 @@
 import { RENDER_MODE, RENDER_MODE_HEADER } from '../common/constants';
 export const getRenderMode = (context) => {
     var _a;
-    const value = (_a = context.headers) === null || _a === void 0 ? void 0 : _a.get(RENDER_MODE_HEADER);
+    const value = (_a = context === null || context === void 0 ? void 0 : context.headers) === null || _a === void 0 ? void 0 : _a.get(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;
 };

package/dist/utils/getRenderMode.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRenderMode.js","sourceRoot":"","sources":["../../src/utils/getRenderMode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAGpE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAgB,EAAe,EAAE;;IAC3D,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,WAAW,CAAE,KAAkC,aAAlC,KAAK,uBAAL,KAAK,CAA+B,WAAW,EAAE,CAAC,CAAC;IAClF,OAAO,SAAS,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;AACjF,CAAC,CAAC"}
+{"version":3,"file":"getRenderMode.js","sourceRoot":"","sources":["../../src/utils/getRenderMode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAGpE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAiB,EAAe,EAAE;;IAC5D,MAAM,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,WAAW,CAAE,KAAkC,aAAlC,KAAK,uBAAL,KAAK,CAA+B,WAAW,EAAE,CAAC,CAAC;IAClF,OAAO,SAAS,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;AACjF,CAAC,CAAC"}

package/dist/views/BaseMacro.jsx

@@ -1,7 +1,5 @@
 import { ComponentRegistry } from '../common/ComponentRegistry';
-import { RENDER_MODE } from '../common/constants';
 import { sanitizeGraphqlName } from '../utils/sanitizeGraphqlName';
-import HTMLReactParser from 'html-react-parser';
 import { shouldShowMissingView, MissingComponent } from './BaseComponent';
 import React from 'react';
 const unescape = require('unescape');
@@ -9,39 +7,12 @@ export const MACRO_DISABLE = 'system:disable';
 export const MACRO_EMBED = 'system:embed';
 const BaseMacro = (props) => {
     var _a, _b;
-    const { data, children, meta, renderInEditMode } = props;
+    const { data, children, meta } = props;
     let config = (_b = (_a = data.config) === null || _a === void 0 ? void 0 : _a[sanitizeGraphqlName(data.name)]) !== null && _b !== void 0 ? _b : {};
     if (data.descriptor !== MACRO_DISABLE) {
         // do not do any processing for disable macro
         config = normalizeValue(config);
     }
-    if (!renderInEditMode && (meta === null || meta === void 0 ? void 0 : meta.renderMode) === RENDER_MODE.EDIT) {
-        const attrs = formatAttributes(config);
-        if (config.body) {
-            // NB. config body takes precedence over children
-            // do not parse system macros (embed, disable) in edit mode
-            // but parse others because panel macros (for instance) wants its content to be html, not string
-            // TODO: should we make this behavior configurable ?
-            const bodyString = !data.descriptor.startsWith('system:') ? HTMLReactParser(config.body) : config.body;
-            return <>
-                {`[${data.name}${attrs}]`}
-                {bodyString}
-                {`[/${data.name}]`}
-            </>;
-        }
-        else if (children) {
-            return <>
-                {`[${data.name}${attrs}]`}
-                {children}
-                {`[/${data.name}]`}
-            </>;
-        }
-        else {
-            return <>
-                {`[${data.name}${attrs}/]`}
-            </>;
-        }
-    }
     const macro = ComponentRegistry.getMacro(data.descriptor);
     const MacroView = macro === null || macro === void 0 ? void 0 : macro.view;
     if (MacroView) {

package/dist/views/BaseMacro.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"BaseMacro.jsx","sourceRoot":"","sources":["../../src/views/BaseMacro.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseMacro.jsx","sourceRoot":"","sources":["../../src/views/BaseMacro.tsx"],"names":[],"mappings":"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"}

package/dist/views/RichTextView.jsx

@@ -4,27 +4,26 @@ import Link from 'next/link';
 import { useMemo } from 'react';
 import { RichText } from '@enonic/react-components';
 const RichTextView = (props) => {
-    var _a;
     const component = useMemo(() => ({
         type: 'text',
         path: props.meta.path,
         text: props.data.processedHtml
     }), [props.meta.path, props.data.processedHtml]);
-    return <RichText data={wrapData(props.data)} meta={toRichTextMetaData(props.meta)} nextMeta={props.meta} component={component} className={props.className} tag={props.tag} replacer={wrapReplacer(props.customReplacer, props.meta, props.renderMacroInEditMode)} renderInEditMode={(_a = props.renderMacroInEditMode) !== null && _a !== void 0 ? _a : true} Macro={MacroAdapter} Link={LinkAdapter} Image={ImageAdapter}/>;
+    return <RichText data={wrapData(props.data)} meta={toRichTextMetaData(props.meta)} nextMeta={props.meta} component={component} className={props.className} tag={props.tag} replacer={wrapReplacer(props.customReplacer, props.meta)} Macro={MacroAdapter} Link={LinkAdapter} Image={ImageAdapter}/>;
 };
-function wrapReplacer(nextReplacer, meta, renderMacroInEditMode) {
+function wrapReplacer(nextReplacer, meta) {
     if (!nextReplacer) {
         return null;
     }
     return ({ el, data }) => {
-        return nextReplacer(el, data, meta, renderMacroInEditMode);
+        return nextReplacer(el, data, meta);
     };
 }
 function wrapData(data) {
     if (!data.macros || !data.macros.length) {
         return data;
     }
-    const macroComponents = data.macros.map(macroData => {
+    const macroComponents = data.macros.map((macroData) => {
         return {
             component: {
                 type: 'macro',
@@ -42,11 +41,12 @@ function wrapData(data) {
     return Object.assign(Object.assign({}, data), { macroComponents });
 }
 function MacroAdapter(props) {
-    const { children, component, data, common, meta, nextMeta, renderInEditMode } = props;
-    return <BaseMacro data={data} meta={nextMeta} renderInEditMode={renderInEditMode}>{children}</BaseMacro>;
+    const { children, component, data, common, meta, nextMeta } = props;
+    return <BaseMacro data={data} meta={nextMeta}>{children}</BaseMacro>;
 }
 function LinkAdapter(props) {
-    return <Link href={getUrl(props.href, props.nextMeta)}>{props.children}</Link>;
+    var _a;
+    return <Link href={getUrl(((_a = props.content) === null || _a === void 0 ? void 0 : _a._path) || props.href, props.nextMeta)}>{props.children}</Link>;
 }
 function ImageAdapter(props) {
     var _a;

package/dist/views/RichTextView.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"RichTextView.jsx","sourceRoot":"","sources":["../../src/views/RichTextView.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAC5D,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAU9B,OAAO,EAAC,QAAQ,EAAmB,MAAM,0BAA0B,CAAC;AASpE,MAAM,YAAY,GAAG,CAAC,KAAwB,EAAE,EAAE;;IAC9C,MAAM,SAAS,GAAkB,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5C,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI;QACrB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,aAAa;KACjC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAEjD,OAAO,CAAC,QAAQ,CACZ,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAC3B,IAAI,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CACrC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CACrB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAC3B,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CACf,QAAQ,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC,CACtF,gBAAgB,CAAC,CAAC,MAAA,KAAK,CAAC,qBAAqB,mCAAI,IAAI,CAAC,CACtD,KAAK,CAAC,CAAC,YAAY,CAAC,CACpB,IAAI,CAAC,CAAC,WAAW,CAAC,CAClB,KAAK,CAAC,CAAC,YAAY,CAAC,EACtB,CAAC;AACP,CAAC,CAAC;AAEF,SAAS,YAAY,CAAC,YAAsC,EAAE,IAAc,EACxE,qBAA8B;IAC9B,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,CAAC,EAAC,EAAE,EAAE,IAAI,EAAwE,EAAE,EAAE;QACzF,OAAO,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAC/D,CAAC,CAAC;AACN,CAAC;AAED,SAAS,QAAQ,CAAC,IAAkB;IAChC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACtC,OAAO,IAA4B,CAAC;IACxC,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QAChD,OAAO;YACH,SAAS,EAAE;gBACP,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,SAAS,CAAC,GAAG;gBAClB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,UAAU,EAAE,SAAS,CAAC,UAAU;aACnC;YACD,IAAI,EAAE;gBACF,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,EAAE;aACjC;SACyC,CAAC;IACnD,CAAC,CAAC,CAAC;IACH,uCACO,IAAI,KACP,eAAe,IACjB;AACN,CAAC;AAED,SAAS,YAAY,CAAC,KAA+C;IACjE,MAAM,EAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAC,GAAG,KAAK,CAAC;IAEpF,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAA8B,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;AACvI,CAAC;AAED,SAAS,WAAW,CAAC,KAA8C;IAC/D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,YAAY,CAAC,KAA+C;;IACjE,MAAM,MAAM,GAAG,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM,EAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;AAClI,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAc;IACtC,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,UAAU;QACrB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,EAAE,EAAE,IAAI,CAAC,EAAE;KACd,CAAA;AACL,CAAC;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"RichTextView.jsx","sourceRoot":"","sources":["../../src/views/RichTextView.tsx"],"names":[],"mappings":"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"}

package/dist/views/Text.jsx

@@ -1,4 +1,4 @@
 import RichTextView from './RichTextView';
-const DefaultTextView = ({ component, meta, path }) => (<RichTextView data={component.value} meta={meta} renderMacroInEditMode={false}/>);
+const DefaultTextView = ({ component, meta, path }) => (<RichTextView data={component.value} meta={meta}/>);
 export default DefaultTextView;
 //# sourceMappingURL=Text.jsx.map

package/dist/views/Text.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"Text.jsx","sourceRoot":"","sources":["../../src/views/Text.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAU1C,MAAM,eAAe,GAAG,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAQ,EAAE,EAAE,CAAC,CACxD,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,EAAE,CACnF,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"Text.jsx","sourceRoot":"","sources":["../../src/views/Text.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAU1C,MAAM,eAAe,GAAG,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAQ,EAAE,EAAE,CAAC,CACxD,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CACrD,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "5.0.0-beta.2",
+  "version": "6.0.0-beta.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "author": "Pavel Milkevich <pmi@enonic.com>",
@@ -56,39 +56,39 @@
   },
   "dependencies": {
     "@enonic/react-components": "^7.0.0-B1",
-    "@formatjs/intl-localematcher": "^0.7.4",
-    "gqlmin": "^0.3.1",
+    "@formatjs/intl-localematcher": "^0.8.5",
+    "gqlmin": "^0.3.2",
     "negotiator": "^1.0.0",
     "unescape": "^1.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.5",
-    "@babel/preset-env": "^7.28.5",
+    "@babel/core": "^7.29.0",
+    "@babel/preset-env": "^7.29.3",
     "@edge-runtime/jest-environment": "^4.0.0",
     "@enonic-types/core": "^8.0.0-B4",
-    "@enonic/eslint-config": "^2.1.0",
+    "@enonic/eslint-config": "^2.3.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.0",
+    "@testing-library/react": "^16.3.2",
     "@types/negotiator": "^0.6.4",
-    "@types/node": "^25.0.2",
+    "@types/node": "^25.6.2",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "babel-jest": "^30.1.2",
+    "babel-jest": "^30.4.1",
     "concurrently": "^9.2.1",
-    "cpy-cli": "^6.0.0",
+    "cpy-cli": "^7.0.0",
     "del-cli": "^7.0.0",
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
     "html-react-parser": "^5.2.6",
-    "jest": "^30.2.0",
-    "jest-environment-jsdom": "^30.2.0",
+    "jest": "^30.3.0",
+    "jest-environment-jsdom": "^30.4.1",
     "madge": "^8.0.0",
     "mkdirp": "^3.0.1",
-    "ts-jest": "^29.4.6",
+    "ts-jest": "^29.4.9",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.51.0"
+    "typescript-eslint": "^8.58.2"
   },
   "types": "index.d.ts",
   "peerDependencies": {

package/dist/guillotine/getCleanContentPathArrayOrThrow400.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCleanContentPathArrayOrThrow400.js","sourceRoot":"","sources":["../../src/guillotine/getCleanContentPathArrayOrThrow400.ts"],"names":[],"mappings":"AAAA,sMAAsM;AACtM,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,WAA0C,EAAU,EAAE;IACrG,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;gBACvB,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,mGAAmG,IAAI,CAAC,SAAS,CACtH,WAAW,CAAC,GAAG;aACtB,CAAC,CAAC,CAAC;QACR,CAAC;QAED,OAAO,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAE3C,CAAC;SAAM,CAAC;QACJ,OAAO,kBAAkB,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,CAAC;AACL,CAAC,CAAC"}

package/dist/utils/getContentApiUrl.d.ts

@@ -1,2 +0,0 @@
-import type { Context } from '../types';
-export declare function getContentApiUrl(context: Context): string;

package/dist/utils/getContentApiUrl.js

@@ -1,15 +0,0 @@
-import { RENDER_MODE } from '../common/constants';
-import { API_URL } from '../common/env';
-import { getLocaleMapping } from './getLocaleMapping';
-import { fixDoubleSlashes } from './fixDoubleSlashes';
-import { getRenderMode } from './getRenderMode';
-export function getContentApiUrl(context) {
-    const project = getLocaleMapping(context).project;
-    const branch = getRenderMode(context) === RENDER_MODE.NEXT
-        ? 'master'
-        : getRenderMode(context) === RENDER_MODE.LIVE
-            ? 'master'
-            : 'draft';
-    return fixDoubleSlashes(`${API_URL}/${project}/${branch}`);
-}
-//# sourceMappingURL=getContentApiUrl.js.map

package/dist/utils/getContentApiUrl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getContentApiUrl.js","sourceRoot":"","sources":["../../src/utils/getContentApiUrl.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC7C,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IAClD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,IAAI;QACtD,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,IAAI;YACzC,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,OAAO,CAAC;IAElB,OAAO,gBAAgB,CAAC,GAAG,OAAO,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC,CAAC;AAC/D,CAAC"}