@remkoj/optimizely-cms-nextjs 5.0.2 → 6.0.0-pre1
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/cms-page/data.d.ts +5 -6
- package/dist/cms-page/data.js +1 -41
- package/dist/cms-page/data.js.map +1 -1
- package/dist/cms-page/layout.d.ts +4 -4
- package/dist/cms-page/layout.js +26 -20
- package/dist/cms-page/layout.js.map +1 -1
- package/dist/cms-page/page.d.ts +10 -5
- package/dist/cms-page/page.js +39 -23
- package/dist/cms-page/page.js.map +1 -1
- package/dist/components/on-page-edit.js +1 -1
- package/dist/components/on-page-edit.js.map +1 -1
- package/dist/ope/page.js +7 -2
- package/dist/ope/page.js.map +1 -1
- package/dist/ope/tools.d.ts +2 -2
- package/dist/ope/tools.js.map +1 -1
- package/dist/ope/types.d.ts +38 -35
- package/package.json +21 -20
package/dist/cms-page/data.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type IOptiGraphClient } from "@remkoj/optimizely-graph-client";
|
|
2
2
|
export type GetContentByPathVariables<LocaleType = string> = {
|
|
3
3
|
path: string | string[];
|
|
4
4
|
locale?: Array<LocaleType> | LocaleType;
|
|
5
5
|
siteId?: string;
|
|
6
|
+
changeset?: string | null;
|
|
6
7
|
};
|
|
7
8
|
type MayBe<T> = T extends Array<infer R> ? Array<R | null> | null : T | null;
|
|
8
9
|
export type GetContentByPathResponse = {
|
|
@@ -29,8 +30,6 @@ export type GetMetaDataByPathResponse = {
|
|
|
29
30
|
} | null>;
|
|
30
31
|
};
|
|
31
32
|
};
|
|
32
|
-
export type GetContentByPathMethod<LocaleType = string> = (client:
|
|
33
|
-
export type GetMetaDataByPathMethod<LocaleType = string> = (client:
|
|
34
|
-
export
|
|
35
|
-
export declare const getContentByPath: GetContentByPathMethod;
|
|
36
|
-
export default getContentByPath;
|
|
33
|
+
export type GetContentByPathMethod<LocaleType = string> = (client: IOptiGraphClient, variables: GetContentByPathVariables<LocaleType>) => Promise<GetContentByPathResponse>;
|
|
34
|
+
export type GetMetaDataByPathMethod<LocaleType = string> = (client: IOptiGraphClient, variables: GetContentByPathVariables<LocaleType>) => Promise<GetMetaDataByPathResponse>;
|
|
35
|
+
export {};
|
package/dist/cms-page/data.js
CHANGED
|
@@ -1,42 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export const getMetaDataByPath = (client, variables) => {
|
|
3
|
-
return client.request(metadataQuery, variables);
|
|
4
|
-
};
|
|
5
|
-
export const getContentByPath = (client, variables) => {
|
|
6
|
-
return client.request(contentQuery, variables);
|
|
7
|
-
};
|
|
8
|
-
export default getContentByPath;
|
|
9
|
-
const contentQuery = gql `query getContentByPathBase($path: String!, $domain: String, $locale: [Locales]) {
|
|
10
|
-
content: Content(
|
|
11
|
-
where: { _metadata: { url: { hierarchical: { eq: $path }, base: { eq: $domain } } } }
|
|
12
|
-
locale: $locale
|
|
13
|
-
) {
|
|
14
|
-
total
|
|
15
|
-
items {
|
|
16
|
-
_metadata {
|
|
17
|
-
key
|
|
18
|
-
locale
|
|
19
|
-
types
|
|
20
|
-
displayName
|
|
21
|
-
version
|
|
22
|
-
}
|
|
23
|
-
_type: __typename
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
}`;
|
|
27
|
-
const metadataQuery = gql `query getGenericMetaData($path: String!, $locale: [Locales], $siteId: String) {
|
|
28
|
-
getGenericMetaData: Content (
|
|
29
|
-
where: { RelativePath: { eq: $path }, SiteId: { eq: $siteId } }
|
|
30
|
-
locale: $locale
|
|
31
|
-
) {
|
|
32
|
-
items {
|
|
33
|
-
name: Name,
|
|
34
|
-
alternatives: ExistingLanguages {
|
|
35
|
-
locale: Name
|
|
36
|
-
href: Link
|
|
37
|
-
}
|
|
38
|
-
canonical: Url
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
}`;
|
|
1
|
+
export {};
|
|
42
2
|
//# sourceMappingURL=data.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/cms-page/data.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/cms-page/data.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type PropsWithChildren, type ReactNode } from
|
|
2
|
-
import { type Metadata, type ResolvingMetadata } from
|
|
3
|
-
import type { ChannelDefinition, ClientFactory } from
|
|
1
|
+
import { type PropsWithChildren, type ReactNode, type JSX } from 'react';
|
|
2
|
+
import { type Metadata, type ResolvingMetadata } from 'next';
|
|
3
|
+
import type { ChannelDefinition, ClientFactory } from '@remkoj/optimizely-graph-client';
|
|
4
4
|
import type { DefaultCmsPageProps } from './page.js';
|
|
5
5
|
import { type GetMetaDataByPathMethod } from './data.js';
|
|
6
6
|
export type CmsPageLayout = {
|
|
@@ -9,7 +9,7 @@ export type CmsPageLayout = {
|
|
|
9
9
|
};
|
|
10
10
|
export type CreateLayoutOptions = {
|
|
11
11
|
defaultLocale: string | null;
|
|
12
|
-
getMetaDataByPath
|
|
12
|
+
getMetaDataByPath?: GetMetaDataByPathMethod;
|
|
13
13
|
client: ClientFactory;
|
|
14
14
|
channel?: ChannelDefinition;
|
|
15
15
|
};
|
package/dist/cms-page/layout.js
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { getServerClient } from "../client.js";
|
|
1
|
+
import { createClient } from '../client.js';
|
|
3
2
|
import { Utils, isDebug } from '@remkoj/optimizely-cms-react/rsc';
|
|
4
3
|
const defaultCreateLayoutOptions = {
|
|
5
4
|
defaultLocale: null,
|
|
6
|
-
|
|
7
|
-
client: getServerClient
|
|
5
|
+
client: createClient,
|
|
8
6
|
};
|
|
9
7
|
export function createLayout(options) {
|
|
10
|
-
const { defaultLocale, getMetaDataByPath, client: clientFactory, channel } = {
|
|
8
|
+
const { defaultLocale, getMetaDataByPath, client: clientFactory, channel, } = {
|
|
11
9
|
...defaultCreateLayoutOptions,
|
|
12
|
-
...
|
|
13
|
-
...options
|
|
10
|
+
...options,
|
|
14
11
|
};
|
|
15
12
|
const pageLayoutDefinition = {
|
|
16
13
|
/**
|
|
@@ -20,15 +17,21 @@ export function createLayout(options) {
|
|
|
20
17
|
* @param props The layout properties
|
|
21
18
|
* @returns The metadata that must be merged into the defaults
|
|
22
19
|
*/
|
|
23
|
-
generateMetadata: async ({ params }, resolving) => {
|
|
20
|
+
generateMetadata: async ({ params: asyncParams }, resolving) => {
|
|
21
|
+
const params = await asyncParams;
|
|
24
22
|
const relativePath = `/${params.path ? '/' + params.path.join('/') : ''}`;
|
|
25
23
|
if (isDebug())
|
|
26
24
|
console.log(`⚪ [CmsPageLayout] Generating metadata for: ${relativePath}`);
|
|
25
|
+
if (!getMetaDataByPath) {
|
|
26
|
+
if (isDebug())
|
|
27
|
+
console.log(`🟡 [CmsPageLayout] No generic metadata function provided`);
|
|
28
|
+
return {};
|
|
29
|
+
}
|
|
27
30
|
const variables = {
|
|
28
|
-
path: relativePath
|
|
31
|
+
path: relativePath,
|
|
29
32
|
};
|
|
30
33
|
const client = clientFactory();
|
|
31
|
-
const response = await getMetaDataByPath(client, variables).catch(e => {
|
|
34
|
+
const response = await getMetaDataByPath(client, variables).catch((e) => {
|
|
32
35
|
console.error(`[CmsPageLayout] Metadata error:`, e);
|
|
33
36
|
return undefined;
|
|
34
37
|
});
|
|
@@ -39,27 +42,30 @@ export function createLayout(options) {
|
|
|
39
42
|
return {};
|
|
40
43
|
}
|
|
41
44
|
const base = await resolving;
|
|
42
|
-
const title = base?.title?.template
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
45
|
+
const title = base?.title?.template
|
|
46
|
+
? {
|
|
47
|
+
template: base?.title?.template,
|
|
48
|
+
default: metadata.name,
|
|
49
|
+
}
|
|
50
|
+
: metadata.name;
|
|
46
51
|
let pageMetadata = {
|
|
47
52
|
title,
|
|
48
53
|
alternates: {
|
|
49
54
|
canonical: metadata.canonical,
|
|
50
|
-
languages: {}
|
|
55
|
+
languages: {},
|
|
51
56
|
},
|
|
52
57
|
openGraph: {
|
|
53
58
|
...base.openGraph,
|
|
54
59
|
title,
|
|
55
60
|
url: metadata.canonical,
|
|
56
|
-
alternateLocale: []
|
|
57
|
-
}
|
|
61
|
+
alternateLocale: [],
|
|
62
|
+
},
|
|
58
63
|
};
|
|
59
64
|
// Add alternative URLs
|
|
60
65
|
const alternates = (metadata?.alternatives || []).filter(Utils.isNotNullOrUndefined);
|
|
61
|
-
alternates.forEach(alt => {
|
|
62
|
-
if (pageMetadata.openGraph &&
|
|
66
|
+
alternates.forEach((alt) => {
|
|
67
|
+
if (pageMetadata.openGraph &&
|
|
68
|
+
Array.isArray(pageMetadata.openGraph.alternateLocale)) {
|
|
63
69
|
pageMetadata.openGraph.alternateLocale.push(alt.locale);
|
|
64
70
|
}
|
|
65
71
|
if (pageMetadata.alternates && pageMetadata.alternates.languages) {
|
|
@@ -69,7 +75,7 @@ export function createLayout(options) {
|
|
|
69
75
|
});
|
|
70
76
|
return pageMetadata;
|
|
71
77
|
},
|
|
72
|
-
PageLayout: ({ children }) => children
|
|
78
|
+
PageLayout: ({ children }) => children,
|
|
73
79
|
};
|
|
74
80
|
return pageLayoutDefinition;
|
|
75
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/cms-page/layout.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/cms-page/layout.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAA;AAmBjE,MAAM,0BAA0B,GAAwB;IACtD,aAAa,EAAE,IAAI;IACnB,MAAM,EAAE,YAAY;CACrB,CAAA;AAED,MAAM,UAAU,YAAY,CAC1B,OAAsC;IAEtC,MAAM,EACJ,aAAa,EACb,iBAAiB,EACjB,MAAM,EAAE,aAAa,EACrB,OAAO,GACR,GAAwB;QACvB,GAAG,0BAA0B;QAC7B,GAAG,OAAO;KACX,CAAA;IAED,MAAM,oBAAoB,GAAkB;QAC1C;;;;;;WAMG;QACH,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,EAAE;YAC7D,MAAM,MAAM,GAAG,MAAM,WAAW,CAAA;YAChC,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;YAEzE,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,GAAG,CACT,8CAA8C,YAAY,EAAE,CAC7D,CAAA;YAEH,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,IAAI,OAAO,EAAE;oBACX,OAAO,CAAC,GAAG,CACT,0DAA0D,CAC3D,CAAA;gBACH,OAAO,EAAE,CAAA;YACX,CAAC;YACD,MAAM,SAAS,GAAG;gBAChB,IAAI,EAAE,YAAY;aACnB,CAAA;YACD,MAAM,MAAM,GAAG,aAAa,EAAE,CAAA;YAC9B,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACtE,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAA;gBACnD,OAAO,SAAS,CAAA;YAClB,CAAC,CAAC,CAAA;YACF,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,OAAO,EAAE;oBACX,OAAO,CAAC,GAAG,CACT,qDAAqD,YAAY,EAAE,CACpE,CAAA;gBACH,OAAO,EAAE,CAAA;YACX,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAA;YAC5B,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ;gBACjC,CAAC,CAAC;oBACE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ;oBAC/B,OAAO,EAAE,QAAQ,CAAC,IAAc;iBACjC;gBACH,CAAC,CAAE,QAAQ,CAAC,IAAe,CAAA;YAC7B,IAAI,YAAY,GAAa;gBAC3B,KAAK;gBACL,UAAU,EAAE;oBACV,SAAS,EAAE,QAAQ,CAAC,SAAmB;oBACvC,SAAS,EAAE,EAAE;iBACd;gBACD,SAAS,EAAE;oBACT,GAAG,IAAI,CAAC,SAAS;oBACjB,KAAK;oBACL,GAAG,EAAE,QAAQ,CAAC,SAAmB;oBACjC,eAAe,EAAE,EAAE;iBACpB;aACF,CAAA;YAED,uBAAuB;YACvB,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CACtD,KAAK,CAAC,oBAAoB,CACW,CAAA;YACvC,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACzB,IACE,YAAY,CAAC,SAAS;oBACtB,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,EACrD,CAAC;oBACD,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBACzD,CAAC;gBACD,IAAI,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;oBACjE,+FAA+F;oBAC/F,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAA;gBAC1D,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,YAAY,CAAA;QACrB,CAAC;QAED,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ;KACvC,CAAA;IACD,OAAO,oBAAoB,CAAA;AAC7B,CAAC;AAED,eAAe,YAAY,CAAA"}
|
package/dist/cms-page/page.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import 'server-only';
|
|
2
2
|
import type { Metadata, ResolvingMetadata } from 'next';
|
|
3
|
+
import { type JSX } from 'react';
|
|
3
4
|
import { type IRouteResolver, type Route } from '@remkoj/optimizely-graph-client/router';
|
|
4
5
|
import { type ChannelDefinition } from '@remkoj/optimizely-graph-client/channels';
|
|
5
6
|
import { type IOptiGraphClient } from '@remkoj/optimizely-graph-client/client';
|
|
@@ -10,8 +11,8 @@ export type DefaultCmsPageParams = {
|
|
|
10
11
|
};
|
|
11
12
|
export type DefaultCmsPageSearchParams = {};
|
|
12
13
|
export type DefaultCmsPageProps<TParams extends Record<string, string | Array<string> | undefined> = DefaultCmsPageParams, TSearchParams extends Record<string, string | Array<string> | undefined> = DefaultCmsPageSearchParams> = {
|
|
13
|
-
params: TParams
|
|
14
|
-
searchParams: TSearchParams
|
|
14
|
+
params: Promise<TParams>;
|
|
15
|
+
searchParams: Promise<TSearchParams>;
|
|
15
16
|
};
|
|
16
17
|
export type OptiCmsNextJsPage<TParams extends Record<string, string | Array<string> | undefined> = DefaultCmsPageParams, TSearchParams extends Record<string, string | Array<string> | undefined> = DefaultCmsPageSearchParams> = {
|
|
17
18
|
/**
|
|
@@ -50,8 +51,12 @@ export type CreatePageOptions<LocaleEnum = SystemLocales, TParams extends Record
|
|
|
50
51
|
/**
|
|
51
52
|
* The factory that should yield the GraphQL Client to be used within this
|
|
52
53
|
* page.
|
|
54
|
+
*
|
|
55
|
+
* @param token The token retrieved by the CMS Page from the context, always undefined
|
|
56
|
+
* @param scope The scope in which the client is being created, this allows for checking draftMode in configuring the client
|
|
57
|
+
* @returns The client instance
|
|
53
58
|
*/
|
|
54
|
-
client: () => IOptiGraphClient
|
|
59
|
+
client: (token?: string, scope?: 'request' | 'metadata') => IOptiGraphClient | Promise<IOptiGraphClient>;
|
|
55
60
|
/**
|
|
56
61
|
* The channel information used to resolve locales, domains and more
|
|
57
62
|
*/
|
|
@@ -76,7 +81,7 @@ export type CreatePageOptions<LocaleEnum = SystemLocales, TParams extends Record
|
|
|
76
81
|
* @return The path to be retrieved from Router or getContentByPath
|
|
77
82
|
* function
|
|
78
83
|
*/
|
|
79
|
-
propsToCmsPath: (props: DefaultCmsPageProps<TParams, TSearchParams>) => string | null
|
|
84
|
+
propsToCmsPath: (props: DefaultCmsPageProps<TParams, TSearchParams>) => Promise<string | null>;
|
|
80
85
|
/**
|
|
81
86
|
* Take the route from the Routing Service and transform that to the route
|
|
82
87
|
* params used by Next.JS. The default implementation assumes that the CMS
|
|
@@ -94,7 +99,7 @@ export type CreatePageOptions<LocaleEnum = SystemLocales, TParams extends Record
|
|
|
94
99
|
* @param slugs The slugs to resolve
|
|
95
100
|
* @returns The resolved locale
|
|
96
101
|
*/
|
|
97
|
-
paramsToLocale: (params?: TParams
|
|
102
|
+
paramsToLocale: (params?: Promise<TParams | undefined>, channel?: ChannelDefinition) => Promise<string | undefined>;
|
|
98
103
|
};
|
|
99
104
|
/**
|
|
100
105
|
* Generate the React Server Side component and Next.JS functions needed to render an
|
package/dist/cms-page/page.js
CHANGED
|
@@ -19,14 +19,14 @@ export var SystemLocales;
|
|
|
19
19
|
const CreatePageOptionDefaults = {
|
|
20
20
|
client: createClient,
|
|
21
21
|
routerFactory: (client) => new RouteResolver(client),
|
|
22
|
-
propsToCmsPath: ({ params }) => buildRequestPath(params),
|
|
22
|
+
propsToCmsPath: async ({ params }) => buildRequestPath(await params),
|
|
23
23
|
routeToParams: (route) => {
|
|
24
24
|
return { path: urlToPath(route.url), lang: route.locale };
|
|
25
25
|
},
|
|
26
|
-
paramsToLocale: (params, channel) => {
|
|
26
|
+
paramsToLocale: async (params, channel) => {
|
|
27
27
|
if (!channel)
|
|
28
28
|
return undefined;
|
|
29
|
-
const lang = params?.lang;
|
|
29
|
+
const lang = (await params)?.lang;
|
|
30
30
|
const toTest = Array.isArray(lang) ? lang.at(0) : lang;
|
|
31
31
|
if (!toTest)
|
|
32
32
|
return channel.defaultLocale;
|
|
@@ -48,17 +48,17 @@ export function createPage(factory, options) {
|
|
|
48
48
|
...CreatePageOptionDefaults,
|
|
49
49
|
...options,
|
|
50
50
|
};
|
|
51
|
-
function buildContext(initialLocale = 'en') {
|
|
51
|
+
async function buildContext(initialLocale = 'en') {
|
|
52
52
|
return new ServerContext({
|
|
53
53
|
factory,
|
|
54
|
-
client: clientFactory(),
|
|
54
|
+
client: await clientFactory(undefined, 'request'),
|
|
55
55
|
mode: 'public',
|
|
56
56
|
locale: initialLocale,
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
const pageDefintion = {
|
|
60
60
|
generateStaticParams: async () => {
|
|
61
|
-
const client = clientFactory();
|
|
61
|
+
const client = await clientFactory(undefined, 'metadata');
|
|
62
62
|
const router = routerFactory(client);
|
|
63
63
|
const channelId = getChannelId(client, channel);
|
|
64
64
|
const allRoutes = await router.getRoutes(channelId, channel ? undefined : true);
|
|
@@ -66,18 +66,21 @@ export function createPage(factory, options) {
|
|
|
66
66
|
},
|
|
67
67
|
generateMetadata: async ({ params, searchParams }, parent) => {
|
|
68
68
|
// Get context
|
|
69
|
-
const context = buildContext();
|
|
69
|
+
const context = await buildContext();
|
|
70
70
|
const channelId = getChannelId(context.client, channel);
|
|
71
71
|
// Read variables from request
|
|
72
|
-
const requestPath =
|
|
72
|
+
const [requestPath, initialLocale] = await Promise.all([
|
|
73
|
+
propsToCmsPath({ params, searchParams }),
|
|
74
|
+
paramsToLocale(params, channel),
|
|
75
|
+
]);
|
|
73
76
|
if (!requestPath)
|
|
74
77
|
return Promise.resolve({});
|
|
75
|
-
const initialLocale = paramsToLocale(params, channel);
|
|
76
78
|
if (initialLocale)
|
|
77
79
|
context.setLocale(initialLocale);
|
|
80
|
+
const awaitedParams = await params;
|
|
78
81
|
// Debug output
|
|
79
82
|
if (context.isDebug)
|
|
80
|
-
console.log(`⚪ [CmsPage.generateMetadata] Processed Next.JS route: ${JSON.stringify(
|
|
83
|
+
console.log(`⚪ [CmsPage.generateMetadata] Processed Next.JS route: ${JSON.stringify(awaitedParams)} => Optimizely CMS route: ${JSON.stringify({ path: requestPath, siteId: channelId })}`);
|
|
81
84
|
// Resolve the route to a content link
|
|
82
85
|
const routeInfo = await getInfoByPath(context.client, routerFactory, requestPath, channel);
|
|
83
86
|
if (!routeInfo || !routeInfo[0]) {
|
|
@@ -117,29 +120,33 @@ export function createPage(factory, options) {
|
|
|
117
120
|
},
|
|
118
121
|
CmsPage: async ({ params, searchParams }) => {
|
|
119
122
|
// Prepare the context
|
|
120
|
-
const context = buildContext();
|
|
123
|
+
const context = await buildContext();
|
|
124
|
+
//const params = await asyncParams;
|
|
121
125
|
// Analyze the Next.JS Request props
|
|
122
|
-
const requestPath =
|
|
126
|
+
const [requestPath, initialLocale] = await Promise.all([
|
|
127
|
+
propsToCmsPath({ params, searchParams }),
|
|
128
|
+
paramsToLocale(params, channel),
|
|
129
|
+
]);
|
|
130
|
+
const awaitedParams = await params;
|
|
123
131
|
if (context.isDebug)
|
|
124
|
-
console.log(`⚪ [CmsPage] Processed Next.JS route: ${JSON.stringify(
|
|
132
|
+
console.log(`⚪ [CmsPage] Processed Next.JS route: ${JSON.stringify(awaitedParams)} => Optimizely CMS route: ${JSON.stringify({ path: requestPath })}`);
|
|
125
133
|
// If we don't have the path, or the path is an internal Next.js route reject it.
|
|
126
134
|
if (!requestPath || requestPath.startsWith('/_next/'))
|
|
127
135
|
return notFound();
|
|
128
136
|
// Determine the initial locale
|
|
129
|
-
const initialLocale = paramsToLocale(params, channel);
|
|
130
137
|
if (initialLocale)
|
|
131
138
|
context.setLocale(initialLocale);
|
|
132
139
|
// Resolve the content based upon the path
|
|
133
|
-
const lookupData = getContentByPath
|
|
134
|
-
?
|
|
135
|
-
:
|
|
140
|
+
const lookupData = await (getContentByPath
|
|
141
|
+
? loadContentByPath(context.client, getContentByPath, requestPath, channel)
|
|
142
|
+
: getInfoByPath(context.client, routerFactory, requestPath, channel));
|
|
136
143
|
if (!lookupData) {
|
|
137
144
|
console.error(`🔴 [CmsPage] Unable to resolve the content for ${JSON.stringify(params)}!`);
|
|
138
145
|
return notFound();
|
|
139
146
|
}
|
|
140
147
|
const [route, contentLink, contentType, graphLocale, contentData] = lookupData;
|
|
141
148
|
if (contentLink?.locale)
|
|
142
|
-
context.setLocale(contentLink
|
|
149
|
+
context.setLocale(contentLink.locale);
|
|
143
150
|
// Make the shared server context available
|
|
144
151
|
updateSharedServerContext(context);
|
|
145
152
|
// Render the content link
|
|
@@ -150,17 +157,24 @@ export function createPage(factory, options) {
|
|
|
150
157
|
}
|
|
151
158
|
// Helper function to obtain the info by path
|
|
152
159
|
async function getInfoByPath(client, routerFactory, requestPath, channel) {
|
|
160
|
+
if (client.debug)
|
|
161
|
+
console.log(`⚪ [CmsPage.getInfoByPath] Loading content for path "${requestPath}" using RouteResolver`);
|
|
153
162
|
const channelId = getChannelId(client, channel);
|
|
154
163
|
const router = routerFactory(client);
|
|
155
164
|
const route = await router.getContentInfoByPath(requestPath, channelId);
|
|
156
|
-
if (!route)
|
|
165
|
+
if (!route) {
|
|
166
|
+
if (client.debug)
|
|
167
|
+
console.warn(`🟠 [CmsPage.getInfoByPath] The RouteResolver was unable to resolve the route information for "${requestPath}"`);
|
|
157
168
|
return undefined;
|
|
169
|
+
}
|
|
158
170
|
const contentLink = router.routeToContentLink(route);
|
|
159
171
|
const contentType = route.contentType;
|
|
160
172
|
const graphLocale = localeToGraphLocale(route.locale, channel);
|
|
161
173
|
return [route, contentLink, contentType, graphLocale, null];
|
|
162
174
|
}
|
|
163
175
|
async function loadContentByPath(client, getContentByPath, requestPath, channel, isDebug = false) {
|
|
176
|
+
if (client.debug)
|
|
177
|
+
console.log(`⚪ [CmsPage.loadContentByPath] Loading content for path "${requestPath}" using getContentByPath method`);
|
|
164
178
|
const channelId = getChannelId(client, channel);
|
|
165
179
|
const pathForRequest = [
|
|
166
180
|
requestPath,
|
|
@@ -172,26 +186,28 @@ async function loadContentByPath(client, getContentByPath, requestPath, channel,
|
|
|
172
186
|
path: pathForRequest,
|
|
173
187
|
siteId: channelId,
|
|
174
188
|
};
|
|
189
|
+
if (client?.isPreviewEnabled())
|
|
190
|
+
requestVars.changeset = client?.getChangeset();
|
|
175
191
|
if (isDebug)
|
|
176
|
-
console.log(`⚪ [CmsPage] Processed Next.JS route => getContentByPath Variables: ${JSON.stringify(requestVars)}`);
|
|
192
|
+
console.log(`⚪ [CmsPage.loadContentByPath] Processed Next.JS route => getContentByPath Variables: ${JSON.stringify(requestVars)}`);
|
|
177
193
|
const response = await getContentByPath(client, requestVars);
|
|
178
194
|
const info = Array.isArray(response?.content?.items)
|
|
179
195
|
? response?.content?.items[0]
|
|
180
196
|
: response?.content?.items;
|
|
181
197
|
if (!info) {
|
|
182
198
|
if (isDebug) {
|
|
183
|
-
console.error(`🔴 [CmsPage] Unable to load content for ${requestPath}, data received: `, response);
|
|
199
|
+
console.error(`🔴 [CmsPage.loadContentByPath] Unable to load content for ${requestPath}, data received: `, response);
|
|
184
200
|
}
|
|
185
201
|
return notFound();
|
|
186
202
|
}
|
|
187
203
|
else if (isDebug && (response?.content?.total ?? 0) > 1) {
|
|
188
|
-
console.warn(`🟠 [CmsPage] Resolving content for ${requestPath}, yielded ${response?.content?.total ?? 0} items, picked:`, info);
|
|
204
|
+
console.warn(`🟠 [CmsPage.loadContentByPath] Resolving content for ${requestPath}, yielded ${response?.content?.total ?? 0} items, picked:`, info);
|
|
189
205
|
}
|
|
190
206
|
// Extract the type & link
|
|
191
207
|
const contentType = Utils.normalizeContentType(info._metadata?.types);
|
|
192
208
|
const contentLink = normalizeContentLinkWithLocale(info._metadata);
|
|
193
209
|
if (!contentLink) {
|
|
194
|
-
console.error('🔴 [CmsPage] Unable to infer the contentLink from the retrieved content, this should not have happened!');
|
|
210
|
+
console.error('🔴 [CmsPage.loadContentByPath] Unable to infer the contentLink from the retrieved content, this should not have happened!');
|
|
195
211
|
return notFound();
|
|
196
212
|
}
|
|
197
213
|
const graphLocale = localeToGraphLocale(info._metadata?.locale, channel);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/cms-page/page.tsx"],"names":[],"mappings":";AAAA,OAAO,aAAa,CAAA;AAEpB,OAAO,SAAS,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAK7C,OAAO,EACL,aAAa,GAGd,MAAM,wCAAwC,CAAA;AAE/C,OAAO,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/cms-page/page.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { useRouter } from 'next/navigation.js';
|
|
|
4
4
|
export const OnPageEdit = ({ children, refreshTimeout = false }) => {
|
|
5
5
|
const router = useRouter();
|
|
6
6
|
const [showMask, setShowMask] = useState(false);
|
|
7
|
-
const reloadDelay = useRef();
|
|
7
|
+
const reloadDelay = useRef(undefined);
|
|
8
8
|
function onContentSaved(eventData) {
|
|
9
9
|
const previewUrl = window.location.href;
|
|
10
10
|
setShowMask(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"on-page-edit.js","sourceRoot":"","sources":["../../src/components/on-page-edit.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EACL,QAAQ,EACR,SAAS,EACT,MAAM,GAGP,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAS9C,MAAM,CAAC,MAAM,UAAU,GAEnB,CAAC,EAAE,QAAQ,EAAE,cAAc,GAAG,KAAK,EAAE,EAAE,EAAE;IAC3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAA;IACxD,MAAM,WAAW,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"on-page-edit.js","sourceRoot":"","sources":["../../src/components/on-page-edit.tsx"],"names":[],"mappings":"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"}
|
package/dist/ope/page.js
CHANGED
|
@@ -32,7 +32,11 @@ export function createEditPageComponent(factory, options) {
|
|
|
32
32
|
function isDevelopment() {
|
|
33
33
|
return process.env.NODE_ENV == 'development';
|
|
34
34
|
}
|
|
35
|
-
async function EditPage(
|
|
35
|
+
async function EditPage({ params, searchParams, }) {
|
|
36
|
+
const props = {
|
|
37
|
+
params: await params,
|
|
38
|
+
searchParams: await searchParams,
|
|
39
|
+
};
|
|
36
40
|
// Validate the search parameters
|
|
37
41
|
if (!validateRequest(props, false, isDevelopment())) {
|
|
38
42
|
console.error('🔴 [OnPageEdit] Invalid edit mode request');
|
|
@@ -46,7 +50,7 @@ export function createEditPageComponent(factory, options) {
|
|
|
46
50
|
}
|
|
47
51
|
const { token, ctx, ...contentRequest } = contentRequestInfo;
|
|
48
52
|
// Build context
|
|
49
|
-
const client = clientFactory(token);
|
|
53
|
+
const client = await clientFactory(token);
|
|
50
54
|
const context = new ServerContext({
|
|
51
55
|
client,
|
|
52
56
|
factory,
|
|
@@ -62,6 +66,7 @@ export function createEditPageComponent(factory, options) {
|
|
|
62
66
|
const contentInfo = await getContentById(client, {
|
|
63
67
|
...contentRequest,
|
|
64
68
|
locale: localeToGraphLocale(contentRequest.locale),
|
|
69
|
+
changeset: client.getChangeset(),
|
|
65
70
|
});
|
|
66
71
|
if ((contentInfo?.content?.total ?? 0) > 1) {
|
|
67
72
|
console.warn('🟠 [OnPageEdit] Content request ' +
|
package/dist/ope/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/ope/page.tsx"],"names":[],"mappings":";AAAA,OAAO,aAAa,CAAA;AAOpB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EACL,aAAa,EACb,KAAK,EACL,UAAU,EACV,yBAAyB,GAE1B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,UAAU,MAAM,+BAA+B,CAAA;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/ope/page.tsx"],"names":[],"mappings":"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"}
|
package/dist/ope/tools.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function isValidRequest(toTest:
|
|
1
|
+
import type { AwaitedEditPageProps, ValidatedEditPageProps, ContentRequest } from './types.js';
|
|
2
|
+
export declare function isValidRequest(toTest: AwaitedEditPageProps, throwOnInvalid?: boolean, isDevelopment?: boolean): toTest is ValidatedEditPageProps;
|
|
3
3
|
export declare function getContentRequest({ params: { path, lang }, searchParams: { preview_token: token, ...searchParams } }: ValidatedEditPageProps): ContentRequest | undefined;
|
|
4
4
|
export declare function readValue<T extends string | undefined>(variableName: string, defaultValue?: T): T extends string ? string : string | undefined;
|
|
5
5
|
export declare function readValueAsInt<T extends number | undefined>(variableName: string, defaultValue?: T): T extends number ? number : number | undefined;
|
package/dist/ope/tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/ope/tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAE1D,MAAM,UAAU,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/ope/tools.ts"],"names":[],"mappings":"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"}
|
package/dist/ope/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ComponentType, type PropsWithChildren } from 'react';
|
|
2
|
-
import { type
|
|
1
|
+
import { type ComponentType, type PropsWithChildren, type JSX } from 'react';
|
|
2
|
+
import { type IOptiGraphClient } from '@remkoj/optimizely-graph-client';
|
|
3
3
|
import { type GraphQLClient } from 'graphql-request';
|
|
4
4
|
import { type ContentQueryProps } from '@remkoj/optimizely-cms-react/rsc';
|
|
5
5
|
export type ContentRequest = (Omit<ContentQueryProps<string>, 'path'> & {
|
|
@@ -8,46 +8,49 @@ export type ContentRequest = (Omit<ContentQueryProps<string>, 'path'> & {
|
|
|
8
8
|
ctx: 'edit' | 'preview';
|
|
9
9
|
});
|
|
10
10
|
type ServerPageProps = {
|
|
11
|
-
params: Record<string, string | Array<string
|
|
12
|
-
searchParams: Record<string, string
|
|
11
|
+
params: Promise<Record<string, string | Array<string>>>;
|
|
12
|
+
searchParams: Promise<Record<string, string>>;
|
|
13
13
|
};
|
|
14
14
|
export type EditPageComponent<T extends ServerPageProps = EditPageProps> = ({ params, searchParams }: T) => Promise<JSX.Element>;
|
|
15
15
|
export type EditPageProps = {
|
|
16
|
-
params: {
|
|
17
|
-
path?: string[] | string;
|
|
18
|
-
lang?: string;
|
|
19
|
-
}
|
|
20
|
-
searchParams: {
|
|
21
|
-
preview_token: string;
|
|
22
|
-
key?: string;
|
|
23
|
-
ver?: string;
|
|
24
|
-
loc?: string;
|
|
25
|
-
ctx?: 'edit' | 'preview';
|
|
26
|
-
path?: string;
|
|
27
|
-
epieditmode?: string;
|
|
28
|
-
}
|
|
16
|
+
readonly params: Promise<{
|
|
17
|
+
readonly path?: string[] | string;
|
|
18
|
+
readonly lang?: string;
|
|
19
|
+
}>;
|
|
20
|
+
readonly searchParams: Promise<{
|
|
21
|
+
readonly preview_token: string;
|
|
22
|
+
readonly key?: string;
|
|
23
|
+
readonly ver?: string;
|
|
24
|
+
readonly loc?: string;
|
|
25
|
+
readonly ctx?: 'edit' | 'preview';
|
|
26
|
+
readonly path?: string;
|
|
27
|
+
readonly epieditmode?: string;
|
|
28
|
+
}>;
|
|
29
|
+
};
|
|
30
|
+
export type AwaitedEditPageProps = {
|
|
31
|
+
[K in keyof EditPageProps]: Awaited<EditPageProps[K]>;
|
|
29
32
|
};
|
|
30
33
|
export type ValidatedEditPageProps = {
|
|
31
|
-
params: {
|
|
32
|
-
path?: string[] | string;
|
|
33
|
-
lang?: string;
|
|
34
|
+
readonly params: {
|
|
35
|
+
readonly path?: string[] | string;
|
|
36
|
+
readonly lang?: string;
|
|
34
37
|
};
|
|
35
38
|
searchParams: {
|
|
36
|
-
preview_token: string;
|
|
39
|
+
readonly preview_token: string;
|
|
37
40
|
} & ({
|
|
38
|
-
key: string;
|
|
39
|
-
ver: string;
|
|
40
|
-
loc: string;
|
|
41
|
-
ctx: 'edit' | 'preview';
|
|
42
|
-
path?: string;
|
|
43
|
-
epieditmode: never;
|
|
41
|
+
readonly key: string;
|
|
42
|
+
readonly ver: string;
|
|
43
|
+
readonly loc: string;
|
|
44
|
+
readonly ctx: 'edit' | 'preview';
|
|
45
|
+
readonly path?: string;
|
|
46
|
+
readonly epieditmode: never;
|
|
44
47
|
} | {
|
|
45
|
-
key: never;
|
|
46
|
-
ver: never;
|
|
47
|
-
loc: never;
|
|
48
|
-
ctx: never;
|
|
49
|
-
path: never;
|
|
50
|
-
epieditmode: 'true' | 'false';
|
|
48
|
+
readonly key: never;
|
|
49
|
+
readonly ver: never;
|
|
50
|
+
readonly loc: never;
|
|
51
|
+
readonly ctx: never;
|
|
52
|
+
readonly path: never;
|
|
53
|
+
readonly epieditmode: 'true' | 'false';
|
|
51
54
|
});
|
|
52
55
|
};
|
|
53
56
|
export type EditViewOptions<LocaleType = string> = {
|
|
@@ -76,7 +79,7 @@ export type EditViewOptions<LocaleType = string> = {
|
|
|
76
79
|
* @param token The token to be used
|
|
77
80
|
* @returns The Optimizely Graph Client
|
|
78
81
|
*/
|
|
79
|
-
clientFactory:
|
|
82
|
+
clientFactory: (token?: string, scope?: 'request' | 'metadata') => IOptiGraphClient | Promise<IOptiGraphClient>;
|
|
80
83
|
/**
|
|
81
84
|
* If provided, this allows to override the CommunicationInjector
|
|
82
85
|
* path.
|
|
@@ -101,7 +104,7 @@ export type EditViewOptions<LocaleType = string> = {
|
|
|
101
104
|
* @param isDevelopment Whether this request runs in development mode
|
|
102
105
|
* @returns If the request is valid
|
|
103
106
|
*/
|
|
104
|
-
requestValidator: (props:
|
|
107
|
+
requestValidator: (props: AwaitedEditPageProps, throwOnInvalid?: boolean, isDevelopment?: boolean) => props is ValidatedEditPageProps;
|
|
105
108
|
/**
|
|
106
109
|
* Enforce a refresh delay in the on page editing / preview, between a signal
|
|
107
110
|
* has been received from the CMS and the instruction to Next.JS to actually
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@remkoj/optimizely-cms-nextjs",
|
|
3
3
|
"description": "Next.JS integration for Optimizely SaaS CMS",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
|
-
"version": "
|
|
5
|
+
"version": "6.0.0-pre1",
|
|
6
6
|
"repository": "https://github.com/remkoj/optimizely-dxp-clients.git",
|
|
7
7
|
"author": "Remko Jantzen <693172+remkoj@users.noreply.github.com>",
|
|
8
8
|
"homepage": "https://github.com/remkoj/optimizely-dxp-clients",
|
|
@@ -44,38 +44,39 @@
|
|
|
44
44
|
}
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@remkoj/optimizely-cms-react": "
|
|
48
|
-
"@remkoj/optimizely-graph-client": "
|
|
49
|
-
"@types/negotiator": "^0.6.
|
|
50
|
-
"@types/node": "^22.
|
|
51
|
-
"@types/react": "^
|
|
52
|
-
"@types/react-dom": "
|
|
53
|
-
"
|
|
54
|
-
"graphql-request": "^6.1.0",
|
|
55
|
-
"next": "^14.2.28",
|
|
47
|
+
"@remkoj/optimizely-cms-react": "6.0.0-pre1",
|
|
48
|
+
"@remkoj/optimizely-graph-client": "6.0.0-pre1",
|
|
49
|
+
"@types/negotiator": "^0.6.4",
|
|
50
|
+
"@types/node": "^22.16.0",
|
|
51
|
+
"@types/react": "^19.1.8",
|
|
52
|
+
"@types/react-dom": "19.1.6",
|
|
53
|
+
"next": "^15.3.5",
|
|
56
54
|
"prop-types": "^15.8.1",
|
|
57
|
-
"react": "^
|
|
58
|
-
"react-dom": "^
|
|
59
|
-
"scheduler": "^0.
|
|
55
|
+
"react": "^19.1.0",
|
|
56
|
+
"react-dom": "^19.1.0",
|
|
57
|
+
"scheduler": "^0.26.0",
|
|
60
58
|
"typescript": "^5.8.3"
|
|
61
59
|
},
|
|
62
60
|
"dependencies": {
|
|
63
61
|
"@formatjs/intl-localematcher": "^0.6.1",
|
|
62
|
+
"@remkoj/optimizely-cms-react": "^6.0.0-pre1",
|
|
63
|
+
"@remkoj/optimizely-graph-client": "^6.0.0-pre1",
|
|
64
64
|
"deepmerge": "^4.3.1",
|
|
65
|
+
"entities": "^6.0.1",
|
|
66
|
+
"graphql": "^16.11.0",
|
|
67
|
+
"graphql-request": "^7.2.0",
|
|
65
68
|
"negotiator": "^1.0.0"
|
|
66
69
|
},
|
|
67
70
|
"peerDependencies": {
|
|
68
|
-
"
|
|
69
|
-
"
|
|
70
|
-
"
|
|
71
|
-
"graphql-request": "^6",
|
|
72
|
-
"next": "^14",
|
|
73
|
-
"react": "^18"
|
|
71
|
+
"next": "^15",
|
|
72
|
+
"react": "^19",
|
|
73
|
+
"react-dom": "^19"
|
|
74
74
|
},
|
|
75
75
|
"scripts": {
|
|
76
76
|
"clean": "yarn tsc --build --clean",
|
|
77
77
|
"prepare": "yarn tsc --build --force",
|
|
78
78
|
"watch": "yarn tsc --watch",
|
|
79
79
|
"recompile": "yarn tsc --build --clean && yarn tsc --build --force"
|
|
80
|
-
}
|
|
80
|
+
},
|
|
81
|
+
"stableVersion": "5.1.0"
|
|
81
82
|
}
|