Merge branch 'dev' into external-db-sync

This commit is contained in:
BilalG1 2026-02-04 18:51:32 -08:00 committed by GitHub
commit 8be639d55f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions

View File

@ -53,6 +53,7 @@ STACK_ENABLE_HARDCODED_PASSKEY_CHALLENGE_FOR_TESTING=yes
STACK_INTEGRATION_CLIENTS_CONFIG='[{"client_id": "neon-local", "client_secret": "neon-local-secret", "id_token_signed_response_alg": "ES256", "redirect_uris": ["http://localhost:30000/api/v2/identity/authorize", "http://localhost:30000/api/v2/auth/authorize"]}, {"client_id": "custom-local", "client_secret": "custom-local-secret", "id_token_signed_response_alg": "ES256", "redirect_uris": ["http://localhost:30000/api/v2/identity/authorize", "http://localhost:30000/api/v2/auth/authorize"]}]'
CRON_SECRET=mock_cron_secret
STACK_FREESTYLE_API_KEY=mock_stack_freestyle_key
STACK_VERCEL_SANDBOX_TOKEN=vercel_sandbox_disabled_for_local_development
STACK_OPENAI_API_KEY=mock_openai_api_key
STACK_STRIPE_SECRET_KEY=sk_test_mockstripekey
STACK_STRIPE_WEBHOOK_SECRET=mock_stripe_webhook_secret

View File

@ -57,9 +57,9 @@ function createVercelSandboxEngine(): JsEngine {
return {
name: 'vercel-sandbox',
execute: async (code: string, options: ExecuteJavascriptOptions): Promise<ExecuteResult> => {
const teamId = getEnvVariable("STACK_VERCEL_SANDBOX_TEAM_ID", "");
const projectId = getEnvVariable("STACK_VERCEL_SANDBOX_PROJECT_ID", "");
const token = getEnvVariable("STACK_VERCEL_SANDBOX_TOKEN", "");
const teamId = getEnvVariable("STACK_VERCEL_SANDBOX_TEAM_ID");
const projectId = getEnvVariable("STACK_VERCEL_SANDBOX_PROJECT_ID");
const token = getEnvVariable("STACK_VERCEL_SANDBOX_TOKEN");
const sandbox = await Sandbox.create({
resources: { vcpus: 2 },
@ -139,11 +139,7 @@ export async function executeJavascript(code: string, options: ExecuteJavascript
}
}, async () => {
if (getEnvVariable("STACK_VERCEL_SANDBOX_TOKEN","") != "") {
if (!getNodeEnvironment().includes("prod")) {
throw new StackAssertionError("STACK_VERCEL_SANDBOX_TOKEN is set in non-production environment. We do not use Vercel Sandbox in non-production environments.");
}
if (getEnvVariable("STACK_VERCEL_SANDBOX_TOKEN") != "vercel_sandbox_disabled_for_local_development") {
const shouldSanityTest = Math.random() < 0.05;
if (shouldSanityTest) {
runAsynchronouslyAndWaitUntil(runSanityTest(code, options));
@ -151,6 +147,10 @@ export async function executeJavascript(code: string, options: ExecuteJavascript
return await runWithFallback(code, options);
} else {
if (getNodeEnvironment().includes("prod")) {
throw new StackAssertionError("STACK_VERCEL_SANDBOX_TOKEN is set to the disabled sentinel value in production. Please configure a real Vercel Sandbox token.");
}
return await runWithoutFallback(code, options);
}
});