Skip to content

Commit ca183a2

Browse files
committed
Merge branch 'shaw/v2-alpha-cli-work' into v2-develop
2 parents 7f0b58d + 946c83d commit ca183a2

Some content is hidden

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

75 files changed

+1782
-13330
lines changed

bun.lock

-10,597
This file was deleted.

package.json

+8-22
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
11
{
22
"name": "eliza",
33
"scripts": {
4+
"preinstall": "npx only-allow bun",
5+
"start": "npx elizaos start",
6+
"start:debug": "LOG_LEVEL=debug npx elizaos start",
7+
"dev": "npx elizaos start",
8+
"build": "turbo run build --filter=./packages/core && turbo run build --filter=./packages/plugin-sql && turbo run build --filter=!./packages/docs --filter=!./packages/core --filter=!./packages/plugin-sql",
49
"clean": "npx turbo run clean --filter=./packages/* && rm -rf dist .turbo node_modules .turbo-tsconfig.json tsconfig.tsbuildinfo bun.lock*",
5-
"cli": "bun --filter=@elizaos/cli cli",
610
"lint": "turbo run lint --filter=./packages/*",
7-
"preinstall": "npx only-allow bun",
8-
"migrate": "turbo run migrate --filter=./packages/plugin-sql --force",
9-
"migrate:generate": "turbo run migrate:generate --filter=./packages/plugin-sql",
10-
"build": "turbo run build --filter=./packages/core && turbo run build --filter=./packages/plugin-sql && turbo run build --filter=!./packages/docs",
11-
"build:docker": "turbo run build --filter=./packages/core && turbo run build --filter=./packages/* --filter=!./packages/docs",
12-
"start": "turbo run start --filter=!./packages/docs",
13-
"start:debug": "LOG_LEVEL=debug turbo run start --filter=!./packages/docs",
14-
"start:no-warnings": "BUN_INSTALL_IGNORE_MISSING_PEER_DEPENDENCIES=1 turbo run start --filter=!./packages/docs",
15-
"build:no-warnings": "BUN_INSTALL_IGNORE_MISSING_PEER_DEPENDENCIES=1 turbo run build --filter=./packages/core && BUN_INSTALL_IGNORE_MISSING_PEER_DEPENDENCIES=1 turbo run build --filter=./packages/plugin-sql && BUN_INSTALL_IGNORE_MISSING_PEER_DEPENDENCIES=1 turbo run build --filter=!./packages/docs",
16-
"agent": "turbo run start --filter=@elizaos/the-org",
17-
"dev": "turbo run build --filter=./packages/core && turbo run dev --filter=!./packages/core --filter=!./packages/docs --concurrency=20",
1811
"release": "bun run build && bun lint && lerna publish --no-private --force-publish && bun lint",
1912
"release:alpha": "bun run build && bun lint && lerna publish prerelease --preid alpha --dist-tag alpha --no-private --force-publish --loglevel verbose && bun lint",
13+
"migrate": "turbo run migrate --filter=./packages/plugin-sql --force",
14+
"migrate:generate": "turbo run migrate:generate --filter=./packages/plugin-sql",
2015
"docker:build": "bash ./scripts/docker.sh build",
2116
"docker:run": "bash ./scripts/docker.sh run",
2217
"docker:bash": "bash ./scripts/docker.sh bash",
2318
"docker:start": "bash ./scripts/docker.sh start",
2419
"docker": "bun docker:build && bun docker:run && bun docker:bash",
25-
"test": "turbo run test --filter=@elizaos/the-org",
26-
"update-sourcemaps": "bash ./update-tsup-config.sh && bun run build",
27-
"reset-sourcemaps": "find packages -name \"tsup.config.ts.bak\" -exec bash -c 'cp \"{}\" \"${0%.bak}\"' {} \\;"
20+
"test": "turbo run test --filter=@elizaos/the-org"
2821
},
2922
"devDependencies": {
3023
"@biomejs/biome": "^1.9.4",
@@ -47,9 +40,6 @@
4740
},
4841
"bun": {
4942
"overrides": {
50-
"onnxruntime-node": "1.20.1",
51-
"@ai-sdk/provider": "1.0.6",
52-
"@ai-sdk/provider-utils": "2.1.6",
5343
"cookie": "0.7.0",
5444
"bs58": "5.0.0",
5545
"secp256k1": "5.0.1",
@@ -58,10 +48,6 @@
5848
"eslint": "9.22.0",
5949
"react": "19.0.0",
6050
"react-dom": "19.0.0",
61-
"solana-bankrun": "0.3.1",
62-
"@metaplex-foundation/umi": "0.9.2",
63-
"buffer": "6.0.3",
64-
"@solana/spl-token": "0.4.9",
6551
"got": "12.6.1"
6652
}
6753
},

packages/cli/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ dist
33
.turbo
44
cache
55
models
6+
templates/

packages/cli/package.json

+10-13
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@
3030
},
3131
"scripts": {
3232
"cli": "bun run build && node dist/index.js",
33-
"start": "bun run build",
34-
"build": "tsup && bun run src/scripts/copy-client-dist.ts && bun run src/scripts/copy-to-create-eliza.ts",
35-
"watch": "tsc --watch",
36-
"typecheck": "tsc --noEmit",
33+
"build": "tsup && bun run src/scripts/copy-client-dist.ts && bun run src/scripts/copy-to-create-eliza.ts && bun run src/scripts/copy-templates.ts",
3734
"release": "changeset version",
3835
"test": "vitest run",
3936
"test:dev": "REGISTRY_URL=http://localhost:3333 vitest run",
@@ -46,14 +43,14 @@
4643
"@babel/parser": "^7.22.6",
4744
"@babel/plugin-transform-typescript": "^7.22.5",
4845
"@electric-sql/pglite": "^0.2.17",
49-
"@elizaos/core": "^1.0.0-alpha.24",
50-
"@elizaos/plugin-anthropic": "^1.0.0-alpha.24",
51-
"@elizaos/plugin-discord": "^1.0.0-alpha.24",
52-
"@elizaos/plugin-local-ai": "^1.0.0-alpha.24",
53-
"@elizaos/plugin-openai": "^1.0.0-alpha.24",
54-
"@elizaos/plugin-sql": "^1.0.0-alpha.24",
55-
"@elizaos/plugin-starter": "^1.0.0-alpha.24",
56-
"@elizaos/project-starter": "^1.0.0-alpha.24",
46+
"@elizaos/core": "workspace:*",
47+
"@elizaos/plugin-anthropic": "workspace:*",
48+
"@elizaos/plugin-discord": "workspace:*",
49+
"@elizaos/plugin-local-ai": "workspace:*",
50+
"@elizaos/plugin-openai": "workspace:*",
51+
"@elizaos/plugin-sql": "workspace:*",
52+
"@elizaos/plugin-starter": "workspace:*",
53+
"@elizaos/project-starter": "workspace:*",
5754
"@noble/curves": "^1.8.1",
5855
"axios": "^1.7.9",
5956
"chalk": "5.2.0",
@@ -91,5 +88,5 @@
9188
"peerDependencies": {
9289
"form-data": "4.0.2"
9390
},
94-
"gitHead": "a1bb2c8ab6805f9585540a9a9e6b6ae39bfd4ed1"
91+
"gitHead": "f2d87b67a335ea97e8a6078536c581f1b2ddc9a0"
9592
}

0 commit comments

Comments
 (0)