@bagelink/workspace 1.10.7 → 1.10.9

package/src/dev.ts

@@ -0,0 +1,171 @@
+import { spawn } from 'node:child_process'
+import process from 'node:process'
+import { listProjects } from './workspace.js'
+
+interface ServerInfo {
+	name: string
+	assignedPort: number
+	actualPort?: number
+	status: 'starting' | 'ready'
+	order: number
+}
+
+const servers = new Map<string, ServerInfo>()
+const projectToPort = new Map<string, number>()
+const seenLines = new Set<string>()
+const START_PORT = 5173
+
+// ANSI colors
+const colors = {
+	reset: '\x1B[0m',
+	cyan: '\x1B[36m',
+	green: '\x1B[32m',
+	yellow: '\x1B[33m',
+	dim: '\x1B[2m',
+	red: '\x1B[31m',
+}
+
+function clearAndPrintServers() {
+	// Clear previous output
+	if (servers.size > 0) {
+		process.stdout.write('\x1B[2J\x1B[H') // Clear screen and move to top
+	}
+
+	console.log(`${colors.cyan}🚀 Development Servers${colors.reset}\n`)
+
+	// Sort by order to maintain consistent display
+	const sortedServers = Array.from(servers.entries()).sort((a, b) => a[1].order - b[1].order)
+
+	for (const [name, info] of sortedServers) {
+		const url = `http://localhost:${info.actualPort ?? info.assignedPort}`
+		if (info.status === 'ready') {
+			console.log(`${colors.green}●${colors.reset} ${colors.cyan}${name}${colors.reset} ${colors.dim}→${colors.reset} ${url}`)
+		}
+		else {
+			console.log(`${colors.yellow}○${colors.reset} ${colors.dim}${name} (starting...)${colors.reset} ${colors.dim}${url}${colors.reset}`)
+		}
+	}
+
+	console.log('')
+}
+
+export async function runDev(
+	filter?: string,
+	additionalArgs: string[] = [],
+) {
+	const argsStr = additionalArgs.length > 0 ? ` -- ${additionalArgs.join(' ')}` : ''
+	const resolvedFilters = resolveFilters(filter)
+	if (!resolvedFilters || resolvedFilters.length === 0) return 1
+
+	// Pre-assign ports based on alphabetical order
+	const projectNames = resolvedFilters.map(f => f.replace('./', '')).sort()
+	projectNames.forEach((name, index) => {
+		const assignedPort = START_PORT + index
+		servers.set(name, {
+			name,
+			assignedPort,
+			status: 'starting',
+			order: index,
+		})
+		projectToPort.set(name, assignedPort)
+	})
+
+	clearAndPrintServers()
+
+	const filterArgs = resolvedFilters.map(f => `--filter '${f}'`).join(' ')
+	const projectNamesDisplay = projectNames.join(', ')
+
+	const command = `bun run ${filterArgs} dev${argsStr}`
+	const proc = spawn(command, {
+		cwd: process.cwd(),
+		stdio: ['inherit', 'pipe', 'pipe'],
+		shell: true,
+	})
+
+	let stdoutBuffer = ''
+	let stderrBuffer = ''
+
+	function processLine(line: string) {
+		if (!line.trim()) return
+
+		// Skip duplicate lines
+		if (seenLines.has(line)) return
+		seenLines.add(line)
+
+		// Extract port from "project dev:   ➜  Local:   http://localhost:5173/"
+		const portMatch = line.match(/Local:\s+http:\/\/localhost:(\d+)/)
+		if (portMatch) {
+			const port = Number.parseInt(portMatch[1], 10)
+
+			// Extract project name from this line
+			const projectInLine = line.match(/^([\w-]+)\s+dev:/)
+			if (projectInLine) {
+				const name = projectInLine[1]
+				const info = servers.get(name)
+				if (info && !info.actualPort) {
+					info.actualPort = port
+					info.status = 'ready'
+					clearAndPrintServers()
+				}
+			}
+		}
+	}
+
+	proc.stdout?.setEncoding('utf8')
+	proc.stderr?.setEncoding('utf8')
+
+	proc.stdout?.on('data', (data: string) => {
+		// Debug: show we're receiving data
+		if (servers.size === 0) {
+			console.log(`${colors.dim}Receiving output...${colors.reset}`)
+		}
+
+		stdoutBuffer += data
+		const lines = stdoutBuffer.split('\n')
+		stdoutBuffer = lines.pop() || ''
+
+		for (const line of lines) {
+			processLine(line)
+		}
+	})
+
+	proc.stderr?.on('data', (data: string) => {
+		stderrBuffer += data
+		const lines = stderrBuffer.split('\n')
+		stderrBuffer = lines.pop() || ''
+
+		for (const line of lines) {
+			processLine(line)
+		}
+	})
+
+	proc.on('error', (error) => {
+		console.error(`${colors.red}Failed to start dev servers:${colors.reset}`, error.message)
+	})
+
+	// Handle Ctrl+C gracefully
+	process.on('SIGINT', () => {
+		proc.kill('SIGINT')
+		process.exit(0)
+	})
+
+	return new Promise<number>((resolve, reject) => {
+		proc.on('exit', (code) => {
+			resolve(code || 0)
+		})
+		proc.on('error', reject)
+	})
+}
+
+function resolveFilters(filter?: string): string[] | null {
+	if (filter) return [filter]
+
+	const projects = listProjects()
+	if (projects.length === 0) {
+		console.error('No projects found')
+		return null
+	}
+
+	// Return all projects as individual filters
+	return projects.map(p => `./${p}`)
+}

