Merge remote-tracking branch 'origin/main' into chore/vite-migration

Author: kathiekiwi

.configs/tsconfig.base.json

@@ -26,7 +26,6 @@
     "esModuleInterop": true,
     "emitDecoratorMetadata": false,
     "experimentalDecorators": false,
-    "downlevelIteration": true,
     "isolatedModules": true,
     "noUncheckedIndexedAccess": true,
 

apps/webapp/app/routes/otel.v1.logs.ts

@@ -21,7 +21,9 @@ export async function action({ request }: ActionFunctionArgs) {
         await exporter.exportLogsRaw(new Uint8Array(buffer));
 
         return new Response(
-          ExportLogsServiceResponse.encode(ExportLogsServiceResponse.create()).finish(),
+          ExportLogsServiceResponse.encode(
+            ExportLogsServiceResponse.create()
+          ).finish() as Uint8Array<ArrayBuffer>,
           { status: 200 }
         );
       }
@@ -30,9 +32,12 @@ export async function action({ request }: ActionFunctionArgs) {
 
       const exportResponse = await exporter.exportLogs(exportRequest);
 
-      return new Response(ExportLogsServiceResponse.encode(exportResponse).finish(), {
-        status: 200,
-      });
+      return new Response(
+        ExportLogsServiceResponse.encode(exportResponse).finish() as Uint8Array<ArrayBuffer>,
+        {
+          status: 200,
+        }
+      );
     } else {
       return new Response(
         "Unsupported content type. Must be either application/x-protobuf or application/json",

apps/webapp/app/routes/otel.v1.metrics.ts

@@ -25,7 +25,9 @@ export async function action({ request }: ActionFunctionArgs) {
         await exporter.exportMetricsRaw(new Uint8Array(buffer));
 
         return new Response(
-          ExportMetricsServiceResponse.encode(ExportMetricsServiceResponse.create()).finish(),
+          ExportMetricsServiceResponse.encode(
+            ExportMetricsServiceResponse.create()
+          ).finish() as Uint8Array<ArrayBuffer>,
           { status: 200 }
         );
       }
@@ -34,9 +36,12 @@ export async function action({ request }: ActionFunctionArgs) {
 
       const exportResponse = await exporter.exportMetrics(exportRequest);
 
-      return new Response(ExportMetricsServiceResponse.encode(exportResponse).finish(), {
-        status: 200,
-      });
+      return new Response(
+        ExportMetricsServiceResponse.encode(exportResponse).finish() as Uint8Array<ArrayBuffer>,
+        {
+          status: 200,
+        }
+      );
     } else {
       return new Response(
         "Unsupported content type. Must be either application/x-protobuf or application/json",

apps/webapp/app/routes/otel.v1.traces.ts

@@ -21,7 +21,9 @@ export async function action({ request }: ActionFunctionArgs) {
         await exporter.exportTracesRaw(new Uint8Array(buffer));
 
         return new Response(
-          ExportTraceServiceResponse.encode(ExportTraceServiceResponse.create()).finish(),
+          ExportTraceServiceResponse.encode(
+            ExportTraceServiceResponse.create()
+          ).finish() as Uint8Array<ArrayBuffer>,
           { status: 200 }
         );
       }
@@ -30,9 +32,12 @@ export async function action({ request }: ActionFunctionArgs) {
 
       const exportResponse = await exporter.exportTraces(exportRequest);
 
-      return new Response(ExportTraceServiceResponse.encode(exportResponse).finish(), {
-        status: 200,
-      });
+      return new Response(
+        ExportTraceServiceResponse.encode(exportResponse).finish() as Uint8Array<ArrayBuffer>,
+        {
+          status: 200,
+        }
+      );
     } else {
       return new Response(
         "Unsupported content type. Must be either application/x-protobuf or application/json",

apps/webapp/app/routes/promo.tsx

@@ -8,7 +8,7 @@ import { LoginPageLayout } from "~/components/LoginPageLayout";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
 import { Fieldset } from "~/components/primitives/Fieldset";
-import { Header2 } from "~/components/primitives/Headers";
+import { Header1 } from "~/components/primitives/Headers";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { TextLink } from "~/components/primitives/TextLink";
 import { isGithubAuthSupported, isGoogleAuthSupported } from "~/services/auth.server";
@@ -139,9 +139,9 @@ export default function PromoPage() {
       <div className="flex w-full flex-col">
         {data.view === "signed_in" ? (
           <>
-            <Header2 className="sm:text-2xl md:text-3xl lg:text-4xl" spacing>
+            <Header1 className="pb-4 leading-tight sm:text-2xl md:text-3xl md:leading-tight lg:text-4xl lg:leading-tight">
               Promo codes are for new accounts
-            </Header2>
+            </Header1>
             <Paragraph variant="base" spacing>
               You're already signed in. Promo credits can only be added to a brand-new account.
             </Paragraph>
@@ -151,11 +151,11 @@ export default function PromoPage() {
           </>
         ) : (
           <>
-            <Header2 className="sm:text-2xl md:text-3xl lg:text-4xl" spacing>
+            <Header1 className="pb-4 leading-tight sm:text-2xl md:text-3xl md:leading-tight lg:text-4xl lg:leading-tight">
               {data.view === "valid"
                 ? `Claim ${formatDollars(data.amountInCents)} credits`
                 : "Create your account"}
-            </Header2>
+            </Header1>
             {data.view === "valid" ? (
               <Paragraph variant="base" spacing>
                 These are only available for new accounts on the Free plan.

apps/webapp/app/services/realtime/redisRealtimeStreams.server.ts

@@ -321,7 +321,9 @@ export class RedisRealtimeStreams implements StreamIngestor, StreamResponder {
     let currentChunkIndex = startChunk;
 
     try {
-      const textStream = stream.pipeThrough(new TextDecoderStream());
+      const textStream = stream.pipeThrough(
+        new TextDecoderStream() as ReadableWritablePair<string, Uint8Array>
+      );
       const reader = textStream.getReader();
 
       while (true) {

apps/webapp/tsconfig.check.json

@@ -10,5 +10,5 @@
     },
     "customConditions": []
   },
-  "exclude": ["**/*.test.ts", "**/*.test.tsx"]
+  "exclude": ["**/*.test.ts", "**/*.test.tsx", "test/setup-test-env.ts"]
 }

apps/webapp/tsconfig.json

@@ -17,7 +17,6 @@
     "skipLibCheck": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"],
       "@/*": ["./*"]

internal-packages/cache/tsconfig.json

@@ -6,7 +6,7 @@
     "moduleResolution": "Node16",
     "moduleDetection": "force",
     "verbatimModuleSyntax": false,
-    "types": ["vitest/globals"],
+    "types": ["vitest/globals", "node"],
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,

internal-packages/clickhouse/tsconfig.build.json

@@ -2,6 +2,8 @@
   "include": ["src/**/*.ts"],
   "exclude": ["src/**/*.test.ts"],
   "compilerOptions": {
+    "types": ["node"],
+    "rootDir": ".",
     "composite": true,
     "target": "ES2019",
     "lib": ["ES2019", "DOM", "DOM.Iterable", "DOM.AsyncIterable"],