@bagelink/workspace 1.11.0 → 1.11.1

package/src/workspace.ts

@@ -3,6 +3,18 @@ import { resolve } from 'node:path'
 import process from 'node:process'
 import prompts from 'prompts'
 
+async function resolveLatestVersion(pkg: string): Promise<string> {
+	try {
+		const res = await fetch(`https://registry.npmjs.org/${pkg}/latest`)
+		if (!res.ok) return 'latest'
+		const data = await res.json() as { version: string }
+		return `^${data.version}`
+	}
+	catch {
+		return 'latest'
+	}
+}
+
 /**
  * Initialize a new workspace with flat structure
  */
@@ -45,8 +57,27 @@ export async function initWorkspace(root: string = process.cwd()): Promise<void>
 
 	const workspaceDir = resolve(root, workspaceName)
 
+	// Resolve actual latest versions from npm before writing package.json
+	console.log('Resolving package versions...')
+	const allPkgs = [
+		'@bagelink/auth',
+		'@bagelink/sdk',
+		'@bagelink/vue',
+		'pinia',
+		'vue',
+		'vue-router',
+		'@bagelink/lint-config',
+		'@bagelink/workspace',
+		'@vitejs/plugin-vue',
+		'eslint',
+		'vite',
+	]
+	const versions = Object.fromEntries(
+		await Promise.all(allPkgs.map(async pkg => [pkg, await resolveLatestVersion(pkg)])),
+	)
+
 	// Create workspace structure
-	createWorkspaceRoot(root, workspaceName, projectId)
+	createWorkspaceRoot(root, workspaceName, projectId, versions)
 
 	// Create shared package
 	createSharedPackage(workspaceDir)
@@ -71,7 +102,7 @@ export async function initWorkspace(root: string = process.cwd()): Promise<void>
 /**
  * Create workspace root files
  */
