Merge branch 'main' into fix-sticky

graphql-hive · Jan 29, 2025 · 719a8ee · 719a8ee
2 parents 0f5fc0e + 3e76e87
commit 719a8ee
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 77 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -246,5 +246,17 @@ module.exports = {
         'cypress/unsafe-to-chain-command': 'off',
       },
     },
+    {
+      files: [
+        // environment should be parsed to avoid global dependencies and sacred .env files
+        'packages/**/environment.ts',
+        // - environment is inlined and must be "registered" in next.config.js
+        // - `import.meta.env` is not supported in Next.js yet
+        'packages/web/docs/**',
+      ],
+      rules: {
+        'no-process-env': 'off',
+      },
+    },
   ],
 };
diff --git a/packages/migrations/src/environment.ts b/packages/migrations/src/environment.ts
@@ -1,7 +1,6 @@
 import { config as dotenv } from 'dotenv';
 import zod from 'zod';
 
-// eslint-disable-next-line no-process-env
 if (!process.env.RELEASE) {
   dotenv({
     debug: true,
@@ -58,11 +57,10 @@ const ClickHouseModel = zod.union([
 ]);
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   clickhouse: ClickHouseModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   postgres: PostgresModel.safeParse(process.env),
 };
 

diff --git a/packages/services/emails/src/environment.ts b/packages/services/emails/src/environment.ts
@@ -104,19 +104,18 @@ const LogModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   email: EmailProviderModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   redis: RedisModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   tracing: OpenTelemetryConfigurationModel.safeParse(process.env),
 };
 

diff --git a/packages/services/policy/src/environment.ts b/packages/services/policy/src/environment.ts
@@ -60,15 +60,14 @@ const LogModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   tracing: OpenTelemetryConfigurationModel.safeParse(process.env),
 };
 

diff --git a/packages/services/rate-limit/src/environment.ts b/packages/services/rate-limit/src/environment.ts
@@ -73,22 +73,21 @@ const LogModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   postgres: PostgresModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
   tracing: zod
     .object({
       ...OpenTelemetryConfigurationModel.shape,
       OPENTELEMETRY_TRACE_USAGE_REQUESTS: emptyString(zod.literal('1').optional()),
     })
-    // eslint-disable-next-line no-process-env
+
     .safeParse(process.env),
 };
 

diff --git a/packages/services/schema/src/environment.ts b/packages/services/schema/src/environment.ts
@@ -88,21 +88,20 @@ const LogModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   redis: RedisModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   requestBroker: RequestBrokerModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   timings: TimingsModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   tracing: OpenTelemetryConfigurationModel.safeParse(process.env),
 };
 

diff --git a/packages/services/server/src/environment.ts b/packages/services/server/src/environment.ts
@@ -257,7 +257,6 @@ const LogModel = zod.object({
   ),
 });
 
-// eslint-disable-next-line no-process-env
 const processEnv = process.env;
 
 const configs = {

diff --git a/packages/services/storage/src/environment.ts b/packages/services/storage/src/environment.ts
@@ -51,11 +51,10 @@ const ClickHouseModel = zod.union([
 ]);
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   clickhouse: ClickHouseModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   postgres: PostgresModel.safeParse(process.env),
 };
 

diff --git a/packages/services/stripe-billing/src/environment.ts b/packages/services/stripe-billing/src/environment.ts
@@ -75,19 +75,18 @@ const LogModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   postgres: PostgresModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   stripe: StripeModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   tracing: OpenTelemetryConfigurationModel.safeParse(process.env),
 };
 

diff --git a/packages/services/tokens/src/environment.ts b/packages/services/tokens/src/environment.ts
@@ -77,24 +77,23 @@ const LogModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   postgres: PostgresModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   redis: RedisModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
   tracing: zod
     .object({
       ...OpenTelemetryConfigurationModel.shape,
       OPENTELEMETRY_TRACE_USAGE_REQUESTS: emptyString(zod.literal('1').optional()),
     })
-    // eslint-disable-next-line no-process-env
+
     .safeParse(process.env),
 };
 

diff --git a/packages/services/usage-estimator/src/environment.ts b/packages/services/usage-estimator/src/environment.ts
@@ -68,17 +68,16 @@ const ClickHouseModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   clickhouse: ClickHouseModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   tracing: OpenTelemetryConfigurationModel.safeParse(process.env),
 };
 

diff --git a/packages/services/usage-ingestor/src/environment.ts b/packages/services/usage-ingestor/src/environment.ts
@@ -113,19 +113,18 @@ const MigrationModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   kafka: KafkaModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   clickhouse: ClickHouseModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   migration: MigrationModel.safeParse(process.env),
 };
 

diff --git a/packages/services/usage/src/environment.ts b/packages/services/usage/src/environment.ts
@@ -91,17 +91,16 @@ const LogModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   kafka: KafkaModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   tracing: OpenTelemetryConfigurationModel.safeParse(process.env),
 };
 

diff --git a/packages/services/webhooks/src/environment.ts b/packages/services/webhooks/src/environment.ts
@@ -79,19 +79,18 @@ const LogModel = zod.object({
 });
 
 const configs = {
-  // eslint-disable-next-line no-process-env
   base: EnvironmentModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   redis: RedisModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   sentry: SentryModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   prometheus: PrometheusModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   log: LogModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   requestBroker: RequestBrokerModel.safeParse(process.env),
-  // eslint-disable-next-line no-process-env
+
   tracing: OpenTelemetryConfigurationModel.safeParse(process.env),
 };
 

diff --git a/packages/web/docs/src/app/case-studies/featured-case-studies-grid.tsx b/packages/web/docs/src/app/case-studies/featured-case-studies-grid.tsx
@@ -12,7 +12,6 @@ export function FeaturedCaseStudiesGrid({
   caseStudies: CaseStudyFile[];
   className?: string;
 }) {
-  // eslint-disable-next-line no-process-env
   if (process.env.NODE_ENV === 'development' && caseStudies.length < 6) {
     while (caseStudies.length < 6) {
       caseStudies = [...caseStudies, ...caseStudies, ...caseStudies];

diff --git a/packages/web/docs/src/app/case-studies/more-stories-section/index.tsx b/packages/web/docs/src/app/case-studies/more-stories-section/index.tsx
@@ -13,7 +13,6 @@ export async function MoreStoriesSection({
   let caseStudies = pageMap.filter(isCaseStudy).slice(0, 4);
 
   if (caseStudies.length < 4) {
-    // eslint-disable-next-line no-process-env
     if (process.env.NODE_ENV === 'development') {
       caseStudies = [...caseStudies, ...caseStudies, ...caseStudies];
     } else {

diff --git a/packages/web/docs/src/app/case-studies/page.tsx b/packages/web/docs/src/app/case-studies/page.tsx
@@ -64,7 +64,6 @@ export default async function CaseStudiesPage() {
           />
         </DecorationIsolation>
       </header>
-      {/* eslint-disable-next-line no-process-env */}
       {(caseStudies.length >= 6 || process.env.NODE_ENV === 'development') && (
         <>
           <FeaturedCaseStudiesGrid caseStudies={caseStudies} className="mt-6 max-xl:hidden" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -257,7 +257,6 @@ const LogModel = zod.object({ @@
       ),
     });
-    // eslint-disable-next-line no-process-env
     const processEnv = process.env;
     const configs = {
@@ Expand Down @@