@exdst-sitecore-content-sdk/astro 0.0.13 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exdst-sitecore-content-sdk/astro",
-  "version": "0.0.13",
+  "version": "0.0.16",
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
@@ -10,8 +10,8 @@
     "./utils": "./src/utils/index.ts",
     "./client": "./src/client/index.ts",
     "./config": "./src/config/index.ts",
-    "./components/*": "./src/components/*",
-    "./components/Placeholder": "./src/components/index.ts"
+    "./components/Placeholder": "./src/components/Placeholder/index.ts"
+
     
   },
   "files": [

package/src/config/define-config.ts

@@ -22,42 +22,58 @@ export const getAstroFallbackConfig = (
         contextId: config?.api?.edge?.contextId || '',
         clientContextId:
           config?.api?.edge?.clientContextId ||
+          import.meta.env?.PUBLIC_SITECORE_EDGE_CONTEXT_ID ||
           process.env.PUBLIC_SITECORE_EDGE_CONTEXT_ID,
         edgeUrl:
-          config?.api?.edge?.edgeUrl || process.env.PUBLIC_SITECORE_EDGE_URL,
+          config?.api?.edge?.edgeUrl ||
+          import.meta.env?.PUBLIC_SITECORE_EDGE_URL ||
+          process.env.PUBLIC_SITECORE_EDGE_URL,
       },
       local: {
         ...config?.api?.local,
         apiKey:
           config?.api?.local?.apiKey ||
+          import.meta.env?.PUBLIC_SITECORE_API_KEY ||
           process.env.PUBLIC_SITECORE_API_KEY ||
           '',
         apiHost:
           config?.api?.local?.apiHost ||
+          import.meta.env?.PUBLIC_SITECORE_API_HOST ||
           process.env.PUBLIC_SITECORE_API_HOST ||
           '',
       },
     },
     defaultSite:
-      config?.defaultSite || process.env.PUBLIC_DEFAULT_SITE_NAME || '',
+      config?.defaultSite ||
+      import.meta.env?.PUBLIC_DEFAULT_SITE_NAME ||
+      process.env.PUBLIC_DEFAULT_SITE_NAME ||
+      '',
     defaultLanguage:
-      config?.defaultLanguage || process.env.PUBLIC_DEFAULT_LANGUAGE || 'en',
+      config?.defaultLanguage ||
+      import.meta.env?.PUBLIC_DEFAULT_LANGUAGE ||
+      process.env.PUBLIC_DEFAULT_LANGUAGE ||
+      'en',
     multisite: {
       ...config?.multisite,
       useCookieResolution:
         config?.multisite?.useCookieResolution ??
-        (() => process.env.VERCEL_ENV === 'preview'),
+        (() => (import.meta.env?.VERCEL_ENV || process.env.VERCEL_ENV) === 'preview'),
     },
     personalize: {
       ...config?.personalize,
-      scope: config?.personalize?.scope || process.env.PUBLIC_PERSONALIZE_SCOPE,
+      scope:
+        config?.personalize?.scope ||
+        import.meta.env?.PUBLIC_PERSONALIZE_SCOPE ||
+        process.env.PUBLIC_PERSONALIZE_SCOPE,
     },
     generateStaticPaths:
-      process.env.GENERATE_STATIC_PATHS !== undefined
-        ? process.env.GENERATE_STATIC_PATHS.toLowerCase() === 'true'
+      (import.meta.env?.GENERATE_STATIC_PATHS ?? process.env.GENERATE_STATIC_PATHS) !== undefined
+        ? (import.meta.env?.GENERATE_STATIC_PATHS || process.env.GENERATE_STATIC_PATHS).toLowerCase() === 'true'
         : config?.generateStaticPaths ?? true,
     sitecoreInternalEditingHostUrl:
-      config?.sitecoreInternalEditingHostUrl || process.env.SITECORE_INTERNAL_EDITING_HOST_URL,
+      config?.sitecoreInternalEditingHostUrl ||
+      import.meta.env?.SITECORE_INTERNAL_EDITING_HOST_URL ||
+      process.env.SITECORE_INTERNAL_EDITING_HOST_URL,
   };
 };
 

package/src/editing/utils.ts

@@ -257,18 +257,22 @@ export const isDesignLibraryPreviewData = (
  * @param {Request} req
  */
 export const resolveServerUrl = (req: Request) => {
-  const internalHostUrl = process.env.SITECORE_INTERNAL_EDITING_HOST_URL;
+  const internalHostUrl =
+    import.meta.env?.SITECORE_INTERNAL_EDITING_HOST_URL ||
+    process.env.SITECORE_INTERNAL_EDITING_HOST_URL;
   if (internalHostUrl) {
     return internalHostUrl;
   }
 
   // in xmc deployment we always use localhost:3000
-  if (process.env.SITECORE) {
+  if (import.meta.env?.SITECORE || process.env.SITECORE) {
     return 'http://localhost:3000';
   }
 
   // to preserve auth headers, use https if we're in our 3 main hosting options
-  const useHttps = (process.env.VERCEL || process.env.NETLIFY) !== undefined;
+  const useHttps =
+    (import.meta.env?.VERCEL || process.env.VERCEL ||
+     import.meta.env?.NETLIFY || process.env.NETLIFY) !== undefined;
   // use https for requests with auth but also support unsecured http rendering hosts
   return `${useHttps ? 'https' : 'http'}://${req.headers.get('host') ?? undefined}`;
 };

package/src/utils/utils.ts

@@ -1,5 +1,5 @@
 export const getEditingSecret = (): string => {
-  const secret = process.env.SITECORE_EDITING_SECRET;
+  const secret = import.meta.env?.SITECORE_EDITING_SECRET || process.env.SITECORE_EDITING_SECRET;
 
   if (!secret || secret.length === 0) {
     throw new Error('The SITECORE_EDITING_SECRET environment variable is missing or invalid.');