@blaze-cms/nextjs-tools 0.146.0-alpha.31 → 0.146.0-alpha.36

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.146.0-alpha.36](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.35...v0.146.0-alpha.36) (2025-03-31)
+
+
+### Bug Fixes
+
+* only do parent redirect when there are graphql errors ([#4697](https://github.com/thebyte9/blaze/issues/4697)) ([1ec63ba](https://github.com/thebyte9/blaze/commit/1ec63ba95c21c11d41721f07346945742d7237ae))
+* prevent 404 error when no data is returned from and improve redi… ([#4688](https://github.com/thebyte9/blaze/issues/4688)) ([3a5af3d](https://github.com/thebyte9/blaze/commit/3a5af3ddf65d67456971d2d75525235c30965633))
+
+
+
+
+
+# [0.146.0-alpha.32](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.31...v0.146.0-alpha.32) (2025-03-17)
+
+**Note:** Version bump only for package @blaze-cms/nextjs-tools
+
+
+
+
+
 # [0.146.0-alpha.31](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.30...v0.146.0-alpha.31) (2025-03-05)
 
 

package/lib/helpers/check-url.js

@@ -161,7 +161,7 @@ var getFullUrl = function getFullUrl(req, asPath) {
 };
 var doUrlCheck = /*#__PURE__*/function () {
   var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref4) {
-    var asPath, url, apolloClient, res, handle404Error, blazeApp, _yield$apolloClient$q, _yield$apolloClient$q2, itemId, itemEntity, urlTo, _yield$apolloClient$q3, pageData, _ref6, _ref6$cacheControlMax, cacheControlMaxAge, redirectUrl, queryString, rootSelectorClasses, parentPATH;
+    var asPath, url, apolloClient, res, handle404Error, blazeApp, _yield$apolloClient$q, _yield$apolloClient$q2, _yield$apolloClient$q3, _yield$apolloClient$q4, _yield$apolloClient$q5, itemId, itemEntity, urlTo, _yield$apolloClient$q6, pageData, _ref6, _ref6$cacheControlMax, cacheControlMaxAge, redirectUrl, queryString, rootSelectorClasses, parentPATH;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -176,18 +176,21 @@ var doUrlCheck = /*#__PURE__*/function () {
           });
         case 4:
           _yield$apolloClient$q = _context3.sent;
-          _yield$apolloClient$q2 = _yield$apolloClient$q.data.checkUrl;
-          itemId = _yield$apolloClient$q2.itemId;
-          itemEntity = _yield$apolloClient$q2.itemEntity;
-          urlTo = _yield$apolloClient$q2.urlTo;
-          _yield$apolloClient$q3 = _yield$apolloClient$q2.pageData;
-          pageData = _yield$apolloClient$q3 === void 0 ? {} : _yield$apolloClient$q3;
-          _ref6 = pageData || {}, _ref6$cacheControlMax = _ref6.cacheControlMaxAge, cacheControlMaxAge = _ref6$cacheControlMax === void 0 ? null : _ref6$cacheControlMax; // pageData can be null when there is no page
+          _yield$apolloClient$q2 = _yield$apolloClient$q.data;
+          _yield$apolloClient$q3 = _yield$apolloClient$q2 === void 0 ? {} : _yield$apolloClient$q2;
+          _yield$apolloClient$q4 = _yield$apolloClient$q3.checkUrl;
+          _yield$apolloClient$q5 = _yield$apolloClient$q4 === void 0 ? {} : _yield$apolloClient$q4;
+          itemId = _yield$apolloClient$q5.itemId;
+          itemEntity = _yield$apolloClient$q5.itemEntity;
+          urlTo = _yield$apolloClient$q5.urlTo;
+          _yield$apolloClient$q6 = _yield$apolloClient$q5.pageData;
+          pageData = _yield$apolloClient$q6 === void 0 ? {} : _yield$apolloClient$q6;
+          _ref6 = pageData || {}, _ref6$cacheControlMax = _ref6.cacheControlMaxAge, cacheControlMaxAge = _ref6$cacheControlMax === void 0 ? null : _ref6$cacheControlMax;
           if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {
             res.setHeader('Cache-Control', "max-age=".concat(cacheControlMaxAge));
           }
           if (!(urlTo && urlTo !== url)) {
-            _context3.next = 18;
+            _context3.next = 20;
             break;
           }
           redirectUrl = urlTo;
@@ -195,11 +198,8 @@ var doUrlCheck = /*#__PURE__*/function () {
             queryString = asPath.split('?')[1];
             redirectUrl = queryString ? "".concat(urlTo, "?").concat(queryString) : urlTo;
           }
-          doRedirect(res, redirectUrl);
-          return _context3.abrupt("return", {
-            redirecting: true
-          });
-        case 18:
+          return _context3.abrupt("return", doRedirect(res, redirectUrl));
+        case 20:
           rootSelectorClasses = (0, _getRootSelectorClasses["default"])(url, getRootClassesLimit());
           return _context3.abrupt("return", {
             pageData: pageData,
@@ -207,26 +207,28 @@ var doUrlCheck = /*#__PURE__*/function () {
             itemId: itemId,
             itemEntity: (0, _reactPageBuilder.getUnpublishedEntityName)(itemEntity)
           });
-        case 22:
-          _context3.prev = 22;
+        case 24:
+          _context3.prev = 24;
           _context3.t0 = _context3["catch"](1);
+          if (!(!_context3.t0.graphQLErrors || !_context3.t0.graphQLErrors.length)) {
+            _context3.next = 28;
+            break;
+          }
+          return _context3.abrupt("return", handleError(_context3.t0, res, handle404Error, blazeApp));
+        case 28:
           parentPATH = (0, _checkParent["default"])(url);
           if (!(handle404Error && parentPATH)) {
-            _context3.next = 29;
+            _context3.next = 31;
             break;
           }
-          doRedirect(res, parentPATH);
-          _context3.next = 30;
-          break;
-        case 29:
-          return _context3.abrupt("return", handleError(_context3.t0, res, handle404Error, blazeApp));
-        case 30:
-          return _context3.abrupt("return", handle404Error ? {} : null);
+          return _context3.abrupt("return", doRedirect(res, parentPATH));
         case 31:
+          return _context3.abrupt("return", handleError(_context3.t0, res, handle404Error, blazeApp));
+        case 32:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[1, 22]]);
+    }, _callee3, null, [[1, 24]]);
   }));
   return function doUrlCheck(_x4) {
     return _ref5.apply(this, arguments);
@@ -260,6 +262,9 @@ function doRedirect(res, redirectUrl) {
   } else {
     window.location.href = redirectUrl;
   }
+  return {
+    redirecting: true
+  };
 }
 var _default = exports["default"] = checkUrl;
 //# sourceMappingURL=check-url.js.map

