Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hacky local build fix #559

Merged
merged 2 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/agent-chatbot/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ yarn-error.log*
# local env files
.env.local
.env.development.local
.env.development
.env.test.local
.env.production.local

Expand Down
2 changes: 1 addition & 1 deletion examples/agent-chatbot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@ai-sdk/openai": "^0.0.53",
"@mastra/core": "^0.1.11",
"@mastra/core": "^0.1.12",
"@mastra/firecrawl": "^1.0.1",
"@mastra/github": "^1.0.2",
"@mastra/slack": "^1.0.2",
Expand Down
3 changes: 2 additions & 1 deletion packages/admin/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ yarn-error.log*

# local env files
.env*.local
.env.development

# vercel
.vercel
Expand All @@ -40,4 +41,4 @@ next-env.d.ts
/playwright-report/

/temp_node_modules
/integrations
/integrations
6 changes: 2 additions & 4 deletions packages/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"@hello-pangea/dnd": "^16.6.0",
"@hookform/resolvers": "^3.9.0",
"@mastra/core": "workspace:^",
"@mastra/core": "^0.1.12",
"@paralleldrive/cuid2": "^2.2.2",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
Expand Down Expand Up @@ -92,9 +92,7 @@
"tiptap-markdown": "^0.8.10",
"use-debounce": "^10.0.3",
"zod": "^3.23.8",
"zod-to-json-schema": "^3.23.2",
"@mastra/slack": "workspace:^",
"@mastra/github": "workspace:^"
"zod-to-json-schema": "^3.23.2"
},
"devDependencies": {
"@currents/playwright": "^1.5.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"author": "",
"type": "module",
"dependencies": {
"@mastra/admin": "^0.1.13",
"@mastra/admin": "workspace:^",
"commander": "^12.1.0",
"dotenv": "^16.3.1",
"execa": "^9.3.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ export async function startNextDevServer(envFile: string = '.env.development') {
// Remove the next.config.js file from the admin path
adminPath = path.resolve(adminPath, '..');

await copyFolder(adminPath, tmpDir);

adminPath = path.resolve(tmpDir, 'admin');

await listFiles(adminPath);
if (!(process.env?.MASTRA_WORKSPACE === 'true')) {
await copyFolder(adminPath, tmpDir);
adminPath = path.resolve(tmpDir, 'admin');
await listFiles(adminPath);
}

copyUserEnvFileToAdmin(adminPath, envFile);

Expand Down
110 changes: 6 additions & 104 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading