fix: docker production build

Dockerfile

@@ -24,7 +24,9 @@ USER node
 RUN yarn install --production=false --frozen-lockfile --ignore-scripts --non-interactive --no-cache
 
 ENV BUILD_ENV=production NODE_ENV=production
-RUN export "$(grep -v '^#' .env.${NEXTJS_DOTENV:-prod} | xargs -0) && yarn build"
+
+# hadolint ignore=SC2046
+RUN export $(grep -v '^#' .env.${NEXTJS_DOTENV:-prod} | xargs -0) && yarn build
 
 # Install only prod dependencies now that we've built, to make the image smaller
 RUN rm -rf node_modules/*

pages/[lang]/product/[...slugOrId].js

@@ -77,10 +77,15 @@ function buildJSONLd(product, shop) {
 function ProductDetailPage({ addItemsToCart, product, isLoadingProduct, shop }) {
   const router = useRouter();
   const currencyCode = (shop && shop.currency.code) || "USD";
-  const JSONLd = useMemo(() => buildJSONLd(product, shop), [product, shop]);
+  const JSONLd = useMemo(() => {
+    if (product && shop) {
+      return buildJSONLd(product, shop);
+    }
+    return null;
+  }, [product, shop]);
 
   if (isLoadingProduct || router.isFallback) return <PageLoading />;
-  if (!product) return <Typography>Not Found</Typography>;
+  if (!product && !shop) return <Typography>Not Found</Typography>;
 
   return (
     <Layout shop={shop}>
@@ -127,10 +132,24 @@ ProductDetailPage.propTypes = {
  */
 export async function getStaticProps({ params: { slugOrId, lang } }) {
   const productSlug = slugOrId && slugOrId[0];
+  const primaryShop = await fetchPrimaryShop(lang);
+
+  if (!primaryShop) {
+    return {
+      props: {
+        shop: null,
+        translations: null,
+        products: null,
+        tags: null
+      },
+      // eslint-disable-next-line camelcase
+      unstable_revalidate: 1 // Revalidate immediately
+    };
+  }
 
   return {
     props: {
-      ...await fetchPrimaryShop(lang),
+      ...primaryShop,
       ...await fetchTranslations(lang, ["common", "productDetail"]),
       ...await fetchCatalogProduct(productSlug),
       ...await fetchAllTags(lang)

pages/[lang]/tag/[slug].js

@@ -109,7 +109,7 @@ class TagGridPage extends Component {
     const pageSize = routingStore.query && routingStore.query.limit ? parseInt(routingStore.query.limit, 10) : uiStore.pageSize;
     const sortBy = routingStore.query && routingStore.query.sortby ? routingStore.query.sortby : uiStore.sortBy;
 
-    if (!tag) {
+    if (!tag && !shop) {
       return (
         <Layout shop={shop}>
           <ProductGridEmptyMessage
@@ -159,9 +159,24 @@ class TagGridPage extends Component {
  * @returns {Object} props
  */
 export async function getStaticProps({ params: { lang, slug } }) {
+  const primaryShop = await fetchPrimaryShop(lang);
+
+  if (!primaryShop) {
+    return {
+      props: {
+        shop: null,
+        translations: null,
+        fetchAllTags: null,
+        tag: null
+      },
+      // eslint-disable-next-line camelcase
+      unstable_revalidate: 1 // Revalidate immediately
+    };
+  }
+
   return {
     props: {
-      ...await fetchPrimaryShop(lang),
+      ...primaryShop,
       ...await fetchTranslations(lang, ["common"]),
       ...await fetchAllTags(lang),
       ...await fetchTag(slug, lang)

staticUtils/graphQLRequest.js

@@ -11,11 +11,11 @@ import appConfig from "../config";
 export default async function graphQLRequest(query, variables) {
   const endpoint = appConfig.IS_BUILDING_NEXTJS === true ? appConfig.BUILD_GRAPHQL_URL : appConfig.INTERNAL_GRAPHQL_URL;
 
-  const graphQLClient = new GraphQLClient(endpoint, {
-    timeout: 20000
-  });
-
   try {
+    const graphQLClient = new GraphQLClient(endpoint, {
+      timeout: 20000
+    });
+
     const data = await graphQLClient.request(query, variables);
     return data;
   } catch (error) {

staticUtils/shop/fetchPrimaryShop.js

@@ -10,5 +10,5 @@ import primaryShopQuery from "./primaryShop.js";
 export default async function fetchPrimaryShop(language) {
   const data = await graphQLRequest(primaryShopQuery, { language });
 
-  return data && data.primaryShop && { shop: data.primaryShop };
+  return (data && data.primaryShop && { shop: data.primaryShop }) || { shop: null };
 }