package/lib/helpers/check-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-url.js","names":["_queryString","require","_reactPageBuilder","_coreAuthUi","_constants","_query","_checkParent","_interopRequireDefault","_checkPreviewUrl","_handleStaticRoutes","_getPageData","_getRootSelectorClasses","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","getRootClassesLimit","Number","process","env","BLAZE_ROOT_SELECTOR_CLASSES_LIMIT","checkUrl","_ref","_asyncToGenerator2","_regenerator","mark","_callee","props","asPath","apolloClient","res","req","query","blazeApp","disableSsr","fullUrl","_parseUrl","url","handler","previewData","urlCheckOptions","result","wrap","_callee$","_context","prev","next","getFullUrl","parseUrl","BLAZE_STATUS_URL","abrupt","isStatusPage","handleStaticRoutes","getHandler","setHeader","BLAZE_X_FRAME_OPTIONS","BLAZE_X_FRAME_OPTIONS_DEFAULT","getHeader","BLAZE_CACHE_CONTROL_HEADER","checkPreviewUrl","checkAccessToken","cache","extract","getPreviewData","doUrlCheck","handle404Error","sent","stop","_x","_ref2","_callee2","_result$pageData","_result$pageData2","rootSelectorClasses","_callee2$","_context2","getPageData","pageData","getRootSelectorClasses","isPreview","_x2","_x3","getHost","_ref3","_ref3$headers","headers","BLAZE_FRONTEND_HOST","host","concat","HTTPS","_window","window","_window$location","location","protocol","hostname","port","urlPort","COLON","DOUBLE_SLASH","_ref5","_callee3","_ref4","_yield$apolloClient$q","_yield$apolloClient$q2","itemId","itemEntity","urlTo","_yield$apolloClient$q3","_ref6","_ref6$cacheControlMax","cacheControlMaxAge","redirectUrl","queryString","parentPATH","_callee3$","_context3","checkUrlQuery","variables","data","BLAZE_DISABLE_REDIRECT_WITH_QUERY","split","doRedirect","redirecting","getUnpublishedEntityName","t0","checkParent","handleError","_x4","err","events","emit","error","networkError","writeHead","write","end","graphQLErrors","statusCode","NOT_FOUND_STATUS_CODE","errorCode","Location","href","_default","exports"],"sources":["../../src/helpers/check-url.js"],"sourcesContent":["import { parseUrl } from 'query-string';\nimport { getUnpublishedEntityName } from '@blaze-cms/react-page-builder';\nimport { checkAccessToken } from '@blaze-cms/core-auth-ui';\nimport {\n  HTTPS,\n  DOUBLE_SLASH,\n  COLON,\n  NOT_FOUND_STATUS_CODE,\n  BLAZE_X_FRAME_OPTIONS_DEFAULT\n} from '../constants';\nimport { checkUrlQuery } from '../application/query';\nimport checkParent from './check-parent';\nimport checkPreviewUrl from './check-preview-url';\nimport handleStaticRoutes from './handle-static-routes';\nimport getPageData from './get-page-data';\nimport getRootSelectorClasses from './get-root-selector-classes';\n\nconst getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT);\n\nconst checkUrl = async props => {\n  const { asPath, apolloClient, res, req, query, blazeApp, disableSsr } = props;\n  const fullUrl = getFullUrl(req, asPath);\n  const { url } = parseUrl(asPath);\n\n  if (process.env.BLAZE_STATUS_URL && url === process.env.BLAZE_STATUS_URL) {\n    return { isStatusPage: true };\n  }\n\n  if (res) {\n    const handler = handleStaticRoutes.getHandler(asPath);\n\n    res.setHeader(\n      'X-Frame-Options',\n      process.env.BLAZE_X_FRAME_OPTIONS || BLAZE_X_FRAME_OPTIONS_DEFAULT\n    );\n\n    if (!res.getHeader('Cache-Control')) {\n      res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');\n    }\n\n    if (handler) {\n      return handler(props);\n    }\n  }\n\n  const previewData = checkPreviewUrl(url, query);\n\n  if (!previewData && disableSsr) return { disableSsr: true };\n\n  await checkAccessToken(apolloClient, {\n    ...props,\n    disableSsr: !Object.keys(apolloClient.cache.extract()).length // empty cache means SSR was disabled\n  });\n\n  if (previewData) return getPreviewData(previewData, apolloClient);\n  const urlCheckOptions = { asPath, url, apolloClient, res };\n  const result = await doUrlCheck({\n    ...urlCheckOptions,\n    handle404Error: true,\n    blazeApp\n  });\n  return { ...result, fullUrl } || {};\n};\n\nconst getPreviewData = async (previewData, apolloClient) => {\n  const result = await getPageData({ ...previewData, apolloClient });\n  const { pageData: { url } = {} } = result;\n  const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n  return { ...previewData, rootSelectorClasses, ...result, isPreview: true };\n};\n\nconst getHost = ({ headers = {} }) =>\n  process.env.BLAZE_FRONTEND_HOST ||\n  headers['x-request-host'] ||\n  headers['x-forwarded-host'] ||\n  headers.host;\n\nconst getFullUrl = (req, asPath) => {\n  if (req) {\n    return `${HTTPS}${getHost(req)}${asPath}`;\n  }\n  const {\n    location: { protocol, hostname, port }\n  } = window;\n  const urlPort = port ? `${COLON}${port}` : '';\n\n  return `${protocol}${DOUBLE_SLASH}${hostname}${urlPort}${asPath}`;\n};\n\nconst doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blazeApp }) => {\n  try {\n    const {\n      data: {\n        checkUrl: { itemId, itemEntity, urlTo, pageData = {} }\n      }\n    } = await apolloClient.query({\n      query: checkUrlQuery,\n      variables: {\n        url\n      }\n    });\n\n    const { cacheControlMaxAge = null } = pageData || {}; // pageData can be null when there is no page\n    if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {\n      res.setHeader('Cache-Control', `max-age=${cacheControlMaxAge}`);\n    }\n\n    if (urlTo && urlTo !== url) {\n      let redirectUrl = urlTo;\n      if (process.env.BLAZE_DISABLE_REDIRECT_WITH_QUERY !== 'true') {\n        const queryString = asPath.split('?')[1];\n        redirectUrl = queryString ? `${urlTo}?${queryString}` : urlTo;\n      }\n\n      doRedirect(res, redirectUrl);\n      return { redirecting: true };\n    }\n    const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n    return {\n      pageData,\n      rootSelectorClasses,\n      itemId,\n      itemEntity: getUnpublishedEntityName(itemEntity)\n    };\n  } catch (err) {\n    const parentPATH = checkParent(url);\n    if (handle404Error && parentPATH) {\n      doRedirect(res, parentPATH);\n    } else {\n      return handleError(err, res, handle404Error, blazeApp);\n    }\n\n    return handle404Error ? {} : null;\n  }\n};\n\nconst handleError = (err, res, handle404Error, blazeApp) => {\n  blazeApp.events.emit('monitor:log', { error: err });\n\n  if (!res) return {};\n  if (err.networkError) {\n    res.writeHead(500, { 'Content-Type': 'text/plain' });\n    res.write('500 Internal Server Error\\n');\n    res.end();\n  } else if (handle404Error && err.graphQLErrors && err.graphQLErrors.length) {\n    res.statusCode = NOT_FOUND_STATUS_CODE;\n    return { errorCode: NOT_FOUND_STATUS_CODE };\n  }\n\n  return {};\n};\n\nfunction doRedirect(res, redirectUrl) {\n  if (res) {\n    res.writeHead(301, { Location: redirectUrl });\n    res.end();\n  } else {\n    window.location.href = redirectUrl;\n  }\n}\n\nexport default checkUrl;\n"],"mappings":"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"}
+{"version":3,"file":"check-url.js","names":["_queryString","require","_reactPageBuilder","_coreAuthUi","_constants","_query","_checkParent","_interopRequireDefault","_checkPreviewUrl","_handleStaticRoutes","_getPageData","_getRootSelectorClasses","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","getRootClassesLimit","Number","process","env","BLAZE_ROOT_SELECTOR_CLASSES_LIMIT","checkUrl","_ref","_asyncToGenerator2","_regenerator","mark","_callee","props","asPath","apolloClient","res","req","query","blazeApp","disableSsr","fullUrl","_parseUrl","url","handler","previewData","urlCheckOptions","result","wrap","_callee$","_context","prev","next","getFullUrl","parseUrl","BLAZE_STATUS_URL","abrupt","isStatusPage","handleStaticRoutes","getHandler","setHeader","BLAZE_X_FRAME_OPTIONS","BLAZE_X_FRAME_OPTIONS_DEFAULT","getHeader","BLAZE_CACHE_CONTROL_HEADER","checkPreviewUrl","checkAccessToken","cache","extract","getPreviewData","doUrlCheck","handle404Error","sent","stop","_x","_ref2","_callee2","_result$pageData","_result$pageData2","rootSelectorClasses","_callee2$","_context2","getPageData","pageData","getRootSelectorClasses","isPreview","_x2","_x3","getHost","_ref3","_ref3$headers","headers","BLAZE_FRONTEND_HOST","host","concat","HTTPS","_window","window","_window$location","location","protocol","hostname","port","urlPort","COLON","DOUBLE_SLASH","_ref5","_callee3","_ref4","_yield$apolloClient$q","_yield$apolloClient$q2","_yield$apolloClient$q3","_yield$apolloClient$q4","_yield$apolloClient$q5","itemId","itemEntity","urlTo","_yield$apolloClient$q6","_ref6","_ref6$cacheControlMax","cacheControlMaxAge","redirectUrl","queryString","parentPATH","_callee3$","_context3","checkUrlQuery","variables","data","BLAZE_DISABLE_REDIRECT_WITH_QUERY","split","doRedirect","getUnpublishedEntityName","t0","graphQLErrors","handleError","checkParent","_x4","err","events","emit","error","networkError","writeHead","write","end","statusCode","NOT_FOUND_STATUS_CODE","errorCode","Location","href","redirecting","_default","exports"],"sources":["../../src/helpers/check-url.js"],"sourcesContent":["import { parseUrl } from 'query-string';\nimport { getUnpublishedEntityName } from '@blaze-cms/react-page-builder';\nimport { checkAccessToken } from '@blaze-cms/core-auth-ui';\nimport {\n  HTTPS,\n  DOUBLE_SLASH,\n  COLON,\n  NOT_FOUND_STATUS_CODE,\n  BLAZE_X_FRAME_OPTIONS_DEFAULT\n} from '../constants';\nimport { checkUrlQuery } from '../application/query';\nimport checkParent from './check-parent';\nimport checkPreviewUrl from './check-preview-url';\nimport handleStaticRoutes from './handle-static-routes';\nimport getPageData from './get-page-data';\nimport getRootSelectorClasses from './get-root-selector-classes';\n\nconst getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT);\n\nconst checkUrl = async props => {\n  const { asPath, apolloClient, res, req, query, blazeApp, disableSsr } = props;\n  const fullUrl = getFullUrl(req, asPath);\n  const { url } = parseUrl(asPath);\n\n  if (process.env.BLAZE_STATUS_URL && url === process.env.BLAZE_STATUS_URL) {\n    return { isStatusPage: true };\n  }\n\n  if (res) {\n    const handler = handleStaticRoutes.getHandler(asPath);\n\n    res.setHeader(\n      'X-Frame-Options',\n      process.env.BLAZE_X_FRAME_OPTIONS || BLAZE_X_FRAME_OPTIONS_DEFAULT\n    );\n\n    if (!res.getHeader('Cache-Control')) {\n      res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');\n    }\n\n    if (handler) {\n      return handler(props);\n    }\n  }\n\n  const previewData = checkPreviewUrl(url, query);\n\n  if (!previewData && disableSsr) return { disableSsr: true };\n\n  await checkAccessToken(apolloClient, {\n    ...props,\n    disableSsr: !Object.keys(apolloClient.cache.extract()).length // empty cache means SSR was disabled\n  });\n\n  if (previewData) return getPreviewData(previewData, apolloClient);\n  const urlCheckOptions = { asPath, url, apolloClient, res };\n  const result = await doUrlCheck({\n    ...urlCheckOptions,\n    handle404Error: true,\n    blazeApp\n  });\n  return { ...result, fullUrl } || {};\n};\n\nconst getPreviewData = async (previewData, apolloClient) => {\n  const result = await getPageData({ ...previewData, apolloClient });\n  const { pageData: { url } = {} } = result;\n  const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n  return { ...previewData, rootSelectorClasses, ...result, isPreview: true };\n};\n\nconst getHost = ({ headers = {} }) =>\n  process.env.BLAZE_FRONTEND_HOST ||\n  headers['x-request-host'] ||\n  headers['x-forwarded-host'] ||\n  headers.host;\n\nconst getFullUrl = (req, asPath) => {\n  if (req) {\n    return `${HTTPS}${getHost(req)}${asPath}`;\n  }\n  const {\n    location: { protocol, hostname, port }\n  } = window;\n  const urlPort = port ? `${COLON}${port}` : '';\n\n  return `${protocol}${DOUBLE_SLASH}${hostname}${urlPort}${asPath}`;\n};\n\nconst doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blazeApp }) => {\n  try {\n    const {\n      data: { checkUrl: { itemId, itemEntity, urlTo, pageData = {} } = {} } = {}\n    } = await apolloClient.query({\n      query: checkUrlQuery,\n      variables: { url }\n    });\n\n    const { cacheControlMaxAge = null } = pageData || {};\n\n    if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {\n      res.setHeader('Cache-Control', `max-age=${cacheControlMaxAge}`);\n    }\n\n    if (urlTo && urlTo !== url) {\n      let redirectUrl = urlTo;\n      if (process.env.BLAZE_DISABLE_REDIRECT_WITH_QUERY !== 'true') {\n        const queryString = asPath.split('?')[1];\n        redirectUrl = queryString ? `${urlTo}?${queryString}` : urlTo;\n      }\n\n      return doRedirect(res, redirectUrl);\n    }\n    const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n    return {\n      pageData,\n      rootSelectorClasses,\n      itemId,\n      itemEntity: getUnpublishedEntityName(itemEntity)\n    };\n  } catch (err) {\n    if (!err.graphQLErrors || !err.graphQLErrors.length) {\n      return handleError(err, res, handle404Error, blazeApp);\n    }\n\n    const parentPATH = checkParent(url);\n    if (handle404Error && parentPATH) {\n      return doRedirect(res, parentPATH);\n    }\n\n    return handleError(err, res, handle404Error, blazeApp);\n  }\n};\n\nconst handleError = (err, res, handle404Error, blazeApp) => {\n  blazeApp.events.emit('monitor:log', { error: err });\n\n  if (!res) return {};\n  if (err.networkError) {\n    res.writeHead(500, { 'Content-Type': 'text/plain' });\n    res.write('500 Internal Server Error\\n');\n    res.end();\n  } else if (handle404Error && err.graphQLErrors && err.graphQLErrors.length) {\n    res.statusCode = NOT_FOUND_STATUS_CODE;\n    return { errorCode: NOT_FOUND_STATUS_CODE };\n  }\n\n  return {};\n};\n\nfunction doRedirect(res, redirectUrl) {\n  if (res) {\n    res.writeHead(301, { Location: redirectUrl });\n    res.end();\n  } else {\n    window.location.href = redirectUrl;\n  }\n\n  return { redirecting: true };\n}\n\nexport default checkUrl;\n"],"mappings":"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"}

package/lib/pages/Resolver.js

@@ -60,10 +60,12 @@ var Resolver = function Resolver(props) {
   if (redirecting) return null;
   if (isStatusPage) return 'OK';
   if (!pageData || !itemId || !itemEntity) {
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_error["default"], {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "next_error"
+    }, /*#__PURE__*/_react["default"].createElement(_error["default"], {
       statusCode: errorCode,
       title: errorMessage
-    }), /*#__PURE__*/_react["default"].createElement(_components.DebugSidebar, {
+    })), /*#__PURE__*/_react["default"].createElement(_components.DebugSidebar, {
       itemId: itemId,
       itemEntity: itemEntity
     }));

package/lib/pages/Resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"Resolver.js","names":["_react","_interopRequireDefault","require","_error","_router","_propTypes","_components","_helpers","_containers","_constants","Resolver","props","pageData","itemId","itemEntity","isStatusPage","fullUrl","disableSsr","_props$rootSelectorCl","rootSelectorClasses","RESOLVER_CONTAINER_CLASS","_props$isPreview","isPreview","_props$errorCode","errorCode","NOT_FOUND_STATUS_CODE","_props$errorMessage","errorMessage","_props$redirecting","redirecting","router","useRouter","window","asPath","location","hash","url","URL","href","searchParams","set","Date","now","push","createElement","Fragment","statusCode","title","DebugSidebar","className","ContentContainer","getInitialProps","_ref","_asyncToGenerator2","_regenerator","mark","_callee","wrap","_callee$","_context","prev","next","abrupt","checkUrl","stop","_x","apply","arguments","propTypes","PropTypes","string","object","bool","number","defaultProps","_default","exports"],"sources":["../../src/pages/Resolver.js"],"sourcesContent":["import React from 'react';\nimport NextError from 'next/error';\nimport { useRouter } from 'next/router';\nimport PropTypes from 'prop-types';\nimport { DebugSidebar } from '../components';\nimport { checkUrl } from '../helpers';\nimport { ContentContainer } from '../containers';\nimport { NOT_FOUND_STATUS_CODE, RESOLVER_CONTAINER_CLASS } from '../constants';\n\nconst Resolver = props => {\n  const {\n    pageData,\n    itemId,\n    itemEntity,\n    isStatusPage,\n    fullUrl,\n    disableSsr,\n    rootSelectorClasses = RESOLVER_CONTAINER_CLASS,\n    isPreview = false,\n    errorCode = NOT_FOUND_STATUS_CODE,\n    errorMessage = null,\n    redirecting = false\n  } = props;\n\n  const router = useRouter();\n\n  if (disableSsr) {\n    if (typeof window !== 'undefined') {\n      let { asPath } = router;\n      if (window.location.hash) {\n        // handle nextjs issue not calling getInitialProps if pushing a url with a hash in it\n        // we add a new query string param to force calling getInitialProps\n        // this should only happen if disableSsr and window.location.hash\n        const url = new URL(router.asPath, window.location.href);\n        if (url.hash) url.searchParams.set('_h', Date.now());\n        asPath = url;\n      }\n      router.push('/Resolver', asPath);\n    }\n    return '';\n  }\n\n  if (redirecting) return null;\n\n  if (isStatusPage) return 'OK';\n\n  if (!pageData || !itemId || !itemEntity) {\n    return (\n      <>\n        <NextError statusCode={errorCode} title={errorMessage} />\n        <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n      </>\n    );\n  }\n\n  return (\n    <div className={rootSelectorClasses}>\n      <ContentContainer\n        pageData={pageData}\n        itemId={itemId}\n        itemEntity={itemEntity}\n        isPreview={isPreview}\n        fullUrl={fullUrl}\n      />\n\n      <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n    </div>\n  );\n};\n\nResolver.getInitialProps = async props => checkUrl(props);\n\nResolver.propTypes = {\n  itemId: PropTypes.string,\n  itemEntity: PropTypes.string,\n  pageData: PropTypes.object,\n  isStatusPage: PropTypes.bool,\n  fullUrl: PropTypes.string,\n  isPreview: PropTypes.bool,\n  errorCode: PropTypes.number,\n  disableSsr: PropTypes.bool,\n  errorMessage: PropTypes.string,\n  rootSelectorClasses: PropTypes.string,\n  redirecting: PropTypes.bool\n};\n\nResolver.defaultProps = {\n  itemId: null,\n  itemEntity: null,\n  pageData: null,\n  isStatusPage: false,\n  fullUrl: '',\n  isPreview: false,\n  errorCode: NOT_FOUND_STATUS_CODE,\n  disableSsr: false,\n  errorMessage: null,\n  rootSelectorClasses: RESOLVER_CONTAINER_CLASS,\n  redirecting: false\n};\n\nexport default Resolver;\n"],"mappings":"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"}
+{"version":3,"file":"Resolver.js","names":["_react","_interopRequireDefault","require","_error","_router","_propTypes","_components","_helpers","_containers","_constants","Resolver","props","pageData","itemId","itemEntity","isStatusPage","fullUrl","disableSsr","_props$rootSelectorCl","rootSelectorClasses","RESOLVER_CONTAINER_CLASS","_props$isPreview","isPreview","_props$errorCode","errorCode","NOT_FOUND_STATUS_CODE","_props$errorMessage","errorMessage","_props$redirecting","redirecting","router","useRouter","window","asPath","location","hash","url","URL","href","searchParams","set","Date","now","push","createElement","Fragment","className","statusCode","title","DebugSidebar","ContentContainer","getInitialProps","_ref","_asyncToGenerator2","_regenerator","mark","_callee","wrap","_callee$","_context","prev","next","abrupt","checkUrl","stop","_x","apply","arguments","propTypes","PropTypes","string","object","bool","number","defaultProps","_default","exports"],"sources":["../../src/pages/Resolver.js"],"sourcesContent":["import React from 'react';\nimport NextError from 'next/error';\nimport { useRouter } from 'next/router';\nimport PropTypes from 'prop-types';\nimport { DebugSidebar } from '../components';\nimport { checkUrl } from '../helpers';\nimport { ContentContainer } from '../containers';\nimport { NOT_FOUND_STATUS_CODE, RESOLVER_CONTAINER_CLASS } from '../constants';\n\nconst Resolver = props => {\n  const {\n    pageData,\n    itemId,\n    itemEntity,\n    isStatusPage,\n    fullUrl,\n    disableSsr,\n    rootSelectorClasses = RESOLVER_CONTAINER_CLASS,\n    isPreview = false,\n    errorCode = NOT_FOUND_STATUS_CODE,\n    errorMessage = null,\n    redirecting = false\n  } = props;\n\n  const router = useRouter();\n\n  if (disableSsr) {\n    if (typeof window !== 'undefined') {\n      let { asPath } = router;\n      if (window.location.hash) {\n        // handle nextjs issue not calling getInitialProps if pushing a url with a hash in it\n        // we add a new query string param to force calling getInitialProps\n        // this should only happen if disableSsr and window.location.hash\n        const url = new URL(router.asPath, window.location.href);\n        if (url.hash) url.searchParams.set('_h', Date.now());\n        asPath = url;\n      }\n      router.push('/Resolver', asPath);\n    }\n    return '';\n  }\n\n  if (redirecting) return null;\n\n  if (isStatusPage) return 'OK';\n\n  if (!pageData || !itemId || !itemEntity) {\n    return (\n      <>\n        <div className=\"next_error\">\n          <NextError statusCode={errorCode} title={errorMessage} />\n        </div>\n        <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n      </>\n    );\n  }\n\n  return (\n    <div className={rootSelectorClasses}>\n      <ContentContainer\n        pageData={pageData}\n        itemId={itemId}\n        itemEntity={itemEntity}\n        isPreview={isPreview}\n        fullUrl={fullUrl}\n      />\n\n      <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n    </div>\n  );\n};\n\nResolver.getInitialProps = async props => checkUrl(props);\n\nResolver.propTypes = {\n  itemId: PropTypes.string,\n  itemEntity: PropTypes.string,\n  pageData: PropTypes.object,\n  isStatusPage: PropTypes.bool,\n  fullUrl: PropTypes.string,\n  isPreview: PropTypes.bool,\n  errorCode: PropTypes.number,\n  disableSsr: PropTypes.bool,\n  errorMessage: PropTypes.string,\n  rootSelectorClasses: PropTypes.string,\n  redirecting: PropTypes.bool\n};\n\nResolver.defaultProps = {\n  itemId: null,\n  itemEntity: null,\n  pageData: null,\n  isStatusPage: false,\n  fullUrl: '',\n  isPreview: false,\n  errorCode: NOT_FOUND_STATUS_CODE,\n  disableSsr: false,\n  errorMessage: null,\n  rootSelectorClasses: RESOLVER_CONTAINER_CLASS,\n  redirecting: false\n};\n\nexport default Resolver;\n"],"mappings":"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"}

package/lib-es/helpers/check-url.js

@@ -112,8 +112,8 @@ const doUrlCheck = async ({
           itemEntity,
           urlTo,
           pageData = {}
-        }
-      }
+        } = {}
+      } = {}
     } = await apolloClient.query({
       query: checkUrlQuery,
       variables: {
@@ -122,7 +122,7 @@ const doUrlCheck = async ({
     });
     const {
       cacheControlMaxAge = null
-    } = pageData || {}; // pageData can be null when there is no page
+    } = pageData || {};
     if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {
       res.setHeader('Cache-Control', `max-age=${cacheControlMaxAge}`);
     }
@@ -132,10 +132,7 @@ const doUrlCheck = async ({
         const queryString = asPath.split('?')[1];
         redirectUrl = queryString ? `${urlTo}?${queryString}` : urlTo;
       }
-      doRedirect(res, redirectUrl);
-      return {
-        redirecting: true
-      };
+      return doRedirect(res, redirectUrl);
     }
     const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());
     return {
@@ -145,13 +142,14 @@ const doUrlCheck = async ({
       itemEntity: getUnpublishedEntityName(itemEntity)
     };
   } catch (err) {
+    if (!err.graphQLErrors || !err.graphQLErrors.length) {
+      return handleError(err, res, handle404Error, blazeApp);
+    }
     const parentPATH = checkParent(url);
     if (handle404Error && parentPATH) {
-      doRedirect(res, parentPATH);
-    } else {
-      return handleError(err, res, handle404Error, blazeApp);
+      return doRedirect(res, parentPATH);
     }
-    return handle404Error ? {} : null;
+    return handleError(err, res, handle404Error, blazeApp);
   }
 };
 const handleError = (err, res, handle404Error, blazeApp) => {
@@ -182,6 +180,9 @@ function doRedirect(res, redirectUrl) {
   } else {
     window.location.href = redirectUrl;
   }
+  return {
+    redirecting: true
+  };
 }
 export default checkUrl;
 //# sourceMappingURL=check-url.js.map

package/lib-es/helpers/check-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-url.js","names":["parseUrl","getUnpublishedEntityName","checkAccessToken","HTTPS","DOUBLE_SLASH","COLON","NOT_FOUND_STATUS_CODE","BLAZE_X_FRAME_OPTIONS_DEFAULT","checkUrlQuery","checkParent","checkPreviewUrl","handleStaticRoutes","getPageData","getRootSelectorClasses","getRootClassesLimit","Number","process","env","BLAZE_ROOT_SELECTOR_CLASSES_LIMIT","checkUrl","props","asPath","apolloClient","res","req","query","blazeApp","disableSsr","fullUrl","getFullUrl","url","BLAZE_STATUS_URL","isStatusPage","handler","getHandler","setHeader","BLAZE_X_FRAME_OPTIONS","getHeader","BLAZE_CACHE_CONTROL_HEADER","previewData","_objectSpread","Object","keys","cache","extract","length","getPreviewData","urlCheckOptions","result","doUrlCheck","handle404Error","pageData","rootSelectorClasses","isPreview","getHost","headers","BLAZE_FRONTEND_HOST","host","location","protocol","hostname","port","window","urlPort","data","itemId","itemEntity","urlTo","variables","cacheControlMaxAge","redirectUrl","BLAZE_DISABLE_REDIRECT_WITH_QUERY","queryString","split","doRedirect","redirecting","err","parentPATH","handleError","events","emit","error","networkError","writeHead","write","end","graphQLErrors","statusCode","errorCode","Location","href"],"sources":["../../src/helpers/check-url.js"],"sourcesContent":["import { parseUrl } from 'query-string';\nimport { getUnpublishedEntityName } from '@blaze-cms/react-page-builder';\nimport { checkAccessToken } from '@blaze-cms/core-auth-ui';\nimport {\n  HTTPS,\n  DOUBLE_SLASH,\n  COLON,\n  NOT_FOUND_STATUS_CODE,\n  BLAZE_X_FRAME_OPTIONS_DEFAULT\n} from '../constants';\nimport { checkUrlQuery } from '../application/query';\nimport checkParent from './check-parent';\nimport checkPreviewUrl from './check-preview-url';\nimport handleStaticRoutes from './handle-static-routes';\nimport getPageData from './get-page-data';\nimport getRootSelectorClasses from './get-root-selector-classes';\n\nconst getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT);\n\nconst checkUrl = async props => {\n  const { asPath, apolloClient, res, req, query, blazeApp, disableSsr } = props;\n  const fullUrl = getFullUrl(req, asPath);\n  const { url } = parseUrl(asPath);\n\n  if (process.env.BLAZE_STATUS_URL && url === process.env.BLAZE_STATUS_URL) {\n    return { isStatusPage: true };\n  }\n\n  if (res) {\n    const handler = handleStaticRoutes.getHandler(asPath);\n\n    res.setHeader(\n      'X-Frame-Options',\n      process.env.BLAZE_X_FRAME_OPTIONS || BLAZE_X_FRAME_OPTIONS_DEFAULT\n    );\n\n    if (!res.getHeader('Cache-Control')) {\n      res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');\n    }\n\n    if (handler) {\n      return handler(props);\n    }\n  }\n\n  const previewData = checkPreviewUrl(url, query);\n\n  if (!previewData && disableSsr) return { disableSsr: true };\n\n  await checkAccessToken(apolloClient, {\n    ...props,\n    disableSsr: !Object.keys(apolloClient.cache.extract()).length // empty cache means SSR was disabled\n  });\n\n  if (previewData) return getPreviewData(previewData, apolloClient);\n  const urlCheckOptions = { asPath, url, apolloClient, res };\n  const result = await doUrlCheck({\n    ...urlCheckOptions,\n    handle404Error: true,\n    blazeApp\n  });\n  return { ...result, fullUrl } || {};\n};\n\nconst getPreviewData = async (previewData, apolloClient) => {\n  const result = await getPageData({ ...previewData, apolloClient });\n  const { pageData: { url } = {} } = result;\n  const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n  return { ...previewData, rootSelectorClasses, ...result, isPreview: true };\n};\n\nconst getHost = ({ headers = {} }) =>\n  process.env.BLAZE_FRONTEND_HOST ||\n  headers['x-request-host'] ||\n  headers['x-forwarded-host'] ||\n  headers.host;\n\nconst getFullUrl = (req, asPath) => {\n  if (req) {\n    return `${HTTPS}${getHost(req)}${asPath}`;\n  }\n  const {\n    location: { protocol, hostname, port }\n  } = window;\n  const urlPort = port ? `${COLON}${port}` : '';\n\n  return `${protocol}${DOUBLE_SLASH}${hostname}${urlPort}${asPath}`;\n};\n\nconst doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blazeApp }) => {\n  try {\n    const {\n      data: {\n        checkUrl: { itemId, itemEntity, urlTo, pageData = {} }\n      }\n    } = await apolloClient.query({\n      query: checkUrlQuery,\n      variables: {\n        url\n      }\n    });\n\n    const { cacheControlMaxAge = null } = pageData || {}; // pageData can be null when there is no page\n    if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {\n      res.setHeader('Cache-Control', `max-age=${cacheControlMaxAge}`);\n    }\n\n    if (urlTo && urlTo !== url) {\n      let redirectUrl = urlTo;\n      if (process.env.BLAZE_DISABLE_REDIRECT_WITH_QUERY !== 'true') {\n        const queryString = asPath.split('?')[1];\n        redirectUrl = queryString ? `${urlTo}?${queryString}` : urlTo;\n      }\n\n      doRedirect(res, redirectUrl);\n      return { redirecting: true };\n    }\n    const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n    return {\n      pageData,\n      rootSelectorClasses,\n      itemId,\n      itemEntity: getUnpublishedEntityName(itemEntity)\n    };\n  } catch (err) {\n    const parentPATH = checkParent(url);\n    if (handle404Error && parentPATH) {\n      doRedirect(res, parentPATH);\n    } else {\n      return handleError(err, res, handle404Error, blazeApp);\n    }\n\n    return handle404Error ? {} : null;\n  }\n};\n\nconst handleError = (err, res, handle404Error, blazeApp) => {\n  blazeApp.events.emit('monitor:log', { error: err });\n\n  if (!res) return {};\n  if (err.networkError) {\n    res.writeHead(500, { 'Content-Type': 'text/plain' });\n    res.write('500 Internal Server Error\\n');\n    res.end();\n  } else if (handle404Error && err.graphQLErrors && err.graphQLErrors.length) {\n    res.statusCode = NOT_FOUND_STATUS_CODE;\n    return { errorCode: NOT_FOUND_STATUS_CODE };\n  }\n\n  return {};\n};\n\nfunction doRedirect(res, redirectUrl) {\n  if (res) {\n    res.writeHead(301, { Location: redirectUrl });\n    res.end();\n  } else {\n    window.location.href = redirectUrl;\n  }\n}\n\nexport default checkUrl;\n"],"mappings":"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"}
+{"version":3,"file":"check-url.js","names":["parseUrl","getUnpublishedEntityName","checkAccessToken","HTTPS","DOUBLE_SLASH","COLON","NOT_FOUND_STATUS_CODE","BLAZE_X_FRAME_OPTIONS_DEFAULT","checkUrlQuery","checkParent","checkPreviewUrl","handleStaticRoutes","getPageData","getRootSelectorClasses","getRootClassesLimit","Number","process","env","BLAZE_ROOT_SELECTOR_CLASSES_LIMIT","checkUrl","props","asPath","apolloClient","res","req","query","blazeApp","disableSsr","fullUrl","getFullUrl","url","BLAZE_STATUS_URL","isStatusPage","handler","getHandler","setHeader","BLAZE_X_FRAME_OPTIONS","getHeader","BLAZE_CACHE_CONTROL_HEADER","previewData","_objectSpread","Object","keys","cache","extract","length","getPreviewData","urlCheckOptions","result","doUrlCheck","handle404Error","pageData","rootSelectorClasses","isPreview","getHost","headers","BLAZE_FRONTEND_HOST","host","location","protocol","hostname","port","window","urlPort","data","itemId","itemEntity","urlTo","variables","cacheControlMaxAge","redirectUrl","BLAZE_DISABLE_REDIRECT_WITH_QUERY","queryString","split","doRedirect","err","graphQLErrors","handleError","parentPATH","events","emit","error","networkError","writeHead","write","end","statusCode","errorCode","Location","href","redirecting"],"sources":["../../src/helpers/check-url.js"],"sourcesContent":["import { parseUrl } from 'query-string';\nimport { getUnpublishedEntityName } from '@blaze-cms/react-page-builder';\nimport { checkAccessToken } from '@blaze-cms/core-auth-ui';\nimport {\n  HTTPS,\n  DOUBLE_SLASH,\n  COLON,\n  NOT_FOUND_STATUS_CODE,\n  BLAZE_X_FRAME_OPTIONS_DEFAULT\n} from '../constants';\nimport { checkUrlQuery } from '../application/query';\nimport checkParent from './check-parent';\nimport checkPreviewUrl from './check-preview-url';\nimport handleStaticRoutes from './handle-static-routes';\nimport getPageData from './get-page-data';\nimport getRootSelectorClasses from './get-root-selector-classes';\n\nconst getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT);\n\nconst checkUrl = async props => {\n  const { asPath, apolloClient, res, req, query, blazeApp, disableSsr } = props;\n  const fullUrl = getFullUrl(req, asPath);\n  const { url } = parseUrl(asPath);\n\n  if (process.env.BLAZE_STATUS_URL && url === process.env.BLAZE_STATUS_URL) {\n    return { isStatusPage: true };\n  }\n\n  if (res) {\n    const handler = handleStaticRoutes.getHandler(asPath);\n\n    res.setHeader(\n      'X-Frame-Options',\n      process.env.BLAZE_X_FRAME_OPTIONS || BLAZE_X_FRAME_OPTIONS_DEFAULT\n    );\n\n    if (!res.getHeader('Cache-Control')) {\n      res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');\n    }\n\n    if (handler) {\n      return handler(props);\n    }\n  }\n\n  const previewData = checkPreviewUrl(url, query);\n\n  if (!previewData && disableSsr) return { disableSsr: true };\n\n  await checkAccessToken(apolloClient, {\n    ...props,\n    disableSsr: !Object.keys(apolloClient.cache.extract()).length // empty cache means SSR was disabled\n  });\n\n  if (previewData) return getPreviewData(previewData, apolloClient);\n  const urlCheckOptions = { asPath, url, apolloClient, res };\n  const result = await doUrlCheck({\n    ...urlCheckOptions,\n    handle404Error: true,\n    blazeApp\n  });\n  return { ...result, fullUrl } || {};\n};\n\nconst getPreviewData = async (previewData, apolloClient) => {\n  const result = await getPageData({ ...previewData, apolloClient });\n  const { pageData: { url } = {} } = result;\n  const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n  return { ...previewData, rootSelectorClasses, ...result, isPreview: true };\n};\n\nconst getHost = ({ headers = {} }) =>\n  process.env.BLAZE_FRONTEND_HOST ||\n  headers['x-request-host'] ||\n  headers['x-forwarded-host'] ||\n  headers.host;\n\nconst getFullUrl = (req, asPath) => {\n  if (req) {\n    return `${HTTPS}${getHost(req)}${asPath}`;\n  }\n  const {\n    location: { protocol, hostname, port }\n  } = window;\n  const urlPort = port ? `${COLON}${port}` : '';\n\n  return `${protocol}${DOUBLE_SLASH}${hostname}${urlPort}${asPath}`;\n};\n\nconst doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blazeApp }) => {\n  try {\n    const {\n      data: { checkUrl: { itemId, itemEntity, urlTo, pageData = {} } = {} } = {}\n    } = await apolloClient.query({\n      query: checkUrlQuery,\n      variables: { url }\n    });\n\n    const { cacheControlMaxAge = null } = pageData || {};\n\n    if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {\n      res.setHeader('Cache-Control', `max-age=${cacheControlMaxAge}`);\n    }\n\n    if (urlTo && urlTo !== url) {\n      let redirectUrl = urlTo;\n      if (process.env.BLAZE_DISABLE_REDIRECT_WITH_QUERY !== 'true') {\n        const queryString = asPath.split('?')[1];\n        redirectUrl = queryString ? `${urlTo}?${queryString}` : urlTo;\n      }\n\n      return doRedirect(res, redirectUrl);\n    }\n    const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n    return {\n      pageData,\n      rootSelectorClasses,\n      itemId,\n      itemEntity: getUnpublishedEntityName(itemEntity)\n    };\n  } catch (err) {\n    if (!err.graphQLErrors || !err.graphQLErrors.length) {\n      return handleError(err, res, handle404Error, blazeApp);\n    }\n\n    const parentPATH = checkParent(url);\n    if (handle404Error && parentPATH) {\n      return doRedirect(res, parentPATH);\n    }\n\n    return handleError(err, res, handle404Error, blazeApp);\n  }\n};\n\nconst handleError = (err, res, handle404Error, blazeApp) => {\n  blazeApp.events.emit('monitor:log', { error: err });\n\n  if (!res) return {};\n  if (err.networkError) {\n    res.writeHead(500, { 'Content-Type': 'text/plain' });\n    res.write('500 Internal Server Error\\n');\n    res.end();\n  } else if (handle404Error && err.graphQLErrors && err.graphQLErrors.length) {\n    res.statusCode = NOT_FOUND_STATUS_CODE;\n    return { errorCode: NOT_FOUND_STATUS_CODE };\n  }\n\n  return {};\n};\n\nfunction doRedirect(res, redirectUrl) {\n  if (res) {\n    res.writeHead(301, { Location: redirectUrl });\n    res.end();\n  } else {\n    window.location.href = redirectUrl;\n  }\n\n  return { redirecting: true };\n}\n\nexport default checkUrl;\n"],"mappings":";;;AAAA,SAASA,QAAQ,QAAQ,cAAc;AACvC,SAASC,wBAAwB,QAAQ,+BAA+B;AACxE,SAASC,gBAAgB,QAAQ,yBAAyB;AAC1D,SACEC,KAAK,EACLC,YAAY,EACZC,KAAK,EACLC,qBAAqB,EACrBC,6BAA6B,QACxB,cAAc;AACrB,SAASC,aAAa,QAAQ,sBAAsB;AACpD,OAAOC,WAAW,MAAM,gBAAgB;AACxC,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,WAAW,MAAM,iBAAiB;AACzC,OAAOC,sBAAsB,MAAM,6BAA6B;AAEhE,MAAMC,mBAAmB,GAAGA,CAAA,KAAMC,MAAM,CAACC,OAAO,CAACC,GAAG,CAACC,iCAAiC,CAAC;AAEvF,MAAMC,QAAQ,GAAG,MAAMC,KAAK,IAAI;EAC9B,MAAM;IAAEC,MAAM;IAAEC,YAAY;IAAEC,GAAG;IAAEC,GAAG;IAAEC,KAAK;IAAEC,QAAQ;IAAEC;EAAW,CAAC,GAAGP,KAAK;EAC7E,MAAMQ,OAAO,GAAGC,UAAU,CAACL,GAAG,EAAEH,MAAM,CAAC;EACvC,MAAM;IAAES;EAAI,CAAC,GAAG9B,QAAQ,CAACqB,MAAM,CAAC;EAEhC,IAAIL,OAAO,CAACC,GAAG,CAACc,gBAAgB,IAAID,GAAG,KAAKd,OAAO,CAACC,GAAG,CAACc,gBAAgB,EAAE;IACxE,OAAO;MAAEC,YAAY,EAAE;IAAK,CAAC;EAC/B;EAEA,IAAIT,GAAG,EAAE;IACP,MAAMU,OAAO,GAAGtB,kBAAkB,CAACuB,UAAU,CAACb,MAAM,CAAC;IAErDE,GAAG,CAACY,SAAS,CACX,iBAAiB,EACjBnB,OAAO,CAACC,GAAG,CAACmB,qBAAqB,IAAI7B,6BACvC,CAAC;IAED,IAAI,CAACgB,GAAG,CAACc,SAAS,CAAC,eAAe,CAAC,EAAE;MACnCd,GAAG,CAACY,SAAS,CAAC,eAAe,EAAEnB,OAAO,CAACC,GAAG,CAACqB,0BAA0B,IAAI,EAAE,CAAC;IAC9E;IAEA,IAAIL,OAAO,EAAE;MACX,OAAOA,OAAO,CAACb,KAAK,CAAC;IACvB;EACF;EAEA,MAAMmB,WAAW,GAAG7B,eAAe,CAACoB,GAAG,EAAEL,KAAK,CAAC;EAE/C,IAAI,CAACc,WAAW,IAAIZ,UAAU,EAAE,OAAO;IAAEA,UAAU,EAAE;EAAK,CAAC;EAE3D,MAAMzB,gBAAgB,CAACoB,YAAY,EAAAkB,aAAA,CAAAA,aAAA,KAC9BpB,KAAK;IACRO,UAAU,EAAE,CAACc,MAAM,CAACC,IAAI,CAACpB,YAAY,CAACqB,KAAK,CAACC,OAAO,CAAC,CAAC,CAAC,CAACC,MAAM,CAAC;EAAA,EAC/D,CAAC;EAEF,IAAIN,WAAW,EAAE,OAAOO,cAAc,CAACP,WAAW,EAAEjB,YAAY,CAAC;EACjE,MAAMyB,eAAe,GAAG;IAAE1B,MAAM;IAAES,GAAG;IAAER,YAAY;IAAEC;EAAI,CAAC;EAC1D,MAAMyB,MAAM,GAAG,MAAMC,UAAU,CAAAT,aAAA,CAAAA,aAAA,KAC1BO,eAAe;IAClBG,cAAc,EAAE,IAAI;IACpBxB;EAAQ,EACT,CAAC;EACF,OAAOc,aAAA,CAAAA,aAAA,KAAKQ,MAAM;IAAEpB;EAAO,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,MAAMkB,cAAc,GAAG,MAAAA,CAAOP,WAAW,EAAEjB,YAAY,KAAK;EAC1D,MAAM0B,MAAM,GAAG,MAAMpC,WAAW,CAAA4B,aAAA,CAAAA,aAAA,KAAMD,WAAW;IAAEjB;EAAY,EAAE,CAAC;EAClE,MAAM;IAAE6B,QAAQ,EAAE;MAAErB;IAAI,CAAC,GAAG,CAAC;EAAE,CAAC,GAAGkB,MAAM;EACzC,MAAMI,mBAAmB,GAAGvC,sBAAsB,CAACiB,GAAG,EAAEhB,mBAAmB,CAAC,CAAC,CAAC;EAC9E,OAAA0B,aAAA,CAAAA,aAAA,CAAAA,aAAA,KAAYD,WAAW;IAAEa;EAAmB,GAAKJ,MAAM;IAAEK,SAAS,EAAE;EAAI;AAC1E,CAAC;AAED,MAAMC,OAAO,GAAGA,CAAC;EAAEC,OAAO,GAAG,CAAC;AAAE,CAAC,KAC/BvC,OAAO,CAACC,GAAG,CAACuC,mBAAmB,IAC/BD,OAAO,CAAC,gBAAgB,CAAC,IACzBA,OAAO,CAAC,kBAAkB,CAAC,IAC3BA,OAAO,CAACE,IAAI;AAEd,MAAM5B,UAAU,GAAGA,CAACL,GAAG,EAAEH,MAAM,KAAK;EAClC,IAAIG,GAAG,EAAE;IACP,OAAQ,GAAErB,KAAM,GAAEmD,OAAO,CAAC9B,GAAG,CAAE,GAAEH,MAAO,EAAC;EAC3C;EACA,MAAM;IACJqC,QAAQ,EAAE;MAAEC,QAAQ;MAAEC,QAAQ;MAAEC;IAAK;EACvC,CAAC,GAAGC,MAAM;EACV,MAAMC,OAAO,GAAGF,IAAI,GAAI,GAAExD,KAAM,GAAEwD,IAAK,EAAC,GAAG,EAAE;EAE7C,OAAQ,GAAEF,QAAS,GAAEvD,YAAa,GAAEwD,QAAS,GAAEG,OAAQ,GAAE1C,MAAO,EAAC;AACnE,CAAC;AAED,MAAM4B,UAAU,GAAG,MAAAA,CAAO;EAAE5B,MAAM;EAAES,GAAG;EAAER,YAAY;EAAEC,GAAG;EAAE2B,cAAc;EAAExB;AAAS,CAAC,KAAK;EACzF,IAAI;IACF,MAAM;MACJsC,IAAI,EAAE;QAAE7C,QAAQ,EAAE;UAAE8C,MAAM;UAAEC,UAAU;UAAEC,KAAK;UAAEhB,QAAQ,GAAG,CAAC;QAAE,CAAC,GAAG,CAAC;MAAE,CAAC,GAAG,CAAC;IAC3E,CAAC,GAAG,MAAM7B,YAAY,CAACG,KAAK,CAAC;MAC3BA,KAAK,EAAEjB,aAAa;MACpB4D,SAAS,EAAE;QAAEtC;MAAI;IACnB,CAAC,CAAC;IAEF,MAAM;MAAEuC,kBAAkB,GAAG;IAAK,CAAC,GAAGlB,QAAQ,IAAI,CAAC,CAAC;IAEpD,IAAI5B,GAAG,IAAI8C,kBAAkB,KAAK,IAAI,IAAIA,kBAAkB,IAAI,CAAC,EAAE;MACjE9C,GAAG,CAACY,SAAS,CAAC,eAAe,EAAG,WAAUkC,kBAAmB,EAAC,CAAC;IACjE;IAEA,IAAIF,KAAK,IAAIA,KAAK,KAAKrC,GAAG,EAAE;MAC1B,IAAIwC,WAAW,GAAGH,KAAK;MACvB,IAAInD,OAAO,CAACC,GAAG,CAACsD,iCAAiC,KAAK,MAAM,EAAE;QAC5D,MAAMC,WAAW,GAAGnD,MAAM,CAACoD,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxCH,WAAW,GAAGE,WAAW,GAAI,GAAEL,KAAM,IAAGK,WAAY,EAAC,GAAGL,KAAK;MAC/D;MAEA,OAAOO,UAAU,CAACnD,GAAG,EAAE+C,WAAW,CAAC;IACrC;IACA,MAAMlB,mBAAmB,GAAGvC,sBAAsB,CAACiB,GAAG,EAAEhB,mBAAmB,CAAC,CAAC,CAAC;IAC9E,OAAO;MACLqC,QAAQ;MACRC,mBAAmB;MACnBa,MAAM;MACNC,UAAU,EAAEjE,wBAAwB,CAACiE,UAAU;IACjD,CAAC;EACH,CAAC,CAAC,OAAOS,GAAG,EAAE;IACZ,IAAI,CAACA,GAAG,CAACC,aAAa,IAAI,CAACD,GAAG,CAACC,aAAa,CAAC/B,MAAM,EAAE;MACnD,OAAOgC,WAAW,CAACF,GAAG,EAAEpD,GAAG,EAAE2B,cAAc,EAAExB,QAAQ,CAAC;IACxD;IAEA,MAAMoD,UAAU,GAAGrE,WAAW,CAACqB,GAAG,CAAC;IACnC,IAAIoB,cAAc,IAAI4B,UAAU,EAAE;MAChC,OAAOJ,UAAU,CAACnD,GAAG,EAAEuD,UAAU,CAAC;IACpC;IAEA,OAAOD,WAAW,CAACF,GAAG,EAAEpD,GAAG,EAAE2B,cAAc,EAAExB,QAAQ,CAAC;EACxD;AACF,CAAC;AAED,MAAMmD,WAAW,GAAGA,CAACF,GAAG,EAAEpD,GAAG,EAAE2B,cAAc,EAAExB,QAAQ,KAAK;EAC1DA,QAAQ,CAACqD,MAAM,CAACC,IAAI,CAAC,aAAa,EAAE;IAAEC,KAAK,EAAEN;EAAI,CAAC,CAAC;EAEnD,IAAI,CAACpD,GAAG,EAAE,OAAO,CAAC,CAAC;EACnB,IAAIoD,GAAG,CAACO,YAAY,EAAE;IACpB3D,GAAG,CAAC4D,SAAS,CAAC,GAAG,EAAE;MAAE,cAAc,EAAE;IAAa,CAAC,CAAC;IACpD5D,GAAG,CAAC6D,KAAK,CAAC,6BAA6B,CAAC;IACxC7D,GAAG,CAAC8D,GAAG,CAAC,CAAC;EACX,CAAC,MAAM,IAAInC,cAAc,IAAIyB,GAAG,CAACC,aAAa,IAAID,GAAG,CAACC,aAAa,CAAC/B,MAAM,EAAE;IAC1EtB,GAAG,CAAC+D,UAAU,GAAGhF,qBAAqB;IACtC,OAAO;MAAEiF,SAAS,EAAEjF;IAAsB,CAAC;EAC7C;EAEA,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAASoE,UAAUA,CAACnD,GAAG,EAAE+C,WAAW,EAAE;EACpC,IAAI/C,GAAG,EAAE;IACPA,GAAG,CAAC4D,SAAS,CAAC,GAAG,EAAE;MAAEK,QAAQ,EAAElB;IAAY,CAAC,CAAC;IAC7C/C,GAAG,CAAC8D,GAAG,CAAC,CAAC;EACX,CAAC,MAAM;IACLvB,MAAM,CAACJ,QAAQ,CAAC+B,IAAI,GAAGnB,WAAW;EACpC;EAEA,OAAO;IAAEoB,WAAW,EAAE;EAAK,CAAC;AAC9B;AAEA,eAAevE,QAAQ"}

package/lib-es/pages/Resolver.js

@@ -41,10 +41,12 @@ const Resolver = props => {
   if (redirecting) return null;
   if (isStatusPage) return 'OK';
   if (!pageData || !itemId || !itemEntity) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(NextError, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: "next_error"
+    }, /*#__PURE__*/React.createElement(NextError, {
       statusCode: errorCode,
       title: errorMessage
-    }), /*#__PURE__*/React.createElement(DebugSidebar, {
+    })), /*#__PURE__*/React.createElement(DebugSidebar, {
       itemId: itemId,
       itemEntity: itemEntity
     }));

package/lib-es/pages/Resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"Resolver.js","names":["React","NextError","useRouter","PropTypes","DebugSidebar","checkUrl","ContentContainer","NOT_FOUND_STATUS_CODE","RESOLVER_CONTAINER_CLASS","Resolver","props","pageData","itemId","itemEntity","isStatusPage","fullUrl","disableSsr","rootSelectorClasses","isPreview","errorCode","errorMessage","redirecting","router","window","asPath","location","hash","url","URL","href","searchParams","set","Date","now","push","createElement","Fragment","statusCode","title","className","getInitialProps","propTypes","string","object","bool","number","defaultProps"],"sources":["../../src/pages/Resolver.js"],"sourcesContent":["import React from 'react';\nimport NextError from 'next/error';\nimport { useRouter } from 'next/router';\nimport PropTypes from 'prop-types';\nimport { DebugSidebar } from '../components';\nimport { checkUrl } from '../helpers';\nimport { ContentContainer } from '../containers';\nimport { NOT_FOUND_STATUS_CODE, RESOLVER_CONTAINER_CLASS } from '../constants';\n\nconst Resolver = props => {\n  const {\n    pageData,\n    itemId,\n    itemEntity,\n    isStatusPage,\n    fullUrl,\n    disableSsr,\n    rootSelectorClasses = RESOLVER_CONTAINER_CLASS,\n    isPreview = false,\n    errorCode = NOT_FOUND_STATUS_CODE,\n    errorMessage = null,\n    redirecting = false\n  } = props;\n\n  const router = useRouter();\n\n  if (disableSsr) {\n    if (typeof window !== 'undefined') {\n      let { asPath } = router;\n      if (window.location.hash) {\n        // handle nextjs issue not calling getInitialProps if pushing a url with a hash in it\n        // we add a new query string param to force calling getInitialProps\n        // this should only happen if disableSsr and window.location.hash\n        const url = new URL(router.asPath, window.location.href);\n        if (url.hash) url.searchParams.set('_h', Date.now());\n        asPath = url;\n      }\n      router.push('/Resolver', asPath);\n    }\n    return '';\n  }\n\n  if (redirecting) return null;\n\n  if (isStatusPage) return 'OK';\n\n  if (!pageData || !itemId || !itemEntity) {\n    return (\n      <>\n        <NextError statusCode={errorCode} title={errorMessage} />\n        <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n      </>\n    );\n  }\n\n  return (\n    <div className={rootSelectorClasses}>\n      <ContentContainer\n        pageData={pageData}\n        itemId={itemId}\n        itemEntity={itemEntity}\n        isPreview={isPreview}\n        fullUrl={fullUrl}\n      />\n\n      <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n    </div>\n  );\n};\n\nResolver.getInitialProps = async props => checkUrl(props);\n\nResolver.propTypes = {\n  itemId: PropTypes.string,\n  itemEntity: PropTypes.string,\n  pageData: PropTypes.object,\n  isStatusPage: PropTypes.bool,\n  fullUrl: PropTypes.string,\n  isPreview: PropTypes.bool,\n  errorCode: PropTypes.number,\n  disableSsr: PropTypes.bool,\n  errorMessage: PropTypes.string,\n  rootSelectorClasses: PropTypes.string,\n  redirecting: PropTypes.bool\n};\n\nResolver.defaultProps = {\n  itemId: null,\n  itemEntity: null,\n  pageData: null,\n  isStatusPage: false,\n  fullUrl: '',\n  isPreview: false,\n  errorCode: NOT_FOUND_STATUS_CODE,\n  disableSsr: false,\n  errorMessage: null,\n  rootSelectorClasses: RESOLVER_CONTAINER_CLASS,\n  redirecting: false\n};\n\nexport default Resolver;\n"],"mappings":"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"}
+{"version":3,"file":"Resolver.js","names":["React","NextError","useRouter","PropTypes","DebugSidebar","checkUrl","ContentContainer","NOT_FOUND_STATUS_CODE","RESOLVER_CONTAINER_CLASS","Resolver","props","pageData","itemId","itemEntity","isStatusPage","fullUrl","disableSsr","rootSelectorClasses","isPreview","errorCode","errorMessage","redirecting","router","window","asPath","location","hash","url","URL","href","searchParams","set","Date","now","push","createElement","Fragment","className","statusCode","title","getInitialProps","propTypes","string","object","bool","number","defaultProps"],"sources":["../../src/pages/Resolver.js"],"sourcesContent":["import React from 'react';\nimport NextError from 'next/error';\nimport { useRouter } from 'next/router';\nimport PropTypes from 'prop-types';\nimport { DebugSidebar } from '../components';\nimport { checkUrl } from '../helpers';\nimport { ContentContainer } from '../containers';\nimport { NOT_FOUND_STATUS_CODE, RESOLVER_CONTAINER_CLASS } from '../constants';\n\nconst Resolver = props => {\n  const {\n    pageData,\n    itemId,\n    itemEntity,\n    isStatusPage,\n    fullUrl,\n    disableSsr,\n    rootSelectorClasses = RESOLVER_CONTAINER_CLASS,\n    isPreview = false,\n    errorCode = NOT_FOUND_STATUS_CODE,\n    errorMessage = null,\n    redirecting = false\n  } = props;\n\n  const router = useRouter();\n\n  if (disableSsr) {\n    if (typeof window !== 'undefined') {\n      let { asPath } = router;\n      if (window.location.hash) {\n        // handle nextjs issue not calling getInitialProps if pushing a url with a hash in it\n        // we add a new query string param to force calling getInitialProps\n        // this should only happen if disableSsr and window.location.hash\n        const url = new URL(router.asPath, window.location.href);\n        if (url.hash) url.searchParams.set('_h', Date.now());\n        asPath = url;\n      }\n      router.push('/Resolver', asPath);\n    }\n    return '';\n  }\n\n  if (redirecting) return null;\n\n  if (isStatusPage) return 'OK';\n\n  if (!pageData || !itemId || !itemEntity) {\n    return (\n      <>\n        <div className=\"next_error\">\n          <NextError statusCode={errorCode} title={errorMessage} />\n        </div>\n        <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n      </>\n    );\n  }\n\n  return (\n    <div className={rootSelectorClasses}>\n      <ContentContainer\n        pageData={pageData}\n        itemId={itemId}\n        itemEntity={itemEntity}\n        isPreview={isPreview}\n        fullUrl={fullUrl}\n      />\n\n      <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n    </div>\n  );\n};\n\nResolver.getInitialProps = async props => checkUrl(props);\n\nResolver.propTypes = {\n  itemId: PropTypes.string,\n  itemEntity: PropTypes.string,\n  pageData: PropTypes.object,\n  isStatusPage: PropTypes.bool,\n  fullUrl: PropTypes.string,\n  isPreview: PropTypes.bool,\n  errorCode: PropTypes.number,\n  disableSsr: PropTypes.bool,\n  errorMessage: PropTypes.string,\n  rootSelectorClasses: PropTypes.string,\n  redirecting: PropTypes.bool\n};\n\nResolver.defaultProps = {\n  itemId: null,\n  itemEntity: null,\n  pageData: null,\n  isStatusPage: false,\n  fullUrl: '',\n  isPreview: false,\n  errorCode: NOT_FOUND_STATUS_CODE,\n  disableSsr: false,\n  errorMessage: null,\n  rootSelectorClasses: RESOLVER_CONTAINER_CLASS,\n  redirecting: false\n};\n\nexport default Resolver;\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/nextjs-tools",
-  "version": "0.146.0-alpha.31",
+  "version": "0.146.0-alpha.36",
   "description": "Blaze nextjs tools",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -33,15 +33,15 @@
     "@blaze-cms/core-errors-ui": "^0.140.3",
     "@blaze-cms/core-ui": "0.146.0-alpha.26",
     "@blaze-cms/nextjs-components": "0.146.0-alpha.28",
-    "@blaze-cms/plugin-auth-fe": "0.146.0-alpha.28",
-    "@blaze-cms/plugin-auth-local-fe": "0.146.0-alpha.26",
-    "@blaze-cms/plugin-google-maps-fe": "0.146.0-alpha.31",
-    "@blaze-cms/plugin-gtm-fe": "0.146.0-alpha.31",
-    "@blaze-cms/plugin-page-builder-fe": "0.146.0-alpha.31",
+    "@blaze-cms/plugin-auth-fe": "0.146.0-alpha.36",
+    "@blaze-cms/plugin-auth-local-fe": "0.146.0-alpha.36",
+    "@blaze-cms/plugin-google-maps-fe": "0.146.0-alpha.36",
+    "@blaze-cms/plugin-gtm-fe": "0.146.0-alpha.36",
+    "@blaze-cms/plugin-page-builder-fe": "0.146.0-alpha.36",
     "@blaze-cms/plugin-preview-fe": "0.146.0-alpha.26",
     "@blaze-cms/plugin-search-ui": "0.146.0-alpha.30",
     "@blaze-cms/plugin-structured-data-fe": "^0.140.3",
-    "@blaze-cms/react-page-builder": "0.146.0-alpha.31",
+    "@blaze-cms/react-page-builder": "0.146.0-alpha.36",
     "@blaze-cms/setup-ui": "^0.140.3",
     "autoprefixer": "^10.2.3",
     "core-js": "^3.2.1",
@@ -69,5 +69,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "af260b3e382dd162760676b915ef742b644dd0f6"
+  "gitHead": "66ba8160c0bf7ae627a665d33aaaaaa4493b8e71"
 }

package/src/helpers/check-url.js

@@ -90,17 +90,14 @@ const getFullUrl = (req, asPath) => {
 const doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blazeApp }) => {
   try {
     const {
-      data: {
-        checkUrl: { itemId, itemEntity, urlTo, pageData = {} }
-      }
+      data: { checkUrl: { itemId, itemEntity, urlTo, pageData = {} } = {} } = {}
     } = await apolloClient.query({
       query: checkUrlQuery,
-      variables: {
-        url
-      }
+      variables: { url }
     });
 
-    const { cacheControlMaxAge = null } = pageData || {}; // pageData can be null when there is no page
+    const { cacheControlMaxAge = null } = pageData || {};
+
     if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {
       res.setHeader('Cache-Control', `max-age=${cacheControlMaxAge}`);
     }
@@ -112,8 +109,7 @@ const doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blaz
         redirectUrl = queryString ? `${urlTo}?${queryString}` : urlTo;
       }
 
-      doRedirect(res, redirectUrl);
-      return { redirecting: true };
+      return doRedirect(res, redirectUrl);
     }
     const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());
     return {
@@ -123,14 +119,16 @@ const doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blaz
       itemEntity: getUnpublishedEntityName(itemEntity)
     };
   } catch (err) {
+    if (!err.graphQLErrors || !err.graphQLErrors.length) {
+      return handleError(err, res, handle404Error, blazeApp);
+    }
+
     const parentPATH = checkParent(url);
     if (handle404Error && parentPATH) {
-      doRedirect(res, parentPATH);
-    } else {
-      return handleError(err, res, handle404Error, blazeApp);
+      return doRedirect(res, parentPATH);
     }
 
-    return handle404Error ? {} : null;
+    return handleError(err, res, handle404Error, blazeApp);
   }
 };
 
