@enonic/nextjs-adapter 0.11.0 → 0.12.0

package/UrlProcessor.d.ts

@@ -9,6 +9,7 @@ export declare class UrlProcessor {
     private static IMG_ATMT_REGEXP;
     private static endSlashPattern;
     private static startSlashPattern;
+    private static localhostPattern;
     private static siteKey;
     static process(url: string, meta: MetaData): string;
     static setSiteKey(key: string): void;

package/UrlProcessor.js

@@ -25,8 +25,11 @@ export class UrlProcessor {
         return ((_a = linkData.find(data => data.ref === ref)) === null || _a === void 0 ? void 0 : _a.image) !== null;
     }
     static stripApiUrl(url, apiUrl) {
-        const common = commonChars(url, apiUrl);
-        const remaining = common.length > 0 ? url.substring(common.length) : url;
+        // normalise localhost-127.0.0.1 if present in urls
+        const normalUrl = url.replace(this.localhostPattern, '127.0.0.1');
+        const normalApiUrl = apiUrl.replace(this.localhostPattern, '127.0.0.1');
+        const common = commonChars(normalUrl, normalApiUrl);
+        const remaining = common.length > 0 ? normalUrl.substring(common.length) : normalUrl;
         return (remaining.length > 0 && remaining.charAt(0) === '/') ? remaining.substring(1) : remaining;
     }
     static isPageUrl(url) {
@@ -50,5 +53,6 @@ UrlProcessor.MACRO_ATTR = 'data-macro-ref';
 UrlProcessor.IMG_ATMT_REGEXP = /_\/image\/|_\/attachment\//;
 UrlProcessor.endSlashPattern = /\/+$/;
 UrlProcessor.startSlashPattern = /^\/+/;
+UrlProcessor.localhostPattern = /localhost/;
 UrlProcessor.setSiteKey(SITE_KEY);
 export const getUrl = UrlProcessor.process.bind(UrlProcessor);

package/guillotine/fetchContent.js

@@ -533,6 +533,7 @@ export const buildContentFetcher = (config) => {
             const { type, components, _path } = metaResult.meta || {};
             contentPath = _path || '';
             if (metaResult.error) {
+                console.error(metaResult.error);
                 return errorResponse(metaResult.error.code, metaResult.error.message, requestType, renderMode, contentApiUrl, xpBaseUrl, contentPath);
             }
             if (!metaResult.meta) {
@@ -586,6 +587,10 @@ export const buildContentFetcher = (config) => {
             // ///////////////    SECOND GUILLOTINE CALL FOR DATA   //////////////////////
             const contentResults = yield fetchContentData(contentApiUrl, contentPath, query, variables, headers);
             // ///////////////////////////////////////////////////////////////////////////
+            if (contentResults.error) {
+                console.error(contentResults.error);
+                return errorResponse(contentResults.error.code, contentResults.error.message, requestType, renderMode, contentApiUrl, xpBaseUrl, contentPath);
+            }
             // Apply processors to every component
             const datas = yield applyProcessors(allDescriptors, contentResults, context);
             //  Unwind the data back to components

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "publishConfig": {
@@ -14,20 +14,20 @@
   },
   "dependencies": {
     "html-react-parser": "^3.0.4",
-    "next": "^13.0.4",
+    "next": "^13.0.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "unescape": "^1.0.1"
   },
   "devDependencies": {
     "@enonic/eslint-config": "^0.1.0",
-    "@types/node": "^18.11.9",
-    "@types/react": "^18.0.25",
+    "@types/node": "^18.11.17",
+    "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.44.0",
-    "eslint": "^8.28.0",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
+    "eslint": "^8.30.0",
     "eslint-plugin-react": "^7.31.11",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.4"
   }
 }