Skip to content

Commit bf3db79

Browse files
committed
chore: merge main into release for new releases
2 parents 0ac5bf6 + a9bbb3f commit bf3db79

File tree

5 files changed

+25
-13
lines changed

5 files changed

+25
-13
lines changed

apps/app/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"@types/three": "^0.180.0",
5959
"@uploadthing/react": "^7.3.0",
6060
"@upstash/ratelimit": "^2.0.5",
61+
"@vercel/analytics": "^1.5.0",
6162
"@vercel/sandbox": "^0.0.21",
6263
"@vercel/sdk": "^1.7.1",
6364
"ai": "^5.0.60",

apps/app/src/app/layout.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { env } from '@/env.mjs';
66
import { auth } from '@/utils/auth';
77
import { cn } from '@comp/ui/cn';
88
import { Analytics as DubAnalytics } from '@dub/analytics/react';
9+
import { Analytics as VercelAnalytics } from '@vercel/analytics/next';
910
import { GeistMono } from 'geist/font/mono';
1011
import type { Metadata } from 'next';
1112
import localFont from 'next/font/local';
@@ -112,6 +113,7 @@ export default async function Layout({ children }: { children: React.ReactNode }
112113
</Providers>
113114
</NuqsAdapter>
114115
<Toaster richColors />
116+
<VercelAnalytics />
115117
</body>
116118
</html>
117119
);

apps/app/src/jobs/tasks/integration/integration-results.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,7 @@ export const sendIntegrationResults = schemaTask({
135135
logger.error(`Failed to create error record: ${createError}`);
136136
}
137137

138-
return {
139-
success: false,
140-
error: error instanceof Error ? error.message : String(error),
141-
};
138+
throw error;
142139
}
143140
},
144141
});

apps/app/src/jobs/tasks/integration/run-integration-tests.ts

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,24 @@ export const runIntegrationTests = task({
5757

5858
try {
5959
const batchHandle = await sendIntegrationResults.batchTriggerAndWait(batchItems);
60-
60+
61+
// Check if any child runs failed
62+
const failedRuns = batchHandle.runs.filter((run) => !run.ok);
63+
64+
if (failedRuns.length > 0) {
65+
const errorMessages = failedRuns
66+
.map((run) => {
67+
const errorMsg = run.error instanceof Error ? run.error.message : String(run.error);
68+
return errorMsg;
69+
})
70+
.join('; ');
71+
72+
logger.error(`Integration tests failed for organization ${organizationId}: ${errorMessages}`);
73+
throw new Error(errorMessages);
74+
}
75+
6176
logger.info(`Successfully completed batch integration tests for organization: ${organizationId}`);
62-
77+
6378
return {
6479
success: true,
6580
organizationId,
@@ -68,13 +83,7 @@ export const runIntegrationTests = task({
6883
};
6984
} catch (error) {
7085
logger.error(`Failed to run integration tests for organization ${organizationId}: ${error}`);
71-
72-
return {
73-
success: false,
74-
error: error instanceof Error ? error.message : String(error),
75-
organizationId,
76-
integrationsCount: integrations.length,
77-
};
86+
throw error;
7887
}
7988
},
8089
});

bun.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
"@types/three": "^0.180.0",
174174
"@uploadthing/react": "^7.3.0",
175175
"@upstash/ratelimit": "^2.0.5",
176+
"@vercel/analytics": "^1.5.0",
176177
"@vercel/sandbox": "^0.0.21",
177178
"@vercel/sdk": "^1.7.1",
178179
"ai": "^5.0.60",
@@ -2233,6 +2234,8 @@
22332234

22342235
"@use-gesture/react": ["@use-gesture/[email protected]", "", { "dependencies": { "@use-gesture/core": "10.3.1" }, "peerDependencies": { "react": ">= 16.8.0" } }, "sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g=="],
22352236

2237+
"@vercel/analytics": ["@vercel/[email protected]", "", { "peerDependencies": { "@remix-run/react": "^2", "@sveltejs/kit": "^1 || ^2", "next": ">= 13", "react": "^18 || ^19 || ^19.0.0-rc", "svelte": ">= 4", "vue": "^3", "vue-router": "^4" }, "optionalPeers": ["@remix-run/react", "@sveltejs/kit", "next", "react", "svelte", "vue", "vue-router"] }, "sha512-MYsBzfPki4gthY5HnYN7jgInhAZ7Ac1cYDoRWFomwGHWEX7odTEzbtg9kf/QSo7XEsEAqlQugA6gJ2WS2DEa3g=="],
2238+
22362239
"@vercel/oidc": ["@vercel/[email protected]", "", { "dependencies": { "@types/ms": "2.1.0", "ms": "2.1.3" } }, "sha512-59PBFx3T+k5hLTEWa3ggiMpGRz1OVvl9eN8SUai+A43IsqiOuAe7qPBf+cray/Fj6mkgnxm/D7IAtjc8zSHi7g=="],
22372240

22382241
"@vercel/sandbox": ["@vercel/[email protected]", "", { "dependencies": { "@vercel/oidc": "^2.0.2", "async-retry": "1.3.3", "jsonlines": "0.1.1", "ms": "2.1.3", "tar-stream": "3.1.7", "undici": "^7.16.0", "zod": "3.24.4" } }, "sha512-j6nAUQyuw6znVaZGd7yI0nab1EWhEtIZPnTXvpDatJ2SObodYZOz5hGoLjCopAuhQBC7vOngbZ1bwP6HxtB5+g=="],

0 commit comments

Comments
 (0)