Merge pull request #30 from thomasKn/fix

Fix type
frontvibe · Feb 3, 2024 · fa079ff · fa079ff
2 parents c89050b + 7a278c4
commit fa079ff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/app/lib/env.server.ts b/app/lib/env.server.ts
@@ -4,13 +4,11 @@
  */
 
 export function envVariables(contextEnv: Env) {
-  let env: Env | NodeJS.ProcessEnv;
+  let env: Env | NodeJS.ProcessEnv = contextEnv;
 
   if (typeof process !== 'undefined') {
     // Process is accessible in Vercel environment
     env = process.env;
-  } else {
-    env = contextEnv;
   }
 
   return {

diff --git a/app/lib/sanity/sanity.server.ts b/app/lib/sanity/sanity.server.ts
@@ -16,12 +16,12 @@ import {loadQuery, queryStore} from './sanity.loader';
 type CreateSanityClientOptions = {
   cache: Cache;
   config: {
-    apiVersion: string;
-    dataset: string;
-    projectId: string;
-    studioUrl: string;
-    useCdn: boolean;
-    useStega: string;
+    apiVersion: string | undefined;
+    dataset: string | undefined;
+    projectId: string | undefined;
+    studioUrl: string | undefined;
+    useCdn: boolean | undefined;
+    useStega: string | undefined;
   };
   waitUntil: ExecutionContext['waitUntil'];
 };
@@ -52,6 +52,17 @@ export function createSanityClient(options: CreateSanityClientOptions) {
   const {cache, config, waitUntil} = options;
   const {apiVersion, dataset, projectId, studioUrl, useCdn, useStega} = config;
 
+  if (
+    typeof projectId === 'undefined' ||
+    typeof apiVersion === 'undefined' ||
+    typeof dataset === 'undefined' ||
+    typeof studioUrl === 'undefined' ||
+    typeof useCdn === 'undefined' ||
+    typeof useStega === 'undefined'
+  ) {
+    throw new Error('Missing required configuration for Sanity client');
+  }
+
   const {client} = getSanityClient({
     apiVersion,
     dataset,