@bagelink/workspace 1.10.6 → 1.11.0

package/bin/bgl.ts

@@ -10,7 +10,12 @@ const [,, command, subcommand, ...args] = process.argv
 
 async function main() {
 	if (command === 'init') {
-		const createWorkspace = args.includes('--workspace') || args.includes('-w')
+		// Check both subcommand and args for --workspace flag
+		const createWorkspace
+			= subcommand === '--workspace'
+				|| subcommand === '-w'
+				|| args.includes('--workspace')
+				|| args.includes('-w')
 		if (createWorkspace) {
 			await initWorkspace()
 		}
@@ -19,7 +24,7 @@ async function main() {
 		}
 	}
 	else if (command === 'add') {
-		const projectName = args[0]
+		const projectName = subcommand // 'bgl add admin' -> subcommand is 'admin'
 		if (!projectName) {
 			console.error('Error: Project name is required')
 			console.log('Usage: bgl add <project-name>')

package/dist/bin/bgl.cjs

@@ -2,7 +2,7 @@
 'use strict';
 
 const process = require('node:process');
-const detect = require('../shared/workspace.DQ-r7Tja.cjs');
+const detect = require('../shared/workspace.BMTTo3s8.cjs');
 require('node:fs');
 require('node:path');
 require('prompts');
@@ -14,14 +14,14 @@ const process__default = /*#__PURE__*/_interopDefaultCompat(process);
 const [, , command, subcommand, ...args] = process__default.argv;
 async function main() {
   if (command === "init") {
-    const createWorkspace = args.includes("--workspace") || args.includes("-w");
+    const createWorkspace = subcommand === "--workspace" || subcommand === "-w" || args.includes("--workspace") || args.includes("-w");
     if (createWorkspace) {
       await detect.initWorkspace();
     } else {
       await detect.generateWorkspaceConfig();
     }
   } else if (command === "add") {
-    const projectName = args[0];
+    const projectName = subcommand;
     if (!projectName) {
       console.error("Error: Project name is required");
       console.log("Usage: bgl add <project-name>");

package/dist/bin/bgl.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import process from 'node:process';
-import { i as initWorkspace, g as generateWorkspaceConfig, h as addProject, l as listProjects, k as isWorkspace, d as setupLint, f as generateSDKForWorkspace, e as generateSDK } from '../shared/workspace.Dq4_YhqE.mjs';
+import { i as initWorkspace, g as generateWorkspaceConfig, h as addProject, l as listProjects, k as isWorkspace, d as setupLint, f as generateSDKForWorkspace, e as generateSDK } from '../shared/workspace.COhZ__uF.mjs';
 import 'node:fs';
 import 'node:path';
 import 'prompts';
@@ -8,14 +8,14 @@ import 'prompts';
 const [, , command, subcommand, ...args] = process.argv;
 async function main() {
   if (command === "init") {
-    const createWorkspace = args.includes("--workspace") || args.includes("-w");
+    const createWorkspace = subcommand === "--workspace" || subcommand === "-w" || args.includes("--workspace") || args.includes("-w");
     if (createWorkspace) {
       await initWorkspace();
     } else {
       await generateWorkspaceConfig();
     }
   } else if (command === "add") {
-    const projectName = args[0];
+    const projectName = subcommand;
     if (!projectName) {
       console.error("Error: Project name is required");
       console.log("Usage: bgl add <project-name>");

package/dist/index.cjs

@@ -3,7 +3,7 @@
 const node_fs = require('node:fs');
 const node_path = require('node:path');
 const process = require('node:process');
-const detect = require('./shared/workspace.DQ-r7Tja.cjs');
+const detect = require('./shared/workspace.BMTTo3s8.cjs');
 require('prompts');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { existsSync } from 'node:fs';
 import { resolve, join } from 'node:path';
 import process from 'node:process';
-import { g as generateWorkspaceConfig, s as setBuildEnvVars, w as writeNetlifyConfig } from './shared/workspace.Dq4_YhqE.mjs';
-export { h as addProject, a as generateNetlifyConfig, b as generateNetlifyRedirect, e as generateSDK, f as generateSDKForWorkspace, c as generateWorkspaceConfigSync, j as getWorkspaceInfo, i as initWorkspace, k as isWorkspace, l as listProjects, d as setupLint } from './shared/workspace.Dq4_YhqE.mjs';
+import { g as generateWorkspaceConfig, s as setBuildEnvVars, w as writeNetlifyConfig } from './shared/workspace.COhZ__uF.mjs';
+export { h as addProject, a as generateNetlifyConfig, b as generateNetlifyRedirect, e as generateSDK, f as generateSDKForWorkspace, c as generateWorkspaceConfigSync, j as getWorkspaceInfo, i as initWorkspace, k as isWorkspace, l as listProjects, d as setupLint } from './shared/workspace.COhZ__uF.mjs';
 import 'prompts';
 
 async function resolveConfig(mode = "development", options = {}) {

package/dist/shared/{workspace.DQ-r7Tja.cjs → workspace.BMTTo3s8.cjs}

@@ -566,10 +566,11 @@ async function initWorkspace(root = process__default.cwd()) {
     process__default.exit(1);
   }
   const { workspaceName, projectId, createFirstProject, firstProjectName } = response;
+  const workspaceDir = node_path.resolve(root, workspaceName);
   createWorkspaceRoot(root, workspaceName, projectId);
-  createSharedPackage(root);
+  createSharedPackage(workspaceDir);
   if (createFirstProject && firstProjectName) {
-    await addProject(firstProjectName, root);
+    await addProject(firstProjectName, workspaceDir);
   }
   console.log("\n\u2705 Workspace created successfully!");
   console.log("\nNext steps:");
@@ -594,7 +595,8 @@ function createWorkspaceRoot(root, name, projectId) {
     private: true,
     workspaces: ["*", "!node_modules"],
     scripts: {
-      dev: "bun run --filter './[!shared]*' dev",
+      dev: "bun scripts/dev.ts",
+      "dev:verbose": "bun run --filter './[!shared]*' dev",
       build: "bun run --filter './[!shared]*' build",
       typecheck: "tsc --noEmit"
     },
@@ -666,6 +668,72 @@ dist
 .vite
 `;
   node_fs.writeFileSync(node_path.resolve(workspaceDir, ".gitignore"), gitignore);
+  const scriptsDir = node_path.resolve(workspaceDir, "scripts");
+  node_fs.mkdirSync(scriptsDir, { recursive: true });
+  const devRunnerContent = `#!/usr/bin/env bun
+import { spawn } from 'bun'
+import { readdir } from 'fs/promises'
+import { resolve } from 'path'
+
+const projectsRoot = process.cwd()
+const projects = (await readdir(projectsRoot, { withFileTypes: true }))
+	.filter(
+		item =>
+			item.isDirectory()
+			&& item.name !== 'node_modules'
+			&& item.name !== 'shared'
+			&& item.name !== 'scripts'
+			&& item.name !== '.git'
+			&& !item.name.startsWith('.'),
+	)
+	.map(item => item.name)
+
+console.log(\`\\n\u{1F680} Starting \${projects.length} project\${projects.length > 1 ? 's' : ''}...\\n\`)
+
+const urlPattern = /Local:\\s+(http:\\/\\/localhost:\\d+)/
+
+projects.forEach((project) => {
+	const proc = spawn({
+		cmd: ['bun', 'run', 'dev'],
+		cwd: resolve(projectsRoot, project),
+		stdout: 'pipe',
+		stderr: 'pipe',
+	})
+
+	const decoder = new TextDecoder()
+
+	proc.stdout.pipeTo(
+		new WritableStream({
+			write(chunk) {
+				const text = decoder.decode(chunk)
+				const match = text.match(urlPattern)
+				if (match) {
+					console.log(\`  \u2713 \${project.padEnd(15)} \u2192 \${match[1]}\`)
+				}
+			},
+		}),
+	)
+
+	proc.stderr.pipeTo(
+		new WritableStream({
+			write(chunk) {
+				const text = decoder.decode(chunk)
+				if (text.includes('error') || text.includes('Error')) {
+					console.error(\`  \u2717 \${project}: \${text.trim()}\`)
+				}
+			},
+		}),
+	)
+})
+
+console.log('\\n\u{1F4A1} Press Ctrl+C to stop all servers\\n')
+
+process.on('SIGINT', () => {
+	console.log('\\n\\n\u{1F44B} Stopping all servers...\\n')
+	process.exit()
+})
+`;
+  node_fs.writeFileSync(node_path.resolve(scriptsDir, "dev.ts"), devRunnerContent);
   console.log(`\u2705 Created workspace: ${name}`);
 }
 function createSharedPackage(root) {

package/dist/shared/{workspace.Dq4_YhqE.mjs → workspace.COhZ__uF.mjs}

@@ -559,10 +559,11 @@ async function initWorkspace(root = process.cwd()) {
     process.exit(1);
   }
   const { workspaceName, projectId, createFirstProject, firstProjectName } = response;
+  const workspaceDir = resolve(root, workspaceName);
   createWorkspaceRoot(root, workspaceName, projectId);
-  createSharedPackage(root);
+  createSharedPackage(workspaceDir);
   if (createFirstProject && firstProjectName) {
-    await addProject(firstProjectName, root);
+    await addProject(firstProjectName, workspaceDir);
   }
   console.log("\n\u2705 Workspace created successfully!");
   console.log("\nNext steps:");
@@ -587,7 +588,8 @@ function createWorkspaceRoot(root, name, projectId) {
     private: true,
     workspaces: ["*", "!node_modules"],
     scripts: {
-      dev: "bun run --filter './[!shared]*' dev",
+      dev: "bun scripts/dev.ts",
+      "dev:verbose": "bun run --filter './[!shared]*' dev",
       build: "bun run --filter './[!shared]*' build",
       typecheck: "tsc --noEmit"
     },
@@ -659,6 +661,72 @@ dist
 .vite
 `;
   writeFileSync(resolve(workspaceDir, ".gitignore"), gitignore);
+  const scriptsDir = resolve(workspaceDir, "scripts");
+  mkdirSync(scriptsDir, { recursive: true });
+  const devRunnerContent = `#!/usr/bin/env bun
+import { spawn } from 'bun'
+import { readdir } from 'fs/promises'
+import { resolve } from 'path'
+
+const projectsRoot = process.cwd()
+const projects = (await readdir(projectsRoot, { withFileTypes: true }))
+	.filter(
+		item =>
+			item.isDirectory()
+			&& item.name !== 'node_modules'
+			&& item.name !== 'shared'
+			&& item.name !== 'scripts'
+			&& item.name !== '.git'
+			&& !item.name.startsWith('.'),
+	)
+	.map(item => item.name)
+
+console.log(\`\\n\u{1F680} Starting \${projects.length} project\${projects.length > 1 ? 's' : ''}...\\n\`)
+
+const urlPattern = /Local:\\s+(http:\\/\\/localhost:\\d+)/
+
+projects.forEach((project) => {
+	const proc = spawn({
+		cmd: ['bun', 'run', 'dev'],
+		cwd: resolve(projectsRoot, project),
+		stdout: 'pipe',
+		stderr: 'pipe',
+	})
+
+	const decoder = new TextDecoder()
+
+	proc.stdout.pipeTo(
+		new WritableStream({
+			write(chunk) {
+				const text = decoder.decode(chunk)
+				const match = text.match(urlPattern)
+				if (match) {
+					console.log(\`  \u2713 \${project.padEnd(15)} \u2192 \${match[1]}\`)
+				}
+			},
+		}),
+	)
+
+	proc.stderr.pipeTo(
+		new WritableStream({
+			write(chunk) {
+				const text = decoder.decode(chunk)
+				if (text.includes('error') || text.includes('Error')) {
+					console.error(\`  \u2717 \${project}: \${text.trim()}\`)
+				}
+			},
+		}),
+	)
+})
+
+console.log('\\n\u{1F4A1} Press Ctrl+C to stop all servers\\n')
+
+process.on('SIGINT', () => {
+	console.log('\\n\\n\u{1F44B} Stopping all servers...\\n')
+	process.exit()
+})
+`;
+  writeFileSync(resolve(scriptsDir, "dev.ts"), devRunnerContent);
   console.log(`\u2705 Created workspace: ${name}`);
 }
 function createSharedPackage(root) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/workspace",
   "type": "module",
-  "version": "1.10.6",
+  "version": "1.11.0",
   "description": "Monorepo workspace tooling for Bagel projects with proxy and config management",
   "author": {
     "name": "Bagel Studio",

package/src/workspace.ts

@@ -43,14 +43,16 @@ export async function initWorkspace(root: string = process.cwd()): Promise<void>
 
 	const { workspaceName, projectId, createFirstProject, firstProjectName } = response
 
+	const workspaceDir = resolve(root, workspaceName)
+
 	// Create workspace structure
 	createWorkspaceRoot(root, workspaceName, projectId)
 
 	// Create shared package
-	createSharedPackage(root)
+	createSharedPackage(workspaceDir)
 
 	if (createFirstProject && firstProjectName) {
-		await addProject(firstProjectName, root)
+		await addProject(firstProjectName, workspaceDir)
 	}
 
 	console.log('\n✅ Workspace created successfully!')
@@ -85,7 +87,8 @@ function createWorkspaceRoot(root: string, name: string, projectId: string): voi
 		private: true,
 		workspaces: ['*', '!node_modules'],
 		scripts: {
-			dev: 'bun run --filter \'./[!shared]*\' dev',
+			dev: 'bun scripts/dev.ts',
+			'dev:verbose': 'bun run --filter \'./[!shared]*\' dev',
 			build: 'bun run --filter \'./[!shared]*\' build',
 			typecheck: 'tsc --noEmit',
 		},
@@ -166,6 +169,77 @@ dist
 
 	writeFileSync(resolve(workspaceDir, '.gitignore'), gitignore)
 
+	// Create scripts directory
+	const scriptsDir = resolve(workspaceDir, 'scripts')
+	mkdirSync(scriptsDir, { recursive: true })
+
+	// Copy dev runner script
+	const devRunnerContent = `#!/usr/bin/env bun
+import { spawn } from 'bun'
+import { readdir } from 'fs/promises'
+import { resolve } from 'path'
+
+const projectsRoot = process.cwd()
+const projects = (await readdir(projectsRoot, { withFileTypes: true }))
+	.filter(
+		item =>
+			item.isDirectory()
+			&& item.name !== 'node_modules'
+			&& item.name !== 'shared'
+			&& item.name !== 'scripts'
+			&& item.name !== '.git'
+			&& !item.name.startsWith('.'),
+	)
+	.map(item => item.name)
+
+console.log(\`\\n🚀 Starting \${projects.length} project\${projects.length > 1 ? 's' : ''}...\\n\`)
+
+const urlPattern = /Local:\\s+(http:\\/\\/localhost:\\d+)/
+
+projects.forEach((project) => {
+	const proc = spawn({
+		cmd: ['bun', 'run', 'dev'],
+		cwd: resolve(projectsRoot, project),
+		stdout: 'pipe',
+		stderr: 'pipe',
+	})
+
+	const decoder = new TextDecoder()
+
+	proc.stdout.pipeTo(
+		new WritableStream({
+			write(chunk) {
+				const text = decoder.decode(chunk)
+				const match = text.match(urlPattern)
+				if (match) {
+					console.log(\`  ✓ \${project.padEnd(15)} → \${match[1]}\`)
+				}
+			},
+		}),
+	)
+
+	proc.stderr.pipeTo(
+		new WritableStream({
+			write(chunk) {
+				const text = decoder.decode(chunk)
+				if (text.includes('error') || text.includes('Error')) {
+					console.error(\`  ✗ \${project}: \${text.trim()}\`)
+				}
+			},
+		}),
+	)
+})
+
+console.log('\\n💡 Press Ctrl+C to stop all servers\\n')
+
+process.on('SIGINT', () => {
+	console.log('\\n\\n👋 Stopping all servers...\\n')
+	process.exit()
+})
+`
+
+	writeFileSync(resolve(scriptsDir, 'dev.ts'), devRunnerContent)
+
 	console.log(`✅ Created workspace: ${name}`)
 }
 

package/templates/dev-runner.ts

@@ -0,0 +1,61 @@
+#!/usr/bin/env bun
+import { spawn } from 'bun'
+import { readdir } from 'fs/promises'
+import { resolve } from 'path'
+
+const projectsRoot = process.cwd()
+const projects = (await readdir(projectsRoot, { withFileTypes: true }))
+	.filter(
+		item =>
+			item.isDirectory()
+			&& item.name !== 'node_modules'
+			&& item.name !== 'shared'
+			&& item.name !== '.git'
+			&& !item.name.startsWith('.'),
+	)
+	.map(item => item.name)
+
+console.log(`\n🚀 Starting ${projects.length} project${projects.length > 1 ? 's' : ''}...\n`)
+
+const urlPattern = /Local:\s+(http:\/\/localhost:\d+)/
+
+projects.forEach((project) => {
+	const proc = spawn({
+		cmd: ['bun', 'run', 'dev'],
+		cwd: resolve(projectsRoot, project),
+		stdout: 'pipe',
+		stderr: 'pipe',
+	})
+
+	const decoder = new TextDecoder()
+
+	proc.stdout.pipeTo(
+		new WritableStream({
+			write(chunk) {
+				const text = decoder.decode(chunk)
+				const match = text.match(urlPattern)
+				if (match) {
+					console.log(`  ✓ ${project.padEnd(15)} → ${match[1]}`)
+				}
+			},
+		}),
+	)
+
+	proc.stderr.pipeTo(
+		new WritableStream({
+			write(chunk) {
+				const text = decoder.decode(chunk)
+				if (text.includes('error') || text.includes('Error')) {
+					console.error(`  ✗ ${project}: ${text.trim()}`)
+				}
+			},
+		}),
+	)
+})
+
+console.log('\n💡 Press Ctrl+C to stop all servers\n')
+
+process.on('SIGINT', () => {
+	console.log('\n\n👋 Stopping all servers...\n')
+	process.exit()
+})