package/src/index.ts

@@ -4,16 +4,8 @@ import type {
 	WorkspaceOptions,
 	ProxyConfig,
 } from './types'
-import { resolveConfig, mergeConfigs } from './config'
-import { generateWorkspaceConfig, generateWorkspaceConfigSync } from './init'
-import {
-	generateNetlifyConfig,
-	generateNetlifyRedirect,
-	writeNetlifyConfig,
-	setBuildEnvVars,
-} from './netlify'
-import { createViteProxy, createCustomProxy } from './proxy'
 
+// Export types (no runtime code)
 export type {
 	ProxyConfig,
 	WorkspaceConfig,
@@ -21,23 +13,9 @@ export type {
 	WorkspaceOptions,
 }
 
-export {
-	createCustomProxy,
-	createViteProxy,
-	generateNetlifyConfig,
-	generateNetlifyRedirect,
-	generateWorkspaceConfig,
-	generateWorkspaceConfigSync,
-	mergeConfigs,
-	resolveConfig,
-	setBuildEnvVars,
-	writeNetlifyConfig,
-}
-
-export { setupLint } from './lint'
-export { generateSDK, generateSDKForWorkspace } from './sdk'
-export { addProject, initWorkspace, listProjects } from './workspace'
-export { getWorkspaceInfo, isWorkspace } from './detect'
+// Runtime composables (browser-safe, no Node.js dependencies)
+export { getApiUrl, useWorkspace } from './composable'
+export type { RuntimeWorkspaceConfig } from './composable'
 
 /**
  * Define workspace configuration
@@ -50,55 +28,3 @@ export function defineWorkspace(
 		return configs[mode] || configs.development
 	}
 }
-
-/**
- * Create a workspace instance for managing project configuration
- * Supports both single project and monorepo setups
- */
-export function createWorkspace(options: WorkspaceOptions = {}) {
-	let cachedConfig: WorkspaceConfig | null = null
-
-	return {
-		/**
-		 * Get resolved config for the specified environment
-		 */
-		async getConfig(mode: WorkspaceEnvironment = 'development'): Promise<WorkspaceConfig> {
-			if (!cachedConfig) {
-				cachedConfig = await resolveConfig(mode, options)
-			}
-			return cachedConfig
-		},
-
-		/**
-		 * Create Vite proxy configuration
-		 */
-		createProxy(config: WorkspaceConfig): ProxyConfig {
-			return createViteProxy(config)
-		},
-
-		/**
-		 * Generate Netlify configuration file
-		 */
-		generateNetlify(
-			config: WorkspaceConfig,
-			outPath: string = './netlify.toml',
-			additionalConfig?: string
-		): void {
-			writeNetlifyConfig(config, outPath, additionalConfig)
-		},
-
-		/**
-		 * Set build environment variables
-		 */
-		setBuildEnv(config: WorkspaceConfig): void {
-			setBuildEnvVars(config)
-		},
-
-		/**
-		 * Clear cached configuration
-		 */
-		clearCache(): void {
-			cachedConfig = null
-		},
-	}
-}

package/src/init.ts

@@ -49,10 +49,15 @@ export async function generateWorkspaceConfig(
 	const configContent = `import { defineWorkspace } from '@bagelink/workspace'
 import type { WorkspaceConfig, WorkspaceEnvironment } from '@bagelink/workspace'
 
+/**
+ * Define your workspace environments
+ * You can add as many custom environments as needed (e.g., 'staging', 'preview')
+ * Use --mode flag to switch: bgl dev --mode <env_name>
+ */
 const configs: Record<WorkspaceEnvironment, WorkspaceConfig> = {
 	localhost: {
 		host: 'http://localhost:8000',
-		proxy: '/api',
+		proxy: '/api', // Optional: remove to skip proxy setup
 		openapi_url: 'http://localhost:8000/openapi.json',
 	},
 	development: {
@@ -91,6 +96,12 @@ export default defineWorkspace(configs)
 			message: 'Create/update vite.config.ts?',
 			initial: true,
 		},
+		{
+			type: 'confirm',
+			name: 'createTsConfig',
+			message: 'Create tsconfig.app.json with path aliases?',
+			initial: true,
+		},
 		{
 			type: 'confirm',
 			name: 'generateNetlify',
@@ -107,6 +118,10 @@ export default defineWorkspace(configs)
 		updateViteConfig(root)
 	}
 
+	if (setupResponse.createTsConfig) {
+		createTsConfig(root)
+	}
+
 	if (setupResponse.generateNetlify) {
 		const prodConfig: WorkspaceConfig = {
 			host: productionHost,
@@ -132,10 +147,15 @@ export function generateWorkspaceConfigSync(
 	const configContent = `import { defineWorkspace } from '@bagelink/workspace'
 import type { WorkspaceConfig, WorkspaceEnvironment } from '@bagelink/workspace'
 
+/**
+ * Define your workspace environments
+ * You can add as many custom environments as needed (e.g., 'staging', 'preview')
+ * Use --mode flag to switch: bgl dev --mode <env_name>
+ */
 const configs: Record<WorkspaceEnvironment, WorkspaceConfig> = {
 	localhost: {
 		host: 'http://localhost:8000',
-		proxy: '/api',
+		proxy: '/api', // Optional: remove to skip proxy setup
 		openapi_url: 'http://localhost:8000/openapi.json',
 	},
 	development: {
@@ -216,6 +236,38 @@ function updatePackageJsonScripts(root: string): void {
 	}
 }
 
+/**
+ * Create tsconfig.app.json with path aliases
+ */
+function createTsConfig(root: string): void {
+	const tsConfigPath = resolve(root, 'tsconfig.app.json')
+	const tsConfigExists = existsSync(tsConfigPath)
+
+	if (tsConfigExists) {
+		console.log('⚠️  tsconfig.app.json already exists, skipping')
+		return
+	}
+
+	const tsConfigContent = `{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"],
+      "@shared/*": ["../shared/*"]
+    }
+  },
+  "include": ["src/**/*", "src/**/*.vue"],
+  "exclude": ["node_modules"]
+}
+`
+
+	writeFileSync(tsConfigPath, tsConfigContent, 'utf-8')
+	console.log('✅ Created tsconfig.app.json')
+}
+
 /**
  * Create or update vite.config.ts
  */
@@ -233,25 +285,31 @@ function updateViteConfig(root: string): void {
 		}
 
 		// Ask to overwrite
-		console.log('⚠️  vite.config.ts exists. Please manually add the workspace configuration.')
-		console.log('    See: https://github.com/bageldb/bagelink/tree/master/packages/workspace#readme')
+		console.log('⚠️  vite.config.ts exists. Please manually add the bagelink plugin:')
+		console.log('')
+		console.log('    import { bagelink } from \'@bagelink/workspace/vite\'')
+		console.log('    import workspace from \'./bgl.config\'')
+		console.log('')
+		console.log('    plugins: [')
+		console.log('      vue(),')
+		console.log('      bagelink({ workspace }),')
+		console.log('    ]')
+		console.log('')
 		return
 	}
 
-	// Create new vite.config.ts
+	// Create new vite.config.ts with plugin
 	const viteConfigContent = `import { defineConfig } from 'vite'
-import { createViteProxy } from '@bagelink/workspace'
+import vue from '@vitejs/plugin-vue'
+import { bagelink } from '@bagelink/workspace/vite'
 import workspace from './bgl.config'
 
 // https://vitejs.dev/config/
-export default defineConfig(({ mode }) => {
-	const config = workspace(mode as 'localhost' | 'development' | 'production')
-
-	return {
-		server: {
-			proxy: createViteProxy(config),
-		},
-	}
+export default defineConfig({
+	plugins: [
+		vue(),
+		bagelink({ workspace }),
+	],
 })
 `
 

package/src/lint.ts

@@ -1,8 +1,35 @@
-import { existsSync, readFileSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import process from 'node:process'
 import prompts from 'prompts'
 
+/**
+ * List of redundant lint config files that can be safely removed
+ * after setting up the new lint configuration
+ */
+const REDUNDANT_FILES = [
+	// Old ESLint configs
+	'.eslintrc',
+	'.eslintrc.json',
+	'.eslintrc.js',
+	'.eslintrc.cjs',
+	'.eslintrc.yaml',
+	'.eslintrc.yml',
+	// Oxlint
+	'oxlint.json',
+	// Old Prettier configs (we create .prettierrc)
+	'prettier.config.js',
+	'prettier.config.cjs',
+	'prettier.config.mjs',
+	'.prettierrc.json',
+	'.prettierrc.yaml',
+	'.prettierrc.yml',
+	'.prettierrc.js',
+	'.prettierrc.cjs',
+	'.prettierrc.mjs',
+	'.prettierrc.toml',
+]
+
 /**
  * Set up linting in a project
  */
@@ -24,6 +51,12 @@ export async function setupLint(
 				{ title: 'Git Hooks', value: 'githooks', selected: false },
 			],
 		},
+		{
+			type: 'confirm',
+			name: 'cleanRedundant',
+			message: 'Clean up redundant lint config files?',
+			initial: true,
+		},
 		{
 			type: 'confirm',
 			name: 'installDeps',
@@ -37,7 +70,12 @@ export async function setupLint(
 		process.exit(1)
 	}
 
-	const { configs, installDeps } = response
+	const { configs, cleanRedundant, installDeps } = response
+
+	// Clean up redundant files first
+	if (cleanRedundant) {
+		await cleanRedundantFiles(root)
+	}
 
 	// Create config files
 	if (configs.includes('eslint')) {
@@ -182,6 +220,56 @@ function createGitHooks(root: string): void {
 	console.log('   Then run: npx simple-git-hooks')
 }
 
+/**
+ * Clean up redundant lint configuration files
+ */
+async function cleanRedundantFiles(root: string): Promise<void> {
+	const foundFiles: string[] = []
+
+	// Check which redundant files exist
+	for (const file of REDUNDANT_FILES) {
+		const filePath = resolve(root, file)
+		if (existsSync(filePath)) {
+			foundFiles.push(file)
+		}
+	}
+
+	if (foundFiles.length === 0) {
+		console.log('✨ No redundant files found')
+		return
+	}
+
+	console.log('\n📋 Found redundant files:')
+	foundFiles.forEach((file) => { console.log(`   - ${file}`) })
+
+	const confirmResponse = await prompts({
+		type: 'confirm',
+		name: 'confirm',
+		message: `Delete ${foundFiles.length} redundant file${foundFiles.length > 1 ? 's' : ''}?`,
+		initial: true,
+	})
+
+	if (!confirmResponse.confirm) {
+		console.log('⏭️  Skipped cleaning redundant files')
+		return
+	}
+
+	// Delete confirmed files
+	let deleted = 0
+	for (const file of foundFiles) {
+		try {
+			unlinkSync(resolve(root, file))
+			console.log(`🗑️  Deleted ${file}`)
+			deleted++
+		}
+		catch (error) {
+			console.error(`❌ Failed to delete ${file}:`, error)
+		}
+	}
+
+	console.log(`✅ Cleaned up ${deleted} file${deleted > 1 ? 's' : ''}`)
+}
+
 /**
  * Update package.json with lint scripts
  */

package/src/netlify.ts

@@ -5,9 +5,13 @@ import process from 'node:process'
 
 /**
  * Generate netlify.toml redirect configuration
+ * Uses environment variables for flexibility across environments
  */
 export function generateNetlifyRedirect(config: WorkspaceConfig): string {
-	const redirect = `[[redirects]]
+	const redirect = `# API Proxy Configuration
+# Environment variables are set in Netlify UI or netlify.toml [build.environment] section
+
+[[redirects]]
   from = "${config.proxy}/*"
   to = "${config.host}/:splat"
   status = 200
@@ -18,13 +22,49 @@ export function generateNetlifyRedirect(config: WorkspaceConfig): string {
 	return redirect
 }
 
+/**
+ * Generate netlify.toml with environment variable template
+ * Provides a standard config that can be reused across projects
+ */
+export function generateNetlifyConfigTemplate(): string {
+	return `# Standard Netlify configuration for Bagelink projects
+# Uses environment variables for proxy configuration
+
+[build.environment]
+  # Set these in Netlify UI or override here
+  # BGL_PROXY_PATH = "/api"
+  # BGL_API_HOST = "https://your-project.bagel.to"
+
+[[redirects]]
+  # Proxy API requests to backend
+  # Uses BGL_PROXY_PATH and BGL_API_HOST from environment
+  from = "/api/*"
+  to = "https://your-project.bagel.to/:splat"
+  status = 200
+  force = true
+  headers = {X-From = "Netlify"}
+
+# Example: Multiple API backends
+# [[redirects]]
+#   from = "/api/v2/*"
+#   to = "https://api-v2.example.com/:splat"
+#   status = 200
+#   force = true
+`
+}
+
 /**
  * Generate complete netlify.toml file
  */
 export function generateNetlifyConfig(
 	config: WorkspaceConfig,
 	additionalConfig?: string,
+	useTemplate: boolean = false,
 ): string {
+	if (useTemplate) {
+		return generateNetlifyConfigTemplate()
+	}
+
 	const redirect = generateNetlifyRedirect(config)
 
 	if (additionalConfig !== undefined && additionalConfig !== '') {
@@ -40,13 +80,24 @@ export function generateNetlifyConfig(
 export function writeNetlifyConfig(
 	config: WorkspaceConfig,
 	outPath: string = './netlify.toml',
-	additionalConfig?: string
+	additionalConfig?: string,
+	useTemplate: boolean = false,
 ): void {
-	const content = generateNetlifyConfig(config, additionalConfig)
+	const content = generateNetlifyConfig(config, additionalConfig, useTemplate)
 	const resolvedPath = resolve(outPath)
 
 	writeFileSync(resolvedPath, content, 'utf-8')
 	console.log(`✓ Generated netlify.toml at ${resolvedPath}`)
+
+	if (!useTemplate) {
+		console.log('\n💡 Tip: For environment-based config, set these in Netlify UI:')
+		console.log(`   BGL_PROXY_PATH = "${config.proxy}"`)
+		console.log(`   BGL_API_HOST = "${config.host}"`)
+		if (config.openapi_url) {
+			console.log(`   BGL_OPENAPI_URL = "${config.openapi_url}"`)
+		}
+		console.log('')
+	}
 }
 
 /**

package/src/proxy.ts

@@ -1,3 +1,4 @@
+import type { IncomingMessage, ServerResponse, ClientRequest } from 'node:http'
 import type { WorkspaceConfig, ProxyConfig } from './types'
 
 /**
@@ -12,7 +13,22 @@ export function createViteProxy(config: WorkspaceConfig): ProxyConfig {
 			target: config.host,
 			changeOrigin: true,
 			rewrite: (path: string) => path.replace(new RegExp(`^${config.proxy}`), ''),
-			secure: true,
+			secure: false,
+			ws: true,
+			followRedirects: true,
+			autoRewrite: true,
+			protocolRewrite: 'http',
+			configure: (proxy: any, _options: any) => {
+				proxy.on('proxyReq', (proxyReq: ClientRequest, req: IncomingMessage, _res: ServerResponse) => {
+					// Ensure proper headers are forwarded
+					if (req.headers.origin) {
+						proxyReq.setHeader('origin', config.host)
+					}
+				})
+				proxy.on('error', (err: Error, _req: IncomingMessage, _res: ServerResponse) => {
+					console.log('proxy error', err)
+				})
+			},
 		}
 	}
 
@@ -21,7 +37,9 @@ export function createViteProxy(config: WorkspaceConfig): ProxyConfig {
 		proxy['/files'] = {
 			target: config.host,
 			changeOrigin: true,
-			secure: true,
+			secure: false,
+			ws: true,
+			followRedirects: true,
 		}
 	}
 
@@ -38,6 +56,7 @@ export function createCustomProxy(
 		changeOrigin?: boolean
 		rewrite?: boolean
 		secure?: boolean
+		ws?: boolean
 	} = {}
 ): ProxyConfig {
 	const proxy: ProxyConfig = {}
@@ -46,7 +65,8 @@ export function createCustomProxy(
 		proxy[path] = {
 			target,
 			changeOrigin: options.changeOrigin ?? true,
-			secure: options.secure ?? true,
+			secure: options.secure ?? false,
+			ws: options.ws ?? true,
 			...(options.rewrite === true && {
 				rewrite: (p: string) => p.replace(new RegExp(`^${path}`), ''),
 			}),