Fix lint and test errors

Author: webstackdev

astro.config.ts

@@ -21,17 +21,14 @@ import { createLogger, type LogOptions, type PluginOption } from 'vite'
  */
 import {
   environmentalVariablesConfig,
-  getSentryAuthToken,
   getSiteUrl,
   isE2eTest,
-  isVercel,
   markdownConfig,
   pwaConfig,
   vercelConfig,
 } from './src/lib/config'
 import { callToActionValidator } from './src/integrations/CtaValidator'
 import { faviconGenerator } from './src/integrations/FaviconGenerator'
-import { packageRelease } from './src/integrations/PackageRelease'
 import { privacyPolicyVersion } from './src/integrations/PrivacyPolicyVersion'
 import { getPackageRelease, packageRelease } from './src/integrations/PackageRelease'
 import { testimonialsLengthWarning } from './src/integrations/TestimonialsLengthWarning'
@@ -87,9 +84,9 @@ const standardIntegrations = [
   /** Warn when testimonial bodies are too short/too long (helps keep carousel cards consistent) */
   testimonialsLengthWarning({ min: 300, max: 400 }),
   /** Enable Sentry build integration when CI provides upload credentials. */
-  ...(shouldEnableSentryIntegration ? [sentry({
-    project: "webstack-builders-corporate-website",
-    org: "webstack-builders",
+  ...(shouldEnableSentryIntegration && sentryAuthToken ? [sentry({
+    project: 'webstack-builders-corporate-website',
+    org: 'webstack-builders',
     authToken: sentryAuthToken,
     release: sentryRelease,
   })] : []),

src/integrations/PackageRelease/index.ts

@@ -8,14 +8,15 @@
  * It is available throughout the app as import.meta.env.PACKAGE_RELEASE_VERSION.
  *
  * Fallback order:
- * 1. Explicit release env / CI commit SHA
+ * 1. CI/Vercel commit SHA
  * 2. package.json name@version
  * 3. BuildError if package.json cannot be read
  */
 
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import type { AstroIntegration } from 'astro'
+import { getOptionalEnv } from '../../lib/config/environmentServer'
 import { BuildError } from '../../lib/errors/BuildError'
 
 interface PackageJson {
@@ -58,10 +59,9 @@ function getPackageName(): string {
 }
 
 function getBuildRelease(): string | undefined {
-  const releaseCandidate = process.env['PACKAGE_RELEASE_VERSION'] ||
-    process.env['GITHUB_SHA'] ||
-    process.env['VERCEL_GIT_COMMIT_SHA'] ||
-    process.env['PUBLIC_VERCEL_GIT_COMMIT_SHA']
+  const releaseCandidate = getOptionalEnv('GITHUB_SHA') ||
+    getOptionalEnv('VERCEL_GIT_COMMIT_SHA') ||
+    getOptionalEnv('PUBLIC_VERCEL_GIT_COMMIT_SHA')
 
   if (!releaseCandidate) {
     return undefined

src/layouts/BaseLayout.astro

@@ -70,7 +70,7 @@ const {
 } = Astro.props
 
 const requestUrl = Astro.url?.href
-const requestHeaders = Astro.request?.headers
+const requestHeaders = Astro.isPrerendered ? undefined : Astro.request.headers
 
 applyRenderSentryContext({
   contextName: 'pageRender',