cx/commerce
4
0
Fork 0
forked from crowetic/commerce
Code Pull Requests Activity

Adds better error messages and environment variable fault tolerance (#1172)

Browse Source 
* Adds better error messages and environment variable fault tolerance

* No hidden undefined
This commit is contained in:
Michael Novotny 2023-08-11 20:19:49 -05:00 committed by GitHub
parent fc92f70c00
commit 528ad9b8ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.example
View File

@ -2,6 +2,6 @@ COMPANY_NAME="Vercel Inc."
TWITTER_CREATOR="@vercel" TWITTER_CREATOR="@vercel"
TWITTER_SITE="https://nextjs.org/commerce" TWITTER_SITE="https://nextjs.org/commerce"
SITE_NAME="Next.js Commerce" SITE_NAME="Next.js Commerce"
SHOPIFY_REVALIDATION_SECRET= SHOPIFY_REVALIDATION_SECRET=""
SHOPIFY_STOREFRONT_ACCESS_TOKEN= SHOPIFY_STOREFRONT_ACCESS_TOKEN=""
SHOPIFY_STORE_DOMAIN= SHOPIFY_STORE_DOMAIN="[your-shopify-store-subdomain].myshopify.com"

11
app/layout.tsx
View File

@ -1,4 +1,5 @@
import Navbar from 'components/layout/navbar'; import Navbar from 'components/layout/navbar';
import { ensureStartsWith } from 'lib/utils';
import { Inter } from 'next/font/google'; import { Inter } from 'next/font/google';
import { ReactNode, Suspense } from 'react'; import { ReactNode, Suspense } from 'react';
import './globals.css'; import './globals.css';
@ -7,6 +8,8 @@ const { TWITTER_CREATOR, TWITTER_SITE, SITE_NAME } = process.env;
const baseUrl = process.env.NEXT_PUBLIC_VERCEL_URL const baseUrl = process.env.NEXT_PUBLIC_VERCEL_URL
? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}` ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`
: 'http://localhost:3000'; : 'http://localhost:3000';
const twitterCreator = TWITTER_CREATOR ? ensureStartsWith(TWITTER_CREATOR, '@') : undefined;
const twitterSite = TWITTER_SITE ? ensureStartsWith(TWITTER_SITE, 'https://') : undefined;
export const metadata = { export const metadata = {
metadataBase: new URL(baseUrl), metadataBase: new URL(baseUrl),
@ -18,12 +21,12 @@ export const metadata = {
follow: true, follow: true,
index: true index: true
}, },
...(TWITTER_CREATOR && ...(twitterCreator &&
TWITTER_SITE && { twitterSite && {
twitter: { twitter: {
card: 'summary_large_image', card: 'summary_large_image',
creator: TWITTER_CREATOR, creator: twitterCreator,
site: TWITTER_SITE site: twitterSite
} }
}) })
}; };

6
lib/shopify/index.ts
View File

@ -1,5 +1,6 @@
import { HIDDEN_PRODUCT_TAG, SHOPIFY_GRAPHQL_API_ENDPOINT, TAGS } from 'lib/constants'; import { HIDDEN_PRODUCT_TAG, SHOPIFY_GRAPHQL_API_ENDPOINT, TAGS } from 'lib/constants';
import { isShopifyError } from 'lib/type-guards'; import { isShopifyError } from 'lib/type-guards';
import { ensureStartsWith } from 'lib/utils';
import { revalidateTag } from 'next/cache'; import { revalidateTag } from 'next/cache';
import { headers } from 'next/headers'; import { headers } from 'next/headers';
import { NextRequest, NextResponse } from 'next/server'; import { NextRequest, NextResponse } from 'next/server';
@ -49,7 +50,9 @@ import {
ShopifyUpdateCartOperation ShopifyUpdateCartOperation
} from './types'; } from './types';
const domain = `https://${process.env.SHOPIFY_STORE_DOMAIN!}`; const domain = process.env.SHOPIFY_STORE_DOMAIN
? ensureStartsWith(process.env.SHOPIFY_STORE_DOMAIN, 'https://')
: '';
const endpoint = `${domain}${SHOPIFY_GRAPHQL_API_ENDPOINT}`; const endpoint = `${domain}${SHOPIFY_GRAPHQL_API_ENDPOINT}`;
const key = process.env.SHOPIFY_STOREFRONT_ACCESS_TOKEN!; const key = process.env.SHOPIFY_STOREFRONT_ACCESS_TOKEN!;
@ -97,6 +100,7 @@ export async function shopifyFetch<T>({
} catch (e) { } catch (e) {
if (isShopifyError(e)) { if (isShopifyError(e)) {
throw { throw {
cause: e.cause?.toString() || 'unknown',
status: e.status || 500, status: e.status || 500,
message: e.message, message: e.message,
query query

1
lib/type-guards.ts
View File

@ -1,6 +1,7 @@
export interface ShopifyErrorLike { export interface ShopifyErrorLike {
status: number; status: number;
message: Error; message: Error;
cause?: Error;
} }
export const isObject = (object: unknown): object is Record<string, unknown> => { export const isObject = (object: unknown): object is Record<string, unknown> => {

3
lib/utils.ts
View File

@ -6,3 +6,6 @@ export const createUrl = (pathname: string, params: URLSearchParams | ReadonlyUR
return `${pathname}${queryString}`; return `${pathname}${queryString}`;
}; };
export const ensureStartsWith = (stringToCheck: string, startsWith: string) =>
stringToCheck.startsWith(startsWith) ? stringToCheck : `${startsWith}${stringToCheck}`;