Skip to content

Commit 9cde2ab

Browse files
authored
Merge pull request #7753 from elizaOS/shaw/eliza-app-release-blockers
Shaw/eliza app release blockers
2 parents 2cfb1d3 + ade3a12 commit 9cde2ab

225 files changed

Lines changed: 5107 additions & 2381 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/cloud-cf-deploy.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,9 @@ jobs:
201201
env:
202202
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
203203
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
204-
run: bunx wrangler pages deploy dist --project-name=eliza-cloud --branch=${{ steps.pages.outputs.branch }}
204+
# Do NOT pass a positional `dist` argument: wrangler.toml already sets
205+
# `pages_build_output_dir = "./dist"`, and passing both makes wrangler
206+
# ignore wrangler.toml — which silently drops the `functions/` upload
207+
# (so `_middleware.ts` never runs and `/api/*` falls through to the
208+
# SPA's index.html instead of being proxied to the API Worker).
209+
run: bunx wrangler pages deploy --project-name=eliza-cloud --branch=${{ steps.pages.outputs.branch }}

.github/workflows/deploy-homepage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585

8686
- name: Install homepage dependencies
8787
working-directory: packages/homepage
88-
run: bun install --frozen-lockfile
88+
run: bun install --no-save --ignore-scripts
8989

9090
- name: Refresh homepage release data
9191
working-directory: packages/homepage

bun.lock

Lines changed: 66 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
"db:cloud:migrate": "bun run packages/scripts/cloud/admin/migrate-with-diagnostics.ts",
160160
"db:cloud:studio": "bun run --cwd packages/cloud-shared db:studio",
161161
"db:cloud:pglite": "bun run packages/scripts/cloud/admin/dev/pglite-server.ts",
162+
"cloud:local:reset": "node scripts/cloud/local-reset.mjs",
162163
"publish:dry-run": "bun packages/scripts/publish-from-dist.mjs",
163164
"publish:packages": "bun packages/scripts/publish-from-dist.mjs --apply",
164165
"typecheck:dist": "NODE_OPTIONS='--max-old-space-size=8192' tsc --noEmit -p tsconfig.dist-paths.json"

packages/agent/src/api/__tests__/conversation-streaming.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ function createChatMessage(text: string) {
6464
}
6565

6666
function createUseModelMock(
67-
impl: (modelType: unknown, params: unknown) => Promise<unknown>,
67+
impl: (...args: Parameters<UseModel>) => Promise<unknown>,
6868
): UseModelMock {
69-
return vi.fn(impl) as unknown as UseModelMock;
69+
const mock = vi.fn(async (...args: Parameters<UseModel>) => impl(...args));
70+
return mock as unknown as UseModelMock;
7071
}
7172

7273
function createStreamingMessageService(

packages/app-core/scripts/copy-runtime-node-modules.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,8 @@ function shouldPrunePackageRelativePath(
600600
if (packageName === "@elizaos/plugin-local-inference") {
601601
return (
602602
normalizedPath === "native/llama.cpp/tools/server/webui" ||
603-
normalizedPath.startsWith("native/llama.cpp/tools/server/webui/")
603+
normalizedPath.startsWith("native/llama.cpp/tools/server/webui/") ||
604+
/^native\/llama\.cpp\/build(?:[-/]|$)/.test(normalizedPath)
604605
);
605606
}
606607

packages/app-core/scripts/desktop-build.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const WRITE_BUILD_INFO_SCRIPT = fs.existsSync(
4545
)
4646
? path.join(ROOT, "scripts", "write-build-info.ts")
4747
: path.join(ROOT, "packages", "scripts", "write-build-info.ts");
48+
const APP_CORE_PACKAGE_DIR = path.join(ROOT, "packages", "app-core");
4849
const CORE_PACKAGE_DIR = path.join(ROOT, "packages", "core");
4950
const SHARED_PACKAGE_DIR = path.join(ROOT, "packages", "shared");
5051

@@ -570,6 +571,7 @@ function ensureWorkspaceRuntimePackageBuilt(packageName, packageDir) {
570571
function ensureWorkspaceRuntimePackagesBuilt() {
571572
ensureWorkspaceRuntimePackageBuilt("@elizaos/core", CORE_PACKAGE_DIR);
572573
ensureWorkspaceRuntimePackageBuilt("@elizaos/shared", SHARED_PACKAGE_DIR);
574+
ensureWorkspaceRuntimePackageBuilt("@elizaos/app-core", APP_CORE_PACKAGE_DIR);
573575
}
574576

575577
function stageDesktopBuild() {

packages/app-core/src/browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
export * from "@elizaos/ui";
2-
export { AppWindowRenderer } from "./runtime/desktop/AppWindowRenderer";
32
export {
43
DESKTOP_TRAY_MENU_ITEMS,
54
DesktopSurfaceNavigationRuntime,
65
DesktopTrayRuntime,
76
DetachedShellRoot,
87
} from "./runtime/desktop";
8+
export { AppWindowRenderer } from "./runtime/desktop/AppWindowRenderer";
99

1010
export type CompatRuntimeState = {
1111
current: unknown;

packages/app-core/src/runtime/desktop/browser-entry-tray-exports.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import { fileURLToPath } from "node:url";
33
import { describe, expect, it } from "vitest";
44
import { DESKTOP_TRAY_MENU_ITEMS } from "./DesktopTrayRuntime";
55

6-
const browserEntryPath = fileURLToPath(new URL("../../browser.ts", import.meta.url));
6+
const browserEntryPath = fileURLToPath(
7+
new URL("../../browser.ts", import.meta.url),
8+
);
79

810
describe("app-core browser desktop tray exports", () => {
911
it("keeps the renderer-facing tray menu wired to the real desktop runtime", () => {
25.8 KB
Loading

0 commit comments

Comments
 (0)