@blaze-cms/nextjs-tools 0.146.0-alpha.4 → 0.146.0-alpha.41

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

@@ -44,8 +44,16 @@ const Resolver = props => {
 
   if (isStatusPage) return 'OK';
 
-  if (!pageData || !itemId || !itemEntity)
-    return <NextError statusCode={errorCode} title={errorMessage} />;
+  if (!pageData || !itemId || !itemEntity) {
+    return (
+      <>
+        <div className="next_error">
+          <NextError statusCode={errorCode} title={errorMessage} />
+        </div>
+        <DebugSidebar itemId={itemId} itemEntity={itemEntity} />
+      </>
+    );
+  }
 
   return (
     <div className={rootSelectorClasses}>

package/tests/unit/src/__snapshots__/constants.test.js.snap

@@ -66,7 +66,7 @@ Object {
   "ROUTE_PATTERN_ROBOTS_TXT": "/robots.txt",
   "ROUTE_PATTERN_SITEMAP": "/sitemap.xml",
   "ROUTE_PATTERN_SITEMAP_FILE_REGEX": /\\\\/sitemap\\\\/\\.\\*\\.xml/,
-  "ROUTE_REGEX": /\\^\\\\/\\[a-z0-9€_\\\\/\\]\\+\\(\\?:\\[-\\\\/\\]\\{1,2\\}\\[a-z0-9\\\\/€_\\\\/\\]\\+\\)\\*\\$\\|\\^\\\\/\\$/i,
+  "ROUTE_REGEX": /\\^\\\\/\\[a-z0-9€_\\\\/\\]\\+\\(\\?:\\[-\\\\/\\\\\\.\\]\\{1,2\\}\\[a-z0-9\\\\/€_\\\\/\\]\\+\\)\\*\\$\\|\\^\\\\/\\$/i,
   "SEARCH_FILTER": "searchfilter",
   "SITEMAP_STORE_KEY": "default_sitemap",
   "STATIC_FILE_FORWARD_HEADERS": Array [

package/tests/unit/src/constants.test.js

@@ -7,10 +7,21 @@ describe('Constants', () => {
     expect(constants).toMatchSnapshot();
   });
 
-  it('should handle trailing and no trailing route slashes', () => {
+  describe('Default route regex', () => {
     const { ROUTE_REGEX } = constants;
-    expect(ROUTE_REGEX.test('/page')).toEqual(true);
-    expect(ROUTE_REGEX.test('/page/')).toEqual(true);
+
+    it('should handle trailing and no trailing route slashes', () => {
+      expect(ROUTE_REGEX.test('/page')).toEqual(true);
+      expect(ROUTE_REGEX.test('/page/')).toEqual(true);
+    });
+
+    it('should allow specific characters in route regex', () => {
+      const validCharacters = 'abc0123€_';
+      expect(ROUTE_REGEX.test(`/${validCharacters}`)).toEqual(true);
+      expect(ROUTE_REGEX.test(`/${validCharacters}/${validCharacters}.pdf`)).toEqual(true);
+      expect(ROUTE_REGEX.test(`/${validCharacters}=`)).toEqual(false);
+      expect(ROUTE_REGEX.test(`/${validCharacters}/${validCharacters}=`)).toEqual(false);
+    });
   });
 
   it('should be able to override default ROUTE_REGEX', () => {

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>
 `;
 

package/tests/unit/src/server/__snapshots__/routes.test.js.snap

@@ -5,7 +5,7 @@ Array [
   Object {
     "name": "resolver",
     "page": "/Resolver",
-    "pattern": /\\^\\\\/\\[a-z0-9€_\\\\/\\]\\+\\(\\?:\\[-\\\\/\\]\\{1,2\\}\\[a-z0-9\\\\/€_\\\\/\\]\\+\\)\\*\\$\\|\\^\\\\/\\$/i,
+    "pattern": /\\^\\\\/\\[a-z0-9€_\\\\/\\]\\+\\(\\?:\\[-\\\\/\\\\\\.\\]\\{1,2\\}\\[a-z0-9\\\\/€_\\\\/\\]\\+\\)\\*\\$\\|\\^\\\\/\\$/i,
   },
   Object {
     "name": "preview",