@enonic/nextjs-adapter 3.0.0-RC3 → 3.0.0-RC4
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.
- package/common/UrlProcessor.js +3 -3
- package/common/UrlProcessor.js.map +1 -1
- package/guillotine/fetchContent.js +5 -5
- package/guillotine/fetchContent.js.map +1 -1
- package/guillotine/fetchContentData.d.ts +2 -2
- package/guillotine/fetchContentData.js +2 -2
- package/guillotine/fetchContentData.js.map +1 -1
- package/guillotine/fetchContentPathsForAllLocales.js +2 -2
- package/guillotine/fetchContentPathsForAllLocales.js.map +1 -1
- package/guillotine/fetchContentPathsForLocale.d.ts +2 -2
- package/guillotine/fetchContentPathsForLocale.js.map +1 -1
- package/guillotine/fetchFromApi.d.ts +2 -2
- package/guillotine/fetchFromApi.js +4 -4
- package/guillotine/fetchFromApi.js.map +1 -1
- package/guillotine/fetchGuillotine.d.ts +2 -2
- package/guillotine/fetchGuillotine.js +2 -2
- package/guillotine/fetchGuillotine.js.map +1 -1
- package/guillotine/fetchMetaData.d.ts +2 -2
- package/guillotine/fetchMetaData.js +2 -2
- package/guillotine/fetchMetaData.js.map +1 -1
- package/index.d.ts +3 -3
- package/index.js +3 -3
- package/index.js.map +1 -1
- package/package.json +12 -11
- package/src/common/UrlProcessor.ts +3 -3
- package/src/guillotine/fetchContent.ts +5 -5
- package/src/guillotine/fetchContentData.ts +3 -3
- package/src/guillotine/fetchContentPathsForAllLocales.ts +3 -3
- package/src/guillotine/fetchContentPathsForLocale.ts +2 -2
- package/src/guillotine/fetchFromApi.ts +5 -5
- package/src/guillotine/fetchGuillotine.ts +3 -3
- package/src/guillotine/fetchMetaData.ts +3 -3
- package/src/index.ts +3 -3
- package/src/types/index.ts +2 -2
- package/src/utils/getAllLocales.ts +6 -0
- package/src/utils/getContentApiUrl.ts +3 -3
- package/src/utils/getLocaleMapping.ts +24 -0
- package/src/utils/getLocaleMappingByLocale.ts +19 -0
- package/src/utils/getLocaleMappingByProjectId.ts +21 -0
- package/src/utils/{getProjectLocaleConfigs.ts → getLocaleMappings.ts} +2 -2
- package/src/utils/getRequestLocaleInfo.ts +5 -5
- package/types/index.d.ts +2 -2
- package/utils/getAllLocales.d.ts +1 -0
- package/utils/getAllLocales.js +5 -0
- package/utils/getAllLocales.js.map +1 -0
- package/utils/getContentApiUrl.js +2 -2
- package/utils/getContentApiUrl.js.map +1 -1
- package/utils/getLocaleMapping.d.ts +2 -0
- package/utils/{getProjectLocaleConfig.js → getLocaleMapping.js} +6 -6
- package/utils/getLocaleMapping.js.map +1 -0
- package/utils/getLocaleMappingByLocale.d.ts +2 -0
- package/utils/getLocaleMappingByLocale.js +13 -0
- package/utils/getLocaleMappingByLocale.js.map +1 -0
- package/utils/getLocaleMappingByProjectId.d.ts +2 -0
- package/utils/getLocaleMappingByProjectId.js +16 -0
- package/utils/getLocaleMappingByProjectId.js.map +1 -0
- package/utils/getLocaleMappings.d.ts +2 -0
- package/utils/{getProjectLocaleConfigs.js → getLocaleMappings.js} +2 -2
- package/utils/getLocaleMappings.js.map +1 -0
- package/utils/getRequestLocaleInfo.js +4 -4
- package/utils/getRequestLocaleInfo.js.map +1 -1
- package/src/utils/getProjectLocaleConfig.ts +0 -24
- package/src/utils/getProjectLocaleConfigById.ts +0 -21
- package/src/utils/getProjectLocaleConfigByLocale.ts +0 -19
- package/src/utils/getProjectLocales.ts +0 -6
- package/utils/getProjectLocaleConfig.d.ts +0 -2
- package/utils/getProjectLocaleConfig.js.map +0 -1
- package/utils/getProjectLocaleConfigById.d.ts +0 -2
- package/utils/getProjectLocaleConfigById.js +0 -16
- package/utils/getProjectLocaleConfigById.js.map +0 -1
- package/utils/getProjectLocaleConfigByLocale.d.ts +0 -2
- package/utils/getProjectLocaleConfigByLocale.js +0 -13
- package/utils/getProjectLocaleConfigByLocale.js.map +0 -1
- package/utils/getProjectLocaleConfigs.d.ts +0 -2
- package/utils/getProjectLocaleConfigs.js.map +0 -1
- package/utils/getProjectLocales.d.ts +0 -1
- package/utils/getProjectLocales.js +0 -5
- package/utils/getProjectLocales.js.map +0 -1
package/common/UrlProcessor.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RENDER_MODE } from './constants';
|
|
2
2
|
import { fixDoubleSlashes } from '../utils/fixDoubleSlashes';
|
|
3
|
-
import {
|
|
3
|
+
import { getLocaleMappingByProjectId } from '../utils/getLocaleMappingByProjectId';
|
|
4
4
|
import { commonChars } from '../utils/commonChars';
|
|
5
5
|
import { addBasePath } from 'next/dist/client/add-base-path';
|
|
6
6
|
export class UrlProcessor {
|
|
@@ -109,8 +109,8 @@ UrlProcessor.endSlashPattern = /\/+$/;
|
|
|
109
109
|
UrlProcessor.startSlashPattern = /^\/+/;
|
|
110
110
|
UrlProcessor.localhostPattern = /localhost/;
|
|
111
111
|
// Actual site is going to be set in fetchContent method, but set a default fallback here too
|
|
112
|
-
const
|
|
113
|
-
UrlProcessor.setSiteKey(
|
|
112
|
+
const defaultMapping = getLocaleMappingByProjectId();
|
|
113
|
+
UrlProcessor.setSiteKey(defaultMapping.site);
|
|
114
114
|
export function getUrl(url, meta) {
|
|
115
115
|
return UrlProcessor.process(url, meta, false, false);
|
|
116
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UrlProcessor.js","sourceRoot":"","sources":["../src/common/UrlProcessor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"UrlProcessor.js","sourceRoot":"","sources":["../src/common/UrlProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ import { UrlProcessor } from '../common/UrlProcessor';
|
|
|
13
13
|
import { FRAGMENT_CONTENTTYPE_NAME, PAGE_TEMPLATE_CONTENTTYPE_NAME, PAGE_TEMPLATE_FOLDER, RENDER_MODE, XP_COMPONENT_TYPE, XP_REQUEST_TYPE, } from '../common/constants';
|
|
14
14
|
import { APP_NAME, APP_NAME_DASHED, IS_DEV_MODE } from '../common/env';
|
|
15
15
|
import { getContentApiUrl } from '../utils/getContentApiUrl';
|
|
16
|
-
import {
|
|
16
|
+
import { getLocaleMapping } from '../utils/getLocaleMapping';
|
|
17
17
|
import { getRenderMode } from '../utils/getRenderMode';
|
|
18
18
|
import { getXpBaseUrl } from '../utils/getXpBaseUrl';
|
|
19
19
|
import { getRequestLocaleInfo } from '../utils/getRequestLocaleInfo';
|
|
@@ -60,12 +60,12 @@ export function fetchContent(context) {
|
|
|
60
60
|
});
|
|
61
61
|
const xpBaseUrl = getXpBaseUrl(context);
|
|
62
62
|
const contentApiUrl = getContentApiUrl(context);
|
|
63
|
-
const
|
|
63
|
+
const mapping = getLocaleMapping(context);
|
|
64
64
|
const renderMode = getRenderMode(context);
|
|
65
65
|
let requestType = XP_REQUEST_TYPE.TYPE;
|
|
66
66
|
const requestContentPath = getCleanContentPathArrayOrThrow400(context.contentPath);
|
|
67
67
|
const errorResponse = buildErrorResponse(requestType, renderMode, contentApiUrl, xpBaseUrl, locale, defaultLocale, requestContentPath);
|
|
68
|
-
UrlProcessor.setSiteKey(
|
|
68
|
+
UrlProcessor.setSiteKey(mapping.site);
|
|
69
69
|
try {
|
|
70
70
|
const [siteRelativeContentPath, componentPath] = getContentAndComponentPaths(requestContentPath);
|
|
71
71
|
if (componentPath) {
|
|
@@ -73,7 +73,7 @@ export function fetchContent(context) {
|
|
|
73
73
|
requestType = XP_REQUEST_TYPE.COMPONENT;
|
|
74
74
|
}
|
|
75
75
|
// ///////////// FIRST GUILLOTINE CALL FOR METADATA /////////////////
|
|
76
|
-
const metaResult = yield fetchMetaData(contentApiUrl, '${site}/' + siteRelativeContentPath,
|
|
76
|
+
const metaResult = yield fetchMetaData(contentApiUrl, '${site}/' + siteRelativeContentPath, mapping, outHeaders);
|
|
77
77
|
// ///////////////////////////////////////////////////////////////////////
|
|
78
78
|
const { _path, type } = metaResult.meta || {};
|
|
79
79
|
const contentPath = _path || siteRelativeContentPath;
|
|
@@ -143,7 +143,7 @@ export function fetchContent(context) {
|
|
|
143
143
|
return errorResponse('400', `Missing or empty query override for content type ${type}`);
|
|
144
144
|
}
|
|
145
145
|
// /////////////// SECOND GUILLOTINE CALL FOR DATA //////////////////////
|
|
146
|
-
const contentResults = yield fetchContentData(contentApiUrl, contentPath,
|
|
146
|
+
const contentResults = yield fetchContentData(contentApiUrl, contentPath, mapping, query, variables, outHeaders);
|
|
147
147
|
// ///////////////////////////////////////////////////////////////////////////
|
|
148
148
|
if (contentResults.error) {
|
|
149
149
|
console.error(contentResults.error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchContent.js","sourceRoot":"","sources":["../src/guillotine/fetchContent.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAC,SAAS,EAAE,OAAO,EAAC,MAAM,cAAc,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AACpD,OAAO,EACH,yBAAyB,EACzB,8BAA8B,EAC9B,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,eAAe,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,QAAQ,EAAE,eAAe,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACrE,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"fetchContent.js","sourceRoot":"","sources":["../src/guillotine/fetchContent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { ContentResult,
|
|
2
|
-
export declare const fetchContentData: <Content = Record<string, unknown>>(contentApiUrl: string, xpContentPath: string,
|
|
1
|
+
import type { ContentResult, LocaleMapping } from '../types';
|
|
2
|
+
export declare const fetchContentData: <Content = Record<string, unknown>>(contentApiUrl: string, xpContentPath: string, mapping: LocaleMapping, query: string, variables?: {}, headers?: {}) => Promise<ContentResult>;
|
|
@@ -8,12 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { fetchGuillotine } from './fetchGuillotine';
|
|
11
|
-
export const fetchContentData = (contentApiUrl, xpContentPath,
|
|
11
|
+
export const fetchContentData = (contentApiUrl, xpContentPath, mapping, query, variables, headers) => __awaiter(void 0, void 0, void 0, function* () {
|
|
12
12
|
const body = { query };
|
|
13
13
|
if (variables && Object.keys(variables).length > 0) {
|
|
14
14
|
body.variables = variables;
|
|
15
15
|
}
|
|
16
|
-
const contentResults = yield fetchGuillotine(contentApiUrl,
|
|
16
|
+
const contentResults = yield fetchGuillotine(contentApiUrl, mapping, {
|
|
17
17
|
body,
|
|
18
18
|
headers,
|
|
19
19
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchContentData.js","sourceRoot":"","sources":["../src/guillotine/fetchContentData.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,aAAqB,EACrB,aAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"fetchContentData.js","sourceRoot":"","sources":["../src/guillotine/fetchContentData.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,aAAqB,EACrB,aAAqB,EACrB,OAAsB,EACtB,KAAa,EACb,SAAc,EACd,OAAY,EACU,EAAE;IACxB,MAAM,IAAI,GAAuB,EAAC,KAAK,EAAC,CAAC;IACzC,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,MAAM,cAAc,GAAG,MAAM,eAAe,CAAyB,aAAa,EAAE,OAAO,EAAE;QACzF,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,CAAA,CAAC"}
|
|
@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { GET_STATIC_PATHS_QUERY } from '../common/constants';
|
|
11
|
-
import {
|
|
11
|
+
import { getLocaleMappings } from '../utils/getLocaleMappings';
|
|
12
12
|
import { fetchContentPathsForLocale } from './fetchContentPathsForLocale';
|
|
13
13
|
export function fetchContentPathsForAllLocales(path_1) {
|
|
14
14
|
return __awaiter(this, arguments, void 0, function* (path, query = GET_STATIC_PATHS_QUERY, countPerLocale = 999) {
|
|
15
|
-
const promises = Object.values(
|
|
15
|
+
const promises = Object.values(getLocaleMappings()).map(config => fetchContentPathsForLocale(path, config, query, countPerLocale));
|
|
16
16
|
return Promise.all(promises).then(results => {
|
|
17
17
|
return results.reduce((all, localePaths) => all.concat(localePaths), []);
|
|
18
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchContentPathsForAllLocales.js","sourceRoot":"","sources":["../src/guillotine/fetchContentPathsForAllLocales.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"fetchContentPathsForAllLocales.js","sourceRoot":"","sources":["../src/guillotine/fetchContentPathsForAllLocales.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AAGxE,MAAM,UAAgB,8BAA8B;yDAChD,IAAY,EACZ,QAAgB,sBAAsB,EACtC,cAAc,GAAG,GAAG;QAEpB,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,GAAG,CACnD,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAChC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,CACtC,CACJ,CAAC;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACxC,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;IACP,CAAC;CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { ContentPathItem,
|
|
2
|
-
export declare function fetchContentPathsForLocale(path: string, config:
|
|
1
|
+
import type { ContentPathItem, LocaleMapping } from '../types';
|
|
2
|
+
export declare function fetchContentPathsForLocale(path: string, config: LocaleMapping, query?: string, count?: number): Promise<ContentPathItem[]>;
|
|
@@ -1 +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,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,UAAgB,0BAA0B;yDAC5C,IAAY,EACZ,
|
|
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,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,UAAgB,0BAA0B;yDAC5C,IAAY,EACZ,MAAqB,EACrB,QAAgB,sBAAsB,EACtC,KAAK,GAAG,GAAG;QAEX,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACnC,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;SACxB,CAAC,CAAC;QACH,MAAM,IAAI,GAAuB;YAC7B,KAAK;YACL,SAAS,EAAE;gBACP,IAAI;gBACJ,KAAK;aACR;SACJ,CAAC;QACF,OAAO,eAAe,CAAoB,aAAa,EAAE,MAAM,EAAE,EAAC,IAAI,EAAC,CAAC,CAAC,IAAI,CAAC,CAC1E,OAAyB,EAC3B,EAAE;YACA,OAAO,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CACtC,IAAuB,EACvB,KAAU,EACZ,EAAE;;gBACA,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;gBACnF,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC;oBACN,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;oBACnC,MAAM,EAAE,MAAM,CAAC,MAAM;iBACxB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YAChB,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC;CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { FetchOptions, GuillotineResponseJson,
|
|
1
|
+
import type { FetchOptions, GuillotineResponseJson, LocaleMapping } from '../types';
|
|
2
2
|
/** Generic fetch */
|
|
3
|
-
export declare function fetchFromApi<Data = Record<string, unknown>>(apiUrl: string,
|
|
3
|
+
export declare function fetchFromApi<Data = Record<string, unknown>>(apiUrl: string, mapping: LocaleMapping, options?: FetchOptions): Promise<GuillotineResponseJson>;
|
|
@@ -8,12 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
/** Generic fetch */
|
|
11
|
-
export function fetchFromApi(apiUrl,
|
|
11
|
+
export function fetchFromApi(apiUrl, mapping, options) {
|
|
12
12
|
return __awaiter(this, void 0, void 0, function* () {
|
|
13
13
|
const opts = {
|
|
14
14
|
method: (options === null || options === void 0 ? void 0 : options.method) || 'POST',
|
|
15
15
|
body: (options === null || options === void 0 ? void 0 : options.body) ? JSON.stringify(options === null || options === void 0 ? void 0 : options.body) : null,
|
|
16
|
-
headers: mergeHeaders(
|
|
16
|
+
headers: mergeHeaders(mapping, options === null || options === void 0 ? void 0 : options.headers),
|
|
17
17
|
next: options === null || options === void 0 ? void 0 : options.next,
|
|
18
18
|
cache: options === null || options === void 0 ? void 0 : options.cache,
|
|
19
19
|
};
|
|
@@ -59,7 +59,7 @@ export function fetchFromApi(apiUrl, projectConfig, options) {
|
|
|
59
59
|
return json;
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
|
-
function mergeHeaders(
|
|
62
|
+
function mergeHeaders(mapping, headers) {
|
|
63
63
|
const newHeaders = new Headers({
|
|
64
64
|
'Accept': 'application/json',
|
|
65
65
|
'Content-Type': 'application/json',
|
|
@@ -70,7 +70,7 @@ function mergeHeaders(projectConfig, headers) {
|
|
|
70
70
|
}
|
|
71
71
|
// append last to make sure it is not overwritten
|
|
72
72
|
}
|
|
73
|
-
newHeaders.set('X-Guillotine-SiteKey',
|
|
73
|
+
newHeaders.set('X-Guillotine-SiteKey', mapping.site);
|
|
74
74
|
return newHeaders;
|
|
75
75
|
}
|
|
76
76
|
//# sourceMappingURL=fetchFromApi.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchFromApi.js","sourceRoot":"","sources":["../src/guillotine/fetchFromApi.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oBAAoB;AACpB,MAAM,UAAgB,YAAY,CAC9B,MAAc,EACd,
|
|
1
|
+
{"version":3,"file":"fetchFromApi.js","sourceRoot":"","sources":["../src/guillotine/fetchFromApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { FetchOptions, GuillotineResult,
|
|
1
|
+
import type { FetchOptions, GuillotineResult, LocaleMapping } from '../types';
|
|
2
2
|
/** Guillotine-specialized fetch, using the generic fetch above */
|
|
3
|
-
export declare function fetchGuillotine<Data = Record<string, unknown>>(contentApiUrl: string,
|
|
3
|
+
export declare function fetchGuillotine<Data = Record<string, unknown>>(contentApiUrl: string, mapping: LocaleMapping, options?: FetchOptions): Promise<GuillotineResult>;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { fetchFromApi } from './fetchFromApi';
|
|
11
11
|
/** Guillotine-specialized fetch, using the generic fetch above */
|
|
12
|
-
export function fetchGuillotine(contentApiUrl,
|
|
12
|
+
export function fetchGuillotine(contentApiUrl, mapping, options) {
|
|
13
13
|
return __awaiter(this, void 0, void 0, function* () {
|
|
14
14
|
var _a;
|
|
15
15
|
const body = options === null || options === void 0 ? void 0 : options.body;
|
|
@@ -23,7 +23,7 @@ export function fetchGuillotine(contentApiUrl, projectConfig, options) {
|
|
|
23
23
|
}
|
|
24
24
|
const path = (_a = body === null || body === void 0 ? void 0 : body.variables) === null || _a === void 0 ? void 0 : _a.path;
|
|
25
25
|
const pathMessage = path ? JSON.stringify(path) : '';
|
|
26
|
-
return yield fetchFromApi(contentApiUrl,
|
|
26
|
+
return yield fetchFromApi(contentApiUrl, mapping, options)
|
|
27
27
|
.then(json => {
|
|
28
28
|
let errors = json.errors; // fetchFromApi ensures json is an object
|
|
29
29
|
if (errors) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchGuillotine.js","sourceRoot":"","sources":["../src/guillotine/fetchGuillotine.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAG5C,kEAAkE;AAClE,MAAM,UAAgB,eAAe,CACjC,aAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"fetchGuillotine.js","sourceRoot":"","sources":["../src/guillotine/fetchGuillotine.ts"],"names":[],"mappings":";;;;;;;;;AAGA,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;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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { MetaResult,
|
|
2
|
-
export declare const fetchMetaData: (contentApiUrl: string, xpContentPath: string,
|
|
1
|
+
import type { MetaResult, LocaleMapping } from '../types';
|
|
2
|
+
export declare const fetchMetaData: (contentApiUrl: string, xpContentPath: string, mapping: LocaleMapping, headers?: {}) => Promise<MetaResult>;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { getMetaQuery, pageFragmentQuery } from './getMetaData';
|
|
11
11
|
import { fetchGuillotine } from './fetchGuillotine';
|
|
12
|
-
export const fetchMetaData = (contentApiUrl, xpContentPath,
|
|
12
|
+
export const fetchMetaData = (contentApiUrl, xpContentPath, mapping, headers) => __awaiter(void 0, void 0, void 0, function* () {
|
|
13
13
|
var _a;
|
|
14
14
|
const body = {
|
|
15
15
|
query: getMetaQuery(pageFragmentQuery()),
|
|
@@ -17,7 +17,7 @@ export const fetchMetaData = (contentApiUrl, xpContentPath, projectConfig, heade
|
|
|
17
17
|
path: xpContentPath,
|
|
18
18
|
},
|
|
19
19
|
};
|
|
20
|
-
const metaResult = yield fetchGuillotine(contentApiUrl,
|
|
20
|
+
const metaResult = yield fetchGuillotine(contentApiUrl, mapping, {
|
|
21
21
|
body,
|
|
22
22
|
headers,
|
|
23
23
|
});
|
|
@@ -1 +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,CACzB,aAAqB,EACrB,aAAqB,EACrB,
|
|
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,CACzB,aAAqB,EACrB,aAAqB,EACrB,OAAsB,EACtB,OAAY,EACO,EAAE;;IACrB,MAAM,IAAI,GAAuB;QAC7B,KAAK,EAAE,YAAY,CAAC,iBAAiB,EAAE,CAAC;QACxC,SAAS,EAAE;YACP,IAAI,EAAE,aAAa;SACtB;KACJ,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAa,aAAa,EAAE,OAAO,EAAE;QACzE,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,CAAA,CAAC"}
|
package/index.d.ts
CHANGED
|
@@ -6,9 +6,9 @@ export { richTextQuery } from './guillotine/metadata/richTextQuery';
|
|
|
6
6
|
export { validateData } from './guillotine/validateData';
|
|
7
7
|
export { I18n } from './i18n/i18n';
|
|
8
8
|
export { getContentApiUrl } from './utils/getContentApiUrl';
|
|
9
|
-
export {
|
|
10
|
-
export {
|
|
11
|
-
export {
|
|
9
|
+
export { getLocaleMapping } from './utils/getLocaleMapping';
|
|
10
|
+
export { getLocaleMappingByProjectId } from './utils/getLocaleMappingByProjectId';
|
|
11
|
+
export { getLocaleMappingByLocale } from './utils/getLocaleMappingByLocale';
|
|
12
12
|
export { getRequestLocaleInfo } from './utils/getRequestLocaleInfo';
|
|
13
13
|
export { sanitizeGraphqlName } from './utils/sanitizeGraphqlName';
|
|
14
14
|
export { UrlProcessor, getAsset, getUrl, } from './common/UrlProcessor';
|
package/index.js
CHANGED
|
@@ -5,9 +5,9 @@ export { richTextQuery } from './guillotine/metadata/richTextQuery';
|
|
|
5
5
|
export { validateData } from './guillotine/validateData';
|
|
6
6
|
export { I18n } from './i18n/i18n';
|
|
7
7
|
export { getContentApiUrl } from './utils/getContentApiUrl';
|
|
8
|
-
export {
|
|
9
|
-
export {
|
|
10
|
-
export {
|
|
8
|
+
export { getLocaleMapping } from './utils/getLocaleMapping';
|
|
9
|
+
export { getLocaleMappingByProjectId } from './utils/getLocaleMappingByProjectId';
|
|
10
|
+
export { getLocaleMappingByLocale } from './utils/getLocaleMappingByLocale';
|
|
11
11
|
export { getRequestLocaleInfo } from './utils/getRequestLocaleInfo';
|
|
12
12
|
export { sanitizeGraphqlName } from './utils/sanitizeGraphqlName';
|
|
13
13
|
export { UrlProcessor, getAsset, getUrl, } from './common/UrlProcessor';
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,EACR,eAAe,EACf,oBAAoB,EACpB,WAAW,GACd,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,GAClB,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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,EACR,eAAe,EACf,oBAAoB,EACpB,WAAW,GACd,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,GAClB,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,GACT,MAAM,uBAAuB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@enonic/nextjs-adapter",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-RC4",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"author": "Pavel Milkevich <pmi@enonic.com>",
|
|
@@ -45,6 +45,7 @@
|
|
|
45
45
|
"prebuild": "npm run clean",
|
|
46
46
|
"prepack": "concurrently -c auto -g --timings npm:test npm:lint npm:build",
|
|
47
47
|
"premadge": "mkdirp docs",
|
|
48
|
+
"prepublishOnly": "node setversion.js",
|
|
48
49
|
"pretest": "del-cli coverage",
|
|
49
50
|
"test": "jest --no-cache --coverage"
|
|
50
51
|
},
|
|
@@ -52,23 +53,23 @@
|
|
|
52
53
|
"@formatjs/intl-localematcher": "^0.5.4",
|
|
53
54
|
"html-react-parser": "^5.1.10",
|
|
54
55
|
"negotiator": "^0.6.3",
|
|
55
|
-
"next": "^14.1
|
|
56
|
+
"next": "^14.2.1",
|
|
56
57
|
"react": "18.2.0",
|
|
57
58
|
"react-dom": "18.2.0",
|
|
58
59
|
"unescape": "^1.0.1"
|
|
59
60
|
},
|
|
60
61
|
"devDependencies": {
|
|
61
62
|
"@edge-runtime/jest-environment": "^2.3.10",
|
|
62
|
-
"@enonic-types/core": "^7.14.
|
|
63
|
+
"@enonic-types/core": "^7.14.1",
|
|
63
64
|
"@enonic/eslint-config": "^1.2.1",
|
|
64
65
|
"@testing-library/jest-dom": "^6.4.2",
|
|
65
|
-
"@testing-library/react": "^
|
|
66
|
+
"@testing-library/react": "^15.0.2",
|
|
66
67
|
"@types/negotiator": "^0.6.3",
|
|
67
|
-
"@types/node": "^20.12.
|
|
68
|
-
"@types/react": "^18.2.
|
|
69
|
-
"@types/react-dom": "^18.2.
|
|
70
|
-
"@typescript-eslint/eslint-plugin": "^7.
|
|
71
|
-
"@typescript-eslint/parser": "^7.
|
|
68
|
+
"@types/node": "^20.12.7",
|
|
69
|
+
"@types/react": "^18.2.78",
|
|
70
|
+
"@types/react-dom": "^18.2.25",
|
|
71
|
+
"@typescript-eslint/eslint-plugin": "^7.6.0",
|
|
72
|
+
"@typescript-eslint/parser": "^7.6.0",
|
|
72
73
|
"concurrently": "^8.2.2",
|
|
73
74
|
"cpy-cli": "^5.0.0",
|
|
74
75
|
"del-cli": "^5.1.0",
|
|
@@ -76,11 +77,11 @@
|
|
|
76
77
|
"eslint-plugin-react": "^7.34.1",
|
|
77
78
|
"jest": "^29.7.0",
|
|
78
79
|
"jest-environment-jsdom": "^29.7.0",
|
|
79
|
-
"madge": "^
|
|
80
|
+
"madge": "^7.0.0",
|
|
80
81
|
"mkdirp": "^3.0.1",
|
|
81
82
|
"ts-jest": "^29.1.2",
|
|
82
83
|
"ts-node": "^10.9.2",
|
|
83
|
-
"typescript": "^5.4.
|
|
84
|
+
"typescript": "^5.4.5"
|
|
84
85
|
},
|
|
85
86
|
"types": "index.d.ts"
|
|
86
87
|
}
|
|
@@ -3,7 +3,7 @@ import type {ImageData, LinkData, MetaData} from '../types';
|
|
|
3
3
|
|
|
4
4
|
import {RENDER_MODE} from './constants';
|
|
5
5
|
import {fixDoubleSlashes} from '../utils/fixDoubleSlashes';
|
|
6
|
-
import {
|
|
6
|
+
import {getLocaleMappingByProjectId} from '../utils/getLocaleMappingByProjectId';
|
|
7
7
|
import {commonChars} from '../utils/commonChars';
|
|
8
8
|
import {addBasePath} from 'next/dist/client/add-base-path';
|
|
9
9
|
|
|
@@ -129,8 +129,8 @@ export class UrlProcessor {
|
|
|
129
129
|
}
|
|
130
130
|
|
|
131
131
|
// Actual site is going to be set in fetchContent method, but set a default fallback here too
|
|
132
|
-
const
|
|
133
|
-
UrlProcessor.setSiteKey(
|
|
132
|
+
const defaultMapping = getLocaleMappingByProjectId();
|
|
133
|
+
UrlProcessor.setSiteKey(defaultMapping.site);
|
|
134
134
|
|
|
135
135
|
export function getUrl(url: string, meta: MetaData): string {
|
|
136
136
|
return UrlProcessor.process(url, meta, false, false);
|
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
} from '../common/constants';
|
|
14
14
|
import {APP_NAME, APP_NAME_DASHED, IS_DEV_MODE} from '../common/env';
|
|
15
15
|
import {getContentApiUrl} from '../utils/getContentApiUrl';
|
|
16
|
-
import {
|
|
16
|
+
import {getLocaleMapping} from '../utils/getLocaleMapping';
|
|
17
17
|
import {getRenderMode} from '../utils/getRenderMode';
|
|
18
18
|
import {getXpBaseUrl} from '../utils/getXpBaseUrl';
|
|
19
19
|
import {getRequestLocaleInfo} from '../utils/getRequestLocaleInfo';
|
|
@@ -64,13 +64,13 @@ export async function fetchContent(context: Context): Promise<FetchContentResult
|
|
|
64
64
|
});
|
|
65
65
|
const xpBaseUrl = getXpBaseUrl(context);
|
|
66
66
|
const contentApiUrl = getContentApiUrl(context);
|
|
67
|
-
const
|
|
67
|
+
const mapping = getLocaleMapping(context);
|
|
68
68
|
const renderMode = getRenderMode(context);
|
|
69
69
|
let requestType = XP_REQUEST_TYPE.TYPE;
|
|
70
70
|
const requestContentPath = getCleanContentPathArrayOrThrow400(context.contentPath);
|
|
71
71
|
const errorResponse = buildErrorResponse(requestType, renderMode, contentApiUrl, xpBaseUrl, locale, defaultLocale, requestContentPath);
|
|
72
72
|
|
|
73
|
-
UrlProcessor.setSiteKey(
|
|
73
|
+
UrlProcessor.setSiteKey(mapping.site);
|
|
74
74
|
|
|
75
75
|
try {
|
|
76
76
|
const [siteRelativeContentPath, componentPath] = getContentAndComponentPaths(requestContentPath);
|
|
@@ -80,7 +80,7 @@ export async function fetchContent(context: Context): Promise<FetchContentResult
|
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
// ///////////// FIRST GUILLOTINE CALL FOR METADATA /////////////////
|
|
83
|
-
const metaResult = await fetchMetaData(contentApiUrl, '${site}/' + siteRelativeContentPath,
|
|
83
|
+
const metaResult = await fetchMetaData(contentApiUrl, '${site}/' + siteRelativeContentPath, mapping, outHeaders);
|
|
84
84
|
// ///////////////////////////////////////////////////////////////////////
|
|
85
85
|
|
|
86
86
|
const {_path, type} = metaResult.meta || {};
|
|
@@ -166,7 +166,7 @@ export async function fetchContent(context: Context): Promise<FetchContentResult
|
|
|
166
166
|
}
|
|
167
167
|
|
|
168
168
|
// /////////////// SECOND GUILLOTINE CALL FOR DATA //////////////////////
|
|
169
|
-
const contentResults = await fetchContentData(contentApiUrl, contentPath,
|
|
169
|
+
const contentResults = await fetchContentData(contentApiUrl, contentPath, mapping, query, variables, outHeaders);
|
|
170
170
|
// ///////////////////////////////////////////////////////////////////////////
|
|
171
171
|
|
|
172
172
|
if (contentResults.error) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {ContentApiBaseBody, ContentResult,
|
|
1
|
+
import type {ContentApiBaseBody, ContentResult, LocaleMapping} from '../types';
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
import {fetchGuillotine} from './fetchGuillotine';
|
|
@@ -7,7 +7,7 @@ import {fetchGuillotine} from './fetchGuillotine';
|
|
|
7
7
|
export const fetchContentData = async <Content = Record<string, unknown>>(
|
|
8
8
|
contentApiUrl: string,
|
|
9
9
|
xpContentPath: string,
|
|
10
|
-
|
|
10
|
+
mapping: LocaleMapping,
|
|
11
11
|
query: string,
|
|
12
12
|
variables?: {},
|
|
13
13
|
headers?: {},
|
|
@@ -16,7 +16,7 @@ export const fetchContentData = async <Content = Record<string, unknown>>(
|
|
|
16
16
|
if (variables && Object.keys(variables).length > 0) {
|
|
17
17
|
body.variables = variables;
|
|
18
18
|
}
|
|
19
|
-
const contentResults = await fetchGuillotine<ContentResult<Content>>(contentApiUrl,
|
|
19
|
+
const contentResults = await fetchGuillotine<ContentResult<Content>>(contentApiUrl, mapping, {
|
|
20
20
|
body,
|
|
21
21
|
headers,
|
|
22
22
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type {ContentPathItem} from '../types';
|
|
2
2
|
|
|
3
3
|
import {GET_STATIC_PATHS_QUERY} from '../common/constants';
|
|
4
|
-
import {
|
|
4
|
+
import {getLocaleMappings} from '../utils/getLocaleMappings';
|
|
5
5
|
import {fetchContentPathsForLocale} from './fetchContentPathsForLocale';
|
|
6
6
|
|
|
7
7
|
|
|
@@ -10,7 +10,7 @@ export async function fetchContentPathsForAllLocales(
|
|
|
10
10
|
query: string = GET_STATIC_PATHS_QUERY,
|
|
11
11
|
countPerLocale = 999,
|
|
12
12
|
): Promise<ContentPathItem[]> {
|
|
13
|
-
const promises = Object.values(
|
|
13
|
+
const promises = Object.values(getLocaleMappings()).map(
|
|
14
14
|
config => fetchContentPathsForLocale(
|
|
15
15
|
path, config, query, countPerLocale,
|
|
16
16
|
),
|
|
@@ -18,4 +18,4 @@ export async function fetchContentPathsForAllLocales(
|
|
|
18
18
|
return Promise.all(promises).then(results => {
|
|
19
19
|
return results.reduce((all, localePaths) => all.concat(localePaths), []);
|
|
20
20
|
});
|
|
21
|
-
}
|
|
21
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {ContentApiBaseBody, ContentPathItem, GuillotineResult,
|
|
1
|
+
import type {ContentApiBaseBody, ContentPathItem, GuillotineResult, LocaleMapping} from '../types';
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
import {GET_STATIC_PATHS_QUERY} from '../common/constants';
|
|
@@ -8,7 +8,7 @@ import {fetchGuillotine} from './fetchGuillotine';
|
|
|
8
8
|
|
|
9
9
|
export async function fetchContentPathsForLocale(
|
|
10
10
|
path: string,
|
|
11
|
-
config:
|
|
11
|
+
config: LocaleMapping,
|
|
12
12
|
query: string = GET_STATIC_PATHS_QUERY,
|
|
13
13
|
count = 999,
|
|
14
14
|
): Promise<ContentPathItem[]> {
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import type {FetchOptions, GuillotineResponse, GuillotineResponseJson,
|
|
1
|
+
import type {FetchOptions, GuillotineResponse, GuillotineResponseJson, LocaleMapping} from '../types';
|
|
2
2
|
|
|
3
3
|
/** Generic fetch */
|
|
4
4
|
export async function fetchFromApi<Data = Record<string, unknown>>(
|
|
5
5
|
apiUrl: string,
|
|
6
|
-
|
|
6
|
+
mapping: LocaleMapping,
|
|
7
7
|
options?: FetchOptions,
|
|
8
8
|
): Promise<GuillotineResponseJson> {
|
|
9
9
|
|
|
10
10
|
const opts = {
|
|
11
11
|
method: options?.method || 'POST',
|
|
12
12
|
body: options?.body ? JSON.stringify(options?.body) : null,
|
|
13
|
-
headers: mergeHeaders(
|
|
13
|
+
headers: mergeHeaders(mapping, options?.headers),
|
|
14
14
|
next: options?.next,
|
|
15
15
|
cache: options?.cache,
|
|
16
16
|
};
|
|
@@ -60,7 +60,7 @@ export async function fetchFromApi<Data = Record<string, unknown>>(
|
|
|
60
60
|
return json;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
-
function mergeHeaders(
|
|
63
|
+
function mergeHeaders(mapping: LocaleMapping, headers?: HeadersInit): Headers {
|
|
64
64
|
const newHeaders = new Headers({
|
|
65
65
|
'Accept': 'application/json',
|
|
66
66
|
'Content-Type': 'application/json',
|
|
@@ -71,6 +71,6 @@ function mergeHeaders(projectConfig: ProjectLocaleConfig, headers?: HeadersInit)
|
|
|
71
71
|
}
|
|
72
72
|
// append last to make sure it is not overwritten
|
|
73
73
|
}
|
|
74
|
-
newHeaders.set('X-Guillotine-SiteKey',
|
|
74
|
+
newHeaders.set('X-Guillotine-SiteKey', mapping.site);
|
|
75
75
|
return newHeaders;
|
|
76
76
|
}
|