@enonic/nextjs-adapter 2.0.0-B2 → 2.0.0-B3

package/guillotine/fetchContent.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { getMetaQuery, pageFragmentQuery } from './getMetaData';
-import adapterConstants, { addJsessionHeaders, addLocaleHeaders, APP_NAME, APP_NAME_DASHED, FRAGMENT_CONTENTTYPE_NAME, FRAGMENT_DEFAULT_REGION_NAME, GET_STATIC_PATHS_QUERY, getContentApiUrl, getLocaleProjectConfig, getLocaleProjectConfigs, getRenderMode, getXpBaseUrl, IS_DEV_MODE, normalizeLocale, PAGE_TEMPLATE_CONTENTTYPE_NAME, PAGE_TEMPLATE_FOLDER, RENDER_MODE, sanitizeGraphqlName, XP_COMPONENT_TYPE, XP_REQUEST_TYPE, } from '../utils';
+import adapterConstants, { addJsessionHeaders, addLocaleHeaders, APP_NAME, APP_NAME_DASHED, FRAGMENT_CONTENTTYPE_NAME, FRAGMENT_DEFAULT_REGION_NAME, GET_STATIC_PATHS_QUERY, getContentApiUrl, getLocaleProjectConfig, getLocaleProjectConfigs, getRenderMode, getXpBaseUrl, IS_DEV_MODE, normalizeLocale, PAGE_TEMPLATE_CONTENTTYPE_NAME, PAGE_TEMPLATE_FOLDER, PURGE_CACHE_URL, RENDER_MODE, sanitizeGraphqlName, XP_COMPONENT_TYPE, XP_REQUEST_TYPE, } from '../utils';
 import { ComponentRegistry } from '../ComponentRegistry';
 import { getUrl, UrlProcessor } from '../UrlProcessor';
 const NO_PROPS_PROCESSOR = (props) => __awaiter(void 0, void 0, void 0, function* () { var _a; return (_a = yield props) !== null && _a !== void 0 ? _a : {}; });
