@enonic/nextjs-adapter 6.0.0-beta.2 → 6.0.0-beta.4

package/dist/index.js

@@ -1,6 +1,6 @@
 export { APP_NAME, APP_NAME_DASHED, APP_NAME_UNDERSCORED, IS_DEV_MODE } from './common/env';
 export { ComponentRegistry } from './common/ComponentRegistry';
-export { CATCH_ALL, JSESSIONID_HEADER, PORTAL_COMPONENT_ATTRIBUTE, PORTAL_REGION_ATTRIBUTE, PROJECT_ID_HEADER, RENDER_MODE, RENDER_MODE_HEADER, XP_BASE_URL_HEADER, XP_COMPONENT_TYPE, XP_REQUEST_TYPE } from './common/constants';
+export { CATCH_ALL, FROM_XP_PARAM, JSESSIONID_HEADER, PORTAL_COMPONENT_ATTRIBUTE, PORTAL_REGION_ATTRIBUTE, PROJECT_ID_HEADER, RENDER_MODE, RENDER_MODE_HEADER, XP_BASE_URL_HEADER, XP_COMPONENT_TYPE, XP_REQUEST_TYPE } from './common/constants';
 export { richTextQuery } from './guillotine/metadata/richTextQuery';
 export { validateData } from './guillotine/validateData';
 export { I18n } from './i18n/i18n';
@@ -12,5 +12,7 @@ export { getRequestLocaleInfo } from './utils/getRequestLocaleInfo';
 export { sanitizeGraphqlName } from './utils/sanitizeGraphqlName';
 export { encryptParams } from './utils/encryptParams';
 export { decryptParams } from './utils/decryptParams';
-export { UrlProcessor, getUrl } from './common/UrlProcessor';
+export { attachmentUrlQuery, imageUrlQuery, mediaUrlQuery, pageUrlQuery } from './guillotine/urlQueries';
+export { attachmentUrl, imageUrl, mediaUrl, pageUrl } from './guillotine/urls';
+export { localizeMappings } from './utils/localizeMappings';
 //# 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;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"}
+{"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,aAAa,EACb,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,EAAC,kBAAkB,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC"}

package/dist/query/Shortcut.js

@@ -1,9 +1,10 @@
 import { queryGuillotineWithPath } from '../guillotine/getMetaData';
