fix(storefront): Properly catching not found content files by slug on…

… route context Returns 404 and redirect to fallback
ecomplus · Mar 9, 2024 · 32dd183 · 32dd183
1 parent 6a003e7
commit 32dd183
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/storefront/config/storefront.cms.js b/packages/storefront/config/storefront.cms.js
@@ -43,7 +43,7 @@ global.__storefrontCMS = (fs, resolvePath, _parseMatter) => {
           contentCache[filename] = content;
         }
       }
-      if (typeof content.then === 'function') return content;
+      if (typeof content?.then === 'function') return content;
       return filename === 'settings'
         ? content
         : new Promise((resolve) => { resolve(content); });

diff --git a/packages/storefront/src/lib/ssr-context.ts b/packages/storefront/src/lib/ssr-context.ts
@@ -244,6 +244,12 @@ const loadRouteContext = async (
     if (cmsContent) cmsContent.$filename = contentFilename;
   }
   try {
+    if (contentFilename && !cmsContent) {
+      const error = new Error('Content file does not exist by current slug') as
+        Partial<ApiError> & { message: string };
+      error.statusCode = 404;
+      throw error;
+    }
     (await Promise.all(apiPrefetchings)).forEach((response) => {
       if (response) {
         const { config: { endpoint }, data } = response;
@@ -256,7 +262,7 @@ const loadRouteContext = async (
       }
     });
   } catch (err: any) {
-    const error: ApiError = err;
+    const error: Partial<ApiError> & { message: string } = err;
     const status = error.statusCode || 500;
     if (status === 404) {
       if (urlPath.endsWith('/')) {