@enonic/nextjs-adapter 3.1.0-B1 → 3.1.0-B3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
+
import gqlmin from 'gqlmin';
|
|
10
11
|
import { fetchFromApi } from './fetchFromApi';
|
|
11
12
|
/** Guillotine-specialized fetch, using the generic fetch above */
|
|
12
13
|
export function fetchGuillotine(contentApiUrl, mapping, options) {
|
|
@@ -21,6 +22,10 @@ export function fetchGuillotine(contentApiUrl, mapping, options) {
|
|
|
21
22
|
},
|
|
22
23
|
};
|
|
23
24
|
}
|
|
25
|
+
else {
|
|
26
|
+
// Minify the query to avoid hitting 200k space limit
|
|
27
|
+
body.query = gqlmin(body.query);
|
|
28
|
+
}
|
|
24
29
|
const path = (_a = body === null || body === void 0 ? void 0 : body.variables) === null || _a === void 0 ? void 0 : _a.path;
|
|
25
30
|
const pathMessage = path ? JSON.stringify(path) : '';
|
|
26
31
|
return yield fetchFromApi(contentApiUrl, mapping, options)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchGuillotine.js","sourceRoot":"","sources":["../src/guillotine/fetchGuillotine.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"fetchGuillotine.js","sourceRoot":"","sources":["../src/guillotine/fetchGuillotine.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAG5C,kEAAkE;AAClE,MAAM,UAAgB,eAAe,CACjC,aAAqB,EACrB,OAAsB,EACtB,OAAsB;;;QAEtB,MAAM,IAAI,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC;QAC3B,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACvD,OAAO;gBACH,KAAK,EAAE;oBACH,IAAI,EAAE,KAAK;oBACX,OAAO,EAAE,qDAAqD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;iBAC7F;aACJ,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,qDAAqD;YACrD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,IAAI,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,0CAAE,IAAI,CAAC;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,MAAM,YAAY,CACrB,aAAa,EACb,OAAO,EACP,OAAO,CACV;aACI,IAAI,CAAC,IAAI,CAAC,EAAE;YACT,IAAI,MAAM,GAAU,IAAI,CAAC,MAAM,CAAC,CAAC,yCAAyC;YAE1E,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBACzB,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;gBACtB,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,sCAAsC,aAAa,EAAE,CAAC,CAAC;gBACrF,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACnB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;gBAEH,OAAO;oBACH,KAAK,EAAE;wBACH,IAAI,EAAE,KAAK;wBACX,OAAO,EAAE,yBAAyB,MAAM,CAAC,MAAM,gDAAgD;qBAClG;iBACJ,CAAC;YACN,CAAC;YAED,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,+CAA+C,WAAW,EAAE,EAAE,GAAG,CAAC,CAAC;YAChF,IAAI,CAAC;gBACD,OAAO,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACV,OAAO,EAAC,KAAK,EAAE,EAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAC,EAAC,CAAC;YACtE,CAAC;QACL,CAAC,CAAC,CAAC;IACX,CAAC;CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@enonic/nextjs-adapter",
|
|
3
|
-
"version": "3.1.0-
|
|
3
|
+
"version": "3.1.0-B3",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"author": "Pavel Milkevich <pmi@enonic.com>",
|
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@enonic/react-components": "^5.0.0-RC5",
|
|
54
54
|
"@formatjs/intl-localematcher": "^0.5.4",
|
|
55
|
+
"gqlmin": "^0.2.2",
|
|
55
56
|
"html-react-parser": "^5.1.16",
|
|
56
57
|
"negotiator": "^0.6.3",
|
|
57
58
|
"next": "^14.2.13",
|
|
@@ -60,6 +61,8 @@
|
|
|
60
61
|
"unescape": "^1.0.1"
|
|
61
62
|
},
|
|
62
63
|
"devDependencies": {
|
|
64
|
+
"@babel/core": "^7.25.7",
|
|
65
|
+
"@babel/preset-env": "^7.25.7",
|
|
63
66
|
"@edge-runtime/jest-environment": "^3.0.3",
|
|
64
67
|
"@enonic-types/core": "^7.14.4",
|
|
65
68
|
"@enonic/eslint-config": "^1.2.1",
|
|
@@ -71,6 +74,7 @@
|
|
|
71
74
|
"@types/react-dom": "^18.3.0",
|
|
72
75
|
"@typescript-eslint/eslint-plugin": "^7.17.0",
|
|
73
76
|
"@typescript-eslint/parser": "^7.18.0",
|
|
77
|
+
"babel-jest": "^29.7.0",
|
|
74
78
|
"concurrently": "^9.0.1",
|
|
75
79
|
"cpy-cli": "^5.0.0",
|
|
76
80
|
"del-cli": "^5.1.0",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type {FetchOptions, GuillotineResult, LocaleMapping} from '../types';
|
|
2
|
-
|
|
2
|
+
import gqlmin from 'gqlmin';
|
|
3
3
|
|
|
4
4
|
import {fetchFromApi} from './fetchFromApi';
|
|
5
5
|
|
|
@@ -18,6 +18,9 @@ export async function fetchGuillotine<Data = Record<string, unknown>>(
|
|
|
18
18
|
message: `Invalid or missing query. JSON.stringify(query) = ${JSON.stringify(body.query)}`,
|
|
19
19
|
},
|
|
20
20
|
};
|
|
21
|
+
} else {
|
|
22
|
+
// Minify the query to avoid hitting 200k space limit
|
|
23
|
+
body.query = gqlmin(body.query);
|
|
21
24
|
}
|
|
22
25
|
|
|
23
26
|
const path = body?.variables?.path;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import type {MetaData, RichTextViewProps, Replacer as OldReplacer, MacroConfig, RichTextData} from '../types';
|
|
3
3
|
|
|
4
|
-
import {getUrl} from '../common/UrlProcessor';
|
|
4
|
+
import {getUrl, UrlProcessor} from '../common/UrlProcessor';
|
|
5
5
|
import BaseMacro from './BaseMacro';
|
|
6
6
|
import Link from 'next/link';
|
|
7
7
|
import type {MacroComponentParams, LinkComponentParams, ImageComponentParams, Replacer as NewReplacer} from '@enonic/react-components';
|
|
@@ -20,7 +20,7 @@ const RichTextView = (props: RichTextViewProps) => {
|
|
|
20
20
|
className={props.className}
|
|
21
21
|
tag={props.tag}
|
|
22
22
|
replacer={wrapReplacer(props.customReplacer, props.meta, props.renderMacroInEditMode)}
|
|
23
|
-
renderInEditMode={props.renderMacroInEditMode}
|
|
23
|
+
renderInEditMode={props.renderMacroInEditMode ?? true}
|
|
24
24
|
Macro={MacroAdapter}
|
|
25
25
|
Link={LinkAdapter}
|
|
26
26
|
Image={ImageAdapter}
|
|
@@ -54,7 +54,8 @@ function LinkAdapter(props: LinkComponentParams<ExtraRichTextProps>) {
|
|
|
54
54
|
}
|
|
55
55
|
|
|
56
56
|
function ImageAdapter(props: ImageComponentParams<ExtraRichTextProps>) {
|
|
57
|
-
|
|
57
|
+
const srcSet = props.srcSet?.length ? UrlProcessor.processSrcSet(props.srcSet, props.meta) : undefined;
|
|
58
|
+
return <img src={getUrl(props.src, props.meta)} alt={props.alt} sizes={props.sizes} srcSet={srcSet}/>;
|
|
58
59
|
}
|
|
59
60
|
|
|
60
61
|
export default RichTextView;
|
package/views/RichTextView.jsx
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { getUrl } from '../common/UrlProcessor';
|
|
1
|
+
import { getUrl, UrlProcessor } from '../common/UrlProcessor';
|
|
2
2
|
import BaseMacro from './BaseMacro';
|
|
3
3
|
import Link from 'next/link';
|
|
4
4
|
import { RichText } from '@enonic/react-components';
|
|
5
5
|
const RichTextView = (props) => {
|
|
6
|
-
|
|
6
|
+
var _a;
|
|
7
|
+
return <RichText data={props.data} meta={props.meta} 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}/>;
|
|
7
8
|
};
|
|
8
9
|
function wrapReplacer(oldReplacer, meta, renderMacroInEditMode) {
|
|
9
10
|
if (!oldReplacer) {
|
|
@@ -28,7 +29,9 @@ function LinkAdapter(props) {
|
|
|
28
29
|
return <Link href={getUrl(props.href, props.meta)}>{props.children}</Link>;
|
|
29
30
|
}
|
|
30
31
|
function ImageAdapter(props) {
|
|
31
|
-
|
|
32
|
+
var _a;
|
|
33
|
+
const srcSet = ((_a = props.srcSet) === null || _a === void 0 ? void 0 : _a.length) ? UrlProcessor.processSrcSet(props.srcSet, props.meta) : undefined;
|
|
34
|
+
return <img src={getUrl(props.src, props.meta)} alt={props.alt} sizes={props.sizes} srcSet={srcSet}/>;
|
|
32
35
|
}
|
|
33
36
|
export default RichTextView;
|
|
34
37
|
//# sourceMappingURL=RichTextView.jsx.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RichTextView.jsx","sourceRoot":"","sources":["../src/views/RichTextView.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"RichTextView.jsx","sourceRoot":"","sources":["../src/views/RichTextView.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAC5D,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAQlD,MAAM,YAAY,GAAG,CAAC,KAAwB,EAAE,EAAE;;IAC9C,OAAO,CAAC,QAAQ,CACZ,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CACjB,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CACjB,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,WAAoC,EAAE,IAAc,EAAE,qBAA8B;IACtG,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,CAAC,OAAgB,EAAE,IAAkB,EAAE,EAAE;QAC5C,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,qBAAqB,CAAC,CAAC;IACnE,CAAC,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,KAA+C;IACjE,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG;QACT,IAAI,EAAE,IAAI;QACV,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,MAAM,EAAE;YACJ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,MAAqC;SACtD;KACJ,CAAC;IAEF,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;AAChG,CAAC;AAED,SAAS,WAAW,CAAC,KAA8C;IAC/D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/E,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,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,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;AAC1G,CAAC;AAED,eAAe,YAAY,CAAC"}
|