Skip to content

Commit 10ee59e

Browse files
committed
Merge branch 'master' into json/control-lints
2 parents 16ec3a9 + 8b59b06 commit 10ee59e

14 files changed

Lines changed: 131 additions & 6398 deletions

File tree

‎Dockerfile.railway‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,18 @@ COPY packages/app/server/ ./packages/app/server/
8282
COPY packages/sdk/ts/ ./packages/sdk/ts/
8383
COPY packages/sdk/next/ ./packages/sdk/next/
8484
COPY packages/sdk/react/ ./packages/sdk/react/
85+
# we are now also copy the examples because pnpm install needs it
86+
COPY packages/sdk/examples/next/ ./packages/sdk/examples/next/
87+
COPY packages/sdk/examples/vite/ ./packages/sdk/examples/vite/
88+
COPY packages/sdk/component-registry/ ./packages/sdk/component-registry/
8589

8690
# Install all workspace dependencies
8791
WORKDIR /app
8892
RUN pnpm install
8993

90-
# Build all packages in correct dependency order using Turbo
94+
# Build only what's needed for the server
9195
WORKDIR /app
92-
RUN pnpm run build
96+
RUN SKIP_ENV_VALIDATION=true pnpm exec turbo run build --filter=echo-server
9397

9498
# Generate Prisma client and copy schema for server
9599
WORKDIR /app/packages/app/control

‎package.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"dev": "turbo run dev --filter=echo-control --filter=echo-server",
99
"build": "turbo run build --env-mode=loose",
10-
"prepare": "SKIP_ENV_VALIDATION=true turbo run build --env-mode=loose --filter=./packages/sdk/* --filter=!echo-next-template --filter=!echo-vite-template --filter=!registry",
10+
"prepare": "SKIP_ENV_VALIDATION=true turbo run build --env-mode=loose --filter=./packages/sdk/* --filter=!echo-next-example --filter=!echo-vite-example --filter=!registry",
1111
"test:unit": "pnpm -C packages/sdk/ts run build && pnpm -r --filter=!packages/app/server run test:unit",
1212
"test:integration": "pnpm -C packages/tests/integration test",
1313
"test:all": "pnpm run test:unit && pnpm run test:integration",
@@ -44,7 +44,11 @@
4444
"pnpm": {
4545
"overrides": {
4646
"@types/react": "19.1.10",
47-
"@types/react-dom": "19.1.7"
47+
"@types/react-dom": "19.1.7",
48+
"@ai-sdk/openai": "2.0.32",
49+
"@ai-sdk/anthropic": "2.0.17",
50+
"@ai-sdk/google": "2.0.14",
51+
"@openrouter/ai-sdk-provider": "1.2.0"
4852
},
4953
"engine-strict": true
5054
}

‎packages/sdk/component-registry/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"dependencies": {
1313
"@merit-systems/echo-next-sdk": "workspace:*",
1414
"@merit-systems/echo-react-sdk": "workspace:*",
15-
"@merit-systems/echo-typescript-sdk": "workspace:*",
1615
"@radix-ui/react-avatar": "^1.1.10",
1716
"@radix-ui/react-dialog": "^1.1.15",
1817
"@radix-ui/react-label": "^2.1.7",

0 commit comments

Comments
 (0)