@@ -157,6 +155,8 @@ function doRedirect(res, redirectUrl) {
   } else {
     window.location.href = redirectUrl;
   }
+
+  return { redirecting: true };
 }
 
 export default checkUrl;

package/src/pages/Resolver.js

@@ -47,7 +47,9 @@ const Resolver = props => {
   if (!pageData || !itemId || !itemEntity) {
     return (
       <>
-        <NextError statusCode={errorCode} title={errorMessage} />
+        <div className="next_error">
+          <NextError statusCode={errorCode} title={errorMessage} />
+        </div>
         <DebugSidebar itemId={itemId} itemEntity={itemEntity} />
       </>
     );

package/tests/unit/src/helpers/check-url.test.js

@@ -229,13 +229,15 @@ describe('Check url', () => {
 
   it('should handle redirect to parent on not found', async () => {
     apolloClient.query.mockImplementationOnce(async () => {
-      throw new Error('Not found');
+      const error = new Error('Not found');
+      error.graphQLErrors = ['error'];
+      throw error;
     });
     const parentChildAsPath = '/parent/child';
     const result = await checkUrl({ ...props, asPath: parentChildAsPath });
     expect(res.writeHead).toHaveBeenCalledWith(301, { Location: '/parent' });
     expect(res.end).toHaveBeenCalled();
-    redirectResultCheck(result, false);
+    redirectResultCheck(result, true);
     apolloQueryCheck(apolloClient, parentChildAsPath);
   });
 

package/tests/unit/src/pages/__snapshots__/Resolver.test.js.snap

@@ -14,7 +14,11 @@ exports[`Resolver page should disable SSR 1`] = `<DocumentFragment />`;
 
 exports[`Resolver page should render 404 error if pageData, itemId or itemEntity falsey 1`] = `
 <DocumentFragment>
-  NextError
+  <div
+    class="next_error"
+  >
+    NextError
+  </div>
 </DocumentFragment>
 `;