@@ -598,6 +598,10 @@ const buildContentFetcher = (config) => {
         UrlProcessor.setSiteKey(projectConfig.site);
         try {
             const requestContentPath = getCleanContentPathArrayOrThrow400(contentPathOrArray);
+            if ('/' + requestContentPath === PURGE_CACHE_URL) {
+                // return 404 for /_/cache/enonic/purge because it should've been handled by standalone endpoint
+                return errorResponse('404', 'Not found', requestType, renderMode, contentApiUrl, xpBaseUrl, context.locale, context.defaultLocale, requestContentPath);
+            }
             const [siteRelativeContentPath, componentPath] = getContentAndComponentPaths(requestContentPath, context);
             if (componentPath) {
                 // set component request type because url contains component path
@@ -786,7 +790,7 @@ function populateEnonicHeaders(context) {
     context.params = Object.assign(context.params || {}, pd.params);
     context.req = req;
 }
-export function fetchContentPathsForAllLocales(path, query = GET_STATIC_PATHS_QUERY, countPerLocale) {
+export function fetchContentPathsForAllLocales(path, query = GET_STATIC_PATHS_QUERY, countPerLocale = 999) {
     return __awaiter(this, void 0, void 0, function* () {
         const promises = Object.values(getLocaleProjectConfigs()).map(config => fetchContentPathsForLocale(path, config, query, countPerLocale));
         return Promise.all(promises).then(results => {
@@ -794,7 +798,7 @@ export function fetchContentPathsForAllLocales(path, query = GET_STATIC_PATHS_QU
         });
     });
 }
-export function fetchContentPathsForLocale(path, config, query = GET_STATIC_PATHS_QUERY, count) {
+export function fetchContentPathsForLocale(path, config, query = GET_STATIC_PATHS_QUERY, count = 999) {
     return __awaiter(this, void 0, void 0, function* () {
         const contentApiUrl = getContentApiUrl({ locale: config.locale });
         const body = {
@@ -805,7 +809,7 @@ export function fetchContentPathsForLocale(path, config, query = GET_STATIC_PATH
             },
         };
         return fetchGuillotine(contentApiUrl, body, config).then((results) => {
-            return results.guillotine.query.reduce((prev, child) => {
+            return results.guillotine.queryDsl.reduce((prev, child) => {
                 var _a;
                 const regexp = new RegExp(`/${(_a = child.site) === null || _a === void 0 ? void 0 : _a._name}/?`);
                 const contentPath = child._path.replace(regexp, '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "2.0.0-B2",
+  "version": "2.0.0-B3",
   "license": "Apache-2.0",
   "main": "index.js",
   "publishConfig": {
@@ -13,22 +13,22 @@
     "lint:fix": "eslint --fix server && eslint --fix src"
   },
   "dependencies": {
-    "html-react-parser": "^4.2.0",
-    "lru-cache": "^10.0.0",
-    "next": "13.4.12",
+    "html-react-parser": "^4.2.1",
+    "lru-cache": "^10.0.1",
+    "next": "13.4.19",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "unescape": "^1.0.1"
   },
   "devDependencies": {
     "@enonic/eslint-config": "^1.1.0",
-    "@types/node": "^20.4.5",
-    "@types/react": "18.2.17",
+    "@types/node": "^20.5.1",
+    "@types/react": "18.2.20",
     "@types/react-dom": "18.2.7",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "eslint": "^8.46.0",
-    "eslint-plugin-react": "^7.33.1",
+    "eslint": "^8.47.0",
+    "eslint-plugin-react": "^7.33.2",
     "typescript": "^5.1.6"
   }
 }

package/server/ClearableFileCache.d.ts

@@ -4,12 +4,13 @@ type FileSystemCacheContext = Omit<CacheHandlerContext, 'fs' | 'serverDistDir'>
     fs: CacheFs;
     serverDistDir: string;
 };
-export default class ClearableFileCache implements CacheHandler {
+export default class FileSystemCache implements CacheHandler {
     private fs;
     private flushToDisk?;
     private serverDistDir;
     private appDir;
     private tagsManifestPath?;
+    private revalidatedTags;
     constructor(ctx: FileSystemCacheContext);
     clear(): void;
     delete(path: string): boolean | undefined;

package/server/ClearableFileCache.js

@@ -41,15 +41,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var lru_cache_1 = require("lru-cache");
-var constants_1 = require("next/dist/lib/constants");
+var utils_1 = require("next/dist/server/lib/incremental-cache/utils");
 var memoryCache;
 var tagsManifest;
-var ClearableFileCache = /** @class */ (function () {
-    function ClearableFileCache(ctx) {
+var FileSystemCache = /** @class */ (function () {
+    function FileSystemCache(ctx) {
         this.fs = ctx.fs;
         this.flushToDisk = ctx.flushToDisk;
         this.serverDistDir = ctx.serverDistDir;
         this.appDir = !!ctx._appDir;
+        this.revalidatedTags = ctx.revalidatedTags;
         if (ctx.maxMemoryCacheSize && !memoryCache) {
             memoryCache = new lru_cache_1.LRUCache({
                 max: ctx.maxMemoryCacheSize,
@@ -82,14 +83,14 @@ var ClearableFileCache = /** @class */ (function () {
             this.loadTagsManifest();
         }
     }
-    ClearableFileCache.prototype.clear = function () {
+    FileSystemCache.prototype.clear = function () {
         memoryCache === null || memoryCache === void 0 ? void 0 : memoryCache.clear();
     };
-    ClearableFileCache.prototype.delete = function (path) {
+    FileSystemCache.prototype.delete = function (path) {
         return memoryCache === null || memoryCache === void 0 ? void 0 : memoryCache.delete(path);
     };
-    ClearableFileCache.prototype.loadTagsManifest = function () {
-        if (!this.tagsManifestPath || !this.fs)
+    FileSystemCache.prototype.loadTagsManifest = function () {
+        if (!this.tagsManifestPath || !this.fs || tagsManifest)
             return;
         try {
             tagsManifest = JSON.parse(this.fs.readFileSync(this.tagsManifestPath).toString('utf8'));
@@ -98,7 +99,7 @@ var ClearableFileCache = /** @class */ (function () {
             tagsManifest = { version: 1, items: {} };
         }
     };
-    ClearableFileCache.prototype.setTags = function (key, tags) {
+    FileSystemCache.prototype.setTags = function (key, tags) {
         return __awaiter(this, void 0, void 0, function () {
             var _i, tags_1, tag, data, err_1;
             return __generator(this, function (_a) {
@@ -135,7 +136,7 @@ var ClearableFileCache = /** @class */ (function () {
             });
         });
     };
-    ClearableFileCache.prototype.revalidateTag = function (tag) {
+    FileSystemCache.prototype.revalidateTag = function (tag) {
         return __awaiter(this, void 0, void 0, function () {
             var data, err_2;
             return __generator(this, function (_a) {
@@ -170,34 +171,35 @@ var ClearableFileCache = /** @class */ (function () {
             });
         });
     };
-    ClearableFileCache.prototype.get = function (key, fetchCache) {
-        var _a, _b;
+    FileSystemCache.prototype.get = function (key, fetchCache) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var data, filePath, fileData, mtime, meta, _c, _d, cacheEntry, _1, _e, filePath, isAppPath, fileData, mtime, lastModified, parsedData, pageData, _f, _g, _h, _j, _k, _l, _m, _2, innerData, isStale;
-            return __generator(this, function (_o) {
-                switch (_o.label) {
+            var data, filePath, fileData, mtime, meta, _e, _f, cacheEntry, _1, _g, filePath, isAppPath, fileData, mtime, lastModified, parsedData, pageData, _h, _j, _k, _l, _m, _o, _p, meta, _q, _r, _2, _3, cacheTags, tagsHeader, derivedTags, isStale, innerData, derivedTags, wasRevalidated;
+            var _this = this;
+            return __generator(this, function (_s) {
+                switch (_s.label) {
                     case 0:
                         data = memoryCache === null || memoryCache === void 0 ? void 0 : memoryCache.get(key);
-                        if (!(!data && process.env.NEXT_RUNTIME !== 'edge')) return [3 /*break*/, 20];
-                        _o.label = 1;
+                        if (!(!data && process.env.NEXT_RUNTIME !== 'edge')) return [3 /*break*/, 24];
+                        _s.label = 1;
                     case 1:
-                        _o.trys.push([1, 6, , 7]);
+                        _s.trys.push([1, 6, , 7]);
                         return [4 /*yield*/, this.getFsPath({
                                 pathname: "".concat(key, ".body"),
                                 appDir: true,
                             })];
                     case 2:
-                        filePath = (_o.sent()).filePath;
+                        filePath = (_s.sent()).filePath;
                         return [4 /*yield*/, this.fs.readFile(filePath)];
                     case 3:
-                        fileData = _o.sent();
+                        fileData = _s.sent();
                         return [4 /*yield*/, this.fs.stat(filePath)];
                     case 4:
-                        mtime = (_o.sent()).mtime;
-                        _d = (_c = JSON).parse;
+                        mtime = (_s.sent()).mtime;
+                        _f = (_e = JSON).parse;
                         return [4 /*yield*/, this.fs.readFile(filePath.replace(/\.body$/, '.meta'))];
                     case 5:
-                        meta = _d.apply(_c, [(_o.sent()).toString('utf8')]);
+                        meta = _f.apply(_e, [(_s.sent()).toString('utf8')]);
                         cacheEntry = {
                             lastModified: mtime.getTime(),
                             value: {
@@ -209,22 +211,22 @@ var ClearableFileCache = /** @class */ (function () {
                         };
                         return [2 /*return*/, cacheEntry];
                     case 6:
-                        _1 = _o.sent();
+                        _1 = _s.sent();
                         return [3 /*break*/, 7];
                     case 7:
-                        _o.trys.push([7, 19, , 20]);
+                        _s.trys.push([7, 23, , 24]);
                         return [4 /*yield*/, this.getFsPath({
                                 pathname: fetchCache ? key : "".concat(key, ".html"),
                                 fetchCache: fetchCache,
                             })];
                     case 8:
-                        _e = _o.sent(), filePath = _e.filePath, isAppPath = _e.isAppPath;
+                        _g = _s.sent(), filePath = _g.filePath, isAppPath = _g.isAppPath;
                         return [4 /*yield*/, this.fs.readFile(filePath)];
                     case 9:
-                        fileData = (_o.sent()).toString('utf-8');
+                        fileData = (_s.sent()).toString('utf-8');
                         return [4 /*yield*/, this.fs.stat(filePath)];
                     case 10:
-                        mtime = (_o.sent()).mtime;
+                        mtime = (_s.sent()).mtime;
                         if (!fetchCache) return [3 /*break*/, 11];
                         lastModified = mtime.getTime();
                         parsedData = JSON.parse(fileData);
@@ -232,60 +234,104 @@ var ClearableFileCache = /** @class */ (function () {
                             lastModified: lastModified,
                             value: parsedData,
                         };
-                        return [3 /*break*/, 18];
+                        return [3 /*break*/, 22];
                     case 11:
                         if (!isAppPath) return [3 /*break*/, 14];
-                        _h = (_g = this.fs).readFile;
+                        _k = (_j = this.fs).readFile;
                         return [4 /*yield*/, this.getFsPath({
                                 pathname: "".concat(key, ".rsc"),
                                 appDir: true,
                             })];
-                    case 12: return [4 /*yield*/, _h.apply(_g, [(_o.sent()).filePath])];
+                    case 12: return [4 /*yield*/, _k.apply(_j, [(_s.sent()).filePath])];
                     case 13:
-                        _f = (_o.sent()).toString('utf8');
+                        _h = (_s.sent()).toString('utf8');
                         return [3 /*break*/, 17];
                     case 14:
-                        _k = (_j = JSON).parse;
-                        _m = (_l = this.fs).readFile;
+                        _m = (_l = JSON).parse;
+                        _p = (_o = this.fs).readFile;
                         return [4 /*yield*/, this.getFsPath({
                                 pathname: "".concat(key, ".json"),
                                 appDir: false,
                             })];
-                    case 15: return [4 /*yield*/, _m.apply(_l, [(_o.sent()).filePath])];
+                    case 15: return [4 /*yield*/, _p.apply(_o, [(_s.sent()).filePath])];
                     case 16:
-                        _f = _k.apply(_j, [(_o.sent()).toString('utf8')]);
-                        _o.label = 17;
+                        _h = _m.apply(_l, [(_s.sent()).toString('utf8')]);
+                        _s.label = 17;
                     case 17:
-                        pageData = _f;
+                        pageData = _h;
+                        meta = {};
+                        if (!isAppPath) return [3 /*break*/, 21];
+                        _s.label = 18;
+                    case 18:
+                        _s.trys.push([18, 20, , 21]);
+                        _r = (_q = JSON).parse;
+                        return [4 /*yield*/, this.fs.readFile(filePath.replace(/\.html$/, '.meta'))];
+                    case 19:
+                        meta = _r.apply(_q, [(_s.sent()).toString('utf-8')]);
+                        return [3 /*break*/, 21];
+                    case 20:
+                        _2 = _s.sent();
+                        return [3 /*break*/, 21];
+                    case 21:
                         data = {
                             lastModified: mtime.getTime(),
                             value: {
                                 kind: 'PAGE',
                                 html: fileData,
                                 pageData: pageData,
+                                headers: meta.headers,
+                                status: meta.status,
                             },
                         };
-                        _o.label = 18;
-                    case 18:
+                        _s.label = 22;
+                    case 22:
                         if (data) {
                             memoryCache === null || memoryCache === void 0 ? void 0 : memoryCache.set(key, data);
                         }
-                        return [3 /*break*/, 20];
-                    case 19:
-                        _2 = _o.sent();
-                        return [3 /*break*/, 20];
-                    case 20:
-                        if (data && ((_a = data === null || data === void 0 ? void 0 : data.value) === null || _a === void 0 ? void 0 : _a.kind) === 'FETCH') {
+                        return [3 /*break*/, 24];
+                    case 23:
+                        _3 = _s.sent();
+                        return [3 /*break*/, 24];
+                    case 24:
+                        if (((_a = data === null || data === void 0 ? void 0 : data.value) === null || _a === void 0 ? void 0 : _a.kind) === 'PAGE') {
+                            tagsHeader = (_b = data.value.headers) === null || _b === void 0 ? void 0 : _b['x-next-cache-tags'];
+                            if (typeof tagsHeader === 'string') {
+                                cacheTags = tagsHeader.split(',');
+                            }
+                        }
+                        if (((_c = data === null || data === void 0 ? void 0 : data.value) === null || _c === void 0 ? void 0 : _c.kind) === 'PAGE' && (cacheTags === null || cacheTags === void 0 ? void 0 : cacheTags.length)) {
                             this.loadTagsManifest();
-                            innerData = data.value.data;
-                            isStale = (_b = innerData.tags) === null || _b === void 0 ? void 0 : _b.some(function (tag) {
+                            derivedTags = (0, utils_1.getDerivedTags)(cacheTags || []);
+                            isStale = derivedTags.some(function (tag) {
                                 var _a;
                                 return (((_a = tagsManifest === null || tagsManifest === void 0 ? void 0 : tagsManifest.items[tag]) === null || _a === void 0 ? void 0 : _a.revalidatedAt) &&
                                     (tagsManifest === null || tagsManifest === void 0 ? void 0 : tagsManifest.items[tag].revalidatedAt) >=
                                         ((data === null || data === void 0 ? void 0 : data.lastModified) || Date.now()));
                             });
+                            // we trigger a blocking validation if an ISR page
+                            // had a tag revalidated, if we want to be a background
+                            // revalidation instead we return data.lastModified = -1
                             if (isStale) {
-                                data.lastModified = Date.now() - constants_1.CACHE_ONE_YEAR;
+                                data = undefined;
+                            }
+                        }
+                        if (data && ((_d = data === null || data === void 0 ? void 0 : data.value) === null || _d === void 0 ? void 0 : _d.kind) === 'FETCH') {
+                            this.loadTagsManifest();
+                            innerData = data.value.data;
+                            derivedTags = (0, utils_1.getDerivedTags)(innerData.tags || []);
+                            wasRevalidated = derivedTags.some(function (tag) {
+                                var _a;
+                                if (_this.revalidatedTags.includes(tag)) {
+                                    return true;
+                                }
+                                return (((_a = tagsManifest === null || tagsManifest === void 0 ? void 0 : tagsManifest.items[tag]) === null || _a === void 0 ? void 0 : _a.revalidatedAt) &&
+                                    (tagsManifest === null || tagsManifest === void 0 ? void 0 : tagsManifest.items[tag].revalidatedAt) >=
+                                        ((data === null || data === void 0 ? void 0 : data.lastModified) || Date.now()));
+                            });
+                            // When revalidate tag is called we don't return
+                            // stale data so it's updated right away
+                            if (wasRevalidated) {
+                                data = undefined;
                             }
                         }
                         return [2 /*return*/, data || null];
@@ -293,7 +339,7 @@ var ClearableFileCache = /** @class */ (function () {
             });
         });
     };
-    ClearableFileCache.prototype.set = function (key, data) {
+    FileSystemCache.prototype.set = function (key, data) {
         return __awaiter(this, void 0, void 0, function () {
             var filePath, isAppPath, htmlPath, _a, _b, filePath;
             return __generator(this, function (_c) {
@@ -323,7 +369,7 @@ var ClearableFileCache = /** @class */ (function () {
                         _c.sent();
                         return [2 /*return*/];
                     case 5:
-                        if (!((data === null || data === void 0 ? void 0 : data.kind) === 'PAGE')) return [3 /*break*/, 11];
+                        if (!((data === null || data === void 0 ? void 0 : data.kind) === 'PAGE')) return [3 /*break*/, 13];
                         isAppPath = typeof data.pageData === 'string';
                         return [4 /*yield*/, this.getFsPath({
                                 pathname: "".concat(key, ".html"),
@@ -346,31 +392,39 @@ var ClearableFileCache = /** @class */ (function () {
                             isAppPath ? data.pageData : JSON.stringify(data.pageData)])];
                     case 10:
                         _c.sent();
-                        return [3 /*break*/, 16];
+                        if (!(data.headers || data.status)) return [3 /*break*/, 12];
+                        return [4 /*yield*/, this.fs.writeFile(htmlPath.replace(/\.html$/, '.meta'), JSON.stringify({
+                                headers: data.headers,
+                                status: data.status,
+                            }))];
                     case 11:
-                        if (!((data === null || data === void 0 ? void 0 : data.kind) === 'FETCH')) return [3 /*break*/, 16];
+                        _c.sent();
+                        _c.label = 12;
+                    case 12: return [3 /*break*/, 18];
+                    case 13:
+                        if (!((data === null || data === void 0 ? void 0 : data.kind) === 'FETCH')) return [3 /*break*/, 18];
                         return [4 /*yield*/, this.getFsPath({
                                 pathname: key,
                                 fetchCache: true,
                             })];
-                    case 12:
+                    case 14:
                         filePath = (_c.sent()).filePath;
                         return [4 /*yield*/, this.fs.mkdir(path_1.default.dirname(filePath))];
-                    case 13:
+                    case 15:
                         _c.sent();
                         return [4 /*yield*/, this.fs.writeFile(filePath, JSON.stringify(data))];
-                    case 14:
+                    case 16:
                         _c.sent();
                         return [4 /*yield*/, this.setTags(key, data.data.tags || [])];
-                    case 15:
+                    case 17:
                         _c.sent();
-                        _c.label = 16;
-                    case 16: return [2 /*return*/];
+                        _c.label = 18;
+                    case 18: return [2 /*return*/];
                 }
             });
         });
     };
-    ClearableFileCache.prototype.getFsPath = function (_a) {
+    FileSystemCache.prototype.getFsPath = function (_a) {
         var pathname = _a.pathname, appDir = _a.appDir, fetchCache = _a.fetchCache;
         return __awaiter(this, void 0, void 0, function () {
             var isAppPath, filePath, err_3;
@@ -413,6 +467,6 @@ var ClearableFileCache = /** @class */ (function () {
             });
         });
     };
-    return ClearableFileCache;
+    return FileSystemCache;
 }());
-exports.default = ClearableFileCache;
+exports.default = FileSystemCache;

package/utils.d.ts

@@ -5,6 +5,7 @@ import { GetServerSidePropsContext } from 'next';
 import { ParsedUrlQuery } from 'node:querystring';
 import { IncomingHttpHeaders } from 'http';
 export declare const IS_DEV_MODE: boolean;
+export declare const PURGE_CACHE_URL = "/_/enonic/cache/purge";
 export declare enum ENV_VARS {
     PROJECTS = "ENONIC_PROJECTS",
     API = "ENONIC_API",
@@ -36,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 = 100){\n  guillotine {\n    query(query: \"type != 'base:folder' AND type != 'base:shortcut' AND type NOT LIKE 'media:*' AND _path NOT LIKE '*/_*'\", first: $count) {\n      _name\n      _path\n      site {\n        _name\n      }\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: {string: \"media:*\"}}}\n        {like: {field: \"_path\", value: {string: \"*/_*\"}}}\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

@@ -1,5 +1,6 @@
 const mode = process.env.MODE || process.env.NEXT_PUBLIC_MODE;
 export const IS_DEV_MODE = (mode === 'development');
+export const PURGE_CACHE_URL = '/_/enonic/cache/purge';
 export var ENV_VARS;
 (function (ENV_VARS) {
     ENV_VARS["PROJECTS"] = "ENONIC_PROJECTS";
@@ -39,14 +40,23 @@ export const DEFAULT_LOCALE_HEADER = 'default-locale';
  * - media
  * - paths with '/_' in them
  */
-export const GET_STATIC_PATHS_QUERY = `query ($count: Int = 100){
+export const GET_STATIC_PATHS_QUERY = `query ($count: Int) {
   guillotine {
-    query(query: "type != 'base:folder' AND type != 'base:shortcut' AND type NOT LIKE 'media:*' AND _path NOT LIKE '*/_*'", first: $count) {
+    queryDsl(
+      first: $count,
+      sort: {
+        field: "modifiedTime",
+        direction: DESC     
+      }
+      query: {boolean: {mustNot: [
+        {in: {field: "type", stringValues: ["base:folder", "base:shortcut"]}}
+        {like: {field: "type", value: {string: "media:*"}}}
+        {like: {field: "_path", value: {string: "*/_*"}}}
+      ]}}
+    ) {
       _name
       _path
-      site {
-        _name
-      }
+      site {_name}
     }
   }
 }`;