@enonic/nextjs-adapter 6.0.0-beta.5 → 6.0.0-beta.7

package/README.md

@@ -2,6 +2,8 @@
 
 > NextJS adapter with Guillotine support and basic views
 
+Requires Enonic XP 8.1+ with Guillotine 9.
+
 ## Installation
 
 ```bash
@@ -99,7 +101,7 @@ Usage:
 ```tsx
 import {fetchGuillotine} from '@enonic/nextjs-adapter/server';
 
-const apiUrl = 'http://domain:8000/graphql/api';
+const apiUrl = 'http://domain:8080/api/com.enonic.app.guillotine:graphql';
 
 const body = {
     query: 'qraphql query as string',
@@ -115,7 +117,7 @@ const headers = {
 const opts = {
     body,
     headers,
-    method: 'GET',
+    method: 'POST',
     next: {
         revalidate: 60,
         tags: ['tag1', 'tag2'],
@@ -315,10 +317,10 @@ turns the returned object into the final URL string.
 | `attachmentUrl` | `attachmentUrlQuery(args?: MediaUrlArgs)` | `attachmentUrl(data)` |
 | `pageUrl`       | `pageUrlQuery(args?: PageUrlArgs)`        | `pageUrl(data, meta)` |
 
-The query builders accept the same arguments as the Guillotine field (`scale`, `quality`, `background`, `format`, `filter`, `params` for
-`imageUrl`; `download`, `params` for `mediaUrl`/`attachmentUrl`; `params` for `pageUrl`) and select every field of the returned object:
-`url`, `path`, `queryString`, `context`, `id`, `fingerprint`, `name`, plus `scale` for images and `intent` for media and attachments
-(`pageUrl` has `url`, `path` and `queryString`).
+The query builders accept the same arguments as the Guillotine field (`scale`, `quality`, `background`, `format`, `filter` for
+`imageUrl`; `download` for `mediaUrl`/`attachmentUrl`; `params` for `pageUrl`) and select every field of the returned object:
+`path`, `queryString`, `context`, `id`, `fingerprint`, `name`, plus `scale` for images and `intent` for media and attachments
+(`pageUrl` has `baseUrl`, `path` and `queryString`).
 Media functions return absolute URLs pointing at the XP media API (`ENONIC_MEDIA_CDN`, defaulting to `ENONIC_API`). `pageUrl` returns a
 relative path for the Next.js router, prefixed with the locale unless it is the default locale (`meta.locale` vs `meta.defaultLocale`);
 `meta` is the runtime data returned by [fetchContent](#fetch-content). Pass `{locale}` alone to always prefix, e.g. for `revalidatePath`.
@@ -350,7 +352,7 @@ mapping's locale unless it is the default one, leaving sources untouched.
 
 <br/>
 
-#### <a id="rich-text-query"></a>`richTextQuery(fieldName: string) => string`
+#### <a id="rich-text-query"></a>`richTextQuery(fieldName: string, options?: RichTextQueryOptions) => string`
 
 This is a utility function for querying for `RichTextData` needed for [RichTextView](#rich-text-view). It creates a graphql query string for
 HTML area input type with given field name.
@@ -369,14 +371,41 @@ through `withRichTextFragments(query)`.
 | Argument    | Description          |
 |-------------|----------------------|
 | `fieldName` | HTML area field name |
+| `options`   | Optional per-field image settings passed to Guillotine's `processHtml` input. Each omitted setting independently retains its current behavior. |
+
+`RichTextQueryOptions` is exported by the adapter:
+
+| Option | Type | Default when omitted |
+|--------|------|----------------------|
+| `imageWidths` | `number[]` | `[400, 800, 1200]` for responsive `srcset` candidates. |
+| `imageSizes` | `string` | `"(max-width: 400px) 400px, (max-width: 800px) 800px, 1200px"` for the HTML `sizes` attribute. |
+| `imageSrcWidth` | `number` | Not sent; Guillotine retains its default primary image width of 768px. |
+
+Passing an empty array or string is an explicit override, not an omitted option.
+These settings apply at query time, not as rendering props. Different fields in the same document can use different settings
+while sharing the same fragment definitions.
+
+```ts
+import {richTextQuery, type RichTextQueryOptions} from '@enonic/nextjs-adapter';
+
+// Only the primary source width changes; responsive widths and sizes keep their defaults.
+const bioQuery = richTextQuery('bio', {imageSrcWidth: 640});
+
+const imageOptions: RichTextQueryOptions = {
+    imageWidths: [320, 640, 960],
+    imageSizes: '(max-width: 640px) 100vw, 640px',
+    imageSrcWidth: 640
+};
+const textQuery = richTextQuery('text', imageOptions);
+```
 
 Usage:
 
 ```tsx
 import {richTextQuery} from '@enonic/nextjs-adapter';
 
-const query = `query($path:ID!){
-    guillotine {
+const query = `query($path:ID!, $scopeKey:String, $project:String, $branch:String){
+    guillotine(scopeKey: $scopeKey, project: $project, branch: $branch) {
         get(key:$path) {
             _path
             type
@@ -500,10 +529,10 @@ import {ComponentRegistry} from '@enonic/nextjs-adapter';
 
 const query = {
     query: 'graphql query',
-    variables: ({path, siteKey, branch, project}, context, config) => {
+    variables: ({path, scopeKey, branch, project}, context, config) => {
         return {
             path: path + '/some/processing',
-            siteKey,
+            scopeKey,
             branch,
             project,
         };
@@ -524,7 +553,7 @@ Gets the common query definition.
 ```tsx
 interface GlobalVariables {
     path: string;
-    siteKey: string;
+    scopeKey: string;
     branch: string;
     project: string;
 }
@@ -1013,13 +1042,17 @@ Requires `transpilePackages: ['@enonic/nextjs-adapter']` in `next.config.js` so
 
 Tag for displaying contents of html area input types. Takes care of processing macros, URLs and images inside.
 
+`RichTextData`, `LinkData`, `ImageData`, `MacroData`, and `MacroConfig` are shared with and re-exported from
+`@enonic/react-components`. Rich-text URL values can be strings (used unchanged) or URL parts (resolved by the adapter using its
+locale and media configuration). The adapter renders the original reference entries without rewriting their data.
+
 | Argument         | Type           | Description                                                                                       |
 |------------------|----------------|---------------------------------------------------------------------------------------------------|
 | `data`           | `RichTextData` | Rich text data                                                                                    |
 | `meta`           | `MetaData`     | Runtime data returned by fetchContent method.                                                     |
 | `customReplacer` | `Replacer`     | Function to do custom element processing. Not invoked for image, link and macro nodes. _Optional_ |
 | `className`      | `String`       | Class name to add to the root html element. _Optional_                                            |
-| `tag = 'div'`    | `String`       | Html tag to use as a root                                                                         |
+| `tag = 'section'` | `ElementType` | Element to use as a root. An html tag name, a component, or `Fragment` to render no root element at all. _Optional_ |
 
 > **TIP!** There is a utility function [richTextQuery(fieldName)](#rich-text-query) generating part of the graphql query to
 > obtain `RichTextData` for html area input types.
@@ -1032,6 +1065,16 @@ import RichTextView from '@enonic/nextjs-adapter/views/RichTextView';
 <RichTextView data={richTextData} meta={meta} tag="section" className="rich-text-view"></RichTextView>
 ```
 
+To render the rich text without any wrapping element, pass `Fragment` as the tag. Note that `className` has
+nowhere to go in that case and is ignored, so apply styling to a surrounding element instead.
+
+```tsx
+import {Fragment} from 'react';
+import RichTextView from '@enonic/nextjs-adapter/views/RichTextView';
+
+<RichTextView data={richTextData} meta={meta} tag={Fragment}></RichTextView>
+```
+
 <br/>
 
 #### `<Regions page={page} meta={meta} name="main" common={common}>`

package/dist/guillotine/combineMultipleQueries.js

@@ -1,8 +1,8 @@
 const ALIAS_PREFIX = 'request';
 const GRAPHQL_FRAGMENTS_REGEXP = /fragment\s+.+\s+on\s+.+\s*{[\s\w{}().,:"'`]+}/;
 // const GUILLOTINE_QUERY_REGEXP = /^\s*query\s*(?:\((.*)*\))?\s*{\s*guillotine\s*{((?:.|\s)+)}\s*}\s*$/;
-const GUILLOTINE_QUERY_REGEXP = /^\s*query\s*(?:\(([^)]*)\))?\s*{\s*((?:.|\s)+)\s*}\s*$/;
-const GLOBAL_PARAMS = [{ key: 'path', type: 'ID!' }, { key: 'siteKey', type: 'String' }, { key: 'project', type: 'String' },
+const GUILLOTINE_QUERY_REGEXP = /^\s*query(?:\s+[_A-Za-z]\w*)?\s*(?:\(([^)]*)\))?\s*{\s*((?:.|\s)+)\s*}\s*$/;
+const GLOBAL_PARAMS = [{ key: 'path', type: 'ID!' }, { key: 'scopeKey', type: 'String' }, { key: 'project', type: 'String' },
     { key: 'branch', type: 'String' }];
 export function combineMultipleQueries(queriesWithVars) {
     const queries = [];

package/dist/guillotine/combineMultipleQueries.js.map

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

package/dist/guillotine/fetchContentData.js

@@ -4,7 +4,7 @@ export const fetchContentData = async (contentApiUrl, contentPath, mapping, bran
         query,
         variables: {
             path: contentPath,
-            siteKey: mapping.site,
+            scopeKey: mapping.site,
             project: mapping.project,
             branch
         }

package/dist/guillotine/fetchContentData.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchContentData.js","sourceRoot":"","sources":["../../src/guillotine/fetchContentData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACjC,aAAqB,EACrB,WAAmB,EACnB,OAAsB,EACtB,MAAc,EACd,KAAa,EACb,SAAuC,EACvC,OAAkC,EACZ,EAAE;IACxB,MAAM,IAAI,GAAuB;QAC7B,KAAK;QACL,SAAS,EAAE;YACP,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM;SACT;KACJ,CAAC;IACF,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,cAAc,GAAG,MAAM,eAAe,CAAyB,aAAa,EAAE;QAChF,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,CAAC"}
+{"version":3,"file":"fetchContentData.js","sourceRoot":"","sources":["../../src/guillotine/fetchContentData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACjC,aAAqB,EACrB,WAAmB,EACnB,OAAsB,EACtB,MAAc,EACd,KAAa,EACb,SAAuC,EACvC,OAAkC,EACZ,EAAE;IACxB,MAAM,IAAI,GAAuB;QAC7B,KAAK;QACL,SAAS,EAAE;YACP,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,OAAO,CAAC,IAAI;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM;SACT;KACJ,CAAC;IACF,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,cAAc,GAAG,MAAM,eAAe,CAAyB,aAAa,EAAE;QAChF,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,CAAC"}

package/dist/guillotine/fetchContentPathsForLocale.js

@@ -11,7 +11,7 @@ export async function fetchContentPathsForLocale(mapping, query = GET_STATIC_PAT
             pathRegex: `/content${mapping.site}/*`,
             count,
             project: mapping.project,
-            siteKey: mapping.site,
+            scopeKey: mapping.site,
             branch: getContentBranch()
         }
     };

package/dist/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,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC5C,OAAsB,EACtB,QAAgB,sBAAsB,EACtC,KAAK,GAAG,GAAG;IAEX,MAAM,aAAa,GAAG,cAAc,CAAC;IACrC,MAAM,IAAI,GAAuB;QAC7B,KAAK;QACL,SAAS,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,WAAW,OAAO,CAAC,IAAI,IAAI;YACtC,KAAK;YACL,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,MAAM,EAAE,gBAAgB,EAAE;SAC7B;KACJ,CAAC;IACF,OAAO,eAAe,CAAoB,aAAa,EAAE,EAAC,IAAI,EAAC,CAAC,CAAC,IAAI,CAAC,CAClE,OAAyB,EAC3B,EAAE;QACA,OAAO,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CACtC,IAAuB,EACvB,KAAU,EACZ,EAAE;;YACA,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;YACnF,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI,CAAC,IAAI,CAAC;gBACN,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;gBACnC,MAAM,EAAE,OAAO,CAAC,MAAM;aACzB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"fetchContentPathsForLocale.js","sourceRoot":"","sources":["../../src/guillotine/fetchContentPathsForLocale.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC5C,OAAsB,EACtB,QAAgB,sBAAsB,EACtC,KAAK,GAAG,GAAG;IAEX,MAAM,aAAa,GAAG,cAAc,CAAC;IACrC,MAAM,IAAI,GAAuB;QAC7B,KAAK;QACL,SAAS,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,WAAW,OAAO,CAAC,IAAI,IAAI;YACtC,KAAK;YACL,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,OAAO,CAAC,IAAI;YACtB,MAAM,EAAE,gBAAgB,EAAE;SAC7B;KACJ,CAAC;IACF,OAAO,eAAe,CAAoB,aAAa,EAAE,EAAC,IAAI,EAAC,CAAC,CAAC,IAAI,CAAC,CAClE,OAAyB,EAC3B,EAAE;QACA,OAAO,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CACtC,IAAuB,EACvB,KAAU,EACZ,EAAE;;YACA,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;YACnF,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI,CAAC,IAAI,CAAC;gBACN,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;gBACnC,MAAM,EAAE,OAAO,CAAC,MAAM;aACzB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/guillotine/fetchMetaData.js

@@ -6,7 +6,7 @@ export const fetchMetaData = async (contentApiUrl, contentPath, mapping, branch,
         query: getMetaQuery(pageFragmentQuery()),
         variables: {
             path: contentPath,
-            siteKey: mapping.site,
+            scopeKey: mapping.site,
             project: mapping.project,
             branch
         }

package/dist/guillotine/fetchMetaData.js.map

@@ -1 +1 @@
-{"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,KAAK,EAC9B,aAAqB,EACrB,WAAmB,EACnB,OAAsB,EACtB,MAAc,EACd,OAAkC,EACf,EAAE;;IACrB,MAAM,IAAI,GAAuB;QAC7B,KAAK,EAAE,YAAY,CAAC,iBAAiB,EAAE,CAAC;QACxC,SAAS,EAAE;YACP,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM;SACT;KACJ,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAa,aAAa,EAAE;QAChE,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,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,KAAK,EAC9B,aAAqB,EACrB,WAAmB,EACnB,OAAsB,EACtB,MAAc,EACd,OAAkC,EACf,EAAE;;IACrB,MAAM,IAAI,GAAuB;QAC7B,KAAK,EAAE,YAAY,CAAC,iBAAiB,EAAE,CAAC;QACxC,SAAS,EAAE;YACP,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,OAAO,CAAC,IAAI;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM;SACT;KACJ,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAa,aAAa,EAAE;QAChE,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,CAAC"}

package/dist/guillotine/getMetaData.js

@@ -37,8 +37,9 @@ ${indent(partConfigQuery(), 4)}
 image {
     caption
     image {
-      imageUrl(scale: "width-768") {
-        url
+      imageUrl(scale: "width(768)") {
+        path
+        queryString
       }
     }
 }`;
@@ -64,8 +65,8 @@ ${indent(pageFragment || '', 4)}
 }
 export function queryGuillotine(query, args) {
     const argsString = args && Object.entries(args).map(([name, type]) => `${name}: ${type}`);
-    return `query($siteKey: String, $project: String, $branch: String${argsString ? ', ' + argsString.join(', ') : ''}) {
-              guillotine(siteKey: $siteKey, project: $project, branch: $branch) {
+    return `query($scopeKey: String, $project: String, $branch: String${argsString ? ', ' + argsString.join(', ') : ''}) {
+              guillotine(scopeKey: $scopeKey, project: $project, branch: $branch) {
                 ${query}
               }
             }`;

package/dist/guillotine/getMetaData.js.map

@@ -1 +1 @@
-{"version":3,"file":"getMetaData.js","sourceRoot":"","sources":["../../src/guillotine/getMetaData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAGvC,MAAM,eAAe,GAAG,GAAW,EAAE;IACjC,OAAO,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,GAAW,EAAE;IACnC,OAAO,WAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,GAAW,EAAE;IACjC,OAAO,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AAGF;;GAEG;AACH,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC;;;;EAI5B,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;;;;;;;EAO5B,MAAM,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;;;EAG9B,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;;;;EAIjC,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;;;;;;;;;EAS5B,CAAC;AAEH,+CAA+C;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC;;;;;EAKrC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC;;;;EAI7B,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;EAC5B,CAAC;AAEH,MAAM,UAAU,YAAY,CAAC,YAAqB;IAC9C,OAAO,uBAAuB,CAAC;;;;EAIjC,MAAM,CAAC,YAAY,IAAI,EAAE,EAAE,CAAC,CAAC;EAC7B,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAa,EAAE,IAA6B;IACxE,MAAM,UAAU,GAAG,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;IAC1F,OAAO,4DAA4D,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;;kBAEnG,KAAK;;cAET,CAAC;AACf,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAa,EAAE,IAA6B;IAChF,OAAO,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AACzE,CAAC"}
+{"version":3,"file":"getMetaData.js","sourceRoot":"","sources":["../../src/guillotine/getMetaData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAGvC,MAAM,eAAe,GAAG,GAAW,EAAE;IACjC,OAAO,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,GAAW,EAAE;IACnC,OAAO,WAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,GAAW,EAAE;IACjC,OAAO,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AAGF;;GAEG;AACH,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC;;;;EAI5B,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;;;;;;;EAO5B,MAAM,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;;;EAG9B,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;;;;EAIjC,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;;;;;;;;;;EAU5B,CAAC;AAEH,+CAA+C;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC;;;;;EAKrC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC;;;;EAI7B,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;EAC5B,CAAC;AAEH,MAAM,UAAU,YAAY,CAAC,YAAqB;IAC9C,OAAO,uBAAuB,CAAC;;;;EAIjC,MAAM,CAAC,YAAY,IAAI,EAAE,EAAE,CAAC,CAAC;EAC7B,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAa,EAAE,IAA6B;IACxE,MAAM,UAAU,GAAG,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;IAC1F,OAAO,6DAA6D,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;;kBAEpG,KAAK;;cAET,CAAC;AACf,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAa,EAAE,IAA6B;IAChF,OAAO,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AACzE,CAAC"}

package/dist/guillotine/getQueryAndVariables.js

@@ -20,7 +20,7 @@ export function getQueryAndVariables(type, path, branch, mapping, context, selec
     let variables = {
         path,
         project: mapping.project,
-        siteKey: mapping.site,
+        scopeKey: mapping.site,
         branch
     };
     if (getVariables) {

package/dist/guillotine/getQueryAndVariables.js.map

@@ -1 +1 @@
-{"version":3,"file":"getQueryAndVariables.js","sourceRoot":"","sources":["../../src/guillotine/getQueryAndVariables.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,oBAAoB,CAChC,IAAY,EACZ,IAAY,EACZ,MAAc,EACd,OAAsB,EACtB,OAAgB,EAChB,aAA+C,EAC/C,MAAY;IAGZ,IAAI,KAAK,EAAE,YAAY,CAAC;IAExB,IACI,OAAO,aAAa,KAAK,QAAQ,IAAI,OAAO,aAAa,KAAK,UAAU,EAC1E,CAAC;QACC,KAAK,GAAG,aAAa,CAAC;IAE1B,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACtC,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACzB,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;IAEpC,CAAC;SAAM,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;QAC3C,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;QAC5B,YAAY,GAAG,aAAa,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED,IAAI,YAAY,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;QACrD,MAAM,KAAK,CAAC,iCAAiC,IAAI,+BAA+B,OAAO,YAAY,EAAE,CAAC,CAAC;IAC3G,CAAC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QACpE,MAAM,KAAK,CAAC,0BAA0B,IAAI,yCAAyC,OAAO,KAAK,EAAE,CAAC,CAAC;IACvG,CAAC;IAED,IAAI,SAAS,GAAoB;QAC7B,IAAI;QACJ,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,IAAI;QACrB,MAAM;KACT,CAAC;IAEF,IAAI,YAAY,EAAE,CAAC;QACf,SAAS,GAAG,YAAY,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QAC9B,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACR,OAAO;YACH,KAAK;YACL,SAAS;SACZ,CAAC;IACN,CAAC;AACL,CAAC"}
+{"version":3,"file":"getQueryAndVariables.js","sourceRoot":"","sources":["../../src/guillotine/getQueryAndVariables.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,oBAAoB,CAChC,IAAY,EACZ,IAAY,EACZ,MAAc,EACd,OAAsB,EACtB,OAAgB,EAChB,aAA+C,EAC/C,MAAY;IAGZ,IAAI,KAAK,EAAE,YAAY,CAAC;IAExB,IACI,OAAO,aAAa,KAAK,QAAQ,IAAI,OAAO,aAAa,KAAK,UAAU,EAC1E,CAAC;QACC,KAAK,GAAG,aAAa,CAAC;IAE1B,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACtC,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACzB,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;IAEpC,CAAC;SAAM,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;QAC3C,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;QAC5B,YAAY,GAAG,aAAa,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED,IAAI,YAAY,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;QACrD,MAAM,KAAK,CAAC,iCAAiC,IAAI,+BAA+B,OAAO,YAAY,EAAE,CAAC,CAAC;IAC3G,CAAC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QACpE,MAAM,KAAK,CAAC,0BAA0B,IAAI,yCAAyC,OAAO,KAAK,EAAE,CAAC,CAAC;IACvG,CAAC;IAED,IAAI,SAAS,GAAoB;QAC7B,IAAI;QACJ,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,IAAI;QACtB,MAAM;KACT,CAAC;IAEF,IAAI,YAAY,EAAE,CAAC;QACf,SAAS,GAAG,YAAY,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QAC9B,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACR,OAAO;YACH,KAAK;YACL,SAAS;SACZ,CAAC;IACN,CAAC;AACL,CAAC"}

package/dist/guillotine/metadata/richTextQuery.d.ts

@@ -1,7 +1,8 @@
+import type { RichTextQueryOptions } from '../../types';
 export declare const RICH_TEXT_MACROS_FRAGMENT = "RichTextMacros";
 export declare const RICH_TEXT_LINKS_FRAGMENT = "RichTextLinks";
 export declare const RICH_TEXT_IMAGES_FRAGMENT = "RichTextImages";
-export declare const richTextQuery: (fieldName: string) => string;
+export declare const richTextQuery: (fieldName: string, options?: RichTextQueryOptions) => string;
 /** The fragment definitions behind richTextQuery(); evaluated when called, so the registered macros are included */
 export declare const richTextFragments: () => string;
 /** Appends the definitions of the rich text fragments a document spreads but does not define (fetchGuillotine does this) */

package/dist/guillotine/metadata/richTextQuery.js

@@ -1,7 +1,7 @@
 import { ComponentRegistry } from '../../common/ComponentRegistry';
 import { configQuery } from './configQuery';
 import { indent } from '../../utils/indent';
-import { imageUrlQuery, mediaUrlQuery, pageUrlQuery } from '../urlQueries';
+import { IMAGE_URL_FIELDS, imageUrlQuery, mediaUrlQuery, pageUrlQuery, toGraphqlLiteral } from '../urlQueries';
 // Fragments on Guillotine's rich text member types: spread by every rich text field, defined once per document
 export const RICH_TEXT_MACROS_FRAGMENT = 'RichTextMacros';
 export const RICH_TEXT_LINKS_FRAGMENT = 'RichTextLinks';
@@ -9,8 +9,10 @@ export const RICH_TEXT_IMAGES_FRAGMENT = 'RichTextImages';
 const macroConfigQuery = () => {
     return configQuery(ComponentRegistry.getMacros(), false, false);
 };
-export const richTextQuery = (fieldName) => {
-    return `${fieldName}(processHtml:{imageWidths:[400, 800, 1200], imageSizes:"(max-width: 400px) 400px, (max-width: 800px) 800px, 1200px"}) {
+export const richTextQuery = (fieldName, options = {}) => {
+    var _a, _b;
+    const processHtml = Object.assign({ imageWidths: (_a = options.imageWidths) !== null && _a !== void 0 ? _a : [400, 800, 1200], imageSizes: (_b = options.imageSizes) !== null && _b !== void 0 ? _b : '(max-width: 400px) 400px, (max-width: 800px) 800px, 1200px' }, (options.imageSrcWidth !== undefined ? { imageSrcWidth: options.imageSrcWidth } : {}));
+    return `${fieldName}(processHtml:${toGraphqlLiteral(processHtml)}) {
     processedHtml
     macros {
         ...${RICH_TEXT_MACROS_FRAGMENT}
@@ -32,30 +34,32 @@ const fragmentDefinitions = () => [
     [RICH_TEXT_LINKS_FRAGMENT, `fragment ${RICH_TEXT_LINKS_FRAGMENT} on Link {
     ref
     uri
+    fragment
+    ${pageUrlQuery()}
     content {
         _path
         _id
-        ${pageUrlQuery()}
     }
     media {
+        ${mediaUrlQuery()}
         content {
             _id
-            ... on media_Image {
-                ${mediaUrlQuery()}
-            }
         }
         intent
     }
 }`],
     [RICH_TEXT_IMAGES_FRAGMENT, `fragment ${RICH_TEXT_IMAGES_FRAGMENT} on Image {
     ref
+    src ${IMAGE_URL_FIELDS}
+    srcset {
+        width
+        ${imageUrlQuery()}
+    }
     image {
         _id
-        ... on media_Image {
-            ${imageUrlQuery({ scale: 'width(768)' })}
-        }
     }
     style {
+        application
         name
         aspectRatio
         filter

package/dist/guillotine/metadata/richTextQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"richTextQuery.js","sourceRoot":"","sources":["../../../src/guillotine/metadata/richTextQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAGzE,+GAA+G;AAC/G,MAAM,CAAC,MAAM,yBAAyB,GAAG,gBAAgB,CAAC;AAC1D,MAAM,CAAC,MAAM,wBAAwB,GAAG,eAAe,CAAC;AACxD,MAAM,CAAC,MAAM,yBAAyB,GAAG,gBAAgB,CAAC;AAE1D,MAAM,gBAAgB,GAAG,GAAW,EAAE;IAClC,OAAO,WAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAE,EAAE;IAC/C,OAAO,GAAG,SAAS;;;aAGV,yBAAyB;;;aAGzB,wBAAwB;;;aAGxB,yBAAyB;OAC/B,CAAC;AACR,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,GAAuB,EAAE,CAAC;IAClD,CAAC,yBAAyB,EAAE,YAAY,yBAAyB;;;;MAI/D,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;EACjC,CAAC;IACC,CAAC,wBAAwB,EAAE,YAAY,wBAAwB;;;;;;UAMzD,YAAY,EAAE;;;;;;kBAMN,aAAa,EAAE;;;;;EAK/B,CAAC;IACC,CAAC,yBAAyB,EAAE,YAAY,yBAAyB;;;;;cAKvD,aAAa,CAAC,EAAC,KAAK,EAAE,YAAY,EAAC,CAAC;;;;;;;;EAQhD,CAAC;CACF,CAAC;AAEF,oHAAoH;AACpH,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAW,EAAE;IAC1C,OAAO,mBAAmB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChF,CAAC,CAAC;AAEF,4HAA4H;AAC5H,MAAM,UAAU,qBAAqB,CAAC,KAAa;IAC/C,MAAM,OAAO,GAAG,mBAAmB,EAAE;SAChC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,IAAI,GAAG,CAAC,CAAC;SACxF,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;IAEzC,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AACtE,CAAC"}
+{"version":3,"file":"richTextQuery.js","sourceRoot":"","sources":["../../../src/guillotine/metadata/richTextQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAC,gBAAgB,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAI7G,+GAA+G;AAC/G,MAAM,CAAC,MAAM,yBAAyB,GAAG,gBAAgB,CAAC;AAC1D,MAAM,CAAC,MAAM,wBAAwB,GAAG,eAAe,CAAC;AACxD,MAAM,CAAC,MAAM,yBAAyB,GAAG,gBAAgB,CAAC;AAE1D,MAAM,gBAAgB,GAAG,GAAW,EAAE;IAClC,OAAO,WAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAE,UAAgC,EAAE,EAAE,EAAE;;IACnF,MAAM,WAAW,mBACb,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EACpD,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,4DAA4D,IAC3F,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAC,aAAa,EAAE,OAAO,CAAC,aAAa,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACzF,CAAC;IACF,OAAO,GAAG,SAAS,gBAAgB,gBAAgB,CAAC,WAAW,CAAC;;;aAGvD,yBAAyB;;;aAGzB,wBAAwB;;;aAGxB,yBAAyB;OAC/B,CAAC;AACR,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,GAAuB,EAAE,CAAC;IAClD,CAAC,yBAAyB,EAAE,YAAY,yBAAyB;;;;MAI/D,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;EACjC,CAAC;IACC,CAAC,wBAAwB,EAAE,YAAY,wBAAwB;;;;MAI7D,YAAY,EAAE;;;;;;UAMV,aAAa,EAAE;;;;;;EAMvB,CAAC;IACC,CAAC,yBAAyB,EAAE,YAAY,yBAAyB;;UAE3D,gBAAgB;;;UAGhB,aAAa,EAAE;;;;;;;;;;;EAWvB,CAAC;CACF,CAAC;AAEF,oHAAoH;AACpH,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAW,EAAE;IAC1C,OAAO,mBAAmB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChF,CAAC,CAAC;AAEF,4HAA4H;AAC5H,MAAM,UAAU,qBAAqB,CAAC,KAAa;IAC/C,MAAM,OAAO,GAAG,mBAAmB,EAAE;SAChC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,IAAI,GAAG,CAAC,CAAC;SACxF,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;IAEzC,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AACtE,CAAC"}

package/dist/guillotine/urlQueries.d.ts

@@ -1,5 +1,9 @@
 import type { ImageUrlArgs, MediaUrlArgs, PageUrlArgs } from '../types';
-export declare const imageUrlQuery: (args: ImageUrlArgs) => string;
+export declare const IMAGE_URL_FIELDS = "{ path queryString context id fingerprint scale name }";
+export declare const ATTACHMENT_URL_FIELDS = "{ path queryString context id fingerprint name intent }";
+export declare const PAGE_URL_FIELDS = "{ baseUrl path queryString }";
+export declare const imageUrlQuery: (args?: ImageUrlArgs) => string;
 export declare const mediaUrlQuery: (args?: MediaUrlArgs) => string;
 export declare const attachmentUrlQuery: (args?: MediaUrlArgs) => string;
 export declare const pageUrlQuery: (args?: PageUrlArgs) => string;
+export declare function toGraphqlLiteral(value: unknown): string;

package/dist/guillotine/urlQueries.js

@@ -1,7 +1,7 @@
 // Every field of the Guillotine 9 result types, so callers can build their own URLs from the parts
-const IMAGE_URL_FIELDS = '{ url path queryString context id fingerprint scale name }';
-const ATTACHMENT_URL_FIELDS = '{ url path queryString context id fingerprint name intent }';
-const PAGE_URL_FIELDS = '{ url path queryString }';
+export const IMAGE_URL_FIELDS = '{ path queryString context id fingerprint scale name }';
+export const ATTACHMENT_URL_FIELDS = '{ path queryString context id fingerprint name intent }';
+export const PAGE_URL_FIELDS = '{ baseUrl path queryString }';
 export const imageUrlQuery = (args) => `imageUrl${toGraphqlArgs(args)} ${IMAGE_URL_FIELDS}`;
 export const mediaUrlQuery = (args) => `mediaUrl${toGraphqlArgs(args)} ${ATTACHMENT_URL_FIELDS}`;
 export const attachmentUrlQuery = (args) => `attachmentUrl${toGraphqlArgs(args)} ${ATTACHMENT_URL_FIELDS}`;
@@ -10,7 +10,7 @@ function toGraphqlArgs(args = {}) {
     const entries = Object.entries(args).filter(([, value]) => value !== undefined && value !== null);
     return entries.length ? `(${entries.map(([key, value]) => `${key}: ${toGraphqlLiteral(value)}`).join(', ')})` : '';
 }
-function toGraphqlLiteral(value) {
+export function toGraphqlLiteral(value) {
     if (Array.isArray(value)) {
         return `[${value.map(toGraphqlLiteral).join(', ')}]`;
     }

package/dist/guillotine/urlQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"urlQueries.js","sourceRoot":"","sources":["../../src/guillotine/urlQueries.ts"],"names":[],"mappings":"AAEA,mGAAmG;AACnG,MAAM,gBAAgB,GAAG,4DAA4D,CAAC;AACtF,MAAM,qBAAqB,GAAG,6DAA6D,CAAC;AAC5F,MAAM,eAAe,GAAG,0BAA0B,CAAC;AAEnD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAkB,EAAU,EAAE,CAAC,WAAW,aAAa,CAAC,IAAI,CAAC,IAAI,gBAAgB,EAAE,CAAC;AAElH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAmB,EAAU,EAAE,CAAC,WAAW,aAAa,CAAC,IAAI,CAAC,IAAI,qBAAqB,EAAE,CAAC;AAExH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAmB,EAAU,EAAE,CAAC,gBAAgB,aAAa,CAAC,IAAI,CAAC,IAAI,qBAAqB,EAAE,CAAC;AAElI,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAkB,EAAU,EAAE,CAAC,UAAU,aAAa,CAAC,IAAI,CAAC,IAAI,eAAe,EAAE,CAAC;AAE/G,SAAS,aAAa,CAAC,OAAe,EAAE;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC;IAClG,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AACvH,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACpC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACzD,CAAC;IACD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9C,0DAA0D;QAC1D,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC3G,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"urlQueries.js","sourceRoot":"","sources":["../../src/guillotine/urlQueries.ts"],"names":[],"mappings":"AAEA,mGAAmG;AACnG,MAAM,CAAC,MAAM,gBAAgB,GAAG,wDAAwD,CAAC;AACzF,MAAM,CAAC,MAAM,qBAAqB,GAAG,yDAAyD,CAAC;AAC/F,MAAM,CAAC,MAAM,eAAe,GAAG,8BAA8B,CAAC;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAmB,EAAU,EAAE,CAAC,WAAW,aAAa,CAAC,IAAI,CAAC,IAAI,gBAAgB,EAAE,CAAC;AAEnH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAmB,EAAU,EAAE,CAAC,WAAW,aAAa,CAAC,IAAI,CAAC,IAAI,qBAAqB,EAAE,CAAC;AAExH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAmB,EAAU,EAAE,CAAC,gBAAgB,aAAa,CAAC,IAAI,CAAC,IAAI,qBAAqB,EAAE,CAAC;AAElI,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAkB,EAAU,EAAE,CAAC,UAAU,aAAa,CAAC,IAAI,CAAC,IAAI,eAAe,EAAE,CAAC;AAE/G,SAAS,aAAa,CAAC,OAAe,EAAE;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC;IAClG,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AACvH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACzD,CAAC;IACD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9C,0DAA0D;QAC1D,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC3G,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}

package/dist/guillotine/urls.js

@@ -10,7 +10,7 @@ export function attachmentUrl(data) {
     return toMediaUrl(data);
 }
 export function pageUrl(data, meta) {
-    return data ? getPageUrl(data.path + (data.queryString || ''), meta) : undefined;
+    return data ? getPageUrl(data.path, meta) + (data.queryString || '') : undefined;
 }
 function toMediaUrl(data) {
     return data ? getMediaUrl(data.path + (data.queryString || '')) : undefined;

package/dist/guillotine/urls.js.map

@@ -1 +1 @@
-{"version":3,"file":"urls.js","sourceRoot":"","sources":["../../src/guillotine/urls.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAI/C,MAAM,UAAU,QAAQ,CAAC,IAAgC;IACrD,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAID,MAAM,UAAU,QAAQ,CAAC,IAAqC;IAC1D,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAID,MAAM,UAAU,aAAa,CAAC,IAAqC;IAC/D,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAMD,MAAM,UAAU,OAAO,CAAC,IAA0C,EAAE,IAAiB;IACjF,OAAO,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACrF,CAAC;AAED,SAAS,UAAU,CAAC,IAAsC;IACtD,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAChF,CAAC"}
+{"version":3,"file":"urls.js","sourceRoot":"","sources":["../../src/guillotine/urls.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAI/C,MAAM,UAAU,QAAQ,CAAC,IAAgC;IACrD,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAID,MAAM,UAAU,QAAQ,CAAC,IAAqC;IAC1D,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAID,MAAM,UAAU,aAAa,CAAC,IAAqC;IAC/D,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAMD,MAAM,UAAU,OAAO,CAAC,IAA0C,EAAE,IAAiB;IACjF,OAAO,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACrF,CAAC;AAED,SAAS,UAAU,CAAC,IAAsC;IACtD,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAChF,CAAC"}

package/dist/types/component.d.ts

@@ -1,6 +1,7 @@
 import type { XP_COMPONENT_TYPE } from '../common/constants';
 import type { Context } from './next';
-import type { RichTextData as CompsRichTextData, LinkData as CompsLinkData, ImageData as CompsImageData, MacroData as CompsMacroData } from '@enonic/react-components';
+import type { RichTextData } from '@enonic/react-components';
+export type { RichTextData, LinkData, ImageData, MacroData, MacroConfig } from '@enonic/react-components';
 export interface ComponentDefinitionParams {
     query?: SelectedQueryMaybeVariablesFunc;
     configQuery?: string;
@@ -33,15 +34,11 @@ export interface FragmentData {
         components: PageComponent[];
     };
 }
-export type ImageData = CompsImageData;
 export interface LayoutData {
     descriptor: string;
     config?: any;
     [customKeysFromQuery: string]: any;
 }
-export type LinkData = CompsLinkData;
-export type MacroConfig = Record<string, any>;
-export type MacroData = CompsMacroData;
 export interface PageComponent {
     [key: string]: any;
     type: XP_COMPONENT_TYPE;
@@ -75,9 +72,17 @@ export interface QueryAndVariables {
     query: string;
     variables?: Record<string, any>;
 }
+export interface RichTextQueryOptions {
+    /** Responsive image widths. Defaults to [400, 800, 1200]. */
+    imageWidths?: number[];
+    /** HTML sizes expression. Defaults to the adapter's 400/800/1200px breakpoints. */
+    imageSizes?: string;
+    /** Primary image width. Omitted by default, preserving Guillotine's default of 768px. */
+    imageSrcWidth?: number;
+}
 export interface GlobalVariables {
     path: string;
-    siteKey: string;
+    scopeKey: string;
     branch: string;
     project: string;
 }
@@ -87,7 +92,6 @@ export type SelectedQueryMaybeVariablesFunc = string | QueryGetter | {
     variables: VariablesGetter;
 } | [string | QueryGetter, VariablesGetter];
 export type RegionTree = Record<string, PageRegion>;
-export type RichTextData = CompsRichTextData;
 export interface TextData {
     value: RichTextData;
 }

package/dist/types/componentProps.d.ts

@@ -1,7 +1,7 @@
 import { DOMNode } from 'html-react-parser';
 import type { RENDER_MODE, XP_REQUEST_TYPE } from '../common/constants';
 import type { FragmentData, LayoutData, MacroConfig, MacroData, PageComponent, PageData, PartData, RichTextData, RegionTree } from './component';
-import type { ReactNode, ReactElement } from 'react';
+import type { ReactNode, ReactElement, ElementType } from 'react';
 export interface BaseComponentProps {
     component: PageComponent;
     meta: MetaData;
@@ -102,6 +102,6 @@ export interface RichTextViewProps {
     data: RichTextData;
     meta: MetaData;
     className?: string;
-    tag?: string;
+    tag?: ElementType;
     customReplacer?: Replacer;
 }

package/dist/types/guillotine.d.ts

@@ -70,7 +70,7 @@ interface Attachment {
     label: string;
     size: number;
     mimeType: string;
-    attachmentUrl: string;
+    attachmentUrl: AttachmentUrl;
 }
 type DateTime = string;
 export interface Component {
@@ -85,7 +85,7 @@ export interface Component {
 }
 type ComponentType = 'page' | 'layout' | 'image' | 'part' | 'text' | 'fragment';
 export interface PageUrl {
-    url: string;
+    baseUrl: string;
     path: string;
     queryString: string;
 }
@@ -132,7 +132,7 @@ interface ContentEdge {
 }
 interface ContentType {
     name: string;
-    displayName: string;
+    title: string;
     description: string;
     superType: string;
     abstract: boolean;
@@ -173,8 +173,6 @@ export interface HeadlessCms {
     getSite?: portal_Site;
     getType?: ContentType;
     getTypes?: ContentType[];
-    query?: Content[];
-    queryConnection?: QueryContentConnection;
     queryDsl?: Content[];
     queryDslConnection?: QueryDSLContentConnection;
 }
@@ -186,6 +184,12 @@ interface Image {
     image: Content;
     ref: string;
     style: ImageStyle;
+    src: ImageUrl | null;
+    srcset: ImageSource[];
+}
+interface ImageSource {
+    width: number;
+    imageUrl: ImageUrl;
 }
 interface ImageComponentData {
     id: string;
@@ -193,6 +197,7 @@ interface ImageComponentData {
     image: media_Image;
 }
 interface ImageStyle {
+    application: string;
     name: string;
     aspectRatio: string;
     filter: string;
@@ -206,6 +211,8 @@ interface LayoutComponentData {
 interface Link {
     ref: string;
     uri: string;
+    pageUrl: PageUrl | null;
+    fragment: string;
     media: Media;
     content: Content;
 }
@@ -229,10 +236,10 @@ interface MacroConfig {
 interface Media {
     content: Content;
     intent: MediaIntentType;
+    mediaUrl: AttachmentUrl | null;
 }
 type MediaIntentType = 'download' | 'inline';
 export interface AttachmentUrl {
-    url: string;
     path: string;
     queryString: string;
     context: string;
@@ -242,7 +249,6 @@ export interface AttachmentUrl {
     intent: MediaIntentType;
 }
 export interface ImageUrl {
-    url: string;
     path: string;
     queryString: string;
     context: string;
@@ -306,10 +312,8 @@ interface PrincipalKey {
     idProvider: string;
     principalId: string;
 }
-interface QueryContentConnection extends ContentConnection {
+interface QueryDSLContentConnection extends ContentConnection {
     aggregationsAsJson: JSON;
-}
-interface QueryDSLContentConnection extends QueryContentConnection {
     highlightAsJson: JSON;
 }
 interface RichText {

package/dist/types/urls.d.ts

@@ -2,16 +2,14 @@ import type { MetaData } from './componentProps';
 import type { AttachmentUrl, ImageUrl, PageUrl } from './guillotine';
 export type GraphqlJson = Record<string, unknown>;
 export interface ImageUrlArgs {
-    scale: string;
+    scale?: string;
     quality?: number;
     background?: string;
     format?: string;
     filter?: string;
-    params?: GraphqlJson;
 }
 export interface MediaUrlArgs {
     download?: boolean;
-    params?: GraphqlJson;
 }
 export interface PageUrlArgs {
     params?: GraphqlJson;

package/dist/views/RichTextView.jsx

@@ -1,7 +1,6 @@
 import BaseMacro from './BaseMacro';
 import Link from 'next/link';
-import { pageUrl } from '../guillotine/urls';
-import { getMediaSrcSet, getMediaUrl } from '../utils/getMediaUrl';
+import { mediaUrl, pageUrl } from '../guillotine/urls';
 import { useMemo } from 'react';
 import { RichText } from '@enonic/react-components';
 const RichTextView = (props) => {
@@ -10,21 +9,17 @@ const RichTextView = (props) => {
         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)} 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, props.data)} Macro={MacroAdapter} Link={LinkAdapter} Image={ImageAdapter}/>;
 };
-function wrapReplacer(nextReplacer, meta) {
+function wrapReplacer(nextReplacer, meta, data) {
     if (!nextReplacer) {
         return null;
     }
-    return ({ el, data }) => {
-        return nextReplacer(el, data, meta);
-    };
+    return ({ el }) => nextReplacer(el, data, meta);
 }
 function wrapData(data) {
-    if (!data.macros || !data.macros.length) {
-        return data;
-    }
-    const macroComponents = data.macros.map((macroData) => {
+    var _a;
+    const macroComponents = (_a = data.macros) === null || _a === void 0 ? void 0 : _a.map((macroData) => {
         return {
             component: {
                 type: 'macro',
@@ -47,16 +42,29 @@ function MacroAdapter(props) {
 }
 function LinkAdapter(props) {
     var _a, _b;
-    const contentUrl = pageUrl((_a = props.content) === null || _a === void 0 ? void 0 : _a.pageUrl, props.nextMeta);
+    const { data } = props;
+    const contentUrl = typeof (data === null || data === void 0 ? void 0 : data.pageUrl) === 'string' ? data.pageUrl : pageUrl(data === null || data === void 0 ? void 0 : data.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>;
+        return <Link href={contentUrl + (data.fragment || '')} data-content-path={(_a = data.content) === null || _a === void 0 ? void 0 : _a._path} target={props.target} title={props.title}>{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>;
+    // Referenced HTML URLs are placeholders, including when the reference cannot be resolved.
+    const href = data ? resolveMediaUrl((_b = data.media) === null || _b === void 0 ? void 0 : _b.mediaUrl) : props.href;
+    return <a href={href} target={props.target} title={props.title}>{props.children}</a>;
 }
 function ImageAdapter(props) {
-    const srcSet = props.srcSet && getMediaSrcSet(props.srcSet);
-    return <img src={getMediaUrl(props.src)} style={props.style} alt={props.alt} sizes={props.sizes} srcSet={srcSet}/>;
+    var _a, _b;
+    const src = resolveMediaUrl((_a = props.data) === null || _a === void 0 ? void 0 : _a.src);
+    if (!src) {
+        return null;
+    }
+    const srcSet = (_b = props.data.srcset) === null || _b === void 0 ? void 0 : _b.map((source) => {
+        const url = resolveMediaUrl(source.imageUrl);
+        return url ? `${url} ${source.width}w` : undefined;
+    }).filter(Boolean).join(', ');
+    return <img src={src} style={props.style} alt={props.alt} sizes={props.sizes} srcSet={srcSet}/>;
+}
+function resolveMediaUrl(value) {
+    return typeof value === 'string' ? value : mediaUrl(value);
 }
 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/dist/views/macros/DefaultMacro.d.ts

@@ -1,4 +1,3 @@
 import type { MacroProps } from '../../types';
-import type { ReactElement } from 'react';
-declare const DefaultMacro: ({ name, config, meta }: MacroProps) => ReactElement;
+declare const DefaultMacro: ({ name, config, meta }: MacroProps) => string | import("react").JSX.Element | import("react").JSX.Element[];
 export default DefaultMacro;

package/dist/views/macros/DefaultMacro.jsx

@@ -1,4 +1,4 @@
 import HTMLReactParser from 'html-react-parser';
-const DefaultMacro = ({ name, config, meta }) => HTMLReactParser(config.body);
+const DefaultMacro = ({ name, config, meta }) => (HTMLReactParser(typeof config.body === 'string' ? config.body : ''));
 export default DefaultMacro;
 //# sourceMappingURL=DefaultMacro.jsx.map

package/dist/views/macros/DefaultMacro.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultMacro.jsx","sourceRoot":"","sources":["../../../src/views/macros/DefaultMacro.tsx"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAIhD,MAAM,YAAY,GAAG,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAa,EAAE,EAAE,CACtD,eAAe,CAAC,MAAM,CAAC,IAAI,CAC9B,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"DefaultMacro.jsx","sourceRoot":"","sources":["../../../src/views/macros/DefaultMacro.tsx"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAGhD,MAAM,YAAY,GAAG,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAa,EAAE,EAAE,CAAC,CACvD,eAAe,CAAC,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CACtE,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/views/macros/DisableMacro.d.ts

@@ -1,3 +1,3 @@
 import type { MacroProps } from '../../types';
-declare const DisableMacro: ({ name, config, meta }: MacroProps) => any;
+declare const DisableMacro: ({ name, config, meta }: MacroProps) => string;
 export default DisableMacro;

package/dist/views/macros/DisableMacro.jsx

@@ -1,3 +1,3 @@
-const DisableMacro = ({ name, config, meta }) => (config.body);
+const DisableMacro = ({ name, config, meta }) => (typeof config.body === 'string' ? config.body : null);
 export default DisableMacro;
 //# sourceMappingURL=DisableMacro.jsx.map

package/dist/views/macros/DisableMacro.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"DisableMacro.jsx","sourceRoot":"","sources":["../../../src/views/macros/DisableMacro.tsx"],"names":[],"mappings":"AAGA,MAAM,YAAY,GAAG,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAa,EAAE,EAAE,CAAC,CACvD,MAAM,CAAC,IAAI,CACd,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"DisableMacro.jsx","sourceRoot":"","sources":["../../../src/views/macros/DisableMacro.tsx"],"names":[],"mappings":"AAGA,MAAM,YAAY,GAAG,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAa,EAAE,EAAE,CAAC,CACvD,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CACvD,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "6.0.0-beta.5",
+  "version": "6.0.0-beta.7",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "author": "Pavel Milkevich <pmi@enonic.com>",
@@ -55,8 +55,8 @@
     "test": "jest --no-cache --coverage"
   },
   "dependencies": {
-    "@enonic/react-components": "^7.0.0",
-    "@formatjs/intl-localematcher": "^0.8.13",
+    "@enonic/react-components": "7.1.0-beta.2",
+    "@formatjs/intl-localematcher": "^0.9.0",
     "gqlmin": "^0.3.2",
     "negotiator": "^1.1.0",
     "unescape": "^1.0.1"
@@ -65,30 +65,30 @@
     "@babel/core": "^7.29.7",
     "@babel/preset-env": "^7.29.7",
     "@edge-runtime/jest-environment": "^4.0.0",
-    "@enonic-types/core": "^8.0.4",
+    "@enonic-types/core": "^8.1.1",
     "@enonic/eslint-config": "^2.3.0",
-    "@testing-library/dom": "^10.4.1",
+    "@testing-library/dom": "^10.4.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/node": "^26.6.5",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "babel-jest": "^30.5.1",
-    "concurrently": "^10.0.5",
+    "babel-jest": "^30.5.2",
+    "concurrently": "^10.0.6",
     "cpy-cli": "^7.0.0",
-    "del-cli": "^7.0.0",
+    "del-cli": "^8.0.1",
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
     "html-react-parser": "^5.2.6",
-    "jest": "^30.5.1",
-    "jest-environment-jsdom": "^30.5.1",
+    "jest": "^30.5.2",
+    "jest-environment-jsdom": "^30.5.2",
     "madge": "^8.0.0",
     "mkdirp": "^3.0.1",
-    "ts-jest": "^29.4.12",
+    "ts-jest": "^29.4.15",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.70.0"
+    "typescript-eslint": "^8.72.0"
   },
   "types": "index.d.ts",
   "peerDependencies": {