+import { pageUrlQuery } from '../guillotine/urlQueries';
 export const getShortcutQuery = queryGuillotineWithPath(`get(key:$path) {
     ... on base_Shortcut {
       data {
         target {
-          _path
+          ${pageUrlQuery()}
         }
         parameters {
           name

package/dist/query/Shortcut.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"Shortcut.js","sourceRoot":"","sources":["../../src/query/Shortcut.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAEtD,MAAM,CAAC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;;;;YAI5C,YAAY,EAAE;;;;;;;;IAQtB,CAAC,CAAC"}

package/dist/server/disableDraftMode.d.ts

@@ -0,0 +1 @@
+export declare function disableDraftMode(): Promise<void>;

package/dist/server/disableDraftMode.js

@@ -0,0 +1,7 @@
+'use server';
+import { draftMode } from 'next/headers';
+// Keep this file to async exports only: Next.js rejects anything else in a 'use server' module
+export async function disableDraftMode() {
+    (await draftMode()).disable();
+}
+//# sourceMappingURL=disableDraftMode.js.map

package/dist/server/disableDraftMode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"disableDraftMode.js","sourceRoot":"","sources":["../../src/server/disableDraftMode.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAEvC,+FAA+F;AAC/F,MAAM,CAAC,KAAK,UAAU,gBAAgB;IAClC,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;AAClC,CAAC"}

package/dist/types/guillotine.d.ts

@@ -84,6 +84,11 @@ export interface Component {
     fragment?: FragmentComponentData | null;
 }
 type ComponentType = 'page' | 'layout' | 'image' | 'part' | 'text' | 'fragment';
+export interface PageUrl {
+    url: string;
+    path: string;
+    queryString: string;
+}
 interface Content {
     _id: string;
     _name: string;
@@ -105,6 +110,7 @@ interface Content {
     x?: ExtraData;
     xAsJson?: JSON;
     pageAsJson?: JSON;
+    pageUrl?: PageUrl;
     pageTemplate?: Content;
     components?: Component[];
     attachments?: Attachment[];
@@ -225,9 +231,29 @@ interface Media {
     intent: MediaIntentType;
 }
 type MediaIntentType = 'download' | 'inline';
+export interface AttachmentUrl {
+    url: string;
+    path: string;
+    queryString: string;
+    context: string;
+    id: string;
+    fingerprint: string;
+    name: string;
+    intent: MediaIntentType;
+}
+export interface ImageUrl {
+    url: string;
+    path: string;
+    queryString: string;
+    context: string;
+    id: string;
+    fingerprint: string;
+    scale: string;
+    name: string;
+}
 interface media_Image extends Content {
-    mediaUrl: string;
-    imageUrl: string;
+    mediaUrl: AttachmentUrl;
+    imageUrl: ImageUrl;
     data: media_Image_Data;
 }
 interface media_Image_Data {

package/dist/types/index.d.ts

@@ -3,6 +3,7 @@ export type * from './componentProps';
 export type * from './guillotine';
 export type * from './i18n';
 export type * from './next';
+export type * from './urls';
 export type * from './util';
 export interface ContentApiBaseBody {
     query?: string;
@@ -45,3 +46,8 @@ export interface StaticContentProps extends Record<string, any> {
     element?: string;
     condition: boolean;
 }
+export interface DraftModeButtonProps {
+    action: () => Promise<void>;
+    label: string;
+}
+export type DraftModeIndicatorProps = Partial<Omit<DraftModeButtonProps, 'action'>>;

package/dist/types/urls.d.ts

@@ -0,0 +1,34 @@
+import type { MetaData } from './componentProps';
+import type { AttachmentUrl, ImageUrl, PageUrl } from './guillotine';
+export type GraphqlJson = Record<string, unknown>;
+export interface ImageUrlArgs {
+    scale: string;
+    quality?: number;
+    background?: string;
+    format?: string;
+    filter?: string;
+    params?: GraphqlJson;
+}
+export interface MediaUrlArgs {
+    download?: boolean;
+    params?: GraphqlJson;
+}
+export interface PageUrlArgs {
+    params?: GraphqlJson;
+}
+/** Object returned by imageUrlQuery(), mediaUrlQuery() and attachmentUrlQuery(): every field of the Guillotine URL type */
+export type MediaUrlResult = ImageUrl | AttachmentUrl;
+/** Object returned by pageUrlQuery() */
+export type PageUrlResult = PageUrl;
+/** Meta for pageUrl(): the locale prefix is omitted when `locale` equals `defaultLocale`; without `defaultLocale` it is always added */
+export type PageUrlMeta = Pick<MetaData, 'locale'> & Partial<Pick<MetaData, 'defaultLocale'>>;
+/** Minimal input for the *Url() functions: `path` is required, `queryString` optional */
+export type UrlParts<T extends {
+    path: string;
+    queryString: string;
+}> = Pick<T, 'path'> & Partial<Pick<T, 'queryString'>>;
+export interface UrlMappingRule {
+    sources: string[];
+    target: string;
+    matchAny?: boolean;
+}

package/dist/types/urls.js

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

package/dist/types/urls.js.map

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

package/dist/utils/getMediaUrl.d.ts

@@ -0,0 +1,3 @@
+/** Absolute media URL from a Guillotine `path` or any XP media `url` (server-side only, passthrough on the client) */
+export declare function getMediaUrl(urlOrPath: string): string;
+export declare function getMediaSrcSet(srcSet: string): string;

package/dist/utils/getMediaUrl.js

@@ -0,0 +1,17 @@
+import { MEDIA_URL } from '../common/env';
+const MEDIA_MARKER = '/media:';
+/** Absolute media URL from a Guillotine `path` or any XP media `url` (server-side only, passthrough on the client) */
+export function getMediaUrl(urlOrPath) {
+    const index = urlOrPath.indexOf(MEDIA_MARKER);
+    if (!MEDIA_URL || index < 0) {
+        return urlOrPath;
+    }
+    return MEDIA_URL + urlOrPath.slice(index);
+}
+export function getMediaSrcSet(srcSet) {
+    return srcSet.split(',').map((candidate) => {
+        const [url, ...descriptors] = candidate.trim().split(/\s+/);
+        return [getMediaUrl(url), ...descriptors].join(' ');
+    }).join(', ');
+}
+//# sourceMappingURL=getMediaUrl.js.map

package/dist/utils/getMediaUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMediaUrl.js","sourceRoot":"","sources":["../../src/utils/getMediaUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;AAExC,MAAM,YAAY,GAAG,SAAS,CAAC;AAE/B,sHAAsH;AACtH,MAAM,UAAU,WAAW,CAAC,SAAiB;IACzC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,CAAC,SAAS,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAc;IACzC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QACvC,MAAM,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5D,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC"}

package/dist/utils/getPageUrl.d.ts

@@ -0,0 +1,3 @@
+import type { PageUrlMeta } from '../types';
+/** Relative URL for a site-relative content path, prefixed with the locale unless it is the default locale */
+export declare function getPageUrl(path: string | null | undefined, meta: PageUrlMeta): string;

package/dist/utils/getPageUrl.js

@@ -0,0 +1,8 @@
+import { stripOutsideSlashes } from './fixDoubleSlashes';
+/** Relative URL for a site-relative content path, prefixed with the locale unless it is the default locale */
+export function getPageUrl(path, meta) {
+    const relative = stripOutsideSlashes(path || '');
+    const prefix = meta.locale === meta.defaultLocale ? '' : `/${meta.locale}`;
+    return relative ? `${prefix}/${relative}` : prefix || '/';
+}
+//# sourceMappingURL=getPageUrl.js.map

package/dist/utils/getPageUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPageUrl.js","sourceRoot":"","sources":["../../src/utils/getPageUrl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEvD,8GAA8G;AAC9G,MAAM,UAAU,UAAU,CAAC,IAA+B,EAAE,IAAiB;IACzE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;IAC3E,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC;AAC9D,CAAC"}

package/dist/utils/localizeMappings.d.ts

@@ -0,0 +1,3 @@
+import type { LocaleMapping, UrlMappingRule } from '../types';
+/** Prefixes mapping targets with the locale, except for the default locale whose URLs carry no prefix; sources stay site-relative */
+export declare function localizeMappings(mappings: UrlMappingRule[], mapping: Pick<LocaleMapping, 'locale' | 'default'>): UrlMappingRule[];

package/dist/utils/localizeMappings.js

@@ -0,0 +1,6 @@
+import { stripLeadingSlashes } from './fixDoubleSlashes';
+/** Prefixes mapping targets with the locale, except for the default locale whose URLs carry no prefix; sources stay site-relative */
+export function localizeMappings(mappings, mapping) {
+    return mappings.map((rule) => (Object.assign(Object.assign({}, rule), { target: mapping.default ? rule.target : `/${mapping.locale}/${stripLeadingSlashes(rule.target)}` })));
+}
+//# sourceMappingURL=localizeMappings.js.map

package/dist/utils/localizeMappings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"localizeMappings.js","sourceRoot":"","sources":["../../src/utils/localizeMappings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEvD,qIAAqI;AACrI,MAAM,UAAU,gBAAgB,CAAC,QAA0B,EAAE,OAAkD;IAC3G,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iCACvB,IAAI,KACP,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAClG,CAAC,CAAC;AACR,CAAC"}

package/dist/views/DraftModeIndicator.d.ts

@@ -0,0 +1,2 @@
+import type { DraftModeIndicatorProps } from '../types';
+export default function DraftModeIndicator({ label }: DraftModeIndicatorProps): Promise<import("react").JSX.Element>;

package/dist/views/DraftModeIndicator.jsx

@@ -0,0 +1,12 @@
+import { draftMode } from 'next/headers';
+import DraftModeButton from '../client/DraftModeButton';
+import { disableDraftMode } from '../server/disableDraftMode';
+const DEFAULT_LABEL = 'Draft Mode';
+export default async function DraftModeIndicator({ label }) {
+    const { isEnabled } = await draftMode();
+    if (!isEnabled) {
+        return null;
+    }
+    return <DraftModeButton action={disableDraftMode} label={label || DEFAULT_LABEL}/>;
+}
+//# sourceMappingURL=DraftModeIndicator.jsx.map

package/dist/views/DraftModeIndicator.jsx.map

@@ -0,0 +1 @@
+{"version":3,"file":"DraftModeIndicator.jsx","sourceRoot":"","sources":["../../src/views/DraftModeIndicator.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,eAAe,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AAE5D,MAAM,aAAa,GAAG,YAAY,CAAC;AAEnC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAC,KAAK,EAA0B;IAC7E,MAAM,EAAC,SAAS,EAAC,GAAG,MAAM,SAAS,EAAE,CAAC;IACtC,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,aAAa,CAAC,EAAE,CAAC;AACvF,CAAC"}

package/dist/views/RichTextView.jsx

@@ -1,6 +1,7 @@
-import { getUrl, UrlProcessor } from '../common/UrlProcessor';
 import BaseMacro from './BaseMacro';
 import Link from 'next/link';
+import { pageUrl } from '../guillotine/urls';
+import { getMediaSrcSet, getMediaUrl } from '../utils/getMediaUrl';
 import { useMemo } from 'react';
 import { RichText } from '@enonic/react-components';
 const RichTextView = (props) => {
@@ -45,13 +46,17 @@ function MacroAdapter(props) {
     return <BaseMacro data={data} meta={nextMeta}>{children}</BaseMacro>;
 }
 function LinkAdapter(props) {
-    var _a;
-    return <Link href={getUrl(((_a = props.content) === null || _a === void 0 ? void 0 : _a._path) || props.href, props.nextMeta)}>{props.children}</Link>;
+    var _a, _b;
+    const contentUrl = pageUrl((_a = props.content) === null || _a === void 0 ? void 0 : _a.pageUrl, props.nextMeta);
+    if (contentUrl) {
+        return <Link href={contentUrl} data-content-path={(_b = props.content) === null || _b === void 0 ? void 0 : _b._path}>{props.children}</Link>;
+    }
+    // media and external links keep the href from processedHtml, media ones get the media base URL
+    return <a href={getMediaUrl(props.href)} target={props.target} title={props.title}>{props.children}</a>;
 }
 function ImageAdapter(props) {
-    var _a;
-    const srcSet = ((_a = props.srcSet) === null || _a === void 0 ? void 0 : _a.length) ? UrlProcessor.processSrcSet(props.srcSet, props.nextMeta) : undefined;
-    return <img src={getUrl(props.src, props.nextMeta)} style={props.style} alt={props.alt} sizes={props.sizes} srcSet={srcSet}/>;
+    const srcSet = props.srcSet && getMediaSrcSet(props.srcSet);
+    return <img src={getMediaUrl(props.src)} style={props.style} alt={props.alt} sizes={props.sizes} srcSet={srcSet}/>;
 }
 function toRichTextMetaData(meta) {
     return {

package/dist/views/RichTextView.jsx.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.0-beta.4",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "author": "Pavel Milkevich <pmi@enonic.com>",
@@ -41,7 +41,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && cpy '**/*.module.css' ../dist --cwd=src",
     "clean": "del-cli dist/ enonic-nextjs-adapter-*.tgz",
     "check:types": "tsc --noEmit",
     "madge": "madge -i docs/madge.png -x '(constants|env)\\.ts' src/index.ts",
@@ -55,40 +55,40 @@
     "test": "jest --no-cache --coverage"
   },
   "dependencies": {
-    "@enonic/react-components": "^7.0.0-B1",
-    "@formatjs/intl-localematcher": "^0.8.5",
+    "@enonic/react-components": "^7.0.0",
+    "@formatjs/intl-localematcher": "^0.8.13",
     "gqlmin": "^0.3.2",
-    "negotiator": "^1.0.0",
+    "negotiator": "^1.1.0",
     "unescape": "^1.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.0",
-    "@babel/preset-env": "^7.29.3",
+    "@babel/core": "^7.29.7",
+    "@babel/preset-env": "^7.29.7",
     "@edge-runtime/jest-environment": "^4.0.0",
-    "@enonic-types/core": "^8.0.0-B4",
+    "@enonic-types/core": "^8.0.4",
     "@enonic/eslint-config": "^2.3.0",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.2",
-    "@types/negotiator": "^0.6.4",
-    "@types/node": "^25.6.2",
+    "@testing-library/jest-dom": "^7.0.1",
+    "@testing-library/react": "^16.3.3",
+    "@types/negotiator": "^0.6.5",
+    "@types/node": "^26.5.1",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "babel-jest": "^30.4.1",
-    "concurrently": "^9.2.1",
+    "babel-jest": "^30.5.1",
+    "concurrently": "^10.0.5",
     "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.3.0",
-    "jest-environment-jsdom": "^30.4.1",
+    "jest": "^30.5.1",
+    "jest-environment-jsdom": "^30.5.1",
     "madge": "^8.0.0",
     "mkdirp": "^3.0.1",
-    "ts-jest": "^29.4.9",
+    "ts-jest": "^29.4.12",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.58.2"
+    "typescript-eslint": "^8.70.0"
   },
   "types": "index.d.ts",
   "peerDependencies": {

package/dist/common/UrlProcessor.d.ts

@@ -1,19 +0,0 @@
-import type { ImageData, LinkData, MetaData } from '../types';
-export declare class UrlProcessor {
-    static IMG_TAG: string;
-    static LINK_TAG: string;
-    static MACRO_TAG: string;
-    static IMG_ATTR: string;
-    static LINK_ATTR: string;
-    static MACRO_ATTR: string;
-    private static IMG_ATMT_REGEXP;
-    static process(url: string, meta: MetaData, serverSide?: boolean, isResource?: boolean): string;
-    private static normalizeBaseUrl;
-    static isMediaLink(ref: string, linkData: LinkData[]): boolean;
-    static isContentImage(ref: string, imageData: ImageData[]): boolean;
-    static processSrcSet(srcset: string, meta: MetaData): string;
-    private static isAttachmentUrl;
-    private static startsWithHash;
-    private static isAbsolute;
-}
-export declare function getUrl(url: string, meta: MetaData): string;

package/dist/common/UrlProcessor.js

@@ -1,97 +0,0 @@
-import { RENDER_MODE } from './constants';
-import { fixDoubleSlashes } from '../utils/fixDoubleSlashes';
-import { addBasePath } from 'next/dist/client/add-base-path';
-import { API_URL } from './env';
-export class UrlProcessor {
-    static process(url, meta, serverSide = false, isResource = false) {
-        if (this.startsWithHash(url) || this.isAbsolute(url) || !meta) {
-            // do not process if:
-            // - url starts with #
-            // - url is absolute
-            // - meta is absent
-            return url;
-        }
-        if (this.isAttachmentUrl(url)) {
-            // XP resource, add api url host and base url
-            const apiUrl = new URL(API_URL);
-            return `${apiUrl.origin}${url}`;
-        }
-        let result = this.normalizeBaseUrl(url, meta, isResource);
-        if (!isResource && meta.locale !== meta.defaultLocale) {
-            // append locale if it's not the default one
-            // to avoid additional middleware redirection
-            // NB: don't add locale to resource urls
-            result = `/${meta.locale}${result}`;
-        }
-        // only add basePath and locale in next mode
-        if (meta.renderMode === RENDER_MODE.NEXT) {
-            if (!serverSide) {
-                // no need for baseurl and basepath on server
-                result = addBasePath(result);
-            }
-        }
-        return fixDoubleSlashes(result);
-    }
-    static normalizeBaseUrl(url, meta, isResource) {
-        if (isResource) {
-            return url;
-        }
-        let result = url;
-        if (result.charAt(0) !== '/') {
-            result = '/' + result;
-        }
-        // Drop the site-name prefix so urls are site-relative
-        // (e.g. /sitename/content/path -> /content/path)
-        if (meta.site && meta.site !== '/'
-            && (result === meta.site || result.startsWith(`${meta.site}/`))) {
-            result = result.substring(meta.site.length) || '/';
-        }
-        return result;
-    }
-    static isMediaLink(ref, linkData) {
-        var _a;
-        // Assuming linkData can't contain more than one entry with the same ref
-        return Array.isArray(linkData) && !!((_a = linkData.find(data => (data === null || data === void 0 ? void 0 : data.ref) === ref)) === null || _a === void 0 ? void 0 : _a.media);
-    }
-    static isContentImage(ref, imageData) {
-        var _a;
-        // Assuming imageData can't contain more than one entry with the same ref
-        return Array.isArray(imageData) && !!((_a = imageData.find(data => data.ref === ref)) === null || _a === void 0 ? void 0 : _a.image);
-    }
-    static processSrcSet(srcset, meta) {
-        return srcset.split(/, */g).map(src => {
-            const srcParts = src.trim().split(' ');
-            switch (srcParts.length) {
-                case 1: // src only
-                    return UrlProcessor.process(src, meta, false, true);
-                case 2: // width descriptor
-                    return `${UrlProcessor.process(srcParts[0], meta, false, true)} ${srcParts[1]}`;
-                case 3: // pixel density descriptor
-                    return `${UrlProcessor.process(srcParts[0], meta, false, true)} ${srcParts[1]} ${srcParts[2]}`;
-                default:
-                    console.warn('Can not process image srcset: ' + src);
-                    return src;
-            }
-        }).join(', ');
-    }
-    static isAttachmentUrl(url) {
-        return this.IMG_ATMT_REGEXP.test(url);
-    }
-    static startsWithHash(url) {
-        return (url === null || url === void 0 ? void 0 : url.charAt(0)) == '#';
-    }
-    static isAbsolute(url) {
-        return /^(?:ht|f)tps?:\/\/[^ :\r\n\t]+/.test(url);
-    }
-}
-UrlProcessor.IMG_TAG = 'img';
-UrlProcessor.LINK_TAG = 'a';
-UrlProcessor.MACRO_TAG = 'editor-macro';
-UrlProcessor.IMG_ATTR = 'data-image-ref';
-UrlProcessor.LINK_ATTR = 'data-link-ref';
-UrlProcessor.MACRO_ATTR = 'data-macro-ref';
-UrlProcessor.IMG_ATMT_REGEXP = /\/_\/media:(image|attachment)\//;
-export function getUrl(url, meta) {
-    return UrlProcessor.process(url, meta, false, false);
-}
-//# sourceMappingURL=UrlProcessor.js.map

package/dist/common/UrlProcessor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"UrlProcessor.js","sourceRoot":"","sources":["../../src/common/UrlProcessor.ts"],"names":[],"mappings":"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"}