@nascentdigital/funnel-engine 7.0.1 → 8.0.0
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/dist/NotFound.d.ts +9 -0
- package/dist/{config/EngineConfig.js → NotFound.js} +1 -1
- package/dist/NotFound.js.map +1 -0
- package/dist/RegionalSite.js +1 -3
- package/dist/RegionalSite.js.map +1 -1
- package/dist/Site.d.ts +0 -5
- package/dist/Site.js +10 -15
- package/dist/Site.js.map +1 -1
- package/dist/SiteLayout.js +2 -3
- package/dist/SiteLayout.js.map +1 -1
- package/dist/config/ServerConfig.d.ts +2 -2
- package/dist/config/ServerConfig.js.map +1 -1
- package/dist/config/index.d.ts +0 -1
- package/dist/config/index.js +0 -1
- package/dist/config/index.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
- package/dist/config/EngineConfig.d.ts +0 -4
- package/dist/config/EngineConfig.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NotFound.js","sourceRoot":"","sources":["../src/NotFound.ts"],"names":[],"mappings":""}
|
package/dist/RegionalSite.js
CHANGED
|
@@ -4,7 +4,6 @@ exports.RegionalSite = void 0;
|
|
|
4
4
|
const funnel_core_1 = require("@nascentdigital/funnel-core");
|
|
5
5
|
const headers_1 = require("next/headers");
|
|
6
6
|
const navigation_1 = require("next/navigation");
|
|
7
|
-
const config_1 = require("./config");
|
|
8
7
|
const SiteContent_1 = require("./SiteContent");
|
|
9
8
|
// extension
|
|
10
9
|
var RegionalSite;
|
|
@@ -13,14 +12,13 @@ var RegionalSite;
|
|
|
13
12
|
function page(site, pageId, render, slugParamName = 'slug') {
|
|
14
13
|
// create content client
|
|
15
14
|
const { version } = funnel_core_1.AppConfig.get();
|
|
16
|
-
const { engine } = config_1.ServerConfig.get();
|
|
17
15
|
const siteContent = SiteContent_1.SiteContent.instance();
|
|
18
16
|
const getTemplateProps = async (props) => {
|
|
19
17
|
var _a;
|
|
20
18
|
// await locale + params
|
|
21
19
|
const draft = await (0, headers_1.draftMode)();
|
|
22
20
|
const params = await props.params;
|
|
23
|
-
const locale = await
|
|
21
|
+
const locale = await funnel_core_1.AppConfig.brandConfig().regionalization.paramsToLocale(params);
|
|
24
22
|
const region = locale.region;
|
|
25
23
|
const language = locale.language;
|
|
26
24
|
// get template data
|
package/dist/RegionalSite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegionalSite.js","sourceRoot":"","sources":["../src/RegionalSite.tsx"],"names":[],"mappings":";;;AAAA,6DAA0F;AAE1F,0CAAsC;AACtC,gDAAwC;
|
|
1
|
+
{"version":3,"file":"RegionalSite.js","sourceRoot":"","sources":["../src/RegionalSite.tsx"],"names":[],"mappings":"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"}
|
package/dist/Site.d.ts
CHANGED
|
@@ -11,7 +11,6 @@ export declare namespace Site {
|
|
|
11
11
|
searchParams: Promise<TQueryParams>;
|
|
12
12
|
};
|
|
13
13
|
function page<TPage extends Schema.Page, TParams extends Record<string, string> = Record<string, string>, TParentParams extends Record<string, string> = {}, TQueryParams extends Page.QueryParams = Page.QueryParams, TRegion extends string = string>(render: Transform<Page.Props<TParams, TParentParams, TQueryParams, TRegion, TPage>, ReactNode> | Transform.Async<Page.Props<TParams, TParentParams, TQueryParams, TRegion, TPage>, ReactNode>, page: TPage, slugParamName?: string): Page.Result<TParams, TParentParams, TQueryParams, TRegion>;
|
|
14
|
-
function notFound(): Page.NotFound;
|
|
15
14
|
namespace Page {
|
|
16
15
|
type QueryParams<T extends string = string> = Record<T, string | string[] | undefined>;
|
|
17
16
|
type Options = {
|
|
@@ -31,9 +30,5 @@ export declare namespace Site {
|
|
|
31
30
|
Component: React.FC<Site.Props<TParams, TQueryParams>>;
|
|
32
31
|
generateMetadata: (props: Site.Props<TParams & TParentParams, TQueryParams>, parent: ResolvingMetadata) => Promise<Metadata>;
|
|
33
32
|
};
|
|
34
|
-
type NotFound = {
|
|
35
|
-
Component: React.FC;
|
|
36
|
-
generateMetadata: undefined;
|
|
37
|
-
};
|
|
38
33
|
}
|
|
39
34
|
}
|
package/dist/Site.js
CHANGED
|
@@ -15,14 +15,14 @@ var Site;
|
|
|
15
15
|
function page(render, page, slugParamName = 'slug') {
|
|
16
16
|
// create content client
|
|
17
17
|
const { version } = funnel_core_1.AppConfig.get();
|
|
18
|
-
const {
|
|
18
|
+
const { NotFound } = config_1.ServerConfig.get();
|
|
19
19
|
const siteContent = SiteContent_1.SiteContent.instance();
|
|
20
20
|
const getTemplateProps = async (props) => {
|
|
21
21
|
// await locale + params
|
|
22
22
|
const { isEnabled: draft } = await (0, headers_1.draftMode)();
|
|
23
23
|
const preview = draft || version === 'draft';
|
|
24
24
|
const params = await props.params;
|
|
25
|
-
const locale = await
|
|
25
|
+
const locale = await funnel_core_1.AppConfig.brandConfig().regionalization.paramsToLocale(params);
|
|
26
26
|
const language = locale.language;
|
|
27
27
|
const region = locale.region;
|
|
28
28
|
// pass searchParams promise and let client page await and handle as needed
|
|
@@ -53,7 +53,14 @@ var Site;
|
|
|
53
53
|
const { pageGroup, region, language, params, searchParams, draft, preview } = await getTemplateProps(props);
|
|
54
54
|
// render not found if content isn't available
|
|
55
55
|
if (!pageGroup || (preview && pageGroup.page.data.state === 'unpublished')) {
|
|
56
|
-
|
|
56
|
+
// use custom not found page
|
|
57
|
+
if (NotFound) {
|
|
58
|
+
return ((0, jsx_runtime_1.jsx)(NotFound, { region: region, language: language }));
|
|
59
|
+
}
|
|
60
|
+
// or go with default NextJS behaviour
|
|
61
|
+
else {
|
|
62
|
+
(0, navigation_1.notFound)();
|
|
63
|
+
}
|
|
57
64
|
}
|
|
58
65
|
// fetch template component
|
|
59
66
|
const { page, group } = pageGroup;
|
|
@@ -127,17 +134,5 @@ var Site;
|
|
|
127
134
|
};
|
|
128
135
|
}
|
|
129
136
|
Site.page = page;
|
|
130
|
-
// default page for pages that should not exist
|
|
131
|
-
function notFound() {
|
|
132
|
-
return {
|
|
133
|
-
Component: () => {
|
|
134
|
-
// always call not found to 404
|
|
135
|
-
(0, navigation_1.notFound)();
|
|
136
|
-
},
|
|
137
|
-
// metadata should not exist
|
|
138
|
-
generateMetadata: undefined
|
|
139
|
-
};
|
|
140
|
-
}
|
|
141
|
-
Site.notFound = notFound;
|
|
142
137
|
})(Site || (exports.Site = Site = {}));
|
|
143
138
|
//# sourceMappingURL=Site.js.map
|
package/dist/Site.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Site.js","sourceRoot":"","sources":["../src/Site.tsx"],"names":[],"mappings":";;;;AAAA,6DAAoG;AAEpG,0CAAsC;AACtC,gDAAwD;AAExD,qCAAkD;AAClD,qCAAqC;AACrC,+CAAyC;AAGzC,YAAY;AACZ,IAAiB,IAAI,
|
|
1
|
+
{"version":3,"file":"Site.js","sourceRoot":"","sources":["../src/Site.tsx"],"names":[],"mappings":"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"}
|
package/dist/SiteLayout.js
CHANGED
|
@@ -5,7 +5,6 @@ const jsx_runtime_1 = require("react/jsx-runtime");
|
|
|
5
5
|
const funnel_core_1 = require("@nascentdigital/funnel-core");
|
|
6
6
|
const headers_1 = require("next/headers");
|
|
7
7
|
const client_1 = require("./client");
|
|
8
|
-
const config_1 = require("./config");
|
|
9
8
|
const SiteContent_1 = require("./SiteContent");
|
|
10
9
|
// extension
|
|
11
10
|
var SiteLayout;
|
|
@@ -30,11 +29,11 @@ var SiteLayout;
|
|
|
30
29
|
const draft = await (0, headers_1.draftMode)();
|
|
31
30
|
const preview = draft.isEnabled || appConfig.version === 'draft';
|
|
32
31
|
const params = await paramsProvider;
|
|
33
|
-
const locale = await
|
|
32
|
+
const locale = await funnel_core_1.AppConfig.brandConfig().regionalization.paramsToLocale(params);
|
|
34
33
|
const region = locale.region;
|
|
35
34
|
const language = locale.language;
|
|
36
35
|
// render
|
|
37
|
-
return ((0, jsx_runtime_1.jsxs)("html", { lang: language, className: className, children: [(0, jsx_runtime_1.jsx)("body", { children: (0, jsx_runtime_1.jsx)(client_1.BreakpointContainer, { children: (0, jsx_runtime_1.jsx)(client_1.AppContainer, { siteData: siteData, brand: brand,
|
|
36
|
+
return ((0, jsx_runtime_1.jsxs)("html", { lang: language, className: className, children: [(0, jsx_runtime_1.jsx)("body", { children: (0, jsx_runtime_1.jsx)(client_1.BreakpointContainer, { children: (0, jsx_runtime_1.jsx)(client_1.AppContainer, { siteData: siteData, brand: brand, locale: locale, children: render({
|
|
38
37
|
preview,
|
|
39
38
|
region,
|
|
40
39
|
language,
|
package/dist/SiteLayout.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteLayout.js","sourceRoot":"","sources":["../src/SiteLayout.tsx"],"names":[],"mappings":";;;;AAAA,6DAAmH;AAEnH,0CAAsC;AAEtC,qCAA0D;AAC1D
|
|
1
|
+
{"version":3,"file":"SiteLayout.js","sourceRoot":"","sources":["../src/SiteLayout.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { EditorConfig } from './EditorConfig';
|
|
2
2
|
import { NextConfig } from './NextConfig';
|
|
3
|
-
import {
|
|
3
|
+
import { NotFound } from '../NotFound';
|
|
4
4
|
export type ServerConfig<TParams extends Record<string, string> = any> = {
|
|
5
5
|
editor: EditorConfig;
|
|
6
|
-
engine: EngineConfig<any>;
|
|
7
6
|
next: NextConfig;
|
|
7
|
+
NotFound?: NotFound;
|
|
8
8
|
};
|
|
9
9
|
export declare namespace ServerConfig {
|
|
10
10
|
function get(): Readonly<ServerConfig>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerConfig.js","sourceRoot":"","sources":["../../src/config/ServerConfig.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"ServerConfig.js","sourceRoot":"","sources":["../../src/config/ServerConfig.ts"],"names":[],"mappings":";;;AAAA,6DAAiE;AAajE,YAAY;AACZ,IAAiB,YAAY,CA4B5B;AA5BD,WAAiB,YAAY;IAE3B,SAAgB,GAAG;QAEjB,8BAA8B;QAC9B,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,mCAAqB,CAAC,6CAA6C,CAAC,CAAA;QAChF,CAAC;QAED,gBAAgB;QAChB,OAAO,MAAM,CAAA;IACf,CAAC;IATe,gBAAG,MASlB,CAAA;IAED,SAAgB,GAAG,CAAC,MAAoB;QAEtC,8DAA8D;QAC9D,MAAM,GAAG,MAAM,CAAA;IACjB,CAAC;IAJe,gBAAG,MAIlB,CAAA;IAED,SAAgB,UAAU;QACxB,MAAM,EAAC,IAAI,EAAC,GAAG,GAAG,EAAE,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAHe,uBAAU,aAGzB,CAAA;IAED,SAAgB,YAAY;QAC1B,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,EAAE,CAAA;QACtB,OAAO,MAAM,CAAA;IACf,CAAC;IAHe,yBAAY,eAG3B,CAAA;AACH,CAAC,EA5BgB,YAAY,4BAAZ,YAAY,QA4B5B;AAGD,uBAAuB;AACvB,IAAI,MAAM,GAA6B,SAAS,CAAA"}
|
package/dist/config/index.d.ts
CHANGED
package/dist/config/index.js
CHANGED
|
@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./EditorConfig"), exports);
|
|
18
|
-
__exportStar(require("./EngineConfig"), exports);
|
|
19
18
|
__exportStar(require("./NextConfig"), exports);
|
|
20
19
|
__exportStar(require("./ServerConfig"), exports);
|
|
21
20
|
__exportStar(require("./SiteConfig"), exports);
|
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA8B;AAC9B
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA8B;AAC9B,+CAA4B;AAC5B,iDAA8B;AAC9B,+CAA4B"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -19,6 +19,7 @@ __exportStar(require("./forms"), exports);
|
|
|
19
19
|
__exportStar(require("./middleware"), exports);
|
|
20
20
|
__exportStar(require("./query"), exports);
|
|
21
21
|
__exportStar(require("./LeadGen"), exports);
|
|
22
|
+
__exportStar(require("./NotFound"), exports);
|
|
22
23
|
__exportStar(require("./RegionalSite"), exports);
|
|
23
24
|
__exportStar(require("./Site"), exports);
|
|
24
25
|
__exportStar(require("./SiteAuth"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,0CAAuB;AACvB,+CAA4B;AAC5B,0CAAuB;AACvB,4CAAyB;AACzB,iDAA8B;AAC9B,yCAAsB;AACtB,6CAA0B;AAC1B,gDAA6B;AAC7B,+CAA4B;AAC5B,+CAA4B;AAC5B,4CAAyB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,0CAAuB;AACvB,+CAA4B;AAC5B,0CAAuB;AACvB,4CAAyB;AACzB,6CAA0B;AAC1B,iDAA8B;AAC9B,yCAAsB;AACtB,6CAA0B;AAC1B,gDAA6B;AAC7B,+CAA4B;AAC5B,+CAA4B;AAC5B,4CAAyB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nascentdigital/funnel-engine",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"registry": "https://registry.npmjs.org/",
|
|
6
6
|
"access": "public"
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"ts-jest": "^29",
|
|
46
46
|
"type-fest": "^4"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "5fb91f3eecdfe1bcf18dc78f0ecf99668816d02a"
|
|
49
49
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"EngineConfig.js","sourceRoot":"","sources":["../../src/config/EngineConfig.ts"],"names":[],"mappings":""}
|