@zengenti/contensis-react-base 3.1.1-beta.13 → 3.1.1-beta.15
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/cjs/{App-ef6e6b20.js → App-8a2f85d5.js} +68 -61
- package/cjs/App-8a2f85d5.js.map +1 -0
- package/cjs/{ChangePassword.container-647da27e.js → ChangePassword.container-efcb1fcd.js} +27 -28
- package/cjs/ChangePassword.container-efcb1fcd.js.map +1 -0
- package/{esm/ToJs-e0b935d4.js → cjs/CookieHelper.class-34994aa1.js} +11 -97
- package/cjs/CookieHelper.class-34994aa1.js.map +1 -0
- package/cjs/{RouteLoader-5e6ee174.js → RouteLoader-4fb33db9.js} +10 -6
- package/cjs/RouteLoader-4fb33db9.js.map +1 -0
- package/cjs/{ContensisDeliveryApi-3532f68b.js → SSRContext-433c53e4.js} +103 -42
- package/cjs/SSRContext-433c53e4.js.map +1 -0
- package/cjs/ToJs-7f965106.js +128 -0
- package/cjs/ToJs-7f965106.js.map +1 -0
- package/cjs/client.js +20 -20
- package/cjs/client.js.map +1 -1
- package/cjs/contensis-react-base.js +28 -25
- package/cjs/contensis-react-base.js.map +1 -1
- package/cjs/redux.js +16 -16
- package/cjs/redux.js.map +1 -1
- package/cjs/routing.js +13 -4
- package/cjs/routing.js.map +1 -1
- package/cjs/{selectors-ce76f972.js → selectors-e3f1fd85.js} +235 -3
- package/cjs/selectors-e3f1fd85.js.map +1 -0
- package/cjs/{version-1fd3379a.js → store-665c229b.js} +7 -23
- package/cjs/store-665c229b.js.map +1 -0
- package/cjs/user.js +9 -10
- package/cjs/user.js.map +1 -1
- package/cjs/util.js +14 -10
- package/cjs/util.js.map +1 -1
- package/cjs/{version-34d2733c.js → version-3b05d6c8.js} +17 -17
- package/cjs/{version-34d2733c.js.map → version-3b05d6c8.js.map} +1 -1
- package/cjs/version-7b43af3e.js +20 -0
- package/cjs/version-7b43af3e.js.map +1 -0
- package/esm/{App-a9eabdd1.js → App-91d81f0c.js} +37 -30
- package/esm/App-91d81f0c.js.map +1 -0
- package/esm/{ChangePassword.container-8a4873c6.js → ChangePassword.container-96dab474.js} +4 -5
- package/esm/ChangePassword.container-96dab474.js.map +1 -0
- package/{cjs/ToJs-56c5315e.js → esm/CookieHelper.class-6d649751.js} +5 -129
- package/esm/CookieHelper.class-6d649751.js.map +1 -0
- package/esm/{RouteLoader-a419b98c.js → RouteLoader-94ca1c51.js} +10 -6
- package/esm/RouteLoader-94ca1c51.js.map +1 -0
- package/esm/{ContensisDeliveryApi-4b5e0510.js → SSRContext-88841734.js} +95 -41
- package/esm/SSRContext-88841734.js.map +1 -0
- package/esm/ToJs-67b34be1.js +98 -0
- package/esm/ToJs-67b34be1.js.map +1 -0
- package/esm/client.js +18 -18
- package/esm/client.js.map +1 -1
- package/esm/contensis-react-base.js +15 -12
- package/esm/contensis-react-base.js.map +1 -1
- package/esm/redux.js +7 -7
- package/esm/routing.js +13 -4
- package/esm/routing.js.map +1 -1
- package/esm/selectors-d2bdfe22.js +396 -0
- package/esm/selectors-d2bdfe22.js.map +1 -0
- package/esm/{version-45170b74.js → store-f524c50d.js} +4 -16
- package/esm/store-f524c50d.js.map +1 -0
- package/esm/user.js +7 -8
- package/esm/user.js.map +1 -1
- package/esm/util.js +6 -5
- package/esm/util.js.map +1 -1
- package/esm/version-7f50b694.js +15 -0
- package/esm/version-7f50b694.js.map +1 -0
- package/esm/{version-31aa860d.js → version-dcc28b32.js} +3 -3
- package/esm/{version-31aa860d.js.map → version-dcc28b32.js.map} +1 -1
- package/models/app/App.d.ts +1 -1
- package/models/app/pages/VersionInfo/components/VersionInfo.d.ts +1 -1
- package/models/client/client.d.ts +1 -1
- package/models/index.d.ts +1 -2
- package/models/models/AppRouteProps.d.ts +11 -0
- package/models/{redux/appstate.d.ts → models/AppState.d.ts} +1 -1
- package/models/models/ContentTypeMapping.d.ts +29 -0
- package/models/models/EntryMapper.d.ts +3 -0
- package/models/models/GetRouteActionArgs.d.ts +15 -0
- package/models/models/ReduxInjector.d.ts +5 -0
- package/models/models/RequireLogin.d.ts +6 -0
- package/models/models/RouteComponent.d.ts +2 -0
- package/models/models/RouteComponentProps.d.ts +9 -0
- package/models/models/RouteLoaderProps.d.ts +6 -0
- package/models/models/RouteNode.d.ts +5 -0
- package/models/models/SSRContext.d.ts +11 -0
- package/models/models/StaticRoute.d.ts +28 -0
- package/models/models/WithEvents.d.ts +29 -0
- package/models/models/config/AppConfig.d.ts +12 -0
- package/models/{config.d.ts → models/config/ServerConfig.d.ts} +2 -12
- package/models/models/config/StateType.d.ts +1 -0
- package/models/models/config/index.d.ts +3 -0
- package/models/models/index.d.ts +15 -0
- package/models/redux/sagas/navigation.d.ts +1 -3
- package/models/redux/store/injectors.d.ts +4 -4
- package/models/redux/store/store.d.ts +1 -2
- package/models/routing/components/RouteLoader.d.ts +1 -1
- package/models/routing/redux/actions.d.ts +2 -3
- package/models/routing/redux/selectors.d.ts +1 -2
- package/models/routing/util/find-contenttype-mapping.d.ts +1 -1
- package/models/server/internalServer.d.ts +1 -1
- package/models/server/util/bundles.d.ts +1 -1
- package/models/server/util/headers.d.ts +1 -1
- package/models/server/webApp.d.ts +1 -1
- package/models/user/redux/selectors.d.ts +1 -2
- package/models/user/util/matchGroups.d.ts +1 -1
- package/models/util/CachedDeliveryApi.d.ts +5 -4
- package/models/util/ContensisDeliveryApi.d.ts +7 -4
- package/models/util/SSRContext.d.ts +30 -0
- package/models/util/index.d.ts +1 -0
- package/models/util/json-mapper.d.ts +1 -2
- package/package.json +1 -1
- package/cjs/App-ef6e6b20.js.map +0 -1
- package/cjs/ChangePassword.container-647da27e.js.map +0 -1
- package/cjs/ContensisDeliveryApi-3532f68b.js.map +0 -1
- package/cjs/CookieConstants-000427db.js +0 -10
- package/cjs/CookieConstants-000427db.js.map +0 -1
- package/cjs/RouteLoader-5e6ee174.js.map +0 -1
- package/cjs/ToJs-56c5315e.js.map +0 -1
- package/cjs/reducers-ea1b2dc0.js +0 -236
- package/cjs/reducers-ea1b2dc0.js.map +0 -1
- package/cjs/selectors-ce76f972.js.map +0 -1
- package/cjs/version-1fd3379a.js.map +0 -1
- package/esm/App-a9eabdd1.js.map +0 -1
- package/esm/ChangePassword.container-8a4873c6.js.map +0 -1
- package/esm/ContensisDeliveryApi-4b5e0510.js.map +0 -1
- package/esm/CookieConstants-3d3b6531.js +0 -6
- package/esm/CookieConstants-3d3b6531.js.map +0 -1
- package/esm/RouteLoader-a419b98c.js.map +0 -1
- package/esm/ToJs-e0b935d4.js.map +0 -1
- package/esm/reducers-919da5e0.js +0 -213
- package/esm/reducers-919da5e0.js.map +0 -1
- package/esm/selectors-08a9e1f0.js +0 -186
- package/esm/selectors-08a9e1f0.js.map +0 -1
- package/esm/version-45170b74.js.map +0 -1
- package/models/routing/routes.d.ts +0 -133
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var SSRContext = require('./SSRContext-433c53e4.js');
|
|
6
6
|
var contensisDeliveryApi = require('contensis-delivery-api');
|
|
7
7
|
var React = require('react');
|
|
8
8
|
var reactRedux = require('react-redux');
|
|
@@ -34,26 +34,26 @@ var lodash = require('lodash');
|
|
|
34
34
|
var _commonjsHelpers = require('./_commonjsHelpers-b3309d7b.js');
|
|
35
35
|
var lodashClean = require('lodash-clean');
|
|
36
36
|
var reactCookie = require('react-cookie');
|
|
37
|
-
var
|
|
37
|
+
var CookieHelper_class = require('./CookieHelper.class-34994aa1.js');
|
|
38
38
|
var cookiesMiddleware = require('universal-cookie-express');
|
|
39
|
-
var
|
|
40
|
-
var App = require('./App-
|
|
41
|
-
var version
|
|
42
|
-
var selectors = require('./selectors-
|
|
39
|
+
var store = require('./store-665c229b.js');
|
|
40
|
+
var App = require('./App-8a2f85d5.js');
|
|
41
|
+
var version = require('./version-3b05d6c8.js');
|
|
42
|
+
var selectors = require('./selectors-e3f1fd85.js');
|
|
43
43
|
var chalk = require('chalk');
|
|
44
|
-
require('./CookieConstants-000427db.js');
|
|
45
44
|
require('loglevel');
|
|
46
45
|
require('@redux-saga/core/effects');
|
|
47
46
|
require('redux');
|
|
48
47
|
require('redux-thunk');
|
|
49
48
|
require('redux-saga');
|
|
50
49
|
require('redux-injectors');
|
|
51
|
-
require('./reducers-ea1b2dc0.js');
|
|
52
50
|
require('history');
|
|
53
51
|
require('await-to-js');
|
|
54
|
-
require('./
|
|
52
|
+
require('./version-7b43af3e.js');
|
|
53
|
+
require('./ChangePassword.container-efcb1fcd.js');
|
|
54
|
+
require('./ToJs-7f965106.js');
|
|
55
55
|
require('react-hot-loader');
|
|
56
|
-
require('./RouteLoader-
|
|
56
|
+
require('./RouteLoader-4fb33db9.js');
|
|
57
57
|
|
|
58
58
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
59
59
|
|
|
@@ -241,7 +241,7 @@ const resolveParentEntries = async (parentContentTypeIds, replaceContentTypeIds,
|
|
|
241
241
|
});
|
|
242
242
|
query.fields = params.fields ? [...JSON.parse(params.fields), parentFieldId] : [];
|
|
243
243
|
if (debug) console.log(`\nResolve parent entries query: \n${JSON.stringify(query.toJSON()).substring(0, 1000)}`);
|
|
244
|
-
const parentResults = await
|
|
244
|
+
const parentResults = await SSRContext.cachedSearch.searchUsingPost(query, Number(params.linkDepth || 0), params.projectId);
|
|
245
245
|
return mergeResults(results, Util.GetItems(parentResults), replaceContentTypeIds, parentFieldId);
|
|
246
246
|
};
|
|
247
247
|
|
|
@@ -298,7 +298,7 @@ class QueryLevelResults {
|
|
|
298
298
|
}
|
|
299
299
|
if (runFirstQuery) {
|
|
300
300
|
if (this.debug) console.log(`\nLevel ${this.level} - First query: \n${JSON.stringify(query.toJSON()).substring(0, 1000)}`);
|
|
301
|
-
this.firstResults = await
|
|
301
|
+
this.firstResults = await SSRContext.cachedSearch.searchUsingPost(query, 0, params.projectId);
|
|
302
302
|
|
|
303
303
|
// mapResultsToValidatedLinks
|
|
304
304
|
for (const linkFieldId of this.linkFieldIds) {
|
|
@@ -336,7 +336,7 @@ class QueryLevelResults {
|
|
|
336
336
|
|
|
337
337
|
if (runFinalQuery) {
|
|
338
338
|
if (this.debug) console.log(`\nLevel ${this.level} - Final query: \n${JSON.stringify(query.toJSON()).substring(0, 1000)}`);
|
|
339
|
-
this.finalResults = await
|
|
339
|
+
this.finalResults = await SSRContext.cachedSearch.searchUsingPost(query, Number(params.linkDepth) || 0, params.projectId);
|
|
340
340
|
if (this.parent) this.parent.runFinalQuery = true;
|
|
341
341
|
|
|
342
342
|
// mapResultsToValidatedLinks
|
|
@@ -484,7 +484,7 @@ class LinkDepthSearchService {
|
|
|
484
484
|
};
|
|
485
485
|
})) || []);
|
|
486
486
|
if (this.debug) console.log(`\nFinal query: ${derivedIds.reduce((accumulator, object) => accumulator + object.entryIds.length, 0)} derived ids \n${JSON.stringify(query.toJSON()).substring(0, 1000)}`);
|
|
487
|
-
const finalQueryResult = await
|
|
487
|
+
const finalQueryResult = await SSRContext.cachedSearch.searchUsingPost(query, Number(params.linkDepth) || 0, params.projectId);
|
|
488
488
|
|
|
489
489
|
// Resolve any parent entries
|
|
490
490
|
|
|
@@ -3875,42 +3875,45 @@ const webApp = (app, ReactApp, config) => {
|
|
|
3875
3875
|
response.status(200);
|
|
3876
3876
|
|
|
3877
3877
|
// Create a store (with a memory history) from our current url
|
|
3878
|
-
const store = await
|
|
3878
|
+
const store$1 = await store.createStore(withReducers, {}, App.history({
|
|
3879
3879
|
initialEntries: [url]
|
|
3880
3880
|
}), stateType);
|
|
3881
3881
|
|
|
3882
3882
|
// dispatch any global and non-saga related actions before calling our JSX
|
|
3883
|
-
const versionStatus =
|
|
3883
|
+
const versionStatus = SSRContext.deliveryApi.getServerSideVersionStatus(request);
|
|
3884
3884
|
|
|
3885
3885
|
// In server-side blocks world, the hostname requested by the client resides in the x-orig-host header
|
|
3886
3886
|
// Because of this, we prioritize x-orig-host when setting our hostname
|
|
3887
3887
|
const hostname = request.headers['x-orig-host'] || request.hostname;
|
|
3888
3888
|
console.info(`Request for ${request.path} hostname: ${hostname} versionStatus: ${versionStatus}`);
|
|
3889
|
-
store.dispatch(version
|
|
3890
|
-
store.dispatch(version
|
|
3889
|
+
store$1.dispatch(version.setVersionStatus(versionStatus));
|
|
3890
|
+
store$1.dispatch(version.setVersion(versionInfo.commitRef, versionInfo.buildNo));
|
|
3891
3891
|
const project = App.pickProject(hostname, request.query);
|
|
3892
3892
|
const groups = allowedGroups && allowedGroups[project];
|
|
3893
|
-
store.dispatch(selectors.setCurrentProject(project, groups, hostname));
|
|
3893
|
+
store$1.dispatch(selectors.setCurrentProject(project, groups, hostname));
|
|
3894
3894
|
const loadableExtractor = loadableChunkExtractors();
|
|
3895
3895
|
const ssrCookies = enableSsrCookies ?
|
|
3896
3896
|
// these cookies are managed by the cookiesMiddleware and contain listeners
|
|
3897
3897
|
// when cookies are read or written in ssr can be added to the `set-cookie` response header
|
|
3898
3898
|
request.universalCookies :
|
|
3899
3899
|
// this is a stub cookie collection so cookie methods can be used in code
|
|
3900
|
-
new
|
|
3900
|
+
new CookieHelper_class.Cookies();
|
|
3901
3901
|
const jsx = /*#__PURE__*/React__default["default"].createElement(server$1.ChunkExtractorManager, {
|
|
3902
3902
|
extractor: loadableExtractor.commonLoadableExtractor
|
|
3903
3903
|
}, /*#__PURE__*/React__default["default"].createElement(reactCookie.CookiesProvider, {
|
|
3904
3904
|
cookies: ssrCookies
|
|
3905
3905
|
}, /*#__PURE__*/React__default["default"].createElement(reactRedux.Provider, {
|
|
3906
|
-
store: store
|
|
3906
|
+
store: store$1
|
|
3907
3907
|
}, /*#__PURE__*/React__default["default"].createElement(reactRouterDom.StaticRouter, {
|
|
3908
3908
|
context: context,
|
|
3909
3909
|
location: url
|
|
3910
|
+
}, /*#__PURE__*/React__default["default"].createElement(SSRContext.SSRContextProvider, {
|
|
3911
|
+
request: request,
|
|
3912
|
+
response: response
|
|
3910
3913
|
}, /*#__PURE__*/React__default["default"].createElement(ReactApp, {
|
|
3911
3914
|
routes: routes,
|
|
3912
3915
|
withEvents: withEvents
|
|
3913
|
-
})))));
|
|
3916
|
+
}))))));
|
|
3914
3917
|
const {
|
|
3915
3918
|
templateHTML = '',
|
|
3916
3919
|
templateHTMLFragment = '',
|
|
@@ -3935,7 +3938,7 @@ const webApp = (app, ReactApp, config) => {
|
|
|
3935
3938
|
|
|
3936
3939
|
// Render the JSX server side and send response as per access method options
|
|
3937
3940
|
if (!accessMethod.DYNAMIC) {
|
|
3938
|
-
store.runSaga(App.rootSaga(withSagas)).toPromise().then(() => {
|
|
3941
|
+
store$1.runSaga(App.rootSaga(withSagas)).toPromise().then(() => {
|
|
3939
3942
|
var _selectCurrentSearch;
|
|
3940
3943
|
const sheet = new styled.ServerStyleSheet();
|
|
3941
3944
|
const html = server$2.renderToString(sheet.collectStyles(jsx));
|
|
@@ -3947,7 +3950,7 @@ const webApp = (app, ReactApp, config) => {
|
|
|
3947
3950
|
if (context.url) {
|
|
3948
3951
|
return response.redirect(context.statusCode || 302, context.url);
|
|
3949
3952
|
}
|
|
3950
|
-
const reduxState = store.getState();
|
|
3953
|
+
const reduxState = store$1.getState();
|
|
3951
3954
|
const styleTags = sheet.getStyleTags();
|
|
3952
3955
|
|
|
3953
3956
|
// After running rootSaga there should be an additional react-loadable
|
|
@@ -4046,7 +4049,7 @@ const webApp = (app, ReactApp, config) => {
|
|
|
4046
4049
|
responseHandler(request, response, `Error occurred: <br />${err.stack} <br />${JSON.stringify(err)}`);
|
|
4047
4050
|
});
|
|
4048
4051
|
server$2.renderToString(jsx);
|
|
4049
|
-
store.close();
|
|
4052
|
+
store$1.close();
|
|
4050
4053
|
}
|
|
4051
4054
|
});
|
|
4052
4055
|
};
|