@enonic/nextjs-adapter 2.0.0-B3 → 2.0.0

package/guillotine/fetchContent.d.ts

@@ -1,6 +1,6 @@
 import { MetaData, PageComponent } from './getMetaData';
 import { ContentPathItem, Context, LocaleProjectConfig } from '../utils';
-import { GetStaticPropsResult } from 'next';
+import { GetServerSidePropsResult, GetStaticPropsResult } from 'next';
 type Result = {
     error?: {
         code: string;
@@ -42,7 +42,8 @@ export declare const fetchGuillotine: (contentApiUrl: string, body: ContentApiBa
  * @returns FetchContentResult object: {data?: T, error?: {code, message}}
  */
 export declare const fetchContent: ContentFetcher;
-export declare function createResponse(props: FetchContentResult, context?: Context): GetStaticPropsResult<FetchContentResult>;
+export declare function createResponse(props: FetchContentResult, context?: Context, isStatic?: true): GetStaticPropsResult<FetchContentResult>;
+export declare function createResponse(props: FetchContentResult, context?: Context, isStatic?: false): GetServerSidePropsResult<FetchContentResult>;
 export declare function fetchContentPathsForAllLocales(path: string, query?: string, countPerLocale?: number): Promise<ContentPathItem[]>;
 export declare function fetchContentPathsForLocale(path: string, config: LocaleProjectConfig, query?: string, count?: number): Promise<ContentPathItem[]>;
 export {};

package/guillotine/fetchContent.js

@@ -747,7 +747,7 @@ const buildContentFetcher = (config) => {
  * @returns FetchContentResult object: {data?: T, error?: {code, message}}
  */
 export const fetchContent = buildContentFetcher(Object.assign(Object.assign({}, adapterConstants), { componentRegistry: ComponentRegistry }));
-export function createResponse(props, context) {
+export function createResponse(props, context, isStatic = true) {
     var _a, _b, _c, _d;
     const { data, meta, error } = props;
     const pageUrl = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.get) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.target) === null || _c === void 0 ? void 0 : _c.pageUrl;
@@ -774,11 +774,14 @@ export function createResponse(props, context) {
     const catchAllInNextProdMode = (meta === null || meta === void 0 ? void 0 : meta.renderMode) === RENDER_MODE.NEXT && !IS_DEV_MODE && (meta === null || meta === void 0 ? void 0 : meta.catchAll);
     const notFound = (error && error.code === '404') || ((_d = context.res) === null || _d === void 0 ? void 0 : _d.statusCode) === 404 || canNotRender || catchAllInNextProdMode || undefined;
     // console.debug('Returning view ' + (notFound ? '(not found)' : ''));
-    return {
+    const result = {
         notFound,
         props,
-        revalidate: 3600, // In seconds, meaning every hour
     };
+    if (isStatic) {
+        result.revalidate = 3600; // In seconds, meaning every hour
+    }
+    return result;
 }
 function populateEnonicHeaders(context) {
     const pd = context.previewData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "2.0.0-B3",
+  "version": "2.0.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "publishConfig": {
@@ -13,7 +13,7 @@
     "lint:fix": "eslint --fix server && eslint --fix src"
   },
   "dependencies": {
-    "html-react-parser": "^4.2.1",
+    "html-react-parser": "^4.2.2",
     "lru-cache": "^10.0.1",
     "next": "13.4.19",
     "react": "18.2.0",
@@ -22,13 +22,13 @@
   },
   "devDependencies": {
     "@enonic/eslint-config": "^1.1.0",
-    "@types/node": "^20.5.1",
-    "@types/react": "18.2.20",
+    "@types/node": "^20.6.0",
+    "@types/react": "18.2.21",
     "@types/react-dom": "18.2.7",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "eslint": "^8.47.0",
+    "eslint": "^8.49.0",
     "eslint-plugin-react": "^7.33.2",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   }
 }

package/utils.d.ts

@@ -37,7 +37,7 @@ export declare const DEFAULT_LOCALE_HEADER = "default-locale";
  * - media
  * - paths with '/_' in them
  */
-export declare const GET_STATIC_PATHS_QUERY = "query ($count: Int) {\n  guillotine {\n    queryDsl(\n      first: $count,\n      sort: {\n        field: \"modifiedTime\",\n        direction: DESC     \n      }\n      query: {boolean: {mustNot: [\n        {in: {field: \"type\", stringValues: [\"base:folder\", \"base:shortcut\"]}}\n        {like: {field: \"type\", value: {string: \"media:*\"}}}\n        {like: {field: \"_path\", value: {string: \"*/_*\"}}}\n      ]}}\n    ) {\n      _name\n      _path\n      site {_name}\n    }\n  }\n}";
+export declare const GET_STATIC_PATHS_QUERY = "query ($count: Int) {\n  guillotine {\n    queryDsl(\n      first: $count,\n      sort: {\n        field: \"modifiedTime\",\n        direction: DESC     \n      }\n      query: {boolean: {mustNot: [\n        {in: {field: \"type\", stringValues: [\"base:folder\", \"base:shortcut\"]}}\n        {like: {field: \"type\", value: \"media:*\"}}\n        {like: {field: \"_path\", value: \"*/_*\"}}\n      ]}}\n    ) {\n      _name\n      _path\n      site {_name}\n    }\n  }\n}";
 export declare enum XP_REQUEST_TYPE {
     COMPONENT = "component",
     TYPE = "type",

package/utils.js

@@ -50,8 +50,8 @@ export const GET_STATIC_PATHS_QUERY = `query ($count: Int) {
       }
       query: {boolean: {mustNot: [
         {in: {field: "type", stringValues: ["base:folder", "base:shortcut"]}}
-        {like: {field: "type", value: {string: "media:*"}}}
-        {like: {field: "_path", value: {string: "*/_*"}}}
+        {like: {field: "type", value: "media:*"}}
+        {like: {field: "_path", value: "*/_*"}}
       ]}}
     ) {
       _name