Merge remote-tracking branch 'upstream/main'

aigem · Jan 12, 2025 · 50dae9d · 50dae9d
2 parents 3448023 + 3a298f1
commit 50dae9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/lib/modules/llm/base-provider.ts b/app/lib/modules/llm/base-provider.ts
@@ -46,7 +46,7 @@ export abstract class BaseProvider implements ProviderInfo {
 
     const apiTokenKey = this.config.apiTokenKey || defaultApiTokenKey;
     const apiKey =
-      apiKeys?.[this.name] || serverEnv?.[apiTokenKey] || process?.env?.[apiTokenKey] || manager.env?.[baseUrlKey];
+      apiKeys?.[this.name] || serverEnv?.[apiTokenKey] || process?.env?.[apiTokenKey] || manager.env?.[apiTokenKey];
 
     return {
       baseUrl,

diff --git a/app/lib/webcontainer/index.ts b/app/lib/webcontainer/index.ts
@@ -24,6 +24,7 @@ if (!import.meta.env.SSR) {
     Promise.resolve()
       .then(() => {
         return WebContainer.boot({
+          coep: 'credentialless',
           workdirName: WORK_DIR_NAME,
           forwardPreviewErrors: true, // Enable error forwarding from iframes
         });