@sitecore-jss/sitecore-jss-nextjs 22.0.0-canary.38 → 22.0.0-canary.42
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/README.md +5 -3
- package/context.d.ts +1 -0
- package/context.js +1 -0
- package/dist/cjs/ComponentBuilder.js +63 -0
- package/dist/cjs/components/BYOCWrapper.js +47 -0
- package/dist/cjs/components/FEaaSWrapper.js +49 -0
- package/dist/cjs/components/NextImage.js +2 -10
- package/dist/cjs/components/RichText.js +10 -10
- package/dist/cjs/context/context.js +83 -0
- package/dist/cjs/context/index.js +5 -0
- package/dist/cjs/editing/constants.js +6 -0
- package/dist/cjs/editing/editing-config-middleware.js +49 -0
- package/dist/cjs/editing/editing-data-middleware.js +2 -2
- package/dist/cjs/editing/editing-data-service.js +15 -7
- package/dist/cjs/editing/editing-render-middleware.js +24 -10
- package/dist/cjs/editing/feaas-render-middleware.js +87 -0
- package/dist/cjs/editing/index.js +7 -1
- package/dist/cjs/editing/render-middleware.js +27 -0
- package/dist/cjs/editing/vercel-editing-data-cache.js +48 -0
- package/dist/cjs/graphql/index.js +7 -0
- package/dist/cjs/index.js +37 -25
- package/dist/cjs/middleware/index.js +3 -1
- package/dist/cjs/middleware/middleware.js +18 -2
- package/dist/cjs/middleware/multisite-middleware.js +14 -8
- package/dist/cjs/middleware/personalize-middleware.js +62 -56
- package/dist/cjs/middleware/redirects-middleware.js +48 -25
- package/dist/cjs/services/base-graphql-sitemap-service.js +7 -6
- package/dist/cjs/services/component-props-service.js +6 -6
- package/dist/cjs/utils/utils.js +7 -16
- package/dist/esm/ComponentBuilder.js +59 -0
- package/dist/esm/components/BYOCWrapper.js +42 -0
- package/dist/esm/components/FEaaSWrapper.js +44 -0
- package/dist/esm/components/NextImage.js +1 -8
- package/dist/esm/components/RichText.js +10 -10
- package/dist/esm/context/context.js +79 -0
- package/dist/esm/context/index.js +1 -0
- package/dist/esm/editing/constants.js +3 -0
- package/dist/esm/editing/editing-config-middleware.js +45 -0
- package/dist/esm/editing/editing-data-middleware.js +1 -1
- package/dist/esm/editing/editing-data-service.js +13 -5
- package/dist/esm/editing/editing-render-middleware.js +24 -10
- package/dist/esm/editing/feaas-render-middleware.js +83 -0
- package/dist/esm/editing/index.js +3 -0
- package/dist/esm/editing/render-middleware.js +23 -0
- package/dist/esm/editing/vercel-editing-data-cache.js +44 -0
- package/dist/esm/graphql/index.js +1 -0
- package/dist/esm/index.js +10 -20
- package/dist/esm/middleware/index.js +1 -0
- package/dist/esm/middleware/middleware.js +18 -2
- package/dist/esm/middleware/multisite-middleware.js +14 -8
- package/dist/esm/middleware/personalize-middleware.js +65 -59
- package/dist/esm/middleware/redirects-middleware.js +48 -25
- package/dist/esm/services/base-graphql-sitemap-service.js +7 -6
- package/dist/esm/services/component-props-service.js +6 -6
- package/dist/esm/utils/utils.js +7 -13
- package/graphql.d.ts +1 -0
- package/graphql.js +1 -0
- package/package.json +15 -12
- package/types/ComponentBuilder.d.ts +61 -0
- package/types/components/BYOCWrapper.d.ts +19 -0
- package/types/components/ComponentPropsContext.d.ts +1 -0
- package/types/components/FEaaSWrapper.d.ts +21 -0
- package/types/components/Link.d.ts +2 -1
- package/types/components/NextImage.d.ts +3 -3
- package/types/components/Placeholder.d.ts +3 -1
- package/types/components/RichText.d.ts +6 -0
- package/types/context/context.d.ts +116 -0
- package/types/context/index.d.ts +1 -0
- package/types/editing/constants.d.ts +3 -0
- package/types/editing/editing-config-middleware.d.ts +29 -0
- package/types/editing/editing-data-service.d.ts +12 -4
- package/types/editing/editing-render-middleware.d.ts +2 -1
- package/types/editing/feaas-render-middleware.d.ts +32 -0
- package/types/editing/index.d.ts +3 -0
- package/types/editing/render-middleware.d.ts +15 -0
- package/types/editing/vercel-editing-data-cache.d.ts +19 -0
- package/types/graphql/index.d.ts +1 -0
- package/types/index.d.ts +12 -12
- package/types/middleware/index.d.ts +1 -0
- package/types/middleware/middleware.d.ts +8 -0
- package/types/middleware/multisite-middleware.d.ts +15 -0
- package/types/middleware/personalize-middleware.d.ts +53 -14
- package/types/services/base-graphql-sitemap-service.d.ts +7 -10
- package/types/services/component-props-service.d.ts +2 -2
- package/types/sharedTypes/component-props.d.ts +5 -1
- package/types/sharedTypes/module-factory.d.ts +33 -0
- package/types/utils/utils.d.ts +2 -0
- package/types/sharedTypes/component-module.d.ts +0 -13
- /package/dist/cjs/sharedTypes/{component-module.js → module-factory.js} +0 -0
- /package/dist/esm/sharedTypes/{component-module.js → module-factory.js} +0 -0
|
@@ -18,7 +18,8 @@ const server_1 = require("next/server");
|
|
|
18
18
|
const site_1 = require("@sitecore-jss/sitecore-jss/site");
|
|
19
19
|
const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
|
|
20
20
|
const middleware_1 = require("./middleware");
|
|
21
|
-
const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, '
|
|
21
|
+
const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
|
|
22
|
+
const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
|
|
22
23
|
/**
|
|
23
24
|
* Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
|
|
24
25
|
* compares with current url and redirects to target url
|
|
@@ -35,13 +36,14 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
|
|
|
35
36
|
const language = this.getLanguage(req);
|
|
36
37
|
const hostname = this.getHostHeader(req) || this.defaultHostname;
|
|
37
38
|
let site;
|
|
39
|
+
const startTimestamp = Date.now();
|
|
38
40
|
sitecore_jss_1.debug.redirects('redirects middleware start: %o', {
|
|
39
41
|
pathname,
|
|
40
42
|
language,
|
|
41
43
|
hostname,
|
|
42
44
|
});
|
|
43
45
|
const createResponse = () => __awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
if (this.config.disabled && this.config.disabled(req, server_1.NextResponse.next())) {
|
|
46
|
+
if (this.config.disabled && this.config.disabled(req, res || server_1.NextResponse.next())) {
|
|
45
47
|
sitecore_jss_1.debug.redirects('skipped (redirects middleware is disabled)');
|
|
46
48
|
return res || server_1.NextResponse.next();
|
|
47
49
|
}
|
|
@@ -57,44 +59,58 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
|
|
|
57
59
|
return res || server_1.NextResponse.next();
|
|
58
60
|
}
|
|
59
61
|
// Find context site language and replace token
|
|
60
|
-
if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target)
|
|
62
|
+
if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target) &&
|
|
63
|
+
!(REGEXP_ABSOLUTE_URL.test(existsRedirect.target) &&
|
|
64
|
+
existsRedirect.target.includes(hostname))) {
|
|
61
65
|
existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
|
|
62
66
|
}
|
|
63
67
|
const url = req.nextUrl.clone();
|
|
64
|
-
|
|
65
|
-
if (absoluteUrlRegex.test(existsRedirect.target)) {
|
|
68
|
+
if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
|
|
66
69
|
url.href = existsRedirect.target;
|
|
67
|
-
url.locale = req.nextUrl.locale;
|
|
68
70
|
}
|
|
69
71
|
else {
|
|
72
|
+
const source = `${url.pathname}${url.search}`;
|
|
70
73
|
url.search = existsRedirect.isQueryStringPreserved ? url.search : '';
|
|
71
74
|
const urlFirstPart = existsRedirect.target.split('/')[1];
|
|
72
75
|
if (this.locales.includes(urlFirstPart)) {
|
|
73
76
|
url.locale = urlFirstPart;
|
|
74
|
-
|
|
77
|
+
existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
|
|
75
78
|
}
|
|
76
|
-
|
|
77
|
-
|
|
79
|
+
const target = source
|
|
80
|
+
.replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
|
|
81
|
+
.replace(/^\/\//, '/')
|
|
82
|
+
.split('?');
|
|
83
|
+
url.pathname = target[0];
|
|
84
|
+
if (target[1]) {
|
|
85
|
+
const newParams = new URLSearchParams(target[1]);
|
|
86
|
+
for (const [key, val] of newParams.entries()) {
|
|
87
|
+
url.searchParams.append(key, val);
|
|
88
|
+
}
|
|
78
89
|
}
|
|
79
90
|
}
|
|
80
91
|
const redirectUrl = decodeURIComponent(url.href);
|
|
81
92
|
/** return Response redirect with http code of redirect type **/
|
|
82
93
|
switch (existsRedirect.redirectType) {
|
|
83
94
|
case site_1.REDIRECT_TYPE_301:
|
|
84
|
-
return server_1.NextResponse.redirect(redirectUrl,
|
|
95
|
+
return server_1.NextResponse.redirect(redirectUrl, {
|
|
96
|
+
status: 301,
|
|
97
|
+
statusText: 'Moved Permanently',
|
|
98
|
+
headers: res === null || res === void 0 ? void 0 : res.headers,
|
|
99
|
+
});
|
|
85
100
|
case site_1.REDIRECT_TYPE_302:
|
|
86
|
-
return server_1.NextResponse.redirect(redirectUrl,
|
|
101
|
+
return server_1.NextResponse.redirect(redirectUrl, {
|
|
102
|
+
status: 302,
|
|
103
|
+
statusText: 'Found',
|
|
104
|
+
headers: res === null || res === void 0 ? void 0 : res.headers,
|
|
105
|
+
});
|
|
87
106
|
case site_1.REDIRECT_TYPE_SERVER_TRANSFER:
|
|
88
|
-
return server_1.NextResponse.rewrite(redirectUrl);
|
|
107
|
+
return server_1.NextResponse.rewrite(redirectUrl, res);
|
|
89
108
|
default:
|
|
90
|
-
return server_1.NextResponse.next();
|
|
109
|
+
return res || server_1.NextResponse.next();
|
|
91
110
|
}
|
|
92
111
|
});
|
|
93
112
|
const response = yield createResponse();
|
|
94
|
-
|
|
95
|
-
// Don't need to set when middleware is disabled
|
|
96
|
-
site && response.cookies.set(this.SITE_SYMBOL, site.name);
|
|
97
|
-
sitecore_jss_1.debug.redirects('redirects middleware end: %o', {
|
|
113
|
+
sitecore_jss_1.debug.redirects('redirects middleware end in %dms: %o', Date.now() - startTimestamp, {
|
|
98
114
|
redirected: response.redirected,
|
|
99
115
|
status: response.status,
|
|
100
116
|
url: response.url,
|
|
@@ -134,15 +150,22 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
|
|
|
134
150
|
return __awaiter(this, void 0, void 0, function* () {
|
|
135
151
|
const redirects = yield this.redirectsService.fetchRedirects(siteName);
|
|
136
152
|
const tragetURL = req.nextUrl.pathname;
|
|
137
|
-
const targetQS =
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
153
|
+
const targetQS = req.nextUrl.search || '';
|
|
154
|
+
const language = this.getLanguage(req);
|
|
155
|
+
const modifyRedirects = structuredClone(redirects);
|
|
156
|
+
return modifyRedirects.length
|
|
157
|
+
? modifyRedirects.find((redirect) => {
|
|
158
|
+
redirect.pattern = redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), '');
|
|
159
|
+
redirect.pattern = `/^\/${redirect.pattern
|
|
141
160
|
.replace(/^\/|\/$/g, '')
|
|
142
|
-
.replace(
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
(
|
|
161
|
+
.replace(/^\^\/|\/\$$/g, '')
|
|
162
|
+
.replace(/^\^|\$$/g, '')
|
|
163
|
+
.replace(/(?<!\\)\?/g, '\\?')
|
|
164
|
+
.replace(/\$\/gi$/g, '')}[\/]?$/gi`;
|
|
165
|
+
return (((0, regex_parser_1.default)(redirect.pattern).test(tragetURL) ||
|
|
166
|
+
(0, regex_parser_1.default)(redirect.pattern).test(`${tragetURL}${targetQS}`) ||
|
|
167
|
+
(0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
|
|
168
|
+
(0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
|
|
146
169
|
(redirect.locale
|
|
147
170
|
? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
|
|
148
171
|
: true));
|
|
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.BaseGraphQLSitemapService = exports.getSiteEmptyError = exports.siteError = exports.languageError = void 0;
|
|
13
|
-
const graphql_1 = require("@sitecore-jss/sitecore-jss/graphql");
|
|
14
13
|
const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
|
|
15
14
|
const personalize_1 = require("@sitecore-jss/sitecore-jss/personalize");
|
|
16
15
|
/** @private */
|
|
@@ -36,7 +35,7 @@ query ${usesPersonalize ? 'PersonalizeSitemapQuery' : 'DefaultSitemapQuery'}(
|
|
|
36
35
|
$language: String!
|
|
37
36
|
$includedPaths: [String]
|
|
38
37
|
$excludedPaths: [String]
|
|
39
|
-
$pageSize: Int =
|
|
38
|
+
$pageSize: Int = 100
|
|
40
39
|
$after: String
|
|
41
40
|
) {
|
|
42
41
|
site {
|
|
@@ -132,7 +131,7 @@ class BaseGraphQLSitemapService {
|
|
|
132
131
|
getTranformedPaths(siteName, languages, formatStaticPath) {
|
|
133
132
|
return __awaiter(this, void 0, void 0, function* () {
|
|
134
133
|
const paths = new Array();
|
|
135
|
-
|
|
134
|
+
for (const language of languages) {
|
|
136
135
|
if (language === '') {
|
|
137
136
|
throw new RangeError(languageEmptyError);
|
|
138
137
|
}
|
|
@@ -140,7 +139,7 @@ class BaseGraphQLSitemapService {
|
|
|
140
139
|
const results = yield this.fetchLanguageSitePaths(language, siteName);
|
|
141
140
|
const transformedPaths = yield this.transformLanguageSitePaths(results, formatStaticPath, language);
|
|
142
141
|
paths.push(...transformedPaths);
|
|
143
|
-
}
|
|
142
|
+
}
|
|
144
143
|
return paths;
|
|
145
144
|
});
|
|
146
145
|
}
|
|
@@ -195,8 +194,10 @@ class BaseGraphQLSitemapService {
|
|
|
195
194
|
* @returns {GraphQLClient} implementation
|
|
196
195
|
*/
|
|
197
196
|
getGraphQLClient() {
|
|
198
|
-
|
|
199
|
-
|
|
197
|
+
if (!this.options.clientFactory) {
|
|
198
|
+
throw new Error('clientFactory needs to be provided when initializing GraphQL client.');
|
|
199
|
+
}
|
|
200
|
+
return this.options.clientFactory({
|
|
200
201
|
debugger: sitecore_jss_1.debug.sitemap,
|
|
201
202
|
});
|
|
202
203
|
}
|
|
@@ -23,9 +23,9 @@ class ComponentPropsService {
|
|
|
23
23
|
*/
|
|
24
24
|
fetchServerSideComponentProps(params) {
|
|
25
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
const {
|
|
26
|
+
const { moduleFactory, layoutData, context } = params;
|
|
27
27
|
const fetchFunctionFactory = (componentName) => __awaiter(this, void 0, void 0, function* () {
|
|
28
|
-
const module = yield
|
|
28
|
+
const module = yield moduleFactory(componentName);
|
|
29
29
|
return module === null || module === void 0 ? void 0 : module.getServerSideProps;
|
|
30
30
|
});
|
|
31
31
|
return this.fetchComponentProps(fetchFunctionFactory, layoutData, context);
|
|
@@ -39,9 +39,9 @@ class ComponentPropsService {
|
|
|
39
39
|
*/
|
|
40
40
|
fetchStaticComponentProps(params) {
|
|
41
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
-
const {
|
|
42
|
+
const { moduleFactory, layoutData, context } = params;
|
|
43
43
|
const fetchFunctionFactory = (componentName) => __awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
const module = yield
|
|
44
|
+
const module = yield moduleFactory(componentName);
|
|
45
45
|
return module === null || module === void 0 ? void 0 : module.getStaticProps;
|
|
46
46
|
});
|
|
47
47
|
return this.fetchComponentProps(fetchFunctionFactory, layoutData, context);
|
|
@@ -128,11 +128,11 @@ class ComponentPropsService {
|
|
|
128
128
|
componentProps[uid] = result;
|
|
129
129
|
})
|
|
130
130
|
.catch((error) => {
|
|
131
|
-
const errLog = `Error during preload data for component ${uid}: ${error.message ||
|
|
132
|
-
error}`;
|
|
131
|
+
const errLog = `Error during preload data for component ${req.rendering.componentName} (${uid}): ${error.message || error}`;
|
|
133
132
|
console.error(chalk_1.default.red(errLog));
|
|
134
133
|
componentProps[uid] = {
|
|
135
134
|
error: error.message || errLog,
|
|
135
|
+
componentName: req.rendering.componentName,
|
|
136
136
|
};
|
|
137
137
|
});
|
|
138
138
|
});
|
package/dist/cjs/utils/utils.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getJssEditingSecret = exports.handleEditorFastRefresh = exports.getPublicUrl = void 0;
|
|
7
|
-
const chalk_1 = __importDefault(require("chalk"));
|
|
8
4
|
const utils_1 = require("@sitecore-jss/sitecore-jss/utils");
|
|
9
5
|
/**
|
|
10
6
|
* Get the publicUrl.
|
|
@@ -12,25 +8,20 @@ const utils_1 = require("@sitecore-jss/sitecore-jss/utils");
|
|
|
12
8
|
* This is set to http://localhost:3000 by default.
|
|
13
9
|
* VERCEL_URL is provided by Vercel in case if we are in Preview deployment (deployment based on the custom branch),
|
|
14
10
|
* preview deployment has unique url, we don't know exact url.
|
|
11
|
+
* Similarly, DEPLOY_URL is provided by Netlify and would give us the deploy URL
|
|
12
|
+
* In production non-editing environments it is desirable to use relative urls, so in that case set PUBLIC_URL = ''
|
|
15
13
|
*/
|
|
16
14
|
const getPublicUrl = () => {
|
|
17
|
-
if (process.env.VERCEL_URL)
|
|
18
|
-
return `https://${process.env.VERCEL_URL}`;
|
|
19
15
|
let url = process.env.PUBLIC_URL;
|
|
20
16
|
if (url === undefined) {
|
|
21
|
-
|
|
17
|
+
if (process.env.NETLIFY && process.env.DEPLOY_URL)
|
|
18
|
+
return process.env.DEPLOY_URL;
|
|
19
|
+
if (process.env.VERCEL_URL)
|
|
20
|
+
return `https://${process.env.VERCEL_URL}`;
|
|
22
21
|
url = 'http://localhost:3000';
|
|
23
22
|
}
|
|
24
|
-
else {
|
|
25
|
-
try {
|
|
26
|
-
new URL(url);
|
|
27
|
-
}
|
|
28
|
-
catch (error) {
|
|
29
|
-
throw new Error(`The PUBLIC_URL environment variable '${url}' is not a valid URL.`);
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
23
|
// Ensure no trailing slash
|
|
33
|
-
return url.
|
|
24
|
+
return url.replace(/\/$/, '');
|
|
34
25
|
};
|
|
35
26
|
exports.getPublicUrl = getPublicUrl;
|
|
36
27
|
/**
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Nextjs implementation of component builder class for building components based on the configuration.
|
|
3
|
+
*/
|
|
4
|
+
export class ComponentBuilder {
|
|
5
|
+
constructor(config) {
|
|
6
|
+
this.config = config;
|
|
7
|
+
/**
|
|
8
|
+
* SXA uses custom default export name
|
|
9
|
+
*/
|
|
10
|
+
this.DEFAULT_EXPORT_NAME = 'Default';
|
|
11
|
+
this.components = new Map([...config.components]);
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Creates a new instance of module factory
|
|
15
|
+
* Module factory provides a module (file) including all exports.
|
|
16
|
+
* Module can be imported dynamically or statically.
|
|
17
|
+
* @returns {ModuleFactory} Module factory implementation
|
|
18
|
+
*/
|
|
19
|
+
getModuleFactory() {
|
|
20
|
+
return (componentName) => {
|
|
21
|
+
const component = this.components.get(componentName);
|
|
22
|
+
if (!component)
|
|
23
|
+
return null;
|
|
24
|
+
// check if module should be imported dynamically
|
|
25
|
+
if (component.module) {
|
|
26
|
+
return component.module();
|
|
27
|
+
}
|
|
28
|
+
return component;
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Creates a new instance of component factory
|
|
33
|
+
* Component can be imported dynamically or statically.
|
|
34
|
+
* @param {Object} [config] Component factory configuration
|
|
35
|
+
* @param {boolean} [config.isEditing] Indicates if component factory is used in editing mode
|
|
36
|
+
* @returns {ComponentFactory} Component factory implementation
|
|
37
|
+
*/
|
|
38
|
+
getComponentFactory({ isEditing } = {}) {
|
|
39
|
+
return (componentName, exportName) => {
|
|
40
|
+
const component = this.components.get(componentName);
|
|
41
|
+
if (!component)
|
|
42
|
+
return null;
|
|
43
|
+
// check if component should be imported dynamically
|
|
44
|
+
if (component.element) {
|
|
45
|
+
// Editing mode doesn't work well with dynamic components in nextjs: dynamic components are not displayed without refresh after a rendering is added.
|
|
46
|
+
// This happens beacuse Sitecore editors simply insert updated HTML generated on server side. This conflicts with nextjs dynamic logic as no HTML gets rendered for dynamic component
|
|
47
|
+
// So we use require() to obtain dynamic components in editing mode while preserving dynamic logic for non-editing scenarios
|
|
48
|
+
// As we need to be able to seamlessly work with dynamic components in both editing and normal modes, different componentFactory functions will be passed to app
|
|
49
|
+
return component.element(isEditing);
|
|
50
|
+
}
|
|
51
|
+
if (exportName && exportName !== this.DEFAULT_EXPORT_NAME) {
|
|
52
|
+
return component[exportName];
|
|
53
|
+
}
|
|
54
|
+
return (component.Default ||
|
|
55
|
+
component.default ||
|
|
56
|
+
component);
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
import { BYOCWrapper, fetchBYOCComponentServerProps, } from '@sitecore-jss/sitecore-jss-react';
|
|
11
|
+
import { constants } from '@sitecore-jss/sitecore-jss';
|
|
12
|
+
/**
|
|
13
|
+
* This is a repackaged version of the React BYOCWrapper component with support for
|
|
14
|
+
* server rendering in Next.js (using component-level data-fetching feature of JSS).
|
|
15
|
+
*/
|
|
16
|
+
/**
|
|
17
|
+
* Will be called during SSG
|
|
18
|
+
* @param {ComponentRendering} rendering
|
|
19
|
+
* @returns {GetStaticPropsContext} context
|
|
20
|
+
*/
|
|
21
|
+
export const getStaticProps = (rendering) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
+
if (process.env.JSS_MODE === constants.JSS_MODE.DISCONNECTED) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
const params = rendering.params || {};
|
|
26
|
+
const result = yield fetchBYOCComponentServerProps(params);
|
|
27
|
+
return result;
|
|
28
|
+
});
|
|
29
|
+
/**
|
|
30
|
+
* Will be called during SSR
|
|
31
|
+
* @param {ComponentRendering} rendering
|
|
32
|
+
* @returns {GetStaticPropsContext} context
|
|
33
|
+
*/
|
|
34
|
+
export const getServerSideProps = (rendering) => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
|
+
if (process.env.JSS_MODE === constants.JSS_MODE.DISCONNECTED) {
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
const params = rendering.params || {};
|
|
39
|
+
const result = yield fetchBYOCComponentServerProps(params);
|
|
40
|
+
return result;
|
|
41
|
+
});
|
|
42
|
+
export default BYOCWrapper;
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
import { FEaaSWrapper, fetchFEaaSComponentServerProps, } from '@sitecore-jss/sitecore-jss-react';
|
|
11
|
+
import { constants } from '@sitecore-jss/sitecore-jss';
|
|
12
|
+
/**
|
|
13
|
+
* This is a repackaged version of the React FEaaSWrapper component with support for
|
|
14
|
+
* server rendering in Next.js (using component-level data-fetching feature of JSS).
|
|
15
|
+
*/
|
|
16
|
+
/**
|
|
17
|
+
* Will be called during SSG
|
|
18
|
+
* @param {ComponentRendering} rendering
|
|
19
|
+
* @param {LayoutServiceData} layoutData
|
|
20
|
+
* @returns {GetStaticPropsContext} context
|
|
21
|
+
*/
|
|
22
|
+
export const getStaticProps = (rendering, layoutData) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
+
if (process.env.JSS_MODE === constants.JSS_MODE.DISCONNECTED) {
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
const params = rendering.params || {};
|
|
27
|
+
const result = yield fetchFEaaSComponentServerProps(params, layoutData.sitecore.context.pageState);
|
|
28
|
+
return result;
|
|
29
|
+
});
|
|
30
|
+
/**
|
|
31
|
+
* Will be called during SSR
|
|
32
|
+
* @param {ComponentRendering} rendering
|
|
33
|
+
* @param {LayoutServiceData} layoutData
|
|
34
|
+
* @returns {GetStaticPropsContext} context
|
|
35
|
+
*/
|
|
36
|
+
export const getServerSideProps = (rendering, layoutData) => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
if (process.env.JSS_MODE === constants.JSS_MODE.DISCONNECTED) {
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
const params = rendering.params || {};
|
|
41
|
+
const result = yield fetchFEaaSComponentServerProps(params, layoutData.sitecore.context.pageState);
|
|
42
|
+
return result;
|
|
43
|
+
});
|
|
44
|
+
export default FEaaSWrapper;
|
|
@@ -14,12 +14,6 @@ import PropTypes from 'prop-types';
|
|
|
14
14
|
import React from 'react';
|
|
15
15
|
import { getEEMarkup, } from '@sitecore-jss/sitecore-jss-react';
|
|
16
16
|
import Image from 'next/image';
|
|
17
|
-
export const sitecoreLoader = ({ src, width }) => {
|
|
18
|
-
const [root, paramString] = src.split('?');
|
|
19
|
-
const params = new URLSearchParams(paramString);
|
|
20
|
-
params.set('mw', width.toString());
|
|
21
|
-
return `${root}?${params}`;
|
|
22
|
-
};
|
|
23
17
|
export const NextImage = (_a) => {
|
|
24
18
|
var { editable, imageParams, field, mediaUrlPrefix, fill, priority } = _a, otherProps = __rest(_a, ["editable", "imageParams", "field", "mediaUrlPrefix", "fill", "priority"]);
|
|
25
19
|
// next handles src and we use a custom loader,
|
|
@@ -55,9 +49,8 @@ export const NextImage = (_a) => {
|
|
|
55
49
|
delete imageProps.width;
|
|
56
50
|
delete imageProps.height;
|
|
57
51
|
}
|
|
58
|
-
const loader = (otherProps.loader ? otherProps.loader : sitecoreLoader);
|
|
59
52
|
if (attrs) {
|
|
60
|
-
return React.createElement(Image, Object.assign({ alt: ""
|
|
53
|
+
return React.createElement(Image, Object.assign({ alt: "" }, imageProps));
|
|
61
54
|
}
|
|
62
55
|
return null; // we can't handle the truth
|
|
63
56
|
};
|
|
@@ -15,7 +15,7 @@ import { useRouter } from 'next/router';
|
|
|
15
15
|
import { RichText as ReactRichText, RichTextPropTypes, } from '@sitecore-jss/sitecore-jss-react';
|
|
16
16
|
const prefetched = {};
|
|
17
17
|
export const RichText = (props) => {
|
|
18
|
-
const { internalLinksSelector = 'a[href^="/"]' } = props, rest = __rest(props, ["internalLinksSelector"]);
|
|
18
|
+
const { internalLinksSelector = 'a[href^="/"]', prefetchLinks = true } = props, rest = __rest(props, ["internalLinksSelector", "prefetchLinks"]);
|
|
19
19
|
const hasText = props.field && props.field.value;
|
|
20
20
|
const isEditing = props.editable && props.field && props.field.editable;
|
|
21
21
|
const router = useRouter();
|
|
@@ -25,12 +25,12 @@ export const RichText = (props) => {
|
|
|
25
25
|
if (hasText && !isEditing) {
|
|
26
26
|
initializeLinks();
|
|
27
27
|
}
|
|
28
|
-
}, []);
|
|
28
|
+
}, [hasText]);
|
|
29
29
|
const routeHandler = (ev) => {
|
|
30
|
-
if (!ev.
|
|
30
|
+
if (!ev.currentTarget)
|
|
31
31
|
return;
|
|
32
32
|
ev.preventDefault();
|
|
33
|
-
const pathname = ev.
|
|
33
|
+
const pathname = ev.currentTarget.href;
|
|
34
34
|
router.push(pathname, pathname, { locale: false });
|
|
35
35
|
};
|
|
36
36
|
const initializeLinks = () => {
|
|
@@ -40,13 +40,13 @@ export const RichText = (props) => {
|
|
|
40
40
|
if (!internalLinks || !internalLinks.length)
|
|
41
41
|
return;
|
|
42
42
|
internalLinks.forEach((link) => {
|
|
43
|
-
if (link.target
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
link.addEventListener('click', routeHandler, false);
|
|
43
|
+
if (link.target === '_blank')
|
|
44
|
+
return;
|
|
45
|
+
if (prefetchLinks && !prefetched[link.pathname]) {
|
|
46
|
+
router.prefetch(link.pathname, undefined, { locale: false });
|
|
47
|
+
prefetched[link.pathname] = true;
|
|
49
48
|
}
|
|
49
|
+
link.addEventListener('click', routeHandler, false);
|
|
50
50
|
});
|
|
51
51
|
};
|
|
52
52
|
return React.createElement(ReactRichText, Object.assign({ ref: richTextRef }, rest));
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { LayoutServicePageState } from '@sitecore-jss/sitecore-jss-react';
|
|
2
|
+
/**
|
|
3
|
+
* Context instance that is used to initialize the application Context and associated Software Development Kits (SDKs).
|
|
4
|
+
*/
|
|
5
|
+
export class Context {
|
|
6
|
+
constructor(props) {
|
|
7
|
+
this.props = props;
|
|
8
|
+
/**
|
|
9
|
+
* Indicates whether the Context and SDK(s) have been initialized
|
|
10
|
+
*/
|
|
11
|
+
this.isInitialized = false;
|
|
12
|
+
/**
|
|
13
|
+
* Software Development Kits (SDKs) to be initialized
|
|
14
|
+
*/
|
|
15
|
+
this.sdks = {};
|
|
16
|
+
/**
|
|
17
|
+
* Promises for the SDKs
|
|
18
|
+
*/
|
|
19
|
+
this.sdkPromises = {};
|
|
20
|
+
this.sdkErrors = {};
|
|
21
|
+
/**
|
|
22
|
+
* Retrieves the Software Development Kit (SDK) instance, ensuring it is initialized before returning
|
|
23
|
+
*
|
|
24
|
+
* @param {string} name SDK name
|
|
25
|
+
* @returns initialized SDK
|
|
26
|
+
*/
|
|
27
|
+
this.getSDK = (name) => {
|
|
28
|
+
if (!this.sdkPromises[name]) {
|
|
29
|
+
return Promise.reject(`Unknown SDK '${String(name)}'`);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
return this.sdkPromises[name].then((result) => {
|
|
33
|
+
return ((this.sdkErrors[name] && Promise.reject(this.sdkErrors[name])) || Promise.resolve(result));
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
this.sitecoreEdgeUrl = props.sitecoreEdgeUrl;
|
|
38
|
+
this.sitecoreEdgeContextId = props.sitecoreEdgeContextId;
|
|
39
|
+
this.siteName = props.siteName;
|
|
40
|
+
this.pageState = LayoutServicePageState.Normal;
|
|
41
|
+
}
|
|
42
|
+
init(props = {}) {
|
|
43
|
+
// Context and SDKs are initialized only once
|
|
44
|
+
if (this.isInitialized)
|
|
45
|
+
return;
|
|
46
|
+
this.isInitialized = true;
|
|
47
|
+
if (props.siteName) {
|
|
48
|
+
this.siteName = props.siteName;
|
|
49
|
+
}
|
|
50
|
+
if (props.pageState) {
|
|
51
|
+
this.pageState = props.pageState;
|
|
52
|
+
}
|
|
53
|
+
// iterate over the SDKs and initialize them
|
|
54
|
+
for (const sdkName of Object.keys(this.props.sdks)) {
|
|
55
|
+
this.initSDK(sdkName);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Initializes the Software Development Kit (SDK)
|
|
60
|
+
*
|
|
61
|
+
* @param {T} name SDK name
|
|
62
|
+
* @returns {void}
|
|
63
|
+
*/
|
|
64
|
+
initSDK(name) {
|
|
65
|
+
this.sdkPromises[name] = new Promise((resolve) => {
|
|
66
|
+
this.props.sdks[name]
|
|
67
|
+
.init(this)
|
|
68
|
+
.then(() => {
|
|
69
|
+
this.sdks[name] = this.props.sdks[name].sdk;
|
|
70
|
+
resolve(this.sdks[name]);
|
|
71
|
+
})
|
|
72
|
+
.catch((e) => {
|
|
73
|
+
// if init rejects, we mark SDK as failed - so getSDK call would reject with a reason
|
|
74
|
+
this.sdkErrors[name] = e;
|
|
75
|
+
resolve(undefined);
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { Context } from './context';
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
import { QUERY_PARAM_EDITING_SECRET } from './constants';
|
|
11
|
+
import { getJssEditingSecret } from '../utils/utils';
|
|
12
|
+
import { debug } from '@sitecore-jss/sitecore-jss';
|
|
13
|
+
/**
|
|
14
|
+
* Middleware / handler used in the editing config API route in xmcloud add on (e.g. '/api/editing/config')
|
|
15
|
+
* provides configuration information to determine feature compatibility on Pages side.
|
|
16
|
+
*/
|
|
17
|
+
export class EditingConfigMiddleware {
|
|
18
|
+
/**
|
|
19
|
+
* @param {EditingConfigMiddlewareConfig} [config] Editing configuration middleware config
|
|
20
|
+
*/
|
|
21
|
+
constructor(config) {
|
|
22
|
+
this.config = config;
|
|
23
|
+
this.handler = (_req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
24
|
+
const secret = _req.query[QUERY_PARAM_EDITING_SECRET];
|
|
25
|
+
if (secret !== getJssEditingSecret()) {
|
|
26
|
+
debug.editing('invalid editing secret - sent "%s" expected "%s"', secret, getJssEditingSecret());
|
|
27
|
+
return res.status(401).json({ message: 'Missing or invalid editing secret' });
|
|
28
|
+
}
|
|
29
|
+
const components = Array.isArray(this.config.components)
|
|
30
|
+
? this.config.components
|
|
31
|
+
: Array.from(this.config.components.keys());
|
|
32
|
+
return res.status(200).json({
|
|
33
|
+
components,
|
|
34
|
+
packages: this.config.metadata.packages,
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Gets the Next.js API route handler
|
|
40
|
+
* @returns middleware handler
|
|
41
|
+
*/
|
|
42
|
+
getHandler() {
|
|
43
|
+
return this.handler;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { editingDataDiskCache } from './editing-data-cache';
|
|
11
11
|
import { isEditingData } from './editing-data';
|
|
12
|
-
import { QUERY_PARAM_EDITING_SECRET } from './
|
|
12
|
+
import { QUERY_PARAM_EDITING_SECRET } from './constants';
|
|
13
13
|
import { getJssEditingSecret } from '../utils/utils';
|
|
14
14
|
/**
|
|
15
15
|
* Middleware / handler for use in the editing data Next.js API dynamic route (e.g. '/api/editing/data/[key]')
|