-function createWorkspaceRoot(root: string, name: string, projectId: string): void {
+function createWorkspaceRoot(root: string, name: string, projectId: string, versions: Record<string, string>): void {
 	const workspaceDir = resolve(root, name)
 
 	if (existsSync(workspaceDir)) {
@@ -87,15 +118,29 @@ function createWorkspaceRoot(root: string, name: string, projectId: string): voi
 		private: true,
 		workspaces: ['*', '!node_modules'],
 		scripts: {
-			dev: 'bun scripts/dev.ts',
-			'dev:verbose': 'bun run --filter \'./[!shared]*\' dev',
-			build: 'bun run --filter \'./[!shared]*\' build',
-			typecheck: 'tsc --noEmit',
+			'dev': 'bgl dev',
+			'dev:local': 'bgl dev --mode localhost',
+			'dev:verbose': 'bun run --filter \'./!shared*\' dev',
+			'build': 'bgl build',
+			'typecheck': 'tsc --noEmit',
+			'lint': 'eslint . --cache',
+			'lint:fix': 'eslint . --cache --fix',
+		},
+		dependencies: {
+			'@bagelink/auth': versions['@bagelink/auth'],
+			'@bagelink/sdk': versions['@bagelink/sdk'],
+			'@bagelink/vue': versions['@bagelink/vue'],
+			'pinia': versions.pinia,
+			'vue': versions.vue,
+			'vue-router': versions['vue-router'],
 		},
 		devDependencies: {
-			'@bagelink/workspace': 'latest',
+			'@bagelink/lint-config': versions['@bagelink/lint-config'],
+			'@bagelink/workspace': versions['@bagelink/workspace'],
+			'@vitejs/plugin-vue': versions['@vitejs/plugin-vue'],
+			'eslint': versions.eslint,
 			'typescript': '^5.0.0',
-			'vite': 'latest',
+			'vite': versions.vite,
 		},
 	}
 
@@ -107,10 +152,15 @@ function createWorkspaceRoot(root: string, name: string, projectId: string): voi
 	// bgl.config.ts (shared)
 	const bglConfig = `import { defineWorkspace } 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>
+ */
 export default defineWorkspace({
 	localhost: {
 		host: 'http://localhost:8000',
-		proxy: '/api',
+		proxy: '/api', // Optional: remove to skip proxy setup
 		openapi_url: 'http://localhost:8000/openapi.json',
 	},
 	development: {
@@ -306,6 +356,12 @@ export async function addProject(
 
 	console.log(`\n📦 Creating project: ${name}\n`)
 
+	console.log('Resolving package versions...')
+	const projectPkgs = ['@vitejs/plugin-vue', 'vite', 'vue', 'pinia', 'vue-router']
+	const versions = Object.fromEntries(
+		await Promise.all(projectPkgs.map(async pkg => [pkg, await resolveLatestVersion(pkg)])),
+	)
+
 	mkdirSync(projectDir, { recursive: true })
 
 	// Determine if this is part of a workspace
@@ -320,11 +376,14 @@ export async function addProject(
 			build: 'vite build',
 			preview: 'vite preview',
 		},
-		dependencies: {} as Record<string, string>,
+		dependencies: {
+			'pinia': versions.pinia,
+			'vue': versions.vue,
+			'vue-router': versions['vue-router'],
+		} as Record<string, string>,
 		devDependencies: {
-			'@vitejs/plugin-vue': 'latest',
-			'vite': 'latest',
-			'vue': 'latest',
+			'@vitejs/plugin-vue': versions['@vitejs/plugin-vue'],
+			'vite': versions.vite,
 		},
 	}
 
@@ -370,25 +429,44 @@ export default defineWorkspace({
 	writeFileSync(resolve(projectDir, 'bgl.config.ts'), bglConfigContent)
 
 	// vite.config.ts
-	const viteConfig = `import { defineConfig } from 'vite'
+	const viteConfig = `import { resolve } from 'node:path'
+import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import { createViteProxy } from '@bagelink/workspace'
+import { bagelink } from '@bagelink/workspace/vite'
 import workspace from './bgl.config'
 
-export default defineConfig(({ mode }) => {
-	const config = workspace(mode as 'localhost' | 'development' | 'production')
-
-	return {
-		plugins: [vue()],
-		server: {
-			proxy: createViteProxy(config),
+export default defineConfig({
+	resolve: {
+		alias: {
+			'@': resolve(__dirname, 'src'),
 		},
-	}
+	},
+	plugins: [
+		vue(),
+		bagelink({ workspace }),
+	],
 })
 `
 
 	writeFileSync(resolve(projectDir, 'vite.config.ts'), viteConfig)
 
+	// tsconfig.json
+	const tsconfigJson = {
+		extends: '../tsconfig.app.json',
+		compilerOptions: {
+			types: ['vite/client'],
+			paths: {
+				'@/*': ['./src/*'],
+			},
+		},
+		include: ['src/**/*'],
+	}
+
+	writeFileSync(
+		resolve(projectDir, 'tsconfig.json'),
+		`${JSON.stringify(tsconfigJson, null, 2)}\n`,
+	)
+
 	// Create basic src structure
 	const srcDir = resolve(projectDir, 'src')
 	mkdirSync(srcDir, { recursive: true })
@@ -410,28 +488,60 @@ export default defineConfig(({ mode }) => {
 
 	writeFileSync(resolve(projectDir, 'index.html'), indexHtml)
 
+	// src/router/index.ts
+	const routerDir = resolve(srcDir, 'router')
+	mkdirSync(routerDir, { recursive: true })
+	const routerTs = `import { createRouter, createWebHistory } from 'vue-router'
+import HomeView from '../views/HomeView.vue'
+
+export default createRouter({
+	history: createWebHistory(import.meta.env.BASE_URL),
+	routes: [
+		{ path: '/', component: HomeView },
+	],
+})
+`
+	writeFileSync(resolve(routerDir, 'index.ts'), routerTs)
+
+	// src/views/HomeView.vue
+	const viewsDir = resolve(srcDir, 'views')
+	mkdirSync(viewsDir, { recursive: true })
+	const homeView = `<script setup lang="ts">
+${isWorkspace ? 'import { formatDate } from \'shared/utils\'\n' : ''}
+</script>
+
+<template>
+	<main>
+		<h1>${name}</h1>
+		${isWorkspace ? '<p>{{ formatDate(new Date()) }}</p>' : ''}
+	</main>
+</template>
+`
+	writeFileSync(resolve(viewsDir, 'HomeView.vue'), homeView)
+
 	// main.ts
 	const mainTs = `import { createApp } from 'vue'
+import { createPinia } from 'pinia'
+import { BagelVue } from '@bagelink/vue'
+import router from './router'
 import App from './App.vue'
 
-createApp(App).mount('#app')
+createApp(App)
+	.use(createPinia())
+	.use(router)
+	.use(BagelVue)
+	.mount('#app')
 `
 
 	writeFileSync(resolve(srcDir, 'main.ts'), mainTs)
 
 	// App.vue
 	const appVue = `<script setup lang="ts">
-import { ref } from 'vue'
-${isWorkspace ? 'import { formatDate } from \'shared/utils\'\n' : ''}
-const count = ref(0)
+import { RouterView } from 'vue-router'
 </script>
 
 <template>
-	<div>
-		<h1>${name}</h1>
-		<button @click="count++">Count: {{ count }}</button>
-		${isWorkspace ? '<p>{{ formatDate(new Date()) }}</p>' : ''}
-	</div>
+	<RouterView />
 </template>
 `
 
@@ -484,7 +594,7 @@ function updateWorkspaceScripts(root: string, projectName: string): void {
 }
 
 /**
- * List all projects in workspace
+ * List all projects in workspace (sorted alphabetically for consistent ordering)
  */
 export function listProjects(root: string = process.cwd()): string[] {
 	try {
@@ -494,10 +604,25 @@ export function listProjects(root: string = process.cwd()): string[] {
 				item => item.isDirectory()
 					&& item.name !== 'node_modules'
 					&& item.name !== 'shared'
+					&& item.name !== 'scripts'
 					&& item.name !== '.git'
 					&& !item.name.startsWith('.'),
 			)
+			.filter((item) => {
+				// Only include directories with package.json that has a dev script
+				const packageJsonPath = resolve(root, item.name, 'package.json')
+				if (!existsSync(packageJsonPath)) return false
+
+				try {
+					const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'))
+					return packageJson.scripts?.dev !== undefined
+				}
+				catch {
+					return false
+				}
+			})
 			.map(item => item.name)
+			.sort() // Sort alphabetically for consistent port assignment
 	}
 	catch {
 		return []

package/templates/tsconfig.app.json

@@ -0,0 +1,23 @@
+{
+  "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"
+